From 58f6737adb7a850b9cc6ec6438943ff849107827 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 17 Mar 2023 14:14:31 +0800
Subject: [PATCH] fix bugs

---
 src/components/DialogWithMenu.vue        | 13 ++++++++-----
 src/views/atomViews/ListViewWithHead.vue |  2 +-
 src/views/modules/pms/bom/config.js      |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue
index 1231e93..55e78a7 100644
--- a/src/components/DialogWithMenu.vue
+++ b/src/components/DialogWithMenu.vue
@@ -60,8 +60,8 @@
             <el-form ref="dataForm" :model="dataForm" v-loading="loadingStatus">
               <el-row v-for="(row, rowIndex) in configs.form.rows" :key="'row_' + rowIndex" :gutter="20">
                 <el-col v-for="(col, colIndex) in row" :key="colIndex" :span="24 / row.length">
-                  <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules || null">
-                    <div v-if="col.forceDisabled" class="force-disabled">
+                  <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules || null" v-show="!col.forceDisabled || (col.forceDisabled && dataForm.id)">
+                    <div v-if="col.forceDisabled && dataForm.id" class="force-disabled">
                       <el-tag :key="col.key" :type="col.type">{{ dataForm[col.prop] || "-" }}</el-tag>
                     </div>
                     <el-input v-if="col.input" v-model="dataForm[col.prop]" clearable :disabled="disableCondition(col.prop)" v-bind="col.elparams" />
@@ -715,8 +715,9 @@ export default {
                     extraIds[key] = value;
                   });
                 }
-
+                
                 // 实际发送请求
+                this.btnLoading = true
                 this.$http({
                   url: this.urls.base,
                   method,
@@ -726,7 +727,7 @@ export default {
                   },
                 })
                   .then(({ data: res }) => {
-                    this.btnLoading = true
+                    this.btnLoading = false 
                     this.loadingStatus = false;
                     console.log("[add&update] res is: ", res);
                     if (res.code === 0) {
@@ -761,13 +762,15 @@ export default {
                         type: "error",
                         duration: 2000,
                       });
+                      if (this.btnLoading) this.btnLoading = false
                     }
                   })
                   .catch((errMsg) => {
                     this.$message.error("参数错误：" + errMsg);
                     if (this.loadingStatus) this.loadingStatus = false;
+                    if (this.btnLoading) this.btnLoading = false
                   });
-              } else {
+                } else {
                 this.$message.error("请核查字段信息");
               }
             });
diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue
index db74a1f..b977f7d 100644
--- a/src/views/atomViews/ListViewWithHead.vue
+++ b/src/views/atomViews/ListViewWithHead.vue
@@ -292,7 +292,7 @@ export default {
           break;
         }
         case "view-recipe": {
-          this.openDialog(data, false, { key: "attr" });
+          this.openDialog(data, true, { key: "attr" });
           break;
         }
         case "copy": {
diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js
index da91708..70f6a66 100644
--- a/src/views/modules/pms/bom/config.js
+++ b/src/views/modules/pms/bom/config.js
@@ -109,7 +109,7 @@ export default function () {
             input: true,
             label: "版本号",
             prop: "externalCode",
-            // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入版本号" },
           },
           { input: true, label: "物料销售文本(短)", prop: "shortDesc", elparams: { placeholder: "物料销售文本" } }