From 78c82cab6956d30014f433cca46e56e0917e6071 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 12 Dec 2023 17:26:41 +0800
Subject: [PATCH] md

---
 src/views/emis/emisCountry/index.vue | 55 ++++++++++++++++------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index c8e1658d..5827989e 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 	<el-row :gutter="20" type='flex'>
-	<el-col :span="3" :xs="3">
+	<el-col :span="4" :xs="4">
 		<div class="head-container">
 		  <el-input
 			v-model="domainName"
@@ -24,7 +24,7 @@
 		  />
 		</div>
 	</el-col>
-	<el-col :span="21" :xs="21">
+	<el-col :span="20" :xs="20" style="border-left:1px solid rgb(248 249 251);">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="" prop="name">
         <el-input
@@ -151,8 +151,8 @@
 		  </el-table-column>
 		</el-table>
 
-		
-	
+
+
 	<pagination
 	  v-show="total>0"
 	  :total="total"
@@ -191,6 +191,18 @@
               <el-input v-model="form.threeCode" placeholder="请输入三字码" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域" prop="remark">
+              <el-select v-model="form.domainId" placeholder="所属区域" clearable filterable>
+                    <el-option
+                      v-for="item in continentIdsOptions"
+                      v-bind:key="item.value"
+                      v-bind:label="item.label"
+                      v-bind:value="item.value"
+                    />
+                  </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -238,7 +250,7 @@ export default {
   components: { elDateSimplePicker,emisCountryView,emisCountryForm },
   dicts: [
   ],
-  
+
   data() {
     return {
 	  domainName:"",
@@ -246,9 +258,12 @@ export default {
 	  domainIdsOptions:[],
 	  domainIdsEditOptions:[],
 	  domainIdMap: new Map(),
+
+    continentIdsOptions:[],
+
 	  defaultProps: {
-		children: "children",
-		label: "label"
+      children: "children",
+      label: "label"
 	  },
 	  domainSelectList:[],
       // 遮罩层
@@ -274,7 +289,7 @@ export default {
 
       openForm: false,
       titleForm: "",
-		
+
       titleEmisCountry: "",
       openEmisCountry: false,
 
@@ -337,23 +352,17 @@ export default {
 	getContinentList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
+
+      this.continentIdsOptions =[];
+
       listEmisContinent(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
           var domainTree={"id":"","label":"所属大区","children":[]};
-          domainTree.children.push({"id":"-1","label":"临时"});
+          // domainTree.children.push({"id":"-1","label":"临时"});
           //this.domainIdMap[-1]="临时";
           var lastDomainId = -1;
           response.rows.forEach(item =>{
-             // this.domainIdMap[item.id]=item.name;
-              //var optItem={value:item.id,label:item.name};
-              //this.domainIdsOptions.push(optItem)
+              var optItem={value:item.id,label:item.name};
+              this.continentIdsOptions.push(optItem)
 
               var treeItem={"id":item.id,"label":item.name};
               domainTree.children.push(treeItem);
@@ -385,18 +394,18 @@ export default {
       var jObj = {
         continentId: continentId
       };
-      this.$cache.local.setJSON("menuDomainId",jObj);
+      this.$cache.local.setJSON("continentId",jObj);
     },
 	getCacheDomainId(){
       try{
-        var domainJsonObj = this.$cache.local.getJSON("menuDomainId");
+        var domainJsonObj = this.$cache.local.getJSON("continentId");
         if(domainJsonObj != undefined){
             return domainJsonObj.continentId;
         }else{
           return -1;
         }
       }catch(e){
-        this.$cache.local.remove("menuDomainId");
+        this.$cache.local.remove("continentId");
       }
     },
     // 取消按钮