Merge branch 'release2.2' of...

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

src/views/ecw/warehouse/index.vue

@@ -303,7 +303,9 @@
             </el-form-item>
             <el-form-item :label="$t('目的港服务')">
               <el-checkbox-group  v-model="lineform.otherService">
-                <el-checkbox @click.native="changeOtherService(item.id)" :checked="lineform.otherService.includes(item.id)"  v-for="item in endServiceGroup" :label="item.id " :key="item.id" :value="item.id" v-show="isShowError(item)"> {{item.text}}</el-checkbox>
+                <template  v-for="item in endServiceGroup" >
+                  <el-checkbox @click.native="changeOtherService(item.id)" :checked="checkedFn(item.id)" :label="item.id " :key="item.id" :value="item.id" v-if="isShowError(item)"> {{item.text}}</el-checkbox>
+                </template>
               </el-checkbox-group>
             </el-form-item>
           <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
@@ -319,7 +321,7 @@
           </el-form-item>
           <el-form-item :label="$t('保费币种')">
             <el-select v-model="lineform.currencyUnit">
-              <el-option v-for="(item) in currencyList" :label="$l(item, 'title')" :value="item.id"></el-option>
+              <el-option v-for="(item) in currencyList" :disabled="item.status === 1" :label="$l(item, 'title')" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('是否支持控货')">
@@ -582,6 +584,11 @@ export default {
   },
 
   computed: {
+    checkedFn(){
+      return (val)=>{
+        return (Array.isArray(this.lineform.otherService) ? this.lineform.otherService : []).includes(val)
+      }
+    },
     DICT_TYPE() {
       return DICT_TYPE
     },
@@ -592,7 +599,7 @@ export default {
       return (item) => {
         if(item.id !== '5' && item.id !== '10') return true;
         const { otherService } = this.lineform;
-        if(otherService.includes('2')) return true;
+        if((Array.isArray(otherService) ? otherService : []).includes('2')) return true;
         return false;
       }
     },
@@ -685,11 +692,9 @@ export default {
   },
   methods: {
     changeOtherService(val){
-      console.log(val,'val')
-      if(val === '2' && !this.lineform.otherService.includes('10')){
+      if(val === '2' && !( Array.isArray(this.lineform.otherService) ? this.lineform.otherService :[]).includes('10')){
         this.lineform.otherService.push('10');
       }
-
     },
     getDictDatas,
     getDictDataLabel,