diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue
index fa2567a..4f560dd 100644
--- a/src/views/inventory/addInvMAOrder.vue
+++ b/src/views/inventory/addInvMAOrder.vue
@@ -380,8 +380,7 @@ export default {
if (res.code === 20000) {
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime;
- this.$message.success("保存成功！");
- if (!isBlank(!code)) {
+ if (!isBlank(code)) {
//扫码添加库存养护记录详情
let params = {
orderIdFk: this.formData.orderId,
diff --git a/src/views/inventory/invMAOrderAudit.vue b/src/views/inventory/invMAOrderAudit.vue
index dc96a4d..7c39c63 100644
--- a/src/views/inventory/invMAOrderAudit.vue
+++ b/src/views/inventory/invMAOrderAudit.vue
@@ -61,9 +61,9 @@
-
-
-
+
+
+
{{ statusMap[scope.row.status] }}
@@ -101,15 +101,15 @@
-
-
+
-
+
+
-
-
+
-
@@ -272,7 +272,7 @@ export default {
auditOrder(row) {
this.$confirm('请选择审核意见', '提示', {
confirmButtonText: '确定',
- cancelButtonText: '取消',
+ cancelButtonText: '驳回',
type: 'warning',
center: true
}).then(() => {
@@ -290,7 +290,23 @@ export default {
}).catch((error) => {
this.$message.error(error.message);
})
- }).catch(() => {
+ }).catch((action) => {
+ if (action === "cancel") {
+ let params = {
+ id: row.id,
+ status: 0
+ };
+ updateStatus(params).then((res) => {
+ if (res.code === 20000) {
+ this.$message.success("审核通过！");
+ this.getList();
+ } else {
+ this.$message.error(res.message);
+ }
+ }).catch((error) => {
+ this.$message.error(error.message);
+ })
+ }
});
},
deleteDialog(id) {
diff --git a/src/views/inventory/invMAOrderCompleted.vue b/src/views/inventory/invMAOrderCompleted.vue
index 80e3813..7eb580c 100644
--- a/src/views/inventory/invMAOrderCompleted.vue
+++ b/src/views/inventory/invMAOrderCompleted.vue
@@ -57,9 +57,10 @@
-
+
+
-
+
{{ statusMap[scope.row.status] }}
@@ -79,15 +80,15 @@
-
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
@@ -222,6 +222,7 @@ export default {
},
closeDialog() {
this.formVisible = false;
+ this.getList();
},
addMAOrder() {
this.maOrder = null;