|
|
@@ -23,7 +23,7 @@
|
|
|
审核处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item :disabled="true">请核数据</el-dropdown-item>
|
|
|
+ <el-dropdown-item @click.native="pleaseCheck">请核数据</el-dropdown-item>
|
|
|
<el-dropdown-item v-if="false">审核进度</el-dropdown-item>
|
|
|
<el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
@@ -540,7 +540,7 @@ import { contrastObj, contrastList } from "@/util/contrastData";
|
|
|
//账单组件
|
|
|
import ApplyPayment from "../../../components/finance/applyPayment";
|
|
|
import billApplication from "@/components/bill/billApplication";
|
|
|
-import { getlistBankBy } from "@/api/basicData/configuration"
|
|
|
+import { getlistBankBy, pleaseCheck, } from "@/api/basicData/configuration"
|
|
|
import feeInfo from "@/components/fee-info/main";
|
|
|
import {
|
|
|
isDiscount,
|
|
|
@@ -875,21 +875,24 @@ export default {
|
|
|
this.pageLoading = true
|
|
|
detail(id).then(res => {
|
|
|
this.form = res.data.data;
|
|
|
+ this.contactsData = this.form.itemsVOList? this.form.itemsVOList: []
|
|
|
+ this.advantageProjectData = this.form.orderFeesList? this.form.orderFeesList: []
|
|
|
+ this.bankOfDepositData = this.form.orderFilesList? this.form.orderFilesList: []
|
|
|
if (!this.form.itemsVOList) {
|
|
|
this.contactsData = []
|
|
|
} else {
|
|
|
this.contactsData = this.form.itemsVOList
|
|
|
}
|
|
|
- if (!this.form.orderFeesList) {
|
|
|
- this.advantageProjectData = []
|
|
|
- } else {
|
|
|
- this.advantageProjectData = this.form.orderFeesList
|
|
|
- }
|
|
|
- if (!this.form.orderFilesList) {
|
|
|
- this.bankOfDepositData = []
|
|
|
- } else {
|
|
|
- this.bankOfDepositData = this.form.orderFilesList
|
|
|
- }
|
|
|
+ // if (!this.form.orderFeesList) {
|
|
|
+ // this.advantageProjectData = []
|
|
|
+ // } else {
|
|
|
+ // this.advantageProjectData = this.form.orderFeesList
|
|
|
+ // }
|
|
|
+ // if (!this.form.orderFilesList) {
|
|
|
+ // this.bankOfDepositData = []
|
|
|
+ // } else {
|
|
|
+ // this.bankOfDepositData = this.form.orderFilesList
|
|
|
+ // }
|
|
|
if (this.form.corpsName) {
|
|
|
this.configuration.dicData = this.form.corpsName
|
|
|
}
|
|
|
@@ -1401,14 +1404,14 @@ export default {
|
|
|
// 计算费用
|
|
|
changeContractAmt(row) {
|
|
|
let orderQuantity = 0;
|
|
|
- let price = 0;
|
|
|
+ let purchaseAmount = 0;
|
|
|
if (row.price) {
|
|
|
- price = row.price;
|
|
|
+ purchaseAmount = row.purchaseAmount;
|
|
|
}
|
|
|
if (row.orderQuantity) {
|
|
|
orderQuantity = row.orderQuantity;
|
|
|
}
|
|
|
- this.$set(row, "amount", Number(orderQuantity) * Number(price)).toFixed(2);
|
|
|
+ this.$set(row, "amount", Number(orderQuantity) * Number(purchaseAmount)).toFixed(2);
|
|
|
},
|
|
|
// 去重
|
|
|
removeRepeat() {
|
|
|
@@ -1431,6 +1434,10 @@ export default {
|
|
|
return this.$message.error('商品信息第'+ (parseInt(item) + 1) + '行订货数量不能小于发货数量')
|
|
|
}
|
|
|
}
|
|
|
+ this.form.orderAmount = 0;
|
|
|
+ this.contactsData.forEach(item => {
|
|
|
+ this.form.orderAmount = Number(this.form.orderAmount) + Number(item.amount)
|
|
|
+ })
|
|
|
//商品信息
|
|
|
this.form.itemsVOList = this.contactsData
|
|
|
// this.form.orderFeesList = this.advantageProjectData
|
|
|
@@ -1492,7 +1499,8 @@ export default {
|
|
|
accDate: this.form.businesDate,
|
|
|
srcType: 1,
|
|
|
tradeType: 'GN',
|
|
|
- optionType: 'GN'
|
|
|
+ optionType: 'GN',
|
|
|
+ amount: this.form.orderAmount
|
|
|
}
|
|
|
if(bool){ //申请货款
|
|
|
this.billData.srcId = -1
|
|
|
@@ -1646,6 +1654,56 @@ export default {
|
|
|
onClose(val) {
|
|
|
this.switchDialog = val;
|
|
|
},
|
|
|
+ //请核
|
|
|
+ pleaseCheck() {
|
|
|
+ // this.verification()
|
|
|
+ if (this.verification()) {
|
|
|
+ this.$confirm("您确定提交此次申请吗？", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ const data = {
|
|
|
+ id : this.form.id,
|
|
|
+ checkType: 'cgqh',
|
|
|
+ url: '/businessManagement/purchaseOrder/index',
|
|
|
+ pageStatus:"this.$store.getters.domPurStatus",
|
|
|
+ pageLabel:"采购订单(N)",
|
|
|
+ checkFlag: 1,
|
|
|
+ }
|
|
|
+ this.pageLoading = true
|
|
|
+ pleaseCheck(data).then(res => {
|
|
|
+ this.$message.success('请核成功')
|
|
|
+ // this.pageLoading = false
|
|
|
+ this.saveActives = ''
|
|
|
+ this.queryData(this.form.id)
|
|
|
+ }).finally(() => {
|
|
|
+ this.pageLoading = false
|
|
|
+ })
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ }
|
|
|
+ },
|
|
|
+ verification() {
|
|
|
+ let getFeeList = this.$refs.feeInfo.submitData()
|
|
|
+ if (contrastObj(this.form, this.oldForm) ||
|
|
|
+ contrastList(this.contactsData, this.oldGoodsList) ||
|
|
|
+ // contrastList(getFeeList, this.oldFeesList) ||
|
|
|
+ contrastList(this.bankOfDepositData, this.oldUploadList)
|
|
|
+ ) {
|
|
|
+ this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.editCustomer(false)
|
|
|
+ }).catch(() => {
|
|
|
+ return false; //取消改动数据
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ return true; //没有动过数据
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
lichao