|
@@ -836,7 +836,6 @@ export default {
|
|
|
}
|
|
|
this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
|
|
|
this.deptBudgetList1.binNumber = this.$route.query.binNumber
|
|
|
- this.getList()
|
|
|
this.dataList.id = this.$route.query.id
|
|
|
this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
|
|
|
this.dataList.contractNo = this.$route.query.contractNo
|
|
@@ -883,16 +882,7 @@ export default {
|
|
|
this.isGetCost = true
|
|
|
this.cost = this.dataList.cost
|
|
|
}
|
|
|
- getReceiptTaskNo({
|
|
|
- flag: 2,
|
|
|
- warehouseName: this.deptBudgetList1.warehouseName,
|
|
|
- agentKey: localStorage.getItem('ws-pf_userId'),
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.deptBudgetList2 = response
|
|
|
- })
|
|
|
-
|
|
|
+ this.getList()
|
|
|
if(this.$route.query.automaticWeightAcquisition == '1'){
|
|
|
this.openPort()
|
|
|
}
|
|
@@ -1084,7 +1074,11 @@ export default {
|
|
|
for (let i = 0; i < this.deptBudgetList2.length; i++) {
|
|
|
if (this.deptBudgetList2[i].inOutTaskNo == e) {
|
|
|
var data = this.deptBudgetList2[i]
|
|
|
- this.dataList.contractNo = this.deptBudgetList2[i].contractNo
|
|
|
+ if (this.deptBudgetList2[i].contractNo) {
|
|
|
+ this.dataList.contractNo = this.deptBudgetList2[i].contractNo
|
|
|
+ } else {
|
|
|
+ this.dataList.contractNo = this.deptBudgetList2[i].moveTaskNo
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
for (var i = 0; i < this.outContractNo.length; i++) {
|
|
@@ -1921,6 +1915,15 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.goodnameList = response
|
|
|
})
|
|
|
+ getReceiptTaskNo({
|
|
|
+ flag: 2,
|
|
|
+ warehouseName: this.deptBudgetList1.warehouseName,
|
|
|
+ agentKey: localStorage.getItem('ws-pf_userId'),
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.deptBudgetList2 = response
|
|
|
+ })
|
|
|
// 品级
|
|
|
pullDown({
|
|
|
constId: 'CON3',
|
|
@@ -1974,10 +1977,7 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.options1 = response
|
|
|
this.outContractNo = response
|
|
|
- // debugger
|
|
|
- // this.contractNoChange(this.dataList.inOutTaskNo)
|
|
|
-
|
|
|
-
|
|
|
+ this.contractNoChange(this.dataList.inOutTaskNo)
|
|
|
})
|
|
|
//合同编号2
|
|
|
xialaNo({
|
|
@@ -2009,8 +2009,6 @@ export default {
|
|
|
this.staffList = response
|
|
|
// this.agent = response
|
|
|
})
|
|
|
- // debugger
|
|
|
- // this.contractNoChange(this.dataList.inOutTaskNo)
|
|
|
|
|
|
},
|
|
|
selecttaskType(e) {
|