From 578912c6f47205f319e0bcd06d535ffcdd4357f9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 15 Jul 2024 11:16:37 +0800
Subject: [PATCH] md

---
 src/views/emis/emisRegion/PcdPanel.vue       | 10 +++++++---
 src/views/emis/emisRegion/emisRegionForm.vue |  8 +++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue
index 2c7dbce6..82b76c01 100644
--- a/src/views/emis/emisRegion/PcdPanel.vue
+++ b/src/views/emis/emisRegion/PcdPanel.vue
@@ -33,8 +33,11 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('所属片区')" prop="regionCode">
-        <CountryAreaPicker :placeholder="$t('所属片区')" :countryCode="queryParams.countryCode" v-model="queryParams.areaId"  @onChange="handleQuery"></CountryAreaPicker>
+      <el-form-item :label="$t('寄件片区')" prop="sendAreaId">
+        <CountryAreaPicker :placeholder="$t('寄件片区')" :countryCode="queryParams.countryCode" v-model="queryParams.sendAreaId"  @onChange="handleQuery"></CountryAreaPicker>
+      </el-form-item>
+      <el-form-item :label="$t('派件片区')" prop="areaId">
+        <CountryAreaPicker :placeholder="$t('派件片区')" :countryCode="queryParams.countryCode" v-model="queryParams.areaId"  @onChange="handleQuery"></CountryAreaPicker>
       </el-form-item>
 
 
@@ -115,7 +118,8 @@
                 <dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/>
               </template>
           </el-table-column>
-          <el-table-column :label="$t('所属片区')" align="center" prop="areaName" width="80" />
+          <el-table-column :label="$t('寄件片区')" align="center" prop="sendAreaName" width="80" />
+          <el-table-column :label="$t('派件片区')" align="center" prop="areaName" width="80" />
            <!-- <el-table-column :label="$t('国家代码')" align="center" prop="countryCode" min-width="100" /> -->
           <el-table-column :label="$t('所属国家')" align="center" prop="countryName" width="80" />
           <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue
index c917e1b4..3943a0d5 100644
--- a/src/views/emis/emisRegion/emisRegionForm.vue
+++ b/src/views/emis/emisRegion/emisRegionForm.vue
@@ -62,7 +62,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2" >
-              <el-form-item label="所属片区" prop="countryAreaId">
+              <el-form-item label="寄件片区" prop="sendAreaId"  label-width="100px">
+                  <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.sendAreaId" ></CountryAreaPicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2" >
+              <el-form-item label="派件片区" prop="areaId" label-width="100px">
                   <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.areaId" ></CountryAreaPicker>
               </el-form-item>
             </el-col>
@@ -259,6 +264,7 @@ export default {
         shortName: null,
         parentCode: this.parentCode,
         areaId: null,
+        sendAreaId:null,
         areaName: null,
         countryCode: this.countryCode,
         countryName: null,