feat: 修复BUG

zhanbo.xu
Commit fc420843cbdd98072c986bb79cac7d86eb909f08 fc420843 1 parent 96a0ed67
Showing 4 changed files with 70 additions and 54 deletions
src/views/config-management/dialog.vue
src/views/config-management/index.vue
src/views/exportListDetail/dialog.vue
src/views/receipt-management/dialog.vue
--- a/src/views/config-management/dialog.vue
View file @fc42084
+++ b/src/views/config-management/dialog.vue
View file @fc42084
@@ -53,16 +53,12 @@
               </el-select>
             </Formitem>
           </el-col>
-          <!-- String | File | Boolean | Integer | Long  -->
+
-          <el-col :span="8">
+          <el-col
-            <Formitem
+            :span="8"
-              label="配置项值"
+            v-if="formData.configType === 'String' || !formData.configType"
-              prop="configValue"
-              type="edit"
-              v-if="
-                formData.configType === 'String' || formData.configType === ''
-              "
           >
+            <Formitem label="配置项值" prop="configValue" type="edit">
               <el-input
                 type="text"
                 class="inputShadow"
@@ -71,46 +67,51 @@
                 v-model="formData.configValue"
                 clearable
                 placeholder=""
+                maxlength="500"
               ></el-input>
             </Formitem>
-            <Formitem
+          </el-col>
-              label="配置项值"
+
-              prop="configValue"
+          <el-col
-              type="edit"
+            :span="8"
             v-if="formData.configType === 'Number' && formData.configType"
           >
+            <Formitem label="配置项值" prop="configValueNumber" type="edit">
               <el-input
                 type="number"
                 class="inputShadow"
-                id="inputInner-edit-configValue"
+                id="inputInner-edit-configValueNumber"
                 resize="none"
-                v-model="formData.configValue"
+                v-model="formData.configValueNumber"
                 clearable
                 placeholder=""
+                maxlength="500"
               ></el-input>
             </Formitem>
-            <Formitem
+          </el-col>
-              label="配置项值"
+
-              prop="configValue"
+          <el-col
-              type="edit"
+            :span="8"
             v-if="formData.configType === 'Boolean' && formData.configType"
           >
+            <Formitem label="配置项值" prop="configValueBoolean">
               <el-select
-                type="text"
+                id="inputInner--configValueBoolean"
-                id="inputInner-edit-configValue"
+                v-model="formData.configValueBoolean"
-                v-model="formData.configValue"
                 clearable
-                filterable
                 placeholder=""
               >
-                <el-option label="true" value="true"></el-option>
+                <el-option label="true" value="true" :key="1"></el-option>
-                <el-option label="false" value="false"></el-option>
+                <el-option label="false" value="false" :key="2"></el-option>
               </el-select>
             </Formitem>
-            <div
+          </el-col>
-              class="uploadItem"
+
+          <el-col
+            :span="8"
             v-if="formData.configType === 'File' && formData.configType"
           >
+            <div class="uploadItem">
               <div
                 class="uploadbox"
                 :style="{
@@ -257,51 +258,38 @@ export default {
     },
   },
-  watch: {
-    outerVisible(val) {
-      if (val) {
-        //
-        this.formData = {
-          configType: "String",
-          ...this.activeOjb,
-          file: {
-            name: this.activeOjb?.configFileName || "",
-            file: this.activeOjb?.configValue || "",
-          },
-        };
-      }
-    },
-  },
   data() {
     return {
       formData: {
-        configName: "",
+        configName: null,
         configType: "String",
-        configValue: "",
+        configValue: null, // 默认string
-        configApp: "",
+        configApp: null,
-        configIp: "",
+        configIp: null,
-        description: "",
+        description: null,
         file: null,
+        configValueNumber: null,
+        configValueBoolean: null,
       },
       rules: {
         configName: [
           {
             required: true,
-            trigger: "blur",
+            trigger: "change",
             message: "请输入配置项名称！",
           },
         ],
         configType: [
           {
             required: true,
-            trigger: "blur",
+            trigger: "change",
             message: "请选择配置项类型！",
           },
         ],
         configValue: [
           {
             required: true,
-            trigger: "blur",
+            trigger: "change",
             message: "请输入配置项值！",
           },
         ],
@@ -309,7 +297,7 @@ export default {
         configApp: [
           {
             required: true,
-            trigger: "blur",
+            trigger: "change",
             message: "请选择配置所属应用！",
           },
         ],
@@ -317,7 +305,7 @@ export default {
         configIp: [
           {
             required: true,
-            trigger: "blur",
+            trigger: "change",
             message: "请输入应用IP列表！",
           },
         ],
@@ -333,11 +321,26 @@ export default {
     };
   },
+  mounted() {
+    this.formData = {
+      configType: "String",
+      ...this.activeOjb,
+      configValueNumber: this.activeOjb.configValue,
+      configValueBoolean: this.activeOjb.configValue,
+      file: {
+        name: this.activeOjb?.configFileName || "",
+        file: this.activeOjb?.configValue || "",
+      },
+    };
+  },
+
   methods: {
     // 配置项类型改变时，根据类型设置配置项值的输入类型
     handleChange() {
       console.log("=======================");
       this.formData.configValue = "";
+      this.formData.configValueNumber = null;
+      this.formData.configValueBoolean = null;
       this.formData.file = null;
     },
     // 上传文件
@@ -384,10 +387,9 @@ export default {
       const formData = new FormData();
       formData.append("configName", val.configName);
       formData.append("configType", val.configType);
-
       formData.append("configApp", val.configApp);
       formData.append("configIp", val.configIp);
-      formData.append("description", val.description);
+      formData.append("description", val.description || "");
       if (val.configType === "File") {
         if (!val.file) {
           this.alertWarningMsg("请上传文件！");
@@ -395,6 +397,12 @@ export default {
         }
         formData.append("configValue", val.file.file);
         formData.append("configFileName", val.file.name);
+      } else if (val.configType === "String") {
+        formData.append("configValue", val.configValue);
+      } else if (val.configType === "Number") {
+        formData.append("configValue", val.configValueNumber);
+      } else {
+        formData.append("configValue", val.configValueBoolean);
       }
       this.loadings.dialogLoading = true;
       if (this.activeOjb && this.activeOjb?.id) {
@@ -426,6 +434,8 @@ export default {
         configIp: "",
         description: "",
         file: null,
+        configValueNumber: null,
+        configValueBoolean: null,
       };
       this.loadings.dialogLoading = false;
       this.$emit("close", flag);
--- a/src/views/config-management/index.vue
View file @fc42084
+++ b/src/views/config-management/index.vue
View file @fc42084
@@ -145,6 +145,7 @@
         </el-table-column>
       </template>
     </Table>
+    <template v-if="outerVisible">
       <DialogVue
         :outerVisible="outerVisible"
         @close="dialogClose"
@@ -152,6 +153,7 @@
         :configAppList="configAppList"
         :activeOjb="activeOjb"
       />
+    </template>
   </div>
 </template>
--- a/src/views/exportListDetail/dialog.vue
View file @fc42084
+++ b/src/views/exportListDetail/dialog.vue
View file @fc42084
@@ -110,6 +110,7 @@
                 clearable
                 placeholder=""
                 @blur="receiptXml"
+                maxlength="18"
               ></el-input>
             </Formitem>
           </el-col>
@@ -124,6 +125,7 @@
                 clearable
                 placeholder=""
                 @blur="receiptXml"
+                maxlength="20"
               ></el-input>
             </Formitem>
           </el-col>
--- a/src/views/receipt-management/dialog.vue
View file @fc42084
+++ b/src/views/receipt-management/dialog.vue
View file @fc42084
@@ -210,6 +210,7 @@
                   clearable
                   placeholder=""
                   @blur="receiptXml"
+                  maxlength="18"
                 ></el-input>
               </Formitem>
             </el-col>
@@ -253,6 +254,7 @@
                   clearable
                   placeholder=""
                   @blur="receiptXml"
+                  maxlength="20"
                 ></el-input>
               </Formitem>
             </el-col>