|
@@ -26,7 +26,8 @@
|
|
|
<el-dropdown-item :disabled="browse || detailData.seeDisabled" @click.native="pleaseCheck">请核数据</el-dropdown-item>
|
|
|
<el-dropdown-item v-if="form.status > 0" @click.native="checkScheduleDialog = true,checkId=form.id">审核进度</el-dropdown-item>
|
|
|
<el-dropdown-item v-if="form.status == 1" @click.native="repealCancel">撤销请核</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="checkDisabled" @click.native="changeApproveOpen">特殊审批</el-dropdown-item>
|
|
|
+ <el-dropdown-item v-if="checkDisabled && form.status != 3" @click.native="changeApproveOpen">特殊审批</el-dropdown-item>
|
|
|
+ <el-dropdown-item v-if="form.status == 3" :disabled="detailData.seeDisabled || form.specialCheckStatus > 0" @click.native="arrearsPleaseCheck">欠款发货审批</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
@@ -37,14 +38,10 @@
|
|
|
账单处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item
|
|
|
- :disabled="detailData.seeDisabled || form.status != 3"
|
|
|
- @click.native="applySettlement('收费')">生成账单
|
|
|
- </el-dropdown-item>
|
|
|
<!-- <el-dropdown-item-->
|
|
|
-<!-- :disabled="detailData.seeDisabled"-->
|
|
|
-<!-- @click.native="applySettlement('申请')"-->
|
|
|
-<!-- >申请退款</el-dropdown-item>-->
|
|
|
+<!-- :disabled="detailData.seeDisabled || form.status != 3"-->
|
|
|
+<!-- @click.native="applySettlement('收费')">生成账单-->
|
|
|
+<!-- </el-dropdown-item>-->
|
|
|
<el-dropdown-item
|
|
|
@click.native="openApplicationDialog"
|
|
|
:disabled="!form.id"
|
|
@@ -1584,6 +1581,7 @@ export default {
|
|
|
khInfoList: [],
|
|
|
messageVisble: false, //消息弹窗开关
|
|
|
changeApproveVis: false, // 更换审批人弹窗
|
|
|
+ arrearsCheck: false, // 是否欠款发货审批
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
@@ -1681,7 +1679,8 @@ export default {
|
|
|
this.pageLoading = true
|
|
|
detail(id).then(async res => {
|
|
|
this.form = res.data.data;
|
|
|
- this.browse = this.form.status > 0? true: false
|
|
|
+ this.browse = this.form.status > 0? true: false;
|
|
|
+ this.arrearsCheck = this.form.specialCheckStatus == 3? true: false;
|
|
|
await getProfit({Id: this.form.corpId}).then(res => {
|
|
|
this.$set(this.form, 'profit',res.data.data.surplusProfit? res.data.data.surplusProfit: '0.00')
|
|
|
})
|
|
@@ -1871,6 +1870,7 @@ export default {
|
|
|
this.$message.info('已取消')
|
|
|
})
|
|
|
} else {
|
|
|
+ if ((Number(this.form.settlmentAmount) < Number(this.form.debitAmount)) && !this.arrearsCheck) return this.$message.error('收款未收齐,禁止生成采购单');
|
|
|
this.$confirm("是否生成采购单?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
@@ -2966,7 +2966,8 @@ export default {
|
|
|
});
|
|
|
})
|
|
|
} else if (type == '采购') {
|
|
|
- this.$confirm(this.form.createPurchase == 1? "已经生成过采购单,是否继续生成?": "是否生成采购单?", {
|
|
|
+ if ((Number(this.form.settlmentAmount) < Number(this.form.debitAmount)) && !this.arrearsCheck) return this.$message.error('收款未收齐,禁止生成采购单');
|
|
|
+ this.$confirm("是否生成采购单?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
@@ -3362,7 +3363,6 @@ export default {
|
|
|
this.pageLoading = true
|
|
|
pleaseCheck(data).then(res => {
|
|
|
this.$message.success('请核成功')
|
|
|
- // this.pageLoading = false
|
|
|
this.saveActives = ''
|
|
|
this.queryData(this.form.id)
|
|
|
}).finally(() => {
|
|
@@ -3393,6 +3393,27 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ // 欠款发货审批
|
|
|
+ arrearsPleaseCheck() {
|
|
|
+ if (this.verification()) {
|
|
|
+ const data = {
|
|
|
+ id : this.form.id,
|
|
|
+ checkType: 'xstpqh',
|
|
|
+ url: '/businessManagement/salesOrder/index',
|
|
|
+ pageStatus:"this.$store.getters.domSaleStatus",
|
|
|
+ pageLabel:"销售订单(N)",
|
|
|
+ checkFlag: 3
|
|
|
+ }
|
|
|
+ this.pageLoading = true
|
|
|
+ pleaseCheck(data).then(res => {
|
|
|
+ this.$message.success('请核成功')
|
|
|
+ this.saveActives = ''
|
|
|
+ this.queryData(this.form.id)
|
|
|
+ }).finally(() => {
|
|
|
+ this.pageLoading = false
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
// 验证新旧值对比
|
|
|
verification() {
|
|
|
let getGoodsList = []
|