合并

src/components/VueFormMaking/components/GenerateForm.vue

@@ -147,6 +147,7 @@
 <script>
 import GenetateFormItem from "./GenerateFormItem";
 import { getOrganCooperation } from "@/api/process/work-order";
+import { deepClone } from "@/utils";
 export default {
   name: "FmGenerateForm",
   components: {
@@ -486,8 +487,19 @@ export default {
       this.$forceUpdate();
     },
     delSubformCol(item, index) {
-      this.models[item.model].splice(index, 1);
-      this.models.status = -1;
+      const subformList = deepClone(this.models[item.model] || []);
+      // 删除当前行
+      if (subformList.length > 1) {
+        this.models[item.model] = [];
+        this.$nextTick(() => {
+          subformList.splice(index, 1);
+          this.models[item.model] = subformList;
+          this.models.status = -1;
+          this.$forceUpdate();
+        });
+      }
+      // this.models[item.model].splice(index, 1);
+      // this.models.status = -1;
     },
     generateModle(genList) {
       for (let i = 0; i < genList.length; i++) {

src/store/modules/getDataList.js

@@ -5,7 +5,7 @@ const loadings = {};
 // ];
 const filterOrganId = [
   1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25,
-  26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 138
+  26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 134
 ];
 const state = {
   allBranch: [],

src/views/process/admin/process-manager.vue

@@ -906,7 +906,7 @@ export default {
           const result = res.data;
           let filterOrganId = [
             1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-            22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 128, 138
+            22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 128, 134
           ];
 
           let tempOrgan = [];

src/views/process/list/create.vue

@@ -244,7 +244,7 @@ export default {
           } else {
             filterOrganId = [
               1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-              22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 123, 124, 125, 128, 138
+              22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 123, 124, 125, 128, 134
             ];
           }
 

src/views/process/list/handle.vue

@@ -1058,7 +1058,7 @@ export default {
           } else {
             filterOrganId = [
               1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-              22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 123, 124, 125, 128, 138
+              22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 123, 124, 125, 128, 134
             ];
           }