From 4f89ec10fafc9618b80a796b550d11bf60f96ba9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 13 Jul 2024 16:48:53 +0800
Subject: [PATCH] md

---
 .../emisCountryArea/emisCountryAreaForm.vue    | 18 +++++++++++++-----
 src/views/emis/emisCountryArea/indexPanel.vue  |  4 +++-
 src/views/emis/emisRegion/PcdPanel.vue         |  1 +
 src/views/emis/emisRegion/emisRegionForm.vue   |  2 ++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/emisCountryArea/emisCountryAreaForm.vue b/src/views/emis/emisCountryArea/emisCountryAreaForm.vue
index 09537e72..2a8de812 100644
--- a/src/views/emis/emisCountryArea/emisCountryAreaForm.vue
+++ b/src/views/emis/emisCountryArea/emisCountryAreaForm.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="0">
         <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
           <el-col :span="24">
-            <el-form-item label="区域名称" prop="name">
+            <el-form-item label="片区名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入区域名称" />
             </el-form-item>
           </el-col>
@@ -17,6 +17,11 @@
                 <CountryPicker :placeholder="$t('所属国家')" v-model="form.countryCode" @onChange="onCountryChange"></CountryPicker>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="服务网点" prop="siteCode">
+              <EmisSiteSimplePicker :placeholder="$t('服务网点')" :countryCode="form.countryCode"  v-model="form.siteCode" ></EmisSiteSimplePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@@ -34,13 +39,14 @@
 <script>
 import { getEmisCountryArea, addEmisCountryArea, updateEmisCountryArea } from "@/api/emis/emisCountryArea";
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 
 export default {
   name: "emisCountryAreaForm",
   props:{
     id:undefined
   },
-  components: { CountryPicker },
+  components: { CountryPicker,EmisSiteSimplePicker },
   dicts: [
   ],
   data() {
@@ -106,16 +112,18 @@ export default {
         id: null,
         name: null,
         nameEn: null,
-        code: null,
         countryCode: null,
-        countryName:null,
+        countryName: null,
+        siteCode: null,
         remark: null,
         tenantId: null,
         delFlag: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        createSite: null,
+        updateSite: null
       };
       this.resetForm("form");
     },
diff --git a/src/views/emis/emisCountryArea/indexPanel.vue b/src/views/emis/emisCountryArea/indexPanel.vue
index 54e5103c..79d41ae1 100644
--- a/src/views/emis/emisCountryArea/indexPanel.vue
+++ b/src/views/emis/emisCountryArea/indexPanel.vue
@@ -22,7 +22,8 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight-50)+'px'"
 
-        v-loading="loading"
+          storageName="emisCountryAreaList_main"
+          v-loading="loading"
            border
            size="mini"
            :data="emisCountryAreaList"
@@ -91,6 +92,7 @@
       <!-- <el-table-column :label="$t('英文名称')" align="center" prop="nameEn" min-width="100" /> -->
       <!-- <el-table-column :label="$t('国家编码')" align="center" prop="countryCode" min-width="100" /> -->
       <el-table-column :label="$t('国家')" align="center" prop="countryName" :sort-orders="['descending','ascending']" sortable="custom"  />
+      <el-table-column :label="$t('服务网点')" align="center" prop="siteName" :sort-orders="['descending','ascending']" sortable="custom"  />
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue
index fad34dbe..2c7dbce6 100644
--- a/src/views/emis/emisRegion/PcdPanel.vue
+++ b/src/views/emis/emisRegion/PcdPanel.vue
@@ -48,6 +48,7 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight-50)+'px'"
 
+          storageName="emisPcdList_main"
             v-loading="loading"
             :data="tableData"
             :default-expand-all="false"
diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue
index 6e5b531b..c917e1b4 100644
--- a/src/views/emis/emisRegion/emisRegionForm.vue
+++ b/src/views/emis/emisRegion/emisRegionForm.vue
@@ -86,6 +86,8 @@ import { getEmisRegion, addEmisRegion, updateEmisRegion,listEmisRegion } from "@
 import RegionPcdTreePicker from '@/views/emis/EmisBaseTools/RegionPcdTreePicker.vue';
 //
 import CountryAreaPicker from '@/views/emis/EmisBaseTools/CountryAreaPicker.vue';
+import CountryAreaPicker2 from '@/views/emis/EmisBaseTools/CountryAreaPicker.vue';
+
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
 import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';