冲突修改

src/components/ptCxForm_components.vue

@@ -77,6 +77,28 @@
                 >
                 </el-date-picker>
               </div>
+              <div
+                class="zdyInputW zdyInputCol2"
+                v-else-if="item.type == 'texts'"
+              >
+                <el-input
+                  type="text"
+                  autosize
+                  resize="none"
+                  :placeholder="item.placeholder"
+                  v-model="formData[item.id]"
+                >
+                </el-input>
+                -
+                <el-input
+                  type="text"
+                  autosize
+                  resize="none"
+                  :placeholder="item.placeholder"
+                  v-model="formData[item.id2]"
+                >
+                </el-input>
+              </div>
               <!--下拉框-->
               <el-select
                 v-model="formData[item.id]"
@@ -218,6 +240,20 @@
           <!--
                               <span @click="switchingConditions" class="color1 mg10"><i :class="toggleZd ? 'fa fa-angle-up fa-zdy20':'fa fa-angle-down fa-zdy20'"></i>{{toggleZd ? '收起条件':'更多条件'}}</span>
                 -->
+          <div
+            @click="switchingConditions"
+            v-if="pageBs == 'bjzycx'"
+            style="color: #007aff; margin: 6px"
+          >
+            <i
+              :class="
+                toggleZd
+                  ? 'fa fa-angle-up fa-zdy20'
+                  : 'fa fa-angle-down fa-zdy20'
+              "
+            ></i>
+            {{ toggleZd == false ? "更多条件" : "收起条件" }}
+          </div>
           <div @click="clearData" class="zdybtn">重置</div>
           <div
             @click="doQueryBtn(true)"
@@ -314,6 +350,7 @@
                   pageBs != 'queryCheckBj' &&
                   pageBs != 'queryZj' &&
                   pageBs != 'queryWl' &&
+                  pageBs != 'bjzycx' &&
                   pageBs != 'queryDx'
                 "
               >
@@ -818,8 +855,8 @@
           :width="pageBs == 'zdxxgl' || pageBs == 'gzrygl' ? '460' : '200'"
           :fixed="pageBs == 'rySp' ? 'right' : false"
           v-if="
-          pageBs == 'wfqdzczl' ||
-          pageBs == 'xywspdzczl' ||
+            pageBs == 'wfqdzczl' ||
+            pageBs == 'xywspdzczl' ||
             !(
               pageBs == 'gnsyrz' ||
               pageBs == 'jdcxsGl' ||
@@ -1319,6 +1356,7 @@ export default {
   },
   props: {
     pageBs: String,
+    pageBt: String,
     cxQueryField: {
       type: Array,
       default: () => [],
@@ -1335,6 +1373,7 @@ export default {
   },
   data() {
     return {
+      toggleZd: false,
       srcList: [],
       tagType: ["danger", "success", "warning", "info", ""],
       tPage: null,
@@ -1427,6 +1466,16 @@ export default {
     };
   },
   methods: {
+    switchingConditions() {
+      debugger;
+      this.toggleZd = !this.toggleZd;
+      this.propQueryField.forEach((val) => {
+        if (val.hasOwnProperty("hidden")) {
+          this.$set(val, "hidden", !this.toggleZd); /*修改对象得值并触发视图*/
+          console.log(val, "/*修改对象得值并触发视图*/");
+        }
+      });
+    },
     bjBack(ajbh, type, bzzt) {
       var obj = {
         ajbh,
@@ -1797,17 +1846,22 @@ export default {
       }
     },
     doQueryBtn(val) {
-      if (val) {
-        this.formData.sfhgpdbz = "";
-      }
-      if (this.formData.isFirst) {
-        this.formData.isFirst = "";
+      if (this.pageBs == "bjzycx") {
+        this.doQuery("yes");
+      } else {
+        if (val) {
+          this.formData.sfhgpdbz = "";
+        }
+        if (this.formData.isFirst) {
+          this.formData.isFirst = "";
+        }
+        this.formData.page = 1;
+        this.doQuery("yes");
       }
-      this.formData.page = 1;
-      this.doQuery("yes");
     },
     doQuery(flag) {
       this.showLoading();
+      var jsonStr = [];
       let self = this,
         json = {};
       for (let i in self.formData) {
@@ -1858,6 +1912,30 @@ export default {
               self.closeLoading();
             }
           });
+        } else if (self.pageBs == "bjzycx") {
+          debugger;
+          jsonStr.push(self.formData);
+          let form = new FormData();
+          if (self.pageBt == "qgasj") {
+            form.append("zylx", "asj");
+          } else if (self.pageBt == "qgfzxyr") {
+            form.append("zylx", "fzxyr");
+          } else if (self.pageBt == "qgxzgzry") {
+            form.append("zylx", "asxzgzryj");
+          }
+          form.append("jsonStr", JSON.stringify(jsonStr));
+          postform(`${url.alyIP2}${this.cxUrl}`, form).then((response) => {
+            if (response.success === true) {
+              self.tableData = response.data.rows;
+              self.tableDataLength = response.data.total;
+              self.tPage = Math.ceil(response.data.total / self.page_size);
+              self.talbeBhgCount = response.data.bhgCount;
+              self.talbehgCount = response.data.hgCount;
+              self.closeLoading();
+            } else {
+              self.closeLoading();
+            }
+          });
         } else {
           self.doQueryRequest(json).then((response) => {
             if (response.success === true) {
@@ -1923,11 +2001,11 @@ export default {
                 }
               });
               self.tableData = response.data.rows;
-              for (let t in self.transformFormTable){
-                self.tableData.map(res=>{
+              for (let t in self.transformFormTable) {
+                self.tableData.map((res) => {
                   console.log(res);
-                  res[t] = self.transformFormTable[t][res[t]]
-                })
+                  res[t] = self.transformFormTable[t][res[t]];
+                });
               }
               self.tableDataLength = response.data.total;
               self.tPage = Math.ceil(response.data.total / self.page_size);
@@ -1958,6 +2036,11 @@ export default {
             });
         }
       }
+      if (val.hidden) {
+        self.toggleZd = false;
+      } else {
+        self.toggleZd = true;
+      }
     });
     if (self.pageBs != "dytj") {
       self.doQuery("yes");