|
@@ -27,7 +27,7 @@
|
|
<ws-button
|
|
<ws-button
|
|
type="primary"
|
|
type="primary"
|
|
v-hasPermission="`report.procurementInReport.view`"
|
|
v-hasPermission="`report.procurementInReport.view`"
|
|
- @click="handlepass()"
|
|
|
|
|
|
+ @click="handleAudit()"
|
|
>通过</ws-button
|
|
>通过</ws-button
|
|
>
|
|
>
|
|
<ws-button
|
|
<ws-button
|
|
@@ -100,8 +100,8 @@
|
|
>
|
|
>
|
|
<span v-else>合同重量: 0 吨</span>
|
|
<span v-else>合同重量: 0 吨</span>
|
|
|
|
|
|
- <span v-if="warehouseList.settlementWeight"
|
|
|
|
- >入库量: {{ warehouseList.settlementWeight }} 吨</span
|
|
|
|
|
|
+ <span v-if="settlementWeight1"
|
|
|
|
+ >入库量: {{ settlementWeight1 }} 吨</span
|
|
>
|
|
>
|
|
<span v-else>入库量: 0 吨</span>
|
|
<span v-else>入库量: 0 吨</span>
|
|
|
|
|
|
@@ -377,6 +377,7 @@
|
|
class="deal"
|
|
class="deal"
|
|
placeholder="输入定金金额"
|
|
placeholder="输入定金金额"
|
|
></el-input>
|
|
></el-input>
|
|
|
|
+
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="上传定金截图" :label-width="formLabelWidth">
|
|
<el-form-item label="上传定金截图" :label-width="formLabelWidth">
|
|
<el-upload
|
|
<el-upload
|
|
@@ -406,7 +407,6 @@ import {
|
|
addDisOrRemarks,
|
|
addDisOrRemarks,
|
|
stockPurchasePayMoney,
|
|
stockPurchasePayMoney,
|
|
} from '@/model/statisticalReport/index'
|
|
} from '@/model/statisticalReport/index'
|
|
-import { posthandle } from '@/model/purchasingManagement/index'
|
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
import Pagination from '@/components/Pagination'
|
|
import Pagination from '@/components/Pagination'
|
|
import WsUpload from '@/components/WsUpload'
|
|
import WsUpload from '@/components/WsUpload'
|
|
@@ -493,11 +493,12 @@ export default {
|
|
payedMoney:'',
|
|
payedMoney:'',
|
|
payNotMoney:'',
|
|
payNotMoney:'',
|
|
settlementWeight: '',
|
|
settlementWeight: '',
|
|
|
|
+ settlementWeight1: '',
|
|
modification: [],
|
|
modification: [],
|
|
contractManagementInfoList: {},
|
|
contractManagementInfoList: {},
|
|
contractManagementInfo: {
|
|
contractManagementInfo: {
|
|
contractManagementInfoList: [],
|
|
contractManagementInfoList: [],
|
|
- deposit: '0',
|
|
|
|
|
|
+ deposit: '',
|
|
depositUrl: '',
|
|
depositUrl: '',
|
|
remark: '',
|
|
remark: '',
|
|
id: '',
|
|
id: '',
|
|
@@ -640,7 +641,8 @@ export default {
|
|
this.contractManagementInfoList.id = this.contractNoList[i].id
|
|
this.contractManagementInfoList.id = this.contractNoList[i].id
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.contractManagementInfoList.deposit = this.deposit
|
|
|
|
|
|
+ this.contractManagementInfoList.deposit = this.deposit
|
|
|
|
+ // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
|
|
this.contractManagementInfoList.depositUrl = this.depositUrl
|
|
this.contractManagementInfoList.depositUrl = this.depositUrl
|
|
addDisOrRemarks(this.contractManagementInfoList)
|
|
addDisOrRemarks(this.contractManagementInfoList)
|
|
.toPromise()
|
|
.toPromise()
|
|
@@ -648,7 +650,7 @@ export default {
|
|
this.$message.success('修改成功')
|
|
this.$message.success('修改成功')
|
|
this.dialogFormVisible5 = false
|
|
this.dialogFormVisible5 = false
|
|
this.getList()
|
|
this.getList()
|
|
- this.contractManagementInfoList = {}
|
|
|
|
|
|
+
|
|
})
|
|
})
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -806,37 +808,37 @@ export default {
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- audit(item, index, status, status2, reason) {
|
|
|
|
- if (index < this.modification.length) {
|
|
|
|
- posthandle({
|
|
|
|
- taskId: item.taskId,
|
|
|
|
- approved: status,
|
|
|
|
- auditMind: reason != undefined ? '已驳回' : '34',
|
|
|
|
- needReapply: status2 != undefined ? true : false,
|
|
|
|
- })
|
|
|
|
- .toPromise()
|
|
|
|
- .then((response) => {
|
|
|
|
- this.audit(
|
|
|
|
- this.modification[index + 1],
|
|
|
|
- index + 1,
|
|
|
|
- status,
|
|
|
|
- status2,
|
|
|
|
- reason
|
|
|
|
- )
|
|
|
|
- })
|
|
|
|
- .catch((req) => {
|
|
|
|
- this.$message.warning(req.message)
|
|
|
|
- })
|
|
|
|
- } else {
|
|
|
|
- if (status == true) {
|
|
|
|
- this.$message.success('通过成功')
|
|
|
|
- this.getList()
|
|
|
|
- } else if (status == false) {
|
|
|
|
- this.$message.success('驳回成功')
|
|
|
|
- this.getList()
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
|
|
+ // audit(item, index, status, status2, reason) {
|
|
|
|
+ // if (index < this.modification.length) {
|
|
|
|
+ // posthandle({
|
|
|
|
+ // taskId: item.taskId,
|
|
|
|
+ // approved: status,
|
|
|
|
+ // auditMind: reason != undefined ? '已驳回' : '34',
|
|
|
|
+ // needReapply: status2 != undefined ? true : false,
|
|
|
|
+ // })
|
|
|
|
+ // .toPromise()
|
|
|
|
+ // .then((response) => {
|
|
|
|
+ // this.audit(
|
|
|
|
+ // this.modification[index + 1],
|
|
|
|
+ // index + 1,
|
|
|
|
+ // status,
|
|
|
|
+ // status2,
|
|
|
|
+ // reason
|
|
|
|
+ // )
|
|
|
|
+ // })
|
|
|
|
+ // .catch((req) => {
|
|
|
|
+ // this.$message.warning(req.message)
|
|
|
|
+ // })
|
|
|
|
+ // } else {
|
|
|
|
+ // if (status == true) {
|
|
|
|
+ // this.$message.success('通过成功')
|
|
|
|
+ // this.getList()
|
|
|
|
+ // } else if (status == false) {
|
|
|
|
+ // this.$message.success('驳回成功')
|
|
|
|
+ // this.getList()
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // },
|
|
handlereject(status) {
|
|
handlereject(status) {
|
|
var that = this
|
|
var that = this
|
|
if (this.modification.length == 0) {
|
|
if (this.modification.length == 0) {
|
|
@@ -869,20 +871,6 @@ export default {
|
|
// this.options = this.contractNoList
|
|
// this.options = this.contractNoList
|
|
// }
|
|
// }
|
|
},
|
|
},
|
|
- handlepass() {
|
|
|
|
- var that = this
|
|
|
|
- if (this.modification.length == 0) {
|
|
|
|
- this.$message.warning('请选择要通过的条目')
|
|
|
|
- } else {
|
|
|
|
- this.$confirm(`是否确定通过?`, {
|
|
|
|
- cancelButtonText: '取消',
|
|
|
|
- confirmButtonText: '确定',
|
|
|
|
- type: 'warning',
|
|
|
|
- }).then(() => {
|
|
|
|
- that.audit(this.modification[0], 0, true, 2)
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
handleSelectionChange(val) {
|
|
handleSelectionChange(val) {
|
|
this.modification = val
|
|
this.modification = val
|
|
},
|
|
},
|
|
@@ -968,11 +956,13 @@ export default {
|
|
this.payingMoney = 0
|
|
this.payingMoney = 0
|
|
this.payedMoney = 0
|
|
this.payedMoney = 0
|
|
this.payNotMoney = 0
|
|
this.payNotMoney = 0
|
|
|
|
+ this.settlementWeight1 = 0
|
|
for (var i = 0; i < response.records.length; i++) {
|
|
for (var i = 0; i < response.records.length; i++) {
|
|
response.records[i].identification = 'false'
|
|
response.records[i].identification = 'false'
|
|
this.payingMoney += response.records[i].amountIngPayable
|
|
this.payingMoney += response.records[i].amountIngPayable
|
|
this.payedMoney += response.records[i].amountEdPayable
|
|
this.payedMoney += response.records[i].amountEdPayable
|
|
this.payNotMoney += response.records[i].amountNotPayable
|
|
this.payNotMoney += response.records[i].amountNotPayable
|
|
|
|
+ this.settlementWeight1 += response.records[i].settlementWeight
|
|
}
|
|
}
|
|
this.deptBudgetTotal = response.total
|
|
this.deptBudgetTotal = response.total
|
|
this.warehouseList = response
|
|
this.warehouseList = response
|