Merge branch 'dev' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc into dev

src/views/contractManagement/storageContractEdit.vue

@@ -382,8 +382,10 @@
         submitType: true,
         options_: regionData,
         options:[],
-        selectedOptions: [],
-        selectedOptions1: [],
+        restaurants1: [],
+        restaurants2: [],
+        restaurants3: [],
+        restaurants4: [],
         tableData: [{
           date: 1111,
           name: 'qqqq',
@@ -421,6 +423,7 @@
         sexList: {},
         selectDuty: {},
         gradeList: {},
+        
         ChapterTwoList: {},
         selectIntendedShip: {},
         interviewTypeList: {},
@@ -439,6 +442,14 @@
           this.options = response
           this.staffList = response
         })
+        this.restaurants1 = JSON.parse(localStorage.getItem('deptBudgetList_data1'));
+      this.restaurants2 = JSON.parse(localStorage.getItem('deptBudgetList_data2'));
+      this.restaurants3 = JSON.parse(localStorage.getItem('deptBudgetList_data3'));
+      this.restaurants4 = JSON.parse(localStorage.getItem('deptBudgetList_data4'));
+      if (!this.restaurants1) this.restaurants1 = [];
+      if (!this.restaurants2) this.restaurants2 = [];
+      if (!this.restaurants3) this.restaurants3 = [];
+      if (!this.restaurants4) this.restaurants4 = [];
       this.loaddata()
       this.editInfo()
       this.showType = this.isShow
@@ -446,6 +457,11 @@
       this.showType = this.isShow
     },
     methods: {
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
       selectstaff(e) {
         this.deptBudgetList.personCharge = ''
         for (var i = 0; i < this.staffList.length; i++) {
@@ -563,32 +579,8 @@
           })
           .toPromise()
           .then((response) => {
-            // var tmp = []
-            // tmp[0] = TextToCode[response.sourceProvince].code
-            // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-            // if (tmp[0] == 810000 || tmp[0] == 820000) {
-            //   tmp[2] = null
-            // } else {
-            //   tmp[2] =
-            //     TextToCode[response.sourceProvince][response.sourceCity][
-            //       response.sourceArea
-            //     ].code
-            // }
-            // this.selectedOptions = tmp
-            var tmp1 = []
-            tmp1[0] = TextToCode[response.deliveryProvince].code
-            tmp1[1] =
-              TextToCode[response.deliveryProvince][response.deliveryCity].code
-            if (tmp1[0] == 810000 || tmp1[0] == 820000) {
-              tmp1[2] = null
-            } else {
-              tmp1[2] =
-                TextToCode[response.deliveryProvince][response.deliveryCity][
-                  response.deliveryArea
-                ].code
-            }
-
-            this.selectedOptions1 = tmp1
+            this.newSelectedOptions=response.sourceProvince+ '/' + response.sourceCity + '/' + response.sourceArea
+             this.newSelectedOptions1=response.deliveryProvince+ '/' + response.deliveryCity + '/' + response.deliveryArea
             this.deptBudgetList = response
             // var arr=this.deptBudgetList.personCharge.split(',')
             // for (let i = 0; i < arr.length; i++) {