Skip to content

J
jiedao-app-operator-master
Commit 204477e6 authored by zhoutong's avatar zhoutong
Browse files
Options

供应商，提单补料优化

parent ef214028
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 138 deletions
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 204477e6
......@@ -343,7 +343,7 @@ export default {
getCabinetPage(null).then((response) => {
this.cabinetList = response.data.list;
});
this.getBoxInfo()
// this.getBoxInfo()
},
methods: {
getTotlContent,
......@@ -428,8 +428,8 @@ export default {
case "modifyCabinet":
this.$set(this.dialogConfig, "fullscreen", false);
this.modifyCabinetObj = {};
this.$set(this.modifyCabinetObj,'cabinetId',this.newshipmentObj.cabinetId)
this.$set(this.modifyCabinetObj,'cubNo',this.newshipmentObj.cubNo)
this.$set(this.modifyCabinetObj,'cabinetId',this.shipmentObj.cabinetId)
this.$set(this.modifyCabinetObj,'cubNo',this.shipmentObj.cubNo)
break;
case "splitOrder":
this.$set(this.dialogConfig, "fullscreen", true);
......@@ -545,7 +545,8 @@ export default {
};
boxUpdate(params).then((res) => {
serviceMsg(res, this);
this.getBoxInfo()
// this.getBoxInfo()
this.$emit('getBoxInfo')
this.closeDialog2();
});
},
......
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
View file @ 204477e6
......@@ -35,10 +35,7 @@
</el-form-item>
<el-form-item :label="$t('包装数量与单位')" class="two-element">
<el-input v-model="subMaterialObj.packageNum" :placeholder="$t('请输入包装数量')"></el-input>
<!-- <el-select v-model="subMaterialObj.packageUnit" :placeholder="$t('请选择单位')">
<el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="$l(unit, 'title')"></el-option>
</el-select> -->
<el-input v-model="subMaterialObj.packageUnit" :placeholder="$t('请输入包装单位')"></el-input>
<dict-selector v-model="subMaterialObj.packageUnit" type="packaging_type" />
</el-form-item>
<el-form-item :label="$t('货物毛重(KGS)')">
<el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入货物毛重') + '(KGS)'"></el-input>
......@@ -157,7 +154,7 @@ export default {
this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||'')
this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||''+response.data.externalBackVO?.ctnNo||'')
if(this.subMaterialObj.goodsDesc == null){
this.$set(this.subMaterialObj,'goodsDesc','/')
}
......
src/views/ecw/box/shippingSea/nodePage/trailer.vue
View file @ 204477e6
......@@ -64,7 +64,7 @@ export default {
},
created() {
const { currNode, shipmentObj } = this.$attrs;
const voName = currNode.voName;
const voName = currNode.voName;console.log(shipmentObj[voName])
let oldData = { ...shipmentObj[voName] };
oldData = formatNumberString(oldData, ["tlContainerStatus"]);
oldData = formatStringNumber(oldData, ["tlCompanyId"]);
......
src/views/ecw/supplier/detail.vue
View file @ 204477e6
......@@ -55,6 +55,18 @@
<dict-selector v-model="formData.cooperationType" type="cooperation_type" disabled />
</el-form-item>
</div>
<div v-if="formData.areaType==1">
<el-form-item :label="$t('国家')" prop="cooperationType">
<el-select v-model="formData.country" :placeholder="$t('请选择国家')">
<el-option
v-for="item in treeList"
:key="item.id"
:label="$l(item,'title')"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</div>
<div v-if="formData.areaType==0">
<el-form-item :label="$t('营业执照')" prop="license">
......@@ -137,108 +149,41 @@
<el-card class="mt-10">
<div class="card-header" slot="header">
<div class="title">{{$t('海运优质资源条件')}}</div>
<div class="title">{{$t('优质条件')}}</div>
</div>
<div>
<el-form-item :label="$t('供应商优势船公司')" prop="shipCompany" label-width="250">
<div v-if="typeBool(formData.companyTypeArr,['1'])">
<el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('海运船公司优势港口')" prop="ports" label-width="250">
<div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
<el-form-item :label="$t('港口')" prop="ports" label-width="250">
<el-select v-model="formData.resourceVO.ports" filterable multiple clearable disabled>
<el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('港口优势条件')" prop="portConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('订舱公司')" prop="bookCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.bookCompany" company-type="1" disabled />
</el-form-item>
<el-form-item :label="$t('订舱优势条件')" prop="bookConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.bookConditions" type="book_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('拖车公司')" prop="trailerCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.trailerCompany" company-type="4" disabled />
</el-form-item>
<el-form-item :label="$t('拖车优势条件')" prop="trailerConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.trailerConditions" type="trailer_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('报关公司')" prop="customsCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.customsCompany" company-type="2" disabled />
</el-form-item>
<el-form-item :label="$t('报关优势条件')" prop="customsConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.customsConditions" type="customs_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('证书公司')" prop="certificateCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.certificateCompany" company-type="3" disabled />
</el-form-item>
<el-form-item :label="$t('证书优势条件')" prop="certificateConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.certificateConditions" type="certificate_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
<el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable readonly></el-input>
<dict-selector v-model="formData.resourceVO.portConditions" type="port_conditions" />
</el-form-item>
<el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
</div>
</el-card>
<el-card class="mt-10">
<div class="card-header" slot="header">
<div class="title">{{$t('空运优质资源条件')}}</div>
</div>
<div>
<el-form-item :label="$t('空运优势机场')" prop="airdrome" label-width="250">
<el-select v-model="formData.resourceVO.airdrome" filterable multiple clearable disabled>
<el-option v-for="(item) in airPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item :label="$t('空运优势航空公司')" prop="airCompany" label-width="250">
<div v-if="typeBool(formData.companyTypeArr,['10'])">
<el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" disabled />
</el-form-item>
<el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('订舱公司')" prop="bookCompanyAir" label-width="250">
<suppliers-selector v-model="formData.resourceVO.bookCompanyAir" company-type="5" disabled />
</el-form-item>
<el-form-item :label="$t('订舱优势条件')" prop="bookConditionsAir" label-width="250">
<dict-selector v-model="formData.resourceVO.bookConditionsAir" type="book_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('报关公司')" prop="customsCompanyAir" label-width="250">
<suppliers-selector v-model="formData.resourceVO.customsCompanyAir" company-type="7" disabled />
</el-form-item>
<el-form-item :label="$t('报关优势条件')" prop="customsConditionsAir" label-width="250">
<dict-selector v-model="formData.resourceVO.customsConditionsAir" type="customs_conditions" disabled />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('证书公司')" prop="certificateCompanyAir" label-width="250">
<suppliers-selector v-model="formData.resourceVO.certificateCompanyAir" company-type="3" disabled />
</el-form-item>
<el-form-item :label="$t('证书优势条件')" prop="certificateConditionsAir" label-width="250">
<dict-selector v-model="formData.resourceVO.certificateConditionsAir" type="certificate_conditions" disabled />
<div v-if="typeBool(formData.companyTypeArr,['3'])">
<el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
<el-radio v-model="formData.resourceVO.certificateSpeed" :label="0" disabled>{{$t('快')}}</el-radio>
<el-radio v-model="formData.resourceVO.certificateSpeed" :label="1" disabled>{{$t('慢')}}</el-radio>
</el-form-item>
</div>
<div>
<el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecordAir" label-width="250">
<el-input v-model="formData.resourceVO.badCooperationRecordAir" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable readonly></el-input>
<el-form-item :label="$t('合作不良记录登记')" prop="badCooperationRecord" label-width="250">
<el-input v-model="formData.resourceVO.badCooperationRecord" :placeholder="$t('请输入合作不良记录登记')" show-word-limit clearable readonly></el-input>
</el-form-item>
</div>
</el-card>
......@@ -287,10 +232,11 @@
<el-form-item :label="$t('品名')" prop="goodName">
<el-input v-model="formData.externalVO.goodName" :placeholder="$t('请输入品名')" show-word-limit clearable readonly></el-input>
</el-form-item>
<el-form-item :label="$t('清关国家')" prop="clearanceFileId">
<el-select v-model="formData.externalVO.clearanceFileId" @change="changeFile" disabled>
<el-form-item :label="$t('CTN NO')" prop="clearanceFileId">
<!-- <el-select v-model="formData.externalVO.clearanceFileId" @change="changeFile">
<el-option v-for="(item) in fileList" :value="item.id" :label="getCountry(item.country,item.district)" :key="item.id" />
</el-select>
</el-select> -->
<el-input v-model="formData.externalVO.ctnNo" :placeholder="$t('请输入CTN NO')" show-word-limit clearable readonly></el-input>
</el-form-item>
</div>
<div class="supplier-item">
......@@ -306,7 +252,8 @@
<el-input v-model="formData.externalVO.packNum" :placeholder="$t('请输入包装数量')" show-word-limit clearable readonly></el-input>
</el-form-item>
<el-form-item :label="$t('包装单位')" prop="packUnit">
<el-input v-model="formData.externalVO.packUnit" :placeholder="$t('请输入包装单位')" show-word-limit clearable readonly></el-input>
<!-- <el-input v-model="formData.externalVO.packUnit" :placeholder="$t('请输入包装单位')" show-word-limit clearable></el-input> -->
<dict-selector v-model="formData.externalVO.packUnit" type="packaging_type" disabled />
</el-form-item>
</div>
<div>
......@@ -423,7 +370,9 @@ export default {
return this.allDocks.filter(item => item.portType == 1)
},
seaPort(){
return this.allDocks.filter(item => item.portType == 2)
if(this.typeBool(this.formData.companyTypeArr,['1','2','4']) && this.typeBool(this.formData.companyTypeArr,['5','7'])) return this.allDocks
if(this.typeBool(this.formData.companyTypeArr,['5','7'])) return this.allDocks.filter(item => item.portType == 1)
if(this.typeBool(this.formData.companyTypeArr,['1','2','4'])) return this.allDocks.filter(item => item.portType == 2)
},
districtList(){
if(!this.fileNoForm.country) return []
......@@ -534,6 +483,15 @@ export default {
return data.map(item=>Number(item))
}
},
typeBool(type,arr) {
let flag = false
type.forEach(item=>{
if(arr.includes(item)){
flag = true
}
})
return flag
},
sameReceive() {
this.$set(this.formData.externalVO,'notifyCompanyName',this.formData.externalVO.receiveCompanyName)
this.$set(this.formData.externalVO,'notifyAddress',this.formData.externalVO.receiveAddress)
......
src/views/ecw/supplier/edit.vue
View file @ 204477e6
......@@ -3,7 +3,7 @@
<el-form ref="elForm" :model="formData" :rules="rules" inline size="small" label-width="100px"
label-position="left">
<div>
<el-form-item>
<el-form-item :label="$t('境内外类型')" prop="areaType">
<el-radio v-model="formData.areaType" :label="0" :disabled="disabled">{{$t('国内')}}</el-radio>
<el-radio v-model="formData.areaType" :label="1" :disabled="disabled">{{$t('国外')}}</el-radio>
</el-form-item>
......@@ -71,6 +71,18 @@
<dict-selector v-model="formData.cooperationType" type="cooperation_type" />
</el-form-item>
</div>
<div v-if="formData.areaType==1">
<el-form-item :label="$t('国家')" prop="cooperationType">
<el-select v-model="formData.country" :placeholder="$t('请选择国家')">
<el-option
v-for="item in treeList"
:key="item.id"
:label="$l(item,'title')"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</div>
<div v-if="formData.areaType==0">
<el-form-item :label="$t('营业执照')" prop="license">
......@@ -247,15 +259,15 @@
<el-card class="mt-10">
<div class="card-header" slot="header">
<div class="title">{{$t('海运优质资源条件')}}</div>
<div class="title">{{$t('优质条件')}}</div>
</div>
<div>
<el-form-item :label="$t('供应商优势船公司')" prop="shipCompany" label-width="250">
<div v-if="typeBool(formData.companyTypeArr,['1'])">
<el-form-item :label="$t('船公司')" prop="shipCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.shipCompany" company-type="9" :disabled="false" />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('海运船公司优势港口')" prop="ports" label-width="250">
<div v-if="typeBool(formData.companyTypeArr,['1','2','4','5','7'])">
<el-form-item :label="$t('港口')" prop="ports" label-width="250">
<el-select v-model="formData.resourceVO.ports" filterable multiple clearable>
<el-option v-for="(item) in seaPort" :key="item.id" :label="$l(item, 'title')" :value="item.id"></el-option>
</el-select>
......@@ -265,36 +277,18 @@
</el-form-item>
<el-button style="margin-left: 30px;" type="text" v-hasPermi="['ecw:dock:create']" @click="portVisible=true">{{$t('新增港口')}}</el-button>
</div>
<div>
<el-form-item :label="$t('订舱公司')" prop="bookCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.bookCompany" company-type="1" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('订舱优势条件')" prop="bookConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.bookConditions" type="book_conditions" />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('拖车公司')" prop="trailerCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.trailerCompany" company-type="4" :disabled="false" />
<div v-if="typeBool(formData.companyTypeArr,['10'])">
<el-form-item :label="$t('航空公司')" prop="airCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.airCompany" company-type="10" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('拖车优势条件')" prop="trailerConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.trailerConditions" type="trailer_conditions" />
<el-form-item :label="$t('航空公司优势条件')" prop="airConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.airConditions" type="port_conditions" />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('报关公司')" prop="customsCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.customsCompany" company-type="2" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('报关优势条件')" prop="customsConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.customsConditions" type="customs_conditions" />
</el-form-item>
</div>
<div>
<el-form-item :label="$t('证书公司')" prop="certificateCompany" label-width="250">
<suppliers-selector v-model="formData.resourceVO.certificateCompany" company-type="3" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('证书优势条件')" prop="certificateConditions" label-width="250">
<dict-selector v-model="formData.resourceVO.certificateConditions" type="certificate_conditions" />
<div v-if="typeBool(formData.companyTypeArr,['3'])">
<el-form-item :label="$t('出证速度')" prop="certificateSpeed" label-width="250">
<el-radio v-model="formData.resourceVO.certificateSpeed" :label="0">{{$t('快')}}</el-radio>
<el-radio v-model="formData.resourceVO.certificateSpeed" :label="1">{{$t('慢')}}</el-radio>
</el-form-item>
</div>
<div>
......@@ -304,7 +298,7 @@
</div>
</el-card>
<el-card class="mt-10">
<el-card class="mt-10" v-if="false">
<div class="card-header" slot="header">
<div class="title">{{$t('空运优质资源条件')}}</div>
</div>
......@@ -400,12 +394,13 @@
<el-form-item :label="$t('品名')" prop="goodName">
<el-input v-model="formData.externalVO.goodName" :placeholder="$t('请输入品名')" show-word-limit clearable></el-input>
</el-form-item>
<el-form-item :label="$t('清关国家')" prop="clearanceFileId">
<el-select v-model="formData.externalVO.clearanceFileId" @change="changeFile">
<el-form-item :label="$t('CTN NO')" prop="ctnNo">
<!-- <el-select v-model="formData.externalVO.clearanceFileId" @change="changeFile">
<el-option v-for="(item) in fileList" :value="item.id" :label="getCountry(item.country,item.district)" :key="item.id" />
</el-select>
</el-select> -->
<el-input v-model="formData.externalVO.ctnNo" :placeholder="$t('请输入CTN NO')" show-word-limit clearable></el-input>
</el-form-item>
<el-button type="text" @click="addFileNo" v-hasPermi="['ecw:supplier:addno']">{{$t('新增清关文件号码')}}</el-button>
<!-- <el-button type="text" @click="addFileNo" v-hasPermi="['ecw:supplier:addno']">{{$t('新增清关文件号码')}}</el-button> -->
</div>
<div class="supplier-item">
<el-form-item :label="$t('From M No')" prop="fromNo">
......@@ -420,7 +415,8 @@
<el-input v-model="formData.externalVO.packNum" :placeholder="$t('请输入包装数量')" show-word-limit clearable></el-input>
</el-form-item>
<el-form-item :label="$t('包装单位')" prop="packUnit">
<el-input v-model="formData.externalVO.packUnit" :placeholder="$t('请输入包装单位')" show-word-limit clearable></el-input>
<!-- <el-input v-model="formData.externalVO.packUnit" :placeholder="$t('请输入包装单位')" show-word-limit clearable></el-input> -->
<dict-selector v-model="formData.externalVO.packUnit" type="packaging_type" />
</el-form-item>
</div>
<div>
......@@ -694,7 +690,9 @@ export default {
return this.allDocks.filter(item => item.portType == 1)
},
seaPort(){
return this.allDocks.filter(item => item.portType == 2)
if(this.typeBool(this.formData.companyTypeArr,['1','2','4']) && this.typeBool(this.formData.companyTypeArr,['5','7'])) return this.allDocks
if(this.typeBool(this.formData.companyTypeArr,['5','7'])) return this.allDocks.filter(item => item.portType == 1)
if(this.typeBool(this.formData.companyTypeArr,['1','2','4'])) return this.allDocks.filter(item => item.portType == 2)
},
districtList(){
if(!this.fileNoForm.country) return []
......@@ -822,6 +820,15 @@ export default {
return data.map(item=>Number(item))
}
},
typeBool(type,arr) {
let flag = false
type.forEach(item=>{
if(arr.includes(item)){
flag = true
}
})
return flag
},
sameReceive() {
this.$set(this.formData.externalVO,'notifyCompanyName',this.formData.externalVO.receiveCompanyName)
this.$set(this.formData.externalVO,'notifyAddress',this.formData.externalVO.receiveAddress)
......
src/views/ecw/supplier/index.vue
View file @ 204477e6
......@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item :label="$t('境内外')" prop="areaType">
<el-select v-model="queryParams.areaType" placeholder="请选择" clearable="true">
<el-select v-model="queryParams.areaType" placeholder="请选择" clearable>
<el-option
v-for="item in areaTypes"
:key="item.value"
......
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