|
@@ -842,20 +842,47 @@ export default {
|
|
|
},
|
|
|
// 审批 确认回调
|
|
|
approveConfirm() {
|
|
|
+ // console.log(this.dict.type.sales_order_type);
|
|
|
this.$refs["approveFormRef"].validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
+ let { status, orderType } = this.approveForm;
|
|
|
let payload = {
|
|
|
basicMap: {
|
|
|
tableName: "sale_order",
|
|
|
},
|
|
|
commMap: {
|
|
|
- ...this.approveForm,
|
|
|
- saleApprover: this.nickName,
|
|
|
+ // status: orderType == "2" ? "3" : "5",
|
|
|
+ // orderType,
|
|
|
+ // saleApprover: this.nickName,
|
|
|
},
|
|
|
conditionMap: {
|
|
|
saleNo: this.approveNo,
|
|
|
},
|
|
|
};
|
|
|
+ if (status == "1") {
|
|
|
+ // 不通过
|
|
|
+ payload.commMap = {
|
|
|
+ status,
|
|
|
+ saleApprover: this.nickName,
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ //通过
|
|
|
+ if (orderType == "2") {
|
|
|
+ //生产
|
|
|
+ payload.commMap = {
|
|
|
+ status: "3",
|
|
|
+ orderType,
|
|
|
+ saleApprover: this.nickName,
|
|
|
+ };
|
|
|
+ } else if (orderType == "1") {
|
|
|
+ //库存
|
|
|
+ payload.commMap = {
|
|
|
+ status: "5",
|
|
|
+ orderType,
|
|
|
+ saleApprover: this.nickName,
|
|
|
+ };
|
|
|
+ }
|
|
|
+ }
|
|
|
let res = await batchEdit(payload);
|
|
|
if (res.code === 200) {
|
|
|
this.$message.success("审批成功");
|
|
@@ -869,6 +896,13 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 初始化审批表单数据
|
|
|
+ initApproveFormData() {
|
|
|
+ Object.assign(this.approveForm, {
|
|
|
+ status: "3",
|
|
|
+ orderType: "",
|
|
|
+ });
|
|
|
+ },
|
|
|
// 重置审计表单数据
|
|
|
resetFormData() {
|
|
|
Object.assign(this.formData, {
|