记录规则版面变更功能修改

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -45,7 +45,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="记录规则版本" prop="version">
+          <el-form-item label="记录规则版本">
             <el-input
               :value="versionText"
               disabled
@@ -585,9 +585,14 @@
         ];
       },
       versionText() {
-        return this.formData.version
-          ? `V${this.formData.version.toFixed(1)}`
-          : 'V1.0';
+        if (this.type == 'clone') {
+          return '系统自动生成';
+        }
+        return (
+          this.formData.bigVersion +
+          this.formData.versionMark +
+          this.formData.smallVersion
+        );
       },
       productColumns() {
         return [
@@ -666,7 +671,10 @@
         // 执行方式列表
         executeMethodList: [],
         // 执行方式 活跃项
-        executeMethodTitle: ''
+        executeMethodTitle: '',
+        bigVersion: '',
+        versionMark: '',
+        smallVersion: ''
       };
 
       return {
@@ -800,9 +808,8 @@
 
           if (this.type == 'clone') {
             this.formData.name = this.formData.name + '-副本';
-            this.formData.version += 1;
 
-            this.formData.fromId = row.id;
+            this.formData.fromId = id;
             this.formData.id = null;
           }
           this.loading = false;
@@ -903,6 +910,21 @@
             return this.$message.warning('至少条件一条规则项');
           }
 
+          // 判断关联工序
+          if (this.formData.reportWorkType == '2') {
+            if (
+              this.formData.produceTaskConfigs &&
+              this.formData.produceTaskConfigs[0] &&
+              this.formData.produceTaskConfigs[0].isUsing &&
+              this.formData.produceTaskConfigs[0].produceTaskId !=
+                this.formData.produceTaskConfigBatchSavePo.produceTaskId
+            ) {
+              return this.$message.warning(
+                '当前规则关联的工序有执行中的记录，不能更改！'
+              );
+            }
+          }
+
           try {
             if (this.formData.isExecuteMethod) {
               // 判断 formData.executeMethodList中的item 是否在details中有一条executeMethodTitle的数据
@@ -996,26 +1018,44 @@
           'yyyy-MM-dd HH:mm:ss'
         );
 
-        // if (this.type == 'edit') {
-        //   body.produceTaskConfigBatchSavePo.updatePOs.push({
-        //     id: body.produceTaskConfigs[0]?.id,
-        //     executeMethod: 2,
-        //     itemType: 2,
-        //     produceTaskId: body.produceTaskConfigBatchSavePo.produceTaskId,
-        //     produceTaskName: body.produceTaskConfigBatchSavePo.produceTaskName,
-        //     reportWorkType: this.formData.reportWorkType
-        //   });
-        //   body.produceTaskConfigBatchSavePo.addPOs = [];
-        // } else {
-        //   body.produceTaskConfigBatchSavePo.addPOs.push({
-        //     executeMethod: 2,
-        //     itemType: 2,
-        //     produceTaskId: body.produceTaskConfigBatchSavePo.produceTaskId,
-        //     produceTaskName: body.produceTaskConfigBatchSavePo.produceTaskName,
-        //     reportWorkType: this.formData.reportWorkType
-        //   });
-        //   body.produceTaskConfigBatchSavePo.updatePOs = [];
-        // }
+        if (body.produceTaskConfigBatchSavePo.produceTaskId) {
+          if (this.type == 'edit') {
+            body.produceTaskConfigBatchSavePo.updatePOs.push({
+              id: body.produceTaskConfigs[0]?.id,
+              executeMethod: 2,
+              itemType: 2,
+              produceTaskId: body.produceTaskConfigBatchSavePo.produceTaskId,
+              produceTaskName:
+                body.produceTaskConfigBatchSavePo.produceTaskName,
+              reportWorkType: this.formData.reportWorkType
+            });
+            body.produceTaskConfigBatchSavePo.addPOs = [];
+            // 如果更换了工序，则把原来的工序删除
+            if (
+              this.formData.produceTaskConfigs &&
+              this.formData.produceTaskConfigs[0]
+            ) {
+              if (
+                this.formData.produceTaskConfigs[0].produceTaskId !=
+                body.produceTaskConfigBatchSavePo.produceTaskId
+              ) {
+                body.produceTaskConfigBatchSavePo.deletedIds = [
+                  this.formData.produceTaskConfigs[0].id
+                ];
+              }
+            }
+          } else {
+            body.produceTaskConfigBatchSavePo.addPOs.push({
+              executeMethod: 2,
+              itemType: 2,
+              produceTaskId: body.produceTaskConfigBatchSavePo.produceTaskId,
+              produceTaskName:
+                body.produceTaskConfigBatchSavePo.produceTaskName,
+              reportWorkType: this.formData.reportWorkType
+            });
+            body.produceTaskConfigBatchSavePo.updatePOs = [];
+          }
+        }
 
         return body;
       },

vue.config.js

@@ -39,8 +39,8 @@ module.exports = {
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
 
-        target: 'http://192.168.1.251:18086', // 开发
-        // target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.251:18086', // 开发
+        target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {