Skip to content

J
jiedao-app-operator-master
Commit fd5b0e6c authored by huyf's avatar huyf
Browse files
Options

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

parents ff8b5001 31ead725
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 194 deletions
src/i18n/languages/en_US.json
View file @ fd5b0e6c
......@@ -1132,7 +1132,7 @@
"会计": "Accounting",
"出纳": "Cashier",
"经手人": "Handler",
"确订打印": "OK to print",
"确定打印": "OK to print",
"收款日期": "Payment Date",
"应收合计": "Total Receivable",
"收款金额": "Receipt Amount",
......@@ -3831,5 +3831,8 @@
"厘": "Centimeters",
"取消付款单反审核": "Cancel Payment Order De-approval",
"提交核销": "Submit for verification",
"是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?"
"是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?",
"流程详情":"Flow details",
"收款单核销审核":"The payment voucher verification review",
"系统提示": "System prompt"
}
src/i18n/languages/zh_CN.json
View file @ fd5b0e6c
......@@ -161,7 +161,7 @@
"目的仓": "目的仓",
"目的地": "目的地",
"确定": "确定",
"确订打印": "确订打印",
"确定打印": "确定打印",
"确认添加": "确认添加",
"税率": "税率",
"箱数": "箱数",
......
src/plugins/modal.js
View file @ fd5b0e6c
import { Message, MessageBox, Notification, Loading } from 'element-ui'
import i18n from "@/i18n";
let loadingInstance;
console.log(i18n.t,'i18n')
export default {
// 消息提示
msg(content) {
......@@ -21,19 +21,19 @@ export default {
},
// 弹出提示
alert(content) {
MessageBox.alert(content, "系统提示")
MessageBox.alert(content, i18n.t("系统提示"))
},
// 错误提示
alertError(content) {
MessageBox.alert(content, "系统提示", { type: 'error' })
MessageBox.alert(content, i18n.t("系统提示"), { type: 'error' })
},
// 成功提示
alertSuccess(content) {
MessageBox.alert(content, "系统提示", { type: 'success' })
MessageBox.alert(content, i18n.t("系统提示"), { type: 'success' })
},
// 警告提示
alertWarning(content) {
MessageBox.alert(content, "系统提示", { type: 'warning' })
MessageBox.alert(content, i18n.t("系统提示"), { type: 'warning' })
},
// 通知提示
notify(content) {
......@@ -52,18 +52,19 @@ export default {
Notification.warning(content)
},
// 确认窗体
confirm(content) {
return MessageBox.confirm(content, "系统提示", {
confirmButtonText: '确定',
cancelButtonText: '取消',
return MessageBox.confirm(content, i18n.t("系统提示"), {
confirmButtonText: i18n.t('确定'),
cancelButtonText: i18n.t('取消'),
type: "warning",
})
},
// 提交内容
prompt(content) {
return MessageBox.prompt(content, "系统提示", {
confirmButtonText: '确定',
cancelButtonText: '取消',
return MessageBox.prompt(content, i18n.t("系统提示"), {
confirmButtonText: i18n.t('确定'),
cancelButtonText: i18n.t('取消'),
type: "warning",
})
},
......
src/router/index.js
View file @ fd5b0e6c
......@@ -157,8 +157,8 @@ export const constantRoutes = [
}, {
path: 'process-instance/detail',
component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
name: '流程详情',
meta: {title: '流程详情', activeMenu: '/bpm/task/my'}
name: 'Flow details',
meta: {title: '流程详情',titleEn:'Flow details', activeMenu: '/bpm/task/my'}
}
]
},
......
src/views/ecw/box/query.vue
View file @ fd5b0e6c
......@@ -140,9 +140,9 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;">{{$t('编辑')}}</el-button>
<el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;" v-hasPermi="['ecw:box-cost:delete']">{{$t('编辑')}}</el-button>
<el-popconfirm :title="$t('确定是否删除')" @confirm="deleteCostClick(scope.row)">
<el-button type="danger" size="small" slot="reference">{{$t('删除')}}</el-button>
<el-button type="danger" size="small" slot="reference" v-hasPermi="['ecw:box-cost:delete']">{{$t('删除')}}</el-button>
</el-popconfirm>
</template>
</el-table-column>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ fd5b0e6c
......@@ -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 @ fd5b0e6c
......@@ -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 @ fd5b0e6c
......@@ -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/customer/query.vue
View file @ fd5b0e6c
......@@ -113,27 +113,27 @@
<el-card style="margin-top: 15px;">
<h3>{{$t('银行账户')}}</h3>
<el-table :data="customer.customerBankBackVOList" border>
<el-table-column label="编号" type="index"></el-table-column>
<el-table-column label="账户名称" prop="accountName"></el-table-column>
<el-table-column label="币别">
<el-table-column :label="$t('编号')" type="index"></el-table-column>
<el-table-column :label="$t('账户名称')" prop="accountName"></el-table-column>
<el-table-column :label="$t('币别')">
<template v-slot="{row}">
{{$l(currecyList.find(i => row.currency == i.id),'title')}}
</template>
</el-table-column>
<el-table-column label="银行名称" prop="bankName"></el-table-column>
<el-table-column label="银行账户" prop="bankAccount"></el-table-column>
<el-table-column label="银行代码" prop="bankCode"></el-table-column>
<el-table-column label="账户类型">
<el-table-column :label="$t('银行名称')" prop="bankName"></el-table-column>
<el-table-column :label="$t('银行账户')" prop="bankAccount"></el-table-column>
<el-table-column :label="$t('银行代码')" prop="bankCode"></el-table-column>
<el-table-column :label="$t('账户类型')">
<template v-slot="{row}">
{{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
</template>
</el-table-column>
<el-table-column label="状态">
<el-table-column :label="$t('状态')">
<template v-slot="{row}">
{{row.status ? '正常' :'停用'}}
{{row.status ? $t('正常') : $t('停用')}}
</template>
</el-table-column>
<el-table-column label="银行地址" prop="bankAddress"></el-table-column>
<el-table-column :label="$t('银行地址')" prop="bankAddress"></el-table-column>
</el-table>
</el-card>
......
src/views/ecw/financial/commission-Payment.vue
View file @ fd5b0e6c
......@@ -40,6 +40,7 @@
<el-date-picker
v-model="selectDate"
type="datetimerange"
value-format="yyyy-MM-DD hh:mm:ss"
range-separator="至"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')">
......@@ -63,7 +64,7 @@
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="getList">{{$t('查找')}}</el-button>
<el-button size="mini" type="primary" @click="queryParams.page = 1;getList()">{{$t('查找')}}</el-button>
<el-button type="success" size="mini" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})" v-has-permi="['ecw:commission-Payment:add']" >{{$t('新增请款单')}}</el-button>
</el-form-item>
</el-col>
......@@ -166,6 +167,17 @@ export default {
listSimpleUsers().then((res) => (this.creatorData = res.data));
this.getList();
},
watch:{
selectDate(val){
if(val.length){
this.queryParams.beginCreateTime = val[0]
this.queryParams.endCreateTime = val[0]
}else {
this.queryParams.beginCreateTime = ''
this.queryParams.endCreateTime = ''
}
}
},
data(){
return {
queryParams:{
......@@ -175,7 +187,8 @@ export default {
salesmanName:null,
searchKey:null,
paymentNo:null,
beginCreateTime:null,
endCreateTime:null,
page:1,
rows:10,
},
......
src/views/ecw/financial/commission-requestFunds.vue
View file @ fd5b0e6c
......@@ -55,6 +55,7 @@
:key="item.id"
:label="item.name"
:value="item.id"
@click.native="selectFn('departmentName', item.name)"
/>
</el-select>
</el-form-item>
......@@ -68,12 +69,13 @@
:rules="{required:true,message:$t('业务员不能为空')}"
:error="$t('业务员不能为空')"
>
<el-select filterable v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
<el-select filterable v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
<el-option
@click.native="selectFn('salesmanName', item.nickname)"
v-for="item in creatorData"
:key="item.id"
:label="item.nickname"
:value="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
......@@ -595,6 +597,10 @@ export default {
},
},
methods: {
selectFn(keyVal, name){
this.form[keyVal] = name;
console.log(this.form,'form:')
},
getCurrencyLabel(id) {
var label = this.currencyList.filter(item => item.id == id)
if (label.length > 0) return this.$i18n.locale == 'zh_CN' ? label[0].titleZh : label[0].titleEn
......
src/views/ecw/financial/creatCollection.vue
View file @ fd5b0e6c
......@@ -926,14 +926,14 @@ export default {
this.rateChange(row, index)
},
writeOffRateChange(row, index) {
row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal))
row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal)).toFixed(2)
const writeOffAmountTotal = this.form.receiptAccountList.filter(v => v.type !== 'total').reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
this.form.receiptAccountList[this.form.receiptAccountList.length -1].writeOffAmount = writeOffAmountTotal
},
rateChange(row, index) {
console.log(row)
row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(6))
row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(2))
this.form.receiptAccountList[index] = {...row}
setTimeout(() => {
......@@ -942,7 +942,7 @@ export default {
this.currencyList.forEach((item,index)=>{
var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
if(dollarList.length>0){
var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(2)
amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
}
})
......@@ -1081,7 +1081,7 @@ export default {
const totalt = this.form.receiptAccountList.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
this.form.receiptAccountList = [...this.form.receiptAccountList, {
type: 'total',
writeOffAmount: totalt,
writeOffAmount: totalt.toFixed(2),
collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
}]
......@@ -1125,7 +1125,7 @@ export default {
const index = this.form.receiptAccountList.findIndex(v => v.currencyId == type)
const t = this.form.receiptAccountList[index]
if (t) {
t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount)
t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount).toFixed(2)
this.rateChange(t, index)
}
},
......
src/views/ecw/financial/payable.vue
View file @ fd5b0e6c
......@@ -102,7 +102,7 @@
<el-form-item :label="$t('供应商名称')">
<el-input
style="max-width: 188px"
v-model="queryParams.orderNo"
v-model="queryParams.supplierName"
:placeholder="$t('请输入供应商名称')"
clearable
@keyup.enter.native="handleQuery"
......@@ -154,9 +154,9 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
<el-button
size="mini"
type="text"
v-hasPermi="['ecw:payable:edit']"
@click="editClick(scope.row)"
>{{ $t('编辑') }}</el-button>
......
src/views/ecw/financial/printPaymentVoucher.vue
View file @ fd5b0e6c
......@@ -77,7 +77,7 @@
</div>
</div>
<div slot="footer" class="card">
<el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
<el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
</div>
</div>
</template>
......
src/views/ecw/financial/printPaymentVoucherCommission.vue
View file @ fd5b0e6c
......@@ -40,7 +40,7 @@
<th style="width:10%;">{{ $t('税率') }}</th>
<th style="width: 15%;">{{ $t('发票号') }}</th>
<th style="width: 10%;">{{ $t('应付金额') }}</th>
<th style="width: 10%;">{{ $t('申请金额') }}</th>
<th style="width: 10%;">{{ $t('申请金额')}}(RMB)</th>
</tr>
<tr v-for="(item, index) in list" :key="index">
<td>{{ index + 1 }}</td>
......@@ -77,7 +77,7 @@
</div>
</div>
<div slot="footer" class="card">
<el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
<el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
</div>
</div>
</template>
......
src/views/ecw/financial/printVoucher.vue
View file @ fd5b0e6c
......@@ -80,7 +80,7 @@
</div>
</div>
<div slot="footer" class="card">
<el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
<el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
</div>
</div>
</template>
......
src/views/ecw/financial/voucher.vue
View file @ fd5b0e6c
......@@ -32,12 +32,14 @@
<dict-selector
:type="DICT_TYPE.ECW_RECEIPT_STATE"
v-model="queryParams.state"
clearable
/>
</el-form-item>
<el-form-item :label="$t('业务员')">
<el-select
v-model="queryParams.salesmanId"
:placeholder="$t('请选择业务员')"
clearable
>
<el-option
v-for="item in creatorData"
......@@ -471,29 +473,29 @@ export default {
}
const receiptIdData = this.list[this.writeOffIndex]
if(this.writeOffType==1){
this.$modal
.confirm(this.$t('您确认要反审核吗')+'?')
.then(()=>{
// this.$alert()
// .confirm(this.$t('您确认要反审核吗')+'?')
// .then(()=>{
financeApproveNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
this.getList();
this.$message.success(this.$t("提交成功"));
this.dialogVisible = false
// this.$store.dispatch('tagsView/delCurrentView')
});
})
.catch(() => {this.dialogVisible = false});
// })
// .catch(() => {this.dialogVisible = false});
}else{
this.$modal
.confirm(this.$t('您确认要反核销吗')+'?')
.then(()=>{
// this.$modal
// .confirm(this.$t('您确认要反核销吗')+'?')
// .then(()=>{
financeReceiptWriteOffNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
this.getList();
this.$message.success(this.$t("提交成功"));
this.dialogVisible = false
// this.$store.dispatch('tagsView/delCurrentView')
});
})
.catch(() => {this.dialogVisible = false});
// })
// .catch(() => {this.dialogVisible = false});
}
},
......
src/views/ecw/supplier/detail.vue
View file @ fd5b0e6c
......@@ -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 @ fd5b0e6c
......@@ -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 @ fd5b0e6c
......@@ -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