|
@@ -174,7 +174,7 @@
|
|
|
<el-select
|
|
|
v-if="row.$cellEdit"
|
|
|
v-model="row.purchaseAmount"
|
|
|
- @focus="changeContractAmt(row)"
|
|
|
+ @change="changeContractAmt(row)"
|
|
|
allow-create
|
|
|
filterable
|
|
|
v-input-limit="2"
|
|
@@ -364,25 +364,6 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog
|
|
|
- title="账单"
|
|
|
- append-to-body
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="applyPaymentDialog"
|
|
|
- width="60%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
- <apply-payment
|
|
|
- :billType="billType"
|
|
|
- :billData="billData"
|
|
|
- itemType="采购"
|
|
|
- @choceFun="choceFun"
|
|
|
- >
|
|
|
- </apply-payment>
|
|
|
- </el-dialog>
|
|
|
|
|
|
<el-dialog
|
|
|
append-to-body
|
|
@@ -396,11 +377,13 @@
|
|
|
v-dialog-drag
|
|
|
>
|
|
|
<financial-account
|
|
|
+ v-if="financialAccountDialog"
|
|
|
:billType="billType"
|
|
|
:billData="{}"
|
|
|
:arrList="applyPaymentList"
|
|
|
:checkData="financeData"
|
|
|
@choceFun="choceFun"
|
|
|
+ @submit="feeSubmit"
|
|
|
>
|
|
|
</financial-account>
|
|
|
</el-dialog>
|
|
@@ -884,13 +867,13 @@ export default {
|
|
|
detail(id).then(res => {
|
|
|
this.form = res.data.data;
|
|
|
this.browse = this.form.status > 0? true: false
|
|
|
- this.contactsData = this.form.itemsVOList? this.form.itemsVOList: []
|
|
|
+ this.contactsData = this.form.orderItemsList? this.form.orderItemsList: []
|
|
|
this.advantageProjectData = this.form.orderFeesList? this.form.orderFeesList: []
|
|
|
this.bankOfDepositData = this.form.orderFilesList? this.form.orderFilesList: []
|
|
|
- if (!this.form.itemsVOList) {
|
|
|
+ if (!this.form.orderItemsList) {
|
|
|
this.contactsData = []
|
|
|
} else {
|
|
|
- this.contactsData = this.form.itemsVOList
|
|
|
+ this.contactsData = this.form.orderItemsList
|
|
|
}
|
|
|
// if (!this.form.orderFeesList) {
|
|
|
// this.advantageProjectData = []
|
|
@@ -926,7 +909,7 @@ export default {
|
|
|
})
|
|
|
this.goodsConfiguration.dicData = [].concat(goodsData)
|
|
|
this.removeGoodsRepeat()
|
|
|
- delete this.form.itemsVOList
|
|
|
+ delete this.form.orderItemsList
|
|
|
delete this.form.orderFeesList
|
|
|
delete this.form.orderFilesList
|
|
|
// delete this.form.corpsName
|
|
@@ -1485,34 +1468,36 @@ export default {
|
|
|
checkType: 'ffsq'
|
|
|
}
|
|
|
this.contactsData.map(e => {
|
|
|
- const form = {
|
|
|
- belongCompany: this.form.belongCompany,
|
|
|
- srcOrderno:this.form.orderNo,
|
|
|
- itemType:"采购",
|
|
|
- corpsName:this.form.corpsName,
|
|
|
- corpId:this.form.corpId,
|
|
|
- srcParentId: this.form.id,
|
|
|
- currency: 'CNY',
|
|
|
- exchangeRate: '1',
|
|
|
- taxRate: '0',
|
|
|
- accDate: this.form.businesDate,
|
|
|
- srcType: 1, // 1.采购or销售主表货款申请 2. 采购or销售-费用明细申请 3.收发货-费用明细
|
|
|
- tradeType: 'GN',
|
|
|
- optionType: 'GN',
|
|
|
- amount: e.amount,
|
|
|
- goodName: e.cname,
|
|
|
- price: e.price,
|
|
|
- unit: e.unit,
|
|
|
- quantity: e.orderQuantity,
|
|
|
- srcFeesId: e.id,
|
|
|
- costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
|
|
|
+ if (e.submitPay != 1) {
|
|
|
+ const form = {
|
|
|
+ belongCompany: this.form.belongCompany,
|
|
|
+ srcOrderno:this.form.orderNo,
|
|
|
+ itemType:"采购",
|
|
|
+ corpsName:this.form.corpsName,
|
|
|
+ corpId:this.form.corpId,
|
|
|
+ srcParentId: this.form.id,
|
|
|
+ currency: 'CNY',
|
|
|
+ exchangeRate: '1',
|
|
|
+ taxRate: '0',
|
|
|
+ accDate: this.form.businesDate,
|
|
|
+ srcType: 1, // 1.采购or销售主表货款申请 2. 采购or销售-费用明细申请 3.收发货-费用明细
|
|
|
+ tradeType: 'GN',
|
|
|
+ optionType: 'GN',
|
|
|
+ amount: e.amount,
|
|
|
+ goodName: e.cname,
|
|
|
+ price: e.purchaseAmount,
|
|
|
+ unit: e.unit,
|
|
|
+ quantity: e.orderQuantity,
|
|
|
+ srcFeesId: e.id,
|
|
|
+ costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
|
|
|
+ }
|
|
|
+ arr.push(form)
|
|
|
}
|
|
|
- arr.push(form)
|
|
|
})
|
|
|
- let getFeeList = this.$refs.feeInfo.submitData().filter(item => item.feesType == 2)
|
|
|
+ let getFeeList = this.$refs.feeInfo.submitData().filter(item => item.feesType == 2 && item.submitPay != 1)
|
|
|
getFeeList.forEach(item => {
|
|
|
let form = {
|
|
|
- srcOrderno:this.form.orgOrderNo,
|
|
|
+ srcOrderno:this.form.orderNo,
|
|
|
itemType:"采购",
|
|
|
corpsName:item.corpName,
|
|
|
corpId: item.corpId,
|
|
@@ -1549,28 +1534,16 @@ export default {
|
|
|
},
|
|
|
//申请货款
|
|
|
applyPayment(type){
|
|
|
- // if (contrastObj(this.form, this.oldForm) ||
|
|
|
- // contrastList(this.contactsData, this.oldGoodsList) ||
|
|
|
- // contrastList(this.advantageProjectData, this.oldFeesList) ||
|
|
|
- // contrastList(this.bankOfDepositData, this.oldUploadList)
|
|
|
- // ) {
|
|
|
- // this.$confirm("您已改动数据,是否先保存在进行操作!", {
|
|
|
- // confirmButtonText: "保存",
|
|
|
- // cancelButtonText: "取消",
|
|
|
- // type: "warning"
|
|
|
- // }).then(() => {
|
|
|
- // this.editCustomer();
|
|
|
- // })
|
|
|
- // }else{
|
|
|
- this.beforeBillData(true,type);
|
|
|
- this.financialAccountDialog = true;
|
|
|
- // }
|
|
|
-
|
|
|
+ this.beforeBillData(true,type);
|
|
|
+ this.financialAccountDialog = true;
|
|
|
},
|
|
|
//关闭账单
|
|
|
choceFun(){
|
|
|
this.financialAccountDialog = false
|
|
|
},
|
|
|
+ feeSubmit() {
|
|
|
+ this.queryData(this.form.id);
|
|
|
+ },
|
|
|
//返回列表
|
|
|
backToList() {
|
|
|
if (contrastObj(this.form, this.oldForm) ||
|