From 2e834499985edecb6e3d9cfbfcafb70620e3cd59 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 17 Feb 2023 16:39:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E6=94=BE=E5=8D=95=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD=E7=9A=84=E7=B1=BB=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/param/busTypeChange.vue      | 14 +++++---
 .../system/param/busTypeChangeModify.vue      | 36 +++++++++++++++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index 8842dedd..a74ccf46 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@@ -119,6 +119,7 @@ export default {
         targetAction: null,
         name: null,
         enable: null,
+        type: null,
         remark: null
       },
       enableMap: {
@@ -131,6 +132,7 @@ export default {
         1: "耗材领用",
         2: "产品申购",
         3: "采购计划",
+        4: "盘点转单"
       },
       formMap: {
         add: "新增单据生成设置",
@@ -186,11 +188,11 @@ export default {
 
     onAddSubmit() {
       if (isBlank(this.inputQuery.originName)) {
-        this.$message.error("补单类型名称不能为空！")
+        this.$message.error("单据类型名称不能为空！")
         return;
       }
       if (isBlank(this.inputQuery.originAction)) {
-        this.$message.error("补单类型代码不能为空！");
+        this.$message.error("单据类型代码不能为空！");
         return;
       }
       if (isBlank(this.inputQuery.targetAction)) {
@@ -198,7 +200,11 @@ export default {
         return;
       }
       if (isBlank(this.inputQuery.enable)) {
-        this.$message.error("请选择启用状态！")
+        this.$message.error("请选择启用状态！");
+        return;
+      }
+      if (isBlank(this.inputQuery.type)) {
+        this.$message.error("请选择类型！");
         return;
       }
 
@@ -209,10 +215,10 @@ export default {
           this.$message.error("单据类型名称不得为纯数字类型！");
           return;
         }
-        this.inputQuery.type = 1;           //默认类型为耗材领用
 
         addBusTypeChange(this.inputQuery).then((res) => {
           if (res.code === 20000) {
+            this.cancelDialog();
             this.loading = false;
             this.getList();
           }
diff --git a/src/views/system/param/busTypeChangeModify.vue b/src/views/system/param/busTypeChangeModify.vue
index f00ca94e..13719b6e 100644
--- a/src/views/system/param/busTypeChangeModify.vue
+++ b/src/views/system/param/busTypeChangeModify.vue
@@ -15,7 +15,6 @@
         </el-col>
       </el-row>
 
-
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="目标单据类型" prop="targetAction">
@@ -48,6 +47,24 @@
         </el-col>
       </el-row>
 
+      <el-row type="flex">
+        <el-col :span="11">
+          <el-form-item label="类型">
+            <el-select v-model="inputQuery.type"
+                       size="small"
+                       placeholder="类型"
+                       style="width: 90%"
+                       clearable
+            >
+              <el-option label="耗材领用" :value="1"></el-option>
+              <el-option label="产品申购" :value="2"></el-option>
+              <el-option label="采购计划" :value="3"></el-option>
+              <el-option label="盘点转单" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row type="flex">
         <el-col :span="23" type="flex">
           <el-form-item prop="comments">
@@ -87,14 +104,14 @@ export default {
         originName: [
           {
             required: true,
-            message: "补单类型名称不能为空",
+            message: "单据类型名称不能为空",
             trigger: "blur"
           }
         ],
         originAction: [
           {
             required: true,
-            message: "补单类型代码不能为空",
+            message: "单据类型代码不能为空",
             trigger: "blur"
           }
         ],
@@ -112,6 +129,19 @@ export default {
             trigger: "blur"
           }
         ],
+        type: [
+          {
+            required: true,
+            message: "请选择类型",
+            trigger: "blur"
+          }
+        ],
+      },
+      typeMap: {
+        1: "耗材领用",
+        2: "产品申购",
+        3: "采购计划",
+        4: "盘点转单"
       },
     }
   },