|
@@ -30,7 +30,7 @@
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
<!-- <a-col :md="6" :sm="8">
|
|
<!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
|
|
<a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
|
|
@@ -111,13 +111,13 @@
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-model-item label="收货人" prop="consignee">
|
|
<a-form-model-item label="收货人" prop="consignee">
|
|
|
- <!-- <j-dict-select-tag
|
|
|
|
|
- style="width:100%;margin-bottom: 10px;" v-model="addBook.consignee"
|
|
|
|
|
|
|
+ <!-- <j-dict-select-tag
|
|
|
|
|
+ style="width:100%;margin-bottom: 10px;" v-model="addBook.consignee"
|
|
|
dictCode="sys_dict_item,item_text,description,dict_id in(select id from sys_dict where dict_code='receiving_goods_info')"
|
|
dictCode="sys_dict_item,item_text,description,dict_id in(select id from sys_dict where dict_code='receiving_goods_info')"
|
|
|
@change="consigneeSelectChange"/> -->
|
|
@change="consigneeSelectChange"/> -->
|
|
|
<j-search-select-tag
|
|
<j-search-select-tag
|
|
@@ -148,7 +148,7 @@
|
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<a-col :md="6" :sm="8">
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-model-item label="出口口岸" prop="exportPort">
|
|
<a-form-model-item label="出口口岸" prop="exportPort">
|
|
|
<j-search-select-tag
|
|
<j-search-select-tag
|
|
@@ -211,12 +211,12 @@
|
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-model-item label="体积" prop="totalVolume">
|
|
|
|
|
|
|
+ <a-form-model-item label="体积" prop="totalVolume">
|
|
|
<a-input placeholder="请输入体积" v-model="addBook.totalVolume" readOnly></a-input>
|
|
<a-input placeholder="请输入体积" v-model="addBook.totalVolume" readOnly></a-input>
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
</a-col>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
<!-- <a-col :md="6" :sm="8">
|
|
<!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-model-item label="人民币" prop="cny">
|
|
<a-form-model-item label="人民币" prop="cny">
|
|
@@ -306,7 +306,7 @@
|
|
|
>
|
|
>
|
|
|
<template slot="CNYfreighForward" slot-scope="text, record, index">
|
|
<template slot="CNYfreighForward" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="CNYfreighForward" :rules="rules.CNYfreighForward" >
|
|
<a-form-model-item prop="CNYfreighForward" :rules="rules.CNYfreighForward" >
|
|
|
- <a-select v-model="record.freightForwarder" style="width:100%" show-search :filterOption="filterOption">
|
|
|
|
|
|
|
+ <a-select v-model="record.freightForwarder" style="width:100%" show-search :filterOption="filterOption">
|
|
|
<a-select-option
|
|
<a-select-option
|
|
|
v-for="(item,index) in FreightOption"
|
|
v-for="(item,index) in FreightOption"
|
|
|
:key="index"
|
|
:key="index"
|
|
@@ -324,13 +324,13 @@
|
|
|
<a-input placeholder="请输入金额" v-model="record.amount" />
|
|
<a-input placeholder="请输入金额" v-model="record.amount" />
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
</template>
|
|
</template>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<template slot="option" slot-scope="text, record, index">
|
|
<template slot="option" slot-scope="text, record, index">
|
|
|
<a @click="adsCNY">增行</a>
|
|
<a @click="adsCNY">增行</a>
|
|
|
<a-divider type="vertical" />
|
|
<a-divider type="vertical" />
|
|
|
<a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="deleteCNY(index)">
|
|
<a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="deleteCNY(index)">
|
|
|
<a style="color: red;" >删除</a>
|
|
<a style="color: red;" >删除</a>
|
|
|
- </a-popconfirm>
|
|
|
|
|
|
|
+ </a-popconfirm>
|
|
|
</template>
|
|
</template>
|
|
|
<!-- CNY项目列 -->
|
|
<!-- CNY项目列 -->
|
|
|
<template slot="CNYProjectList" slot-scope="text, record, index">
|
|
<template slot="CNYProjectList" slot-scope="text, record, index">
|
|
@@ -362,7 +362,7 @@
|
|
|
>
|
|
>
|
|
|
<template slot="USDfreighForward" slot-scope="text, record, index">
|
|
<template slot="USDfreighForward" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="USDfreighForward" :rules="rules.USDfreighForward" >
|
|
<a-form-model-item prop="USDfreighForward" :rules="rules.USDfreighForward" >
|
|
|
- <a-select v-model="record.freightForwarder" style="width:100%" show-search :filterOption="filterOption">
|
|
|
|
|
|
|
+ <a-select v-model="record.freightForwarder" style="width:100%" show-search :filterOption="filterOption">
|
|
|
<a-select-option
|
|
<a-select-option
|
|
|
v-for="(item,index) in FreightOption"
|
|
v-for="(item,index) in FreightOption"
|
|
|
:key="index"
|
|
:key="index"
|
|
@@ -380,7 +380,7 @@
|
|
|
<a-divider type="vertical" />
|
|
<a-divider type="vertical" />
|
|
|
<a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="deleteUSD(index)">
|
|
<a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="deleteUSD(index)">
|
|
|
<a style="color: red;" >删除</a>
|
|
<a style="color: red;" >删除</a>
|
|
|
- </a-popconfirm>
|
|
|
|
|
|
|
+ </a-popconfirm>
|
|
|
</template>
|
|
</template>
|
|
|
<template slot="USDmoney" slot-scope="text, record, index">
|
|
<template slot="USDmoney" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="USDmoney" :rules="rules.USDmoney" >
|
|
<a-form-model-item prop="USDmoney" :rules="rules.USDmoney" >
|
|
@@ -390,7 +390,7 @@
|
|
|
<!-- USD项目列 -->
|
|
<!-- USD项目列 -->
|
|
|
<template slot="USDProjectList" slot-scope="text, record, index">
|
|
<template slot="USDProjectList" slot-scope="text, record, index">
|
|
|
<a-form-model-item prop="USDProjectList" :rules="rules.USDProjectList">
|
|
<a-form-model-item prop="USDProjectList" :rules="rules.USDProjectList">
|
|
|
- <a-select v-model="record.itemColumn" style="width:100%">
|
|
|
|
|
|
|
+ <a-select v-model="record.itemColumn" style="width:100%">
|
|
|
<a-select-option
|
|
<a-select-option
|
|
|
v-for="(item,index) in itemArrOption"
|
|
v-for="(item,index) in itemArrOption"
|
|
|
:key="index"
|
|
:key="index"
|
|
@@ -750,7 +750,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// 参照装箱单
|
|
// 参照装箱单
|
|
|
- referPackingList(data) {
|
|
|
|
|
|
|
+ referPackingList(data) {
|
|
|
console.log('打开参照装箱单')
|
|
console.log('打开参照装箱单')
|
|
|
if(data === '0'){
|
|
if(data === '0'){
|
|
|
this.$refs.packingListModal.packingListModVis = true
|
|
this.$refs.packingListModal.packingListModVis = true
|
|
@@ -782,7 +782,12 @@ export default {
|
|
|
item.volume = item.totalVolume
|
|
item.volume = item.totalVolume
|
|
|
//参照面料时,单价许计算 金额/净重
|
|
//参照面料时,单价许计算 金额/净重
|
|
|
if(item.readyFabric == '面料'){
|
|
if(item.readyFabric == '面料'){
|
|
|
|
|
+ if (item.netWeight == 0){
|
|
|
|
|
+ item.price=0
|
|
|
|
|
+ // item.totalPrice = 0
|
|
|
|
|
+ }else{
|
|
|
item.price = (item.totalPrice/item.netWeight).toFixed(4)
|
|
item.price = (item.totalPrice/item.netWeight).toFixed(4)
|
|
|
|
|
+ }
|
|
|
this.query = '0'
|
|
this.query = '0'
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -840,7 +845,7 @@ export default {
|
|
|
// for (var i=0; i<dataList.length; i++){
|
|
// for (var i=0; i<dataList.length; i++){
|
|
|
// var data = dataList[i];
|
|
// var data = dataList[i];
|
|
|
// var sub = {
|
|
// var sub = {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// documentNo:data.documentNo,
|
|
// documentNo:data.documentNo,
|
|
|
// createBy:data.createBy,
|
|
// createBy:data.createBy,
|
|
|
|
|
|
|
@@ -912,8 +917,8 @@ export default {
|
|
|
this.addBook.customsCode = ''
|
|
this.addBook.customsCode = ''
|
|
|
this.addBook.dutyParagraph = ''
|
|
this.addBook.dutyParagraph = ''
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
// 设置表头计算值,直接设置表头值对象不能刷新,把表头对象换了就可以了
|
|
// 设置表头计算值,直接设置表头值对象不能刷新,把表头对象换了就可以了
|
|
|
setHeadCalField(){
|
|
setHeadCalField(){
|
|
@@ -929,7 +934,7 @@ export default {
|
|
|
containerNumberArr.push(rowData.containerNumber)
|
|
containerNumberArr.push(rowData.containerNumber)
|
|
|
readyFabricArr.push(rowData.readyFabric)
|
|
readyFabricArr.push(rowData.readyFabric)
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
|
|
if (rowData.totalPrice != undefined && rowData.totalPrice != ""){
|
|
|
moneyAll += rowData.totalPrice*1;
|
|
moneyAll += rowData.totalPrice*1;
|
|
|
}
|
|
}
|
|
@@ -944,7 +949,7 @@ export default {
|
|
|
headData.totalVolume = (containerNumberArr.length)*68;
|
|
headData.totalVolume = (containerNumberArr.length)*68;
|
|
|
}
|
|
}
|
|
|
headData.money = parseFloat(moneyAll.toFixed(2));
|
|
headData.money = parseFloat(moneyAll.toFixed(2));
|
|
|
- this.allVloum = headData.totalVolume
|
|
|
|
|
|
|
+ this.allVloum = headData.totalVolume
|
|
|
this.addBook = headData;
|
|
this.addBook = headData;
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -1015,7 +1020,7 @@ export default {
|
|
|
// this.$message.error('数据需要合并,请先合并数据!')
|
|
// this.$message.error('数据需要合并,请先合并数据!')
|
|
|
// return
|
|
// return
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// }
|
|
// }
|
|
|
}
|
|
}
|
|
|
this.confirmLoading = true
|
|
this.confirmLoading = true
|
|
@@ -1089,7 +1094,7 @@ export default {
|
|
|
}else{
|
|
}else{
|
|
|
this.confirmLoading = false
|
|
this.confirmLoading = false
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
// this.getShipmentList() // 刷新托书列表
|
|
// this.getShipmentList() // 刷新托书列表
|
|
@@ -1310,7 +1315,7 @@ export default {
|
|
|
freightForwarderClick(val,record){
|
|
freightForwarderClick(val,record){
|
|
|
record.freightForwarderName = val.cvenname;
|
|
record.freightForwarderName = val.cvenname;
|
|
|
this.$forceUpdate();
|
|
this.$forceUpdate();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
itemColumnClick(val,record){
|
|
itemColumnClick(val,record){
|
|
|
record.itemColumnName = val.text;
|
|
record.itemColumnName = val.text;
|
|
@@ -1348,7 +1353,7 @@ export default {
|
|
|
})
|
|
})
|
|
|
this.setHeadCalField()
|
|
this.setHeadCalField()
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
// dataSource(val) {
|
|
// dataSource(val) {
|
|
|
// console.log(val)
|
|
// console.log(val)
|