阀门选型调整

src/optionSystem/FProductManage/modules/table.vue

@@ -161,6 +161,7 @@ export default {
           : [...this.list, ...res.data];
       this.totalPage = res.pageTotal;
       this.param.content.sort = res.sort;
+      console.log(callback,'callback11111')
       callback && callback();
     },
     setSort(column, sort) {

src/optionSystem/selectOption/components/DieFa.vue

@@ -744,15 +744,11 @@
         }}</el-button>
         <el-button
           size="small"
-          @click="
-            guangtouParam.content.where.drivetype == '电动'
-              ? (active = 2)
-              : (active = 3)
-          "
+          @click="reselection"
           type="primary"
           v-if="active == 4"
           class="normal-btn-width"
-          >{{ $t("上一步") }}</el-button
+          >{{ $t("重选") }}</el-button
         >
         <el-button
           size="small"
@@ -964,6 +960,12 @@ export default {
         this.$refs.fujianRef.listData();
       }
     },
+    reselection(){
+      this.active = 1;
+      this.guangtouParam.content.where.drivetype = "电动";
+      this.resultArr = [];
+      this.fujianArr = [];
+    },
     close() {
       this.active = 1;
       this.guangtouParam.content.where.drivetype = "电动";

src/optionSystem/selectOption/components/DieFaModel.vue

@@ -737,15 +737,11 @@
       <div class="fixed__btn__panel" v-if="active == 4">
         <el-button
             size="small"
-            @click="
-            guangtouParam.content.where.drivetype == '电动'
-              ? (active = 2)
-              : (active = 3)
-          "
+            @click="reselection"
             type="primary"
             v-if="active == 4"
             class="normal-btn-width"
-        >{{ $t("上一步") }}</el-button
+        >{{ $t("重选") }}</el-button
         >
         <el-button
           size="small"
@@ -952,6 +948,12 @@ export default {
         this.$refs.fujianRef.listData();
       }
     },
+    reselection(){
+      this.active = 1;
+      this.guangtouParam.content.where.drivetype = "电动";
+      this.resultArr = [];
+      this.fujianArr = [];
+    },
     close() {
       this.active = 1;
       this.guangtouParam.content.where.drivetype = "电动";

src/optionSystem/valveOption/DieFa.vue

@@ -1303,12 +1303,12 @@ export default {
         let isBreak = false;
         for (let i = startIndex; i < keys.length; i++) {
           if (isBreak) break;
-          if (!keys[i].includes("condition")) {
+          if (!keys[i]?.includes("condition")) {
             if (this.$refs[ref].list.length) {
               if (i >= index) {
                 if (keys[i] !== "drivetype")
                   this[keys[i]] = this.$refs[ref].list[0].option[keys[i]];
-                if (this[keys[i]].length === 1) {
+                if (this[keys[i]] && this[keys[i]].length === 1) {
                   if (this[type].content.where[position])
                     this[type].content.where[keys[i]] = this[keys[i]][0].value;
                   if (this.timer) clearTimeout(this.timer);
@@ -1316,12 +1316,13 @@ export default {
                     this.$refs[ref] && this.$refs[ref].listData();
                   });
                 } else if (
+                    this[keys[i]] &&
                   this[keys[i]].length > 1 &&
                   keys[i] !== "drivetype"
                 ) {
                   this[type].content.where[keys[i]] = "";
                 }
-                if (this.$refs[ref].list[0].option[keys[i]].length > 1) {
+                if (this.$refs[ref].list[0].option[keys[i]] && this.$refs[ref].list[0].option[keys[i]].length > 1) {
                   isBreak = true;
                 }
               }
@@ -1331,6 +1332,7 @@ export default {
           }
         }
         this.loading = false;
+        console.log(this.loading,'loading  updateWhereKeys')
       };
       switch (type) {
         case "guangtouParam":