Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/views/dialogMange/components/relayTable.vue

@@ -147,7 +147,12 @@
             :key="val.fieldName"
             :label="val.fieldDescription"
             :value="val.fieldName"
-          ></el-option>
+          >
+            <span style="float: left">{{ val.fieldDescription }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+              val.fieldName
+            }}</span>
+          </el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -209,7 +214,7 @@ export default {
           label: "依赖其他字段",
         },
       ],
-      // tableList: []
+      tableList: [],
     };
   },
   computed: {

ruoyi-ui/src/views/dialogMange/index.vue

@@ -309,7 +309,12 @@
                       :key="val.fieldName"
                       :label="val.fieldDescription"
                       :value="val.fieldName"
-                    ></el-option>
+                    >
+                    <span style="float: left">{{ val.fieldDescription }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      val.fieldName
+                    }}</span>
+                  </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -499,7 +504,12 @@
                       :key="val.fieldName"
                       :label="val.fieldDescription"
                       :value="val.fieldName"
-                    ></el-option>
+                    >
+                    <span style="float: left">{{ val.fieldDescription }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      val.fieldName
+                    }}</span>
+                  </el-option>
                   </el-select>
                 </el-form-item>
               </el-form>
@@ -1545,31 +1555,31 @@ export default {
           msg: "显示的字段数不能为空",
         };
       }
-      if (
-        tableFieldList.filter((item) => item.isExport && !item.isChildren)
-          .length == 0
-      ) {
-        return {
-          val: false,
-          msg: "导出字段中至少应有一个主表字段",
-        };
-      }
+      // if (
+      //   tableFieldList.filter((item) => item.isExport && !item.isChildren)
+      //     .length == 0
+      // ) {
+      //   return {
+      //     val: false,
+      //     msg: "导出字段中至少应有一个主表字段",
+      //   };
+      // }
       // 导出的字段的描述不能重复
-      let describeArr = tableFieldList
-        .filter((item) => item.isExport)
-        .map((item) => item.fieldDescription);
-      let isRepeat = false;
-      describeArr.map((item) => {
-        if (describeArr.indexOf(item) != describeArr.lastIndexOf(item)) {
-          isRepeat = true;
-        }
-      });
-      if (isRepeat) {
-        return {
-          val: false,
-          msg: "导出的字段描述不能重复",
-        };
-      }
+      // let describeArr = tableFieldList
+      //   .filter((item) => item.isExport)
+      //   .map((item) => item.fieldDescription);
+      // let isRepeat = false;
+      // describeArr.map((item) => {
+      //   if (describeArr.indexOf(item) != describeArr.lastIndexOf(item)) {
+      //     isRepeat = true;
+      //   }
+      // });
+      // if (isRepeat) {
+      //   return {
+      //     val: false,
+      //     msg: "导出的字段描述不能重复",
+      //   };
+      // }
 
       return {
         val: true,

ruoyi-ui/src/views/dialogMange/relayTableMange/tablelist.vue

@@ -1001,6 +1001,10 @@ export default {
       this.isShowAddData = false;
       this.dataCountFormData = {};
     },
+    // 解决回显input输入不上去bug
+    iptChange(){
+	    this.$forceUpdate();  //强制刷新
+    },
     // 修改统计信息
     async handleUpdateStat(row) {
       // console.log(row);