|
|
@@ -8,18 +8,12 @@
|
|
|
<ws-button :type="searchType==2?'primary':''" @click="handlestatus(2)">待结算</ws-button>
|
|
|
<ws-button :type="searchType==3?'primary':''" @click="handlestatus(3)">已结算</ws-button>
|
|
|
<ws-button :type="searchType==''?'primary':''" @click="handlestatus('')">全部</ws-button>
|
|
|
- <ws-button type="primary" v-hasPermission="
|
|
|
- `report.procurementInReport.view`
|
|
|
- " @click="handlepass1()">通过</ws-button>
|
|
|
- <ws-button type="primary" v-hasPermission="
|
|
|
- `report.procurementInReport.view`
|
|
|
- " @click="handlereject(3)">驳回</ws-button>
|
|
|
<ws-button type="primary" v-hasPermission="
|
|
|
`report.procurementInReport.view`
|
|
|
" @click="handlepass()">通过</ws-button>
|
|
|
<ws-button type="primary" v-hasPermission="
|
|
|
`report.procurementInReport.view`
|
|
|
- " @click="handlereject(2)">驳回</ws-button>
|
|
|
+ " @click="handlereject()">驳回</ws-button>
|
|
|
<ws-button type="primary" v-hasPermission="
|
|
|
`report.procurementInReport.payment`
|
|
|
" @click="handlepayment">付款</ws-button>
|
|
|
@@ -32,15 +26,6 @@
|
|
|
<ws-button type="primary" v-hasPermission="
|
|
|
`report.procurementInReport.carry`
|
|
|
" @click="carryover">补货结转</ws-button>
|
|
|
- <ws-button type="primary" v-hasPermission="
|
|
|
- `report.procurementInReport.view`
|
|
|
- " @click="handleAudit()">审核</ws-button>
|
|
|
- <ws-button type="primary" v-hasPermission="
|
|
|
- `report.procurementInReport.view`
|
|
|
- " @click="handlepass1()">通过</ws-button>
|
|
|
- <ws-button type="primary" v-hasPermission="
|
|
|
- `report.procurementInReport.view`
|
|
|
- " @click="handlereject(3)">驳回</ws-button>
|
|
|
</el-col>
|
|
|
<el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
|
|
|
<ws-select
|
|
|
@@ -89,10 +74,10 @@
|
|
|
border
|
|
|
:summary-method="getSummaries"
|
|
|
show-summary
|
|
|
- :selectable='selectInit'
|
|
|
+
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55"></el-table-column>
|
|
|
+ <el-table-column :selectable='selectInit' type="selection" width="55"></el-table-column>
|
|
|
<el-table-column type="index" label="序号" width="50"></el-table-column>
|
|
|
<el-table-column
|
|
|
class="table_td"
|
|
|
@@ -433,10 +418,10 @@
|
|
|
:append-to-body="true"
|
|
|
>
|
|
|
<el-form :model="form">
|
|
|
- <el-button :type="currect ? 'primary' : ''" @click="currect = true"
|
|
|
+ <el-button :type="currect ? 'primary' : ''" @click="cur(0)"
|
|
|
>本合同</el-button
|
|
|
>
|
|
|
- <el-button :type="!currect ? 'primary' : ''" @click="currect = false"
|
|
|
+ <el-button :type="!currect ? 'primary' : ''" @click="cur(1)"
|
|
|
>其他合同</el-button
|
|
|
>
|
|
|
<el-form-item
|
|
|
@@ -445,11 +430,11 @@
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
|
<ws-select
|
|
|
- v-if="carryovercontractnolist.length > 0"
|
|
|
+ v-if="carryovercontractnolist"
|
|
|
v-model="carryoverlist.contractNo"
|
|
|
placeholder="请选择合同"
|
|
|
clearable
|
|
|
- @change="contractchange"
|
|
|
+ @change="carryovercontractchange"
|
|
|
maxlength="500"
|
|
|
type="input"
|
|
|
>
|
|
|
@@ -490,6 +475,7 @@ import {
|
|
|
postpaymoney,
|
|
|
postopeninvoice,
|
|
|
postbatchopeninvoice,
|
|
|
+ getselectctcontractno
|
|
|
} from '@/model/statisticalReport/index'
|
|
|
import {
|
|
|
posthandle
|
|
|
@@ -621,6 +607,23 @@ export default {
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ cur(status){
|
|
|
+ if(status==0){
|
|
|
+ this.currect=true
|
|
|
+ }else{
|
|
|
+ var that=this
|
|
|
+ this.currect=false
|
|
|
+ getselectctcontractno({customerName:this.modification[0].customerName,contractNo:this.modification[0].contractNo}).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+
|
|
|
+ that.carryovercontractnolist=response
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ console.log(response)
|
|
|
+ EventBus.$emit('error', response.message)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
selectInit(row){
|
|
|
//在这里一定要记得类型匹配的上。
|
|
|
if(row.approveStatus==null){
|
|
|
@@ -851,12 +854,12 @@ export default {
|
|
|
// this.$message.success('审核成功')
|
|
|
// this.getList()
|
|
|
// })
|
|
|
- that.audit(this.modification[0],0,true,1)
|
|
|
+ that.audit(this.modification[0],0,true)
|
|
|
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- audit(item,index,status,status1){
|
|
|
+ audit(item,index,status){
|
|
|
if(index<this.modification.length){
|
|
|
posthandle({ taskId: item.taskId,
|
|
|
approved: status,
|
|
|
@@ -864,38 +867,17 @@ export default {
|
|
|
needReapply: false,})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- this.audit(this.modification[index+1],index+1,status,status1)
|
|
|
+ this.audit(this.modification[index+1],index+1,status)
|
|
|
}).catch((req) => {
|
|
|
this.$message.warning(req.message)
|
|
|
})
|
|
|
}else{
|
|
|
if(status){
|
|
|
- if(status1==1){
|
|
|
- this.$message.success('审核成功')
|
|
|
- }else if(status1==2){
|
|
|
- this.$message.success('通过成功')
|
|
|
- }else if(status1==3){
|
|
|
- this.$message.success('通过成功')
|
|
|
- }
|
|
|
+ this.$message.success('通过成功')
|
|
|
this.getList()
|
|
|
}else if(!status){
|
|
|
if(status1==2){
|
|
|
postaudit({
|
|
|
- roleFlag: status1,
|
|
|
- flag: 2,
|
|
|
- purchaseReceiptReportList: this.modification,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.$message.success('驳回成功')
|
|
|
- this.getList()
|
|
|
- })
|
|
|
- .catch((req) => {
|
|
|
- this.$message.success('驳回失败')
|
|
|
- })
|
|
|
- }else if(status1==3){
|
|
|
- postaudit({
|
|
|
- roleFlag: status1,
|
|
|
flag: 2,
|
|
|
purchaseReceiptReportList: this.modification,
|
|
|
})
|
|
|
@@ -918,7 +900,7 @@ export default {
|
|
|
if (this.modification.length == 0) {
|
|
|
this.$message.warning('请选择要驳回的条目')
|
|
|
} else {
|
|
|
- this.$confirm(`驳回后任务将退回到统计，是否确定驳回？`, {
|
|
|
+ this.$confirm(`是否确定驳回？`, {
|
|
|
cancelButtonText: '取消',
|
|
|
confirmButtonText: '确定',
|
|
|
type: 'warning',
|
|
|
@@ -936,7 +918,7 @@ export default {
|
|
|
// .catch((req) => {
|
|
|
// this.$message.success('驳回失败')
|
|
|
// })
|
|
|
- that.audit(this.modification[0],0,false,status)
|
|
|
+ that.audit(this.modification[0],0,false)
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
@@ -945,24 +927,11 @@ export default {
|
|
|
if (this.modification.length == 0) {
|
|
|
this.$message.warning('请选择要通过的条目')
|
|
|
} else {
|
|
|
- this.$confirm(`审核通过后，任务将发送给决策人，是否确定通过？`, {
|
|
|
+ this.$confirm(`是否确定通过？`, {
|
|
|
cancelButtonText: '取消',
|
|
|
confirmButtonText: '确定',
|
|
|
type: 'warning',
|
|
|
}).then(() => {
|
|
|
- // postaudit({
|
|
|
- // roleFlag: 2,
|
|
|
- // flag: 1,
|
|
|
- // purchaseReceiptReportList: this.modification,
|
|
|
- // })
|
|
|
- // .toPromise()
|
|
|
- // .then((response) => {
|
|
|
- // this.$message.success('通过成功')
|
|
|
- // this.getList()
|
|
|
- // })
|
|
|
- // .catch((req) => {
|
|
|
- // this.$message.success('通过失败')
|
|
|
- // })
|
|
|
that.audit(this.modification[0],0,true,2)
|
|
|
})
|
|
|
}
|
|
|
@@ -995,8 +964,17 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
carryoverconfirm() {
|
|
|
+ var data={}
|
|
|
+ if(!this.carryoverlist.carryOverWeight){
|
|
|
+ this.$message.warning('结转重量不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(this.carryoverlist.carryOverWeight>this.modification[0].netWeight){
|
|
|
+ this.$message.warning('结转重量不能超过净重')
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.currect == true) {
|
|
|
- postreplanishent({
|
|
|
+ data={
|
|
|
customerConfirmationStatusFlag:
|
|
|
this.modification[0].customerConfirmationStatusFlag,
|
|
|
id:this.modification[0].id,
|
|
|
@@ -1007,17 +985,28 @@ export default {
|
|
|
carryOverWeight: this.carryoverlist.carryOverWeight,
|
|
|
},
|
|
|
amountNotPayable: this.modification[0].amountNotPayable,
|
|
|
- })
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ data={
|
|
|
+ customerConfirmationStatusFlag:
|
|
|
+ this.modification[0].customerConfirmationStatusFlag,
|
|
|
+ id:this.modification[0].id,
|
|
|
+ contractNo:this.carryoverlist.contractNo,
|
|
|
+ carryOverWeight: this.carryoverlist.carryOverWeight,
|
|
|
+ purchaseReceiptReport: {
|
|
|
+ contractNo: this.carryoverlist.contractNo,
|
|
|
+ carryOverWeight: this.carryoverlist.carryOverWeight,
|
|
|
+ },
|
|
|
+ amountNotPayable: this.modification[0].amountNotPayable,
|
|
|
+ }
|
|
|
+ }
|
|
|
+ postreplanishent(data)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.dialogFormVisible11=false
|
|
|
this.$message.success('结转成功')
|
|
|
- this.dialogFormVisible11 = false
|
|
|
this.getList()
|
|
|
})
|
|
|
- } else if (this.carryovercontractnolist.length <=0){
|
|
|
- this.$message.warning('无可结转的其他合同')
|
|
|
- }
|
|
|
},
|
|
|
amendconfirm() {
|
|
|
this.amendlist.id = this.modification[0].id
|
|
|
@@ -1045,12 +1034,6 @@ export default {
|
|
|
this.$message.warning('请选择一条要结转的条目')
|
|
|
} else {
|
|
|
this.dialogFormVisible11 = true
|
|
|
- console.log(this.contractNoList.records)
|
|
|
- this.carryovercontractnolist = this.contractNoList.records.filter(
|
|
|
- (item) => {
|
|
|
- return this.modification[0].id != item.id
|
|
|
- }
|
|
|
- )
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -1074,6 +1057,13 @@ export default {
|
|
|
})
|
|
|
this.getList()
|
|
|
},
|
|
|
+ carryovercontractchange(e) {
|
|
|
+ for (let i = 0; i < this.carryovercontractnolist.length; i++) {
|
|
|
+ if(this.carryovercontractnolist[i].contractNo==e){
|
|
|
+ this.carryoverlist.netWeight=this.carryovercontractnolist[i].netWeight
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
updated() {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.warehouseList.doLayout()
|
