Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/warehouse/index.vue

@@ -307,12 +307,12 @@
               </el-checkbox-group>
             </el-form-item>
           <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
-           <el-select v-model="ladingform.makeBillNode">
+           <el-select v-model="lineform.makeBillNode">
              <el-option v-show="item.value !== '1'" v-for="(item, index) in getDictDatas(DICT_TYPE.AIR_SHIPMENT_PROCESS)" :label="$l(item, 'label')" :value="item.value"></el-option>
            </el-select>
           </el-form-item>
           <el-form-item label="线路是否在客户端显示">
-            <el-radio-group v-model="ladingform.isClientShow">
+            <el-radio-group v-model="lineform.isClientShow">
               <el-radio :label="1">可见</el-radio>
               <el-radio :label="0">不可见</el-radio>
             </el-radio-group>
@@ -533,8 +533,8 @@ export default {
       },
       // 表单参数
       form: {checkList:[],},
-      ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[],isClientShow:1,makeBillNode:''},
-      lineform: {otherService:[],},
+      ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
+      lineform: {otherService:[],isClientShow:1,makeBillNode:'2'},
       startName:'',
       destName:'',
 
@@ -857,8 +857,8 @@ export default {
       serviceConfig({
         lineId: this.lineform.lineId,
         otherService: otherService.join(','),
-        isClientShow:this.ladingform.isClientShow,
-        makeBillNode:this.ladingform.makeBillNode
+        isClientShow:this.lineform.isClientShow,
+        makeBillNode:this.lineform.makeBillNode
         }).then(res => {
           this.$modal.msgSuccess(this.$t("操作成功"));