Merge branch 'release2.2' of...

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

src/utils/dict.js

@@ -219,6 +219,7 @@ export const DICT_TYPE = {
   BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
 
   APP_TYPE:"app_type",   //系统类型
+  AIR_SHIPMENT_PROCESS:'air_shipment_process'
 }
 
 /**

src/views/ecw/warehouse/index.vue

@@ -295,7 +295,7 @@
         </div>
         <br/>
 
-        <el-form ref="form" :model="lineform" :rules="rules" label-width="120px">
+        <el-form ref="form" :model="lineform" :rules="rules" label-width="160px">
             <el-form-item :label="$t('始发港服务')">
               <el-checkbox-group v-model="lineform.otherService">
                 <el-checkbox v-for="item in serviceGroup" :label="item.id" :key="item.id" :value="item.id"> {{item.text}}</el-checkbox>
@@ -306,6 +306,28 @@
                 <el-checkbox v-for="item in endServiceGroup" :label="item.id" :key="item.id" :value="item.id" v-show="isShowError(item)"> {{item.text}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          <el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
+           <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="lineform.isClientShow">
+              <el-radio :label="1">可见</el-radio>
+              <el-radio :label="0">不可见</el-radio>
+            </el-radio-group>
+          </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-select>
+          </el-form-item>
+          <el-form-item :label="$t('是否支持控货')">
+            <el-radio-group v-model="lineform.controlstatus">
+              <el-radio :label="0">支持</el-radio>
+              <el-radio :label="1">不支持</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
 
         <div slot="footer" class="dialog-footer">
@@ -393,7 +415,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar
 exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList,serviceConfig } from "@/api/ecw/warehouse";
 import { getNodePage } from "@/api/ecw/node";
 import { getListTree } from "@/api/ecw/region";
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+import {getDictDatas, DICT_TYPE, getDictDataL, getDictDataLabel} from '@/utils/dict'
 import {CommonStatusEnum} from '@/utils/constants'
 import { uploadFile } from "@/api/infra/file";
 import { listDept } from "@/api/system/dept";
@@ -405,7 +427,7 @@ import Template from "../../cms/template/index";
 
 // 海运和空运的抬头模板
 import tpl from './tpl'
-console.log(tpl)
+import {getCurrencyPage} from "@/api/ecw/currency";
 export default {
   name: "Warehouse",
   components: {
@@ -428,6 +450,7 @@ export default {
     };
 
     return {
+      currencyList:[],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -466,7 +489,8 @@ export default {
         {id: '3', text: this.$t('非控货订单代收货款')},
         {id: '4', text: this.$t('海外仓')},
         {id: '2', text: this.$t('送货上门')},
-        {id: '5', text: this.$t('提货异常')}
+        {id: '5', text: this.$t('提货异常')},
+        {id: '10', text: this.$t('默认送货上门')}
       ],
 
       // 总条数
@@ -524,7 +548,7 @@ export default {
       // 表单参数
       form: {checkList:[],},
       ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
-      lineform: {otherService:[]},
+      lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlstatus:0,currencyUnit:''},
       startName:'',
       destName:'',
 
@@ -559,9 +583,15 @@ export default {
   },
 
   computed: {
+    DICT_TYPE() {
+      return DICT_TYPE
+    },
+    getDictDataL() {
+      return getDictDataL
+    },
     isShowError() {
       return (item) => {
-        if(item.id !== '5') return true;
+        if(item.id !== '5' && item.id !== '10') return true;
         const { otherService } = this.lineform;
         if(otherService.includes('2')) return true;
         return false;
@@ -646,16 +676,16 @@ export default {
     },
 
   created() {
+    getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     if(this.nodeId) {
       this.queryParams.nodeId = parseInt(this.nodeId);
     }
     this.getList();
     this.getNodeList();
     this.getContinentsList();
-    console.log("regionTypeDatas:"+JSON.stringify(this.regionTypeDatas));
-    console.log("transportDatas:"+JSON.stringify(this.transportDatas));
   },
   methods: {
+    getDictDataLabel,
     setTpl(type){
       this.ladingform.titleZh = tpl[type]
     },
@@ -841,10 +871,13 @@ export default {
       }
       serviceConfig({
         lineId: this.lineform.lineId,
-        otherService: otherService.join(',')
+        otherService: otherService.join(','),
+        makeBillNode:this.lineform.makeBillNode,
+        isClientShow:this.lineform.isClientShow,
+        controlstatus:this.lineform.controlstatus,
+        currencyUnit:this.lineform.currencyUnit
         }).then(res => {
           this.$modal.msgSuccess(this.$t("操作成功"));
-
           for(let index in this.routeList) {
             let routeItem = this.routeList[index];
             if(routeItem.lineId && routeItem.lineId == this.lineform.lineId) {
@@ -1092,7 +1125,6 @@ export default {
             });
             this.ladingform.lineId=lineId.substr(0,lineId.length-1);
         }
-        console.log(this.ladingform.lineId);
         this.ladingform.account = JSON.stringify(this.arr);
           createTemplate(this.ladingform).then(response => {
               this.$modal.msgSuccess(this.$t("设置路线提单模板成功"));