Commit fe71b581 authored by 邓春圆's avatar 邓春圆

添加 空运提单制作节点 ,是否可见

parent 8f6b0964
...@@ -224,6 +224,7 @@ export const DICT_TYPE = { ...@@ -224,6 +224,7 @@ export const DICT_TYPE = {
BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态 BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
APP_TYPE:"app_type", //系统类型 APP_TYPE:"app_type", //系统类型
AIR_SHIPMENT_PROCESS:'air_shipment_process'
} }
/** /**
......
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" /> <el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('会员控货下单要求')" prop="kycStatus"> <el-form-item :label="$t('会员控货下单要求')" prop="kycStatus">
<el-radio-group v-model="form.kycStatus"> <el-radio-group v-model="form.kycStatus">
<el-radio v-for="dict in kycDatas" :key="dict.value" :label="dict.value">{{$l(dict, 'label')}}</el-radio> <el-radio v-for="dict in kycDatas" :key="dict.value" :label="dict.value">{{$l(dict, 'label')}}</el-radio>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
</div> </div>
<br/> <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-form-item :label="$t('始发港服务')">
<el-checkbox-group v-model="lineform.otherService"> <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> <el-checkbox v-for="item in serviceGroup" :label="item.id" :key="item.id" :value="item.id"> {{item.text}}</el-checkbox>
...@@ -306,6 +306,17 @@ ...@@ -306,6 +306,17 @@
<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 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-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
<el-select v-model="ladingform.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 :label="1">可见</el-radio>
<el-radio :label="0">不可见</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -393,7 +404,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar ...@@ -393,7 +404,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar
exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList,serviceConfig } from "@/api/ecw/warehouse"; exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList,serviceConfig } from "@/api/ecw/warehouse";
import { getNodePage } from "@/api/ecw/node"; import { getNodePage } from "@/api/ecw/node";
import { getListTree } from "@/api/ecw/region"; 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 {CommonStatusEnum} from '@/utils/constants'
import { uploadFile } from "@/api/infra/file"; import { uploadFile } from "@/api/infra/file";
import { listDept } from "@/api/system/dept"; import { listDept } from "@/api/system/dept";
...@@ -405,7 +416,6 @@ import Template from "../../cms/template/index"; ...@@ -405,7 +416,6 @@ import Template from "../../cms/template/index";
// 海运和空运的抬头模板 // 海运和空运的抬头模板
import tpl from './tpl' import tpl from './tpl'
console.log(tpl)
export default { export default {
name: "Warehouse", name: "Warehouse",
components: { components: {
...@@ -523,8 +533,8 @@ export default { ...@@ -523,8 +533,8 @@ export default {
}, },
// 表单参数 // 表单参数
form: {checkList:[],}, form: {checkList:[],},
ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]}, ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[],isClientShow:1,makeBillNode:''},
lineform: {otherService:[]}, lineform: {otherService:[],},
startName:'', startName:'',
destName:'', destName:'',
...@@ -559,6 +569,12 @@ export default { ...@@ -559,6 +569,12 @@ export default {
}, },
computed: { computed: {
DICT_TYPE() {
return DICT_TYPE
},
getDictDataL() {
return getDictDataL
},
isShowError() { isShowError() {
return (item) => { return (item) => {
if(item.id !== '5') return true; if(item.id !== '5') return true;
...@@ -652,10 +668,9 @@ export default { ...@@ -652,10 +668,9 @@ export default {
this.getList(); this.getList();
this.getNodeList(); this.getNodeList();
this.getContinentsList(); this.getContinentsList();
console.log("regionTypeDatas:"+JSON.stringify(this.regionTypeDatas));
console.log("transportDatas:"+JSON.stringify(this.transportDatas));
}, },
methods: { methods: {
getDictDataLabel,
setTpl(type){ setTpl(type){
this.ladingform.titleZh = tpl[type] this.ladingform.titleZh = tpl[type]
}, },
...@@ -1092,7 +1107,6 @@ export default { ...@@ -1092,7 +1107,6 @@ export default {
}); });
this.ladingform.lineId=lineId.substr(0,lineId.length-1); this.ladingform.lineId=lineId.substr(0,lineId.length-1);
} }
console.log(this.ladingform.lineId);
this.ladingform.account = JSON.stringify(this.arr); this.ladingform.account = JSON.stringify(this.arr);
createTemplate(this.ladingform).then(response => { createTemplate(this.ladingform).then(response => {
this.$modal.msgSuccess(this.$t("设置路线提单模板成功")); this.$modal.msgSuccess(this.$t("设置路线提单模板成功"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment