Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java

@@ -169,7 +169,7 @@ public class WxModeController extends BaseController
             }
         }
         if (delFlag) {
-            return error("删除的组合已经被占用,不支持上传");
+            return error("删除的组合已经被占用,不支持删除");
         }
         return toAjax(wxModeService.deleteWxModeByIds(ids));
     }

flossom-ui/src/views/system/mode/index.vue

@@ -740,6 +740,7 @@ export default {
       this.form.combineData = this.combineData;
       let technologyFlag = false;
       let effectContent = false;
+      let modeNameFlag = false;
       if (this.form.combineData.length>0){
         this.form.combineData.forEach(data => {
           console.log("----"+data.technologyArray)
@@ -749,19 +750,26 @@ export default {
           if (!data.effectContent) {
             effectContent = true;
           }
+          if (!data.combineModeId) {
+            modeNameFlag = true;
+          }
         })
       } else  {
-        if (this.form.instrumentType == 2) {
+        if (this.form.instrumentType == 2 && this.form.isCustomMode == 1) {
           this.$message.error("模式组合不能为空");
           return;
         }
       }
       console.log(this.form.combineData)
-      if (technologyFlag) {
+      if (technologyFlag && this.form.isCustomMode == 1) {
         this.$message.error("使用技术不能为空");
         return;
       }
-      if (effectContent) {
+      if (modeNameFlag && this.form.isCustomMode == 1) {
+        this.$message.error("模式组合中的模式名称不能为空");
+        return;
+      }
+      if (effectContent && this.form.isCustomMode == 1) {
         this.$message.error("模式功效不能为空");
         return;
       }