hd-idevvue3 3.0.3 → 3.0.4

package/src/hdcom/HdComQuery.vue

@@ -1,81 +1,149 @@
 <template>
-  <el-dialog title="高级查询" :visible.sync="visible" width='80%' append-to-body top="2vh">
+  <el-dialog
+    title="高级查询"
+    :visible.sync="visible"
+    width="80%"
+    append-to-body
+    top="2vh"
+  >
     <div class="filter-container" style="padding: 0">
-      <el-select v-model="selQueryId" filterable default-first-option placeholder="请选择方案" @change="change">
-        <el-option v-for="item in proLs" :key="item.queryId" :label="item.name" :value="item.queryId">
+      <el-select
+        v-model="selQueryId"
+        filterable
+        default-first-option
+        placeholder="请选择方案"
+        @change="change"
+      >
+        <el-option
+          v-for="item in proLs"
+          :key="item.queryId"
+          :label="item.name"
+          :value="item.queryId"
+        >
         </el-option>
       </el-select>
 
-      <el-button class="filter-item" @click="remove" type="primary" :hotKeyRange="$options.name">{{$t('删除方案')}}
+      <el-button
+        class="filter-item"
+        @click="remove"
+        type="primary"
+        :hotKeyRange="$options.name"
+        >{{ $t('删除方案') }}
       </el-button>
-      <el-button class="filter-item" @click="proSaveVisible=true" type="primary" :hotKeyRange="$options.name">
-        {{$t('方案保存')}}
+      <el-button
+        class="filter-item"
+        @click="proSaveVisible = true"
+        type="primary"
+        :hotKeyRange="$options.name"
+      >
+        {{ $t('方案保存') }}
       </el-button>
-      <el-button class="filter-item" @click="add" type="primary" :hotKeyRange="$options.name">{{$t('新增条件')}}
+      <el-button
+        class="filter-item"
+        @click="add"
+        type="primary"
+        :hotKeyRange="$options.name"
+        >{{ $t('新增条件') }}
       </el-button>
     </div>
     <div style="height: 360px">
       <el-row>
         <el-col :span="11">
-          <div style="padding-top: 0px;height: 250px">
-            <HdComQueryDetail :allColumn="allColumn" ref="LQuery" :list="leftLs" title="组一"></HdComQueryDetail>
+          <div style="padding-top: 0px; height: 250px">
+            <HdComQueryDetail
+              :allColumn="allColumn"
+              ref="LQuery"
+              :list="leftLs"
+              title="组一"
+            ></HdComQueryDetail>
           </div>
         </el-col>
         <el-col :span="2">
-          <div style="width: 100%;position: relative;top:50px;text-align: center">{{$t('或者')}}</div>
+          <div
+            style="
+              width: 100%;
+              position: relative;
+              top: 50px;
+              text-align: center;
+            "
+          >
+            {{ $t('或者') }}
+          </div>
         </el-col>
         <el-col :span="11">
-          <div style="padding-top: 0px;height: 250px">
-            <HdComQueryDetail :allColumn="allColumn" ref="RQuery" :list="rightLs" title="组二"></HdComQueryDetail>
+          <div style="padding-top: 0px; height: 250px">
+            <HdComQueryDetail
+              :allColumn="allColumn"
+              ref="RQuery"
+              :list="rightLs"
+              title="组二"
+            ></HdComQueryDetail>
           </div>
         </el-col>
       </el-row>
 
       <el-row>
-        <div style="padding-top: 0px;height: 100px">
-          <HdComSortDetail :allColumn="allColumn" ref="RQuery" :list="sortLs" title="排序"></HdComSortDetail>
+        <div style="padding-top: 0px; height: 100px">
+          <HdComSortDetail
+            :allColumn="allColumn"
+            ref="RQuery"
+            :list="sortLs"
+            title="排序"
+          ></HdComSortDetail>
         </div>
       </el-row>
     </div>
     <!--    <el-container style="height: 260px">
-          <el-main>
-            <el-container>
-              <el-aside width="45%" title="组1" :arrowShow="false" style="padding-top: 0px">
-                <HdComQueryDetail :allColumn="allColumn" ref="LQuery" :list="leftLs"></HdComQueryDetail>
-              </el-aside>
-              <ex-aside width="5%" :arrowShow="false">
-                <div style="width: 100%;position: relative;top:50px;text-align: center">{{$t('或者')}}</div>
-              </ex-aside>
-              <el-aside width="45%" title="组2" :arrowShow="false" style="padding-top: 0px">
-                <HdComQueryDetail :allColumn="allColumn" ref="RQuery" :list="rightLs"></HdComQueryDetail>
-              </el-aside>
-            </el-container>
-          </el-main>
-          <el-footer :arrowShow="false" height="100px" title="排序">
-          </el-footer>
-        </el-container>-->
+              <el-main>
+                <el-container>
+                  <el-aside width="45%" title="组1" :arrowShow="false" style="padding-top: 0px">
+                    <HdComQueryDetail :allColumn="allColumn" ref="LQuery" :list="leftLs"></HdComQueryDetail>
+                  </el-aside>
+                  <ex-aside width="5%" :arrowShow="false">
+                    <div style="width: 100%;position: relative;top:50px;text-align: center">{{$t('或者')}}</div>
+                  </ex-aside>
+                  <el-aside width="45%" title="组2" :arrowShow="false" style="padding-top: 0px">
+                    <HdComQueryDetail :allColumn="allColumn" ref="RQuery" :list="rightLs"></HdComQueryDetail>
+                  </el-aside>
+                </el-container>
+              </el-main>
+              <el-footer :arrowShow="false" height="100px" title="排序">
+              </el-footer>
+            </el-container>-->
     <div slot="footer" class="dialog-footer">
-      <el-button @click="doCloseAndKeep()">{{$t('关闭') + '(' + $t('保留条件') + ')'}}</el-button>
-      <el-button @click="doCloseAndClear">{{$t('关闭')}}</el-button>
-      <el-button @click="doQueryRs" type="primary" :hotKeyRange="$options.name">{{$t('查询')}}</el-button>
+      <el-button @click="doCloseAndKeep()">{{
+        $t('关闭') + '(' + $t('保留条件') + ')'
+      }}</el-button>
+      <el-button @click="doCloseAndClear">{{ $t('关闭') }}</el-button>
+      <el-button
+        @click="doQueryRs"
+        type="primary"
+        :hotKeyRange="$options.name"
+        >{{ $t('查询') }}</el-button
+      >
     </div>
-    <el-dialog title="方案保存" :visible.sync="proSaveVisible" width='30%' append-to-body top="2vh">
+    <el-dialog
+      title="方案保存"
+      :visible.sync="proSaveVisible"
+      width="30%"
+      append-to-body
+      top="2vh"
+    >
       <el-row>
         <el-col :span="20">
           <el-input v-model="proName"></el-input>
         </el-col>
         <el-col :span="4">
-          <el-button @click="doSave" type="primary">{{$t('保存')}}</el-button>
+          <el-button @click="doSave" type="primary">{{ $t('保存') }}</el-button>
         </el-col>
       </el-row>
     </el-dialog>
   </el-dialog>
-
 </template>
 
 <script>
 import HdComQueryDetail from './HdComQueryDetail'
-import HdComSortDetail from "./HdComSortDetail";
+import HdComSortDetail from './HdComSortDetail'
 
 export default {
   name: 'HdComQuery',
@@ -91,13 +159,13 @@ export default {
       selQueryId: '',
       proName: '',
       proLs: [],
-      keepQueryUse: false
+      keepQueryUse: false,
     }
   },
   inheritAttrs: false,
   props: {
     hdQuery: Object,
-    allColumn: Array
+    allColumn: Array,
   },
   mounted() {
     this.doQuery()
@@ -108,24 +176,30 @@ export default {
       comQuery.name = this.proName
       comQuery.menuId = this.$route.name
       comQuery.gridId = this.getHdComGrid().$refs.hdgrid.gridId
-      const innHdQuery = { vueleftQueryLs: [], vuerightQueryLs: [], sorts: { params: this.sortLs } }
+      const innHdQuery = {
+        vueleftQueryLs: [],
+        vuerightQueryLs: [],
+        sorts: { params: this.sortLs },
+      }
       this.addToHdQuery(innHdQuery.vueleftQueryLs, this.leftLs)
       innHdQuery.vueGroupRel = 'or'
       this.addToHdQuery(innHdQuery.vuerightQueryLs, this.rightLs)
       comQuery.hdQuery = innHdQuery
-      this.$http.post('/webresources/login/com/ComQuery/saveone/', comQuery).then(response => {
-        const data = response.data
-        this.$message({
-          type: data.code == '-1' ? 'error' : 'success',
-          showClose: true,
-          duration: 1500,
-          message: data.message
+      this.$http
+        .post('/webresources/login/com/ComQuery/saveone/', comQuery)
+        .then((response) => {
+          const data = response.data
+          this.$message({
+            type: data.code == '-1' ? 'error' : 'success',
+            showClose: true,
+            duration: 1500,
+            message: data.message,
+          })
+          this.proLs.push(data.data)
+          this.selQueryId = data.data.queryId
+          this.proSaveVisible = false
+          this.getHdComGrid().adQueryTemplateNameList = this.proLs
         })
-        this.proLs.push(data.data)
-        this.selQueryId = data.data.queryId
-        this.proSaveVisible = false
-        this.getHdComGrid().adQueryTemplateNameList = this.proLs;
-      })
     },
     remove() {
       if (!this.selQueryId) {
@@ -133,29 +207,31 @@ export default {
           type: 'error',
           message: this.$t('请先选择要删除的方案'),
           showClose: true,
-          duration: 1500
+          duration: 1500,
         })
         return false
       }
       const comQuery = {}
       comQuery.queryId = this.selQueryId
-      this.$http.post('/webresources/login/com/ComQuery/remove/', comQuery).then(response => {
-        const data = response.data
-        for (let i = 0; i < this.proLs.length; i++) {
-          if (this.proLs[i].queryId == this.selQueryId) {
-            this.proLs.splice(i, 1)
-            this.selQueryId = null
-            break
+      this.$http
+        .post('/webresources/login/com/ComQuery/remove/', comQuery)
+        .then((response) => {
+          const data = response.data
+          for (let i = 0; i < this.proLs.length; i++) {
+            if (this.proLs[i].queryId == this.selQueryId) {
+              this.proLs.splice(i, 1)
+              this.selQueryId = null
+              break
+            }
           }
-        }
-        this.$message({
-          type: data.code == '-1' ? 'error' : 'success',
-          showClose: true,
-          duration: 1500,
-          message: data.message
+          this.$message({
+            type: data.code == '-1' ? 'error' : 'success',
+            showClose: true,
+            duration: 1500,
+            message: data.message,
+          })
+          this.getHdComGrid().adQueryTemplateNameList = this.proLs
         })
-        this.getHdComGrid().adQueryTemplateNameList = this.proLs;
-      })
     },
     doQuery() {
       // 默认三个
@@ -176,9 +252,11 @@ export default {
       innHdQuery.query.menuId = this.$route.name
       innHdQuery.query.gridId = this.getHdComGrid().$refs.hdgrid.gridId
       if (this.isFirst) {
-        this.$http.post('/webresources/login/com/ComQuery/find/', innHdQuery).then(response => {
-          this.proLs = response.data
-        })
+        this.$http
+          .post('/webresources/login/com/ComQuery/find/', innHdQuery)
+          .then((response) => {
+            this.proLs = response.data
+          })
       }
       this.isFirst = false
     },
@@ -190,12 +268,14 @@ export default {
       this.visible = false
     },
     change(val) {
-      this.$http.post('/webresources/login/com/ComQuery/findDetail?queryId=' + val).then(response => {
-        const data = response.data
-        this.leftLs = this.listInit(data[0])
-        this.rightLs = this.listInit(data[1])
-        this.sortLs = this.sortInit(data[2])
-      })
+      this.$http
+        .post('/webresources/login/com/ComQuery/findDetail?queryId=' + val)
+        .then((response) => {
+          const data = response.data
+          this.leftLs = this.listInit(data[0])
+          this.rightLs = this.listInit(data[1])
+          this.sortLs = this.sortInit(data[2])
+        })
       // this.selCol = val
     },
     listInit(list) {
@@ -212,12 +292,15 @@ export default {
       return list
     },
     sortInit(list) {
-      return list.map(sort => {
+      return list.map((sort) => {
         return {
           sortProperty: sort.key,
           sortType: sort.value,
           alias: sort.rel,
-          text: this.allColumn.find(v => v.$attrs.prop == sort.key).$attrs.label + '/' + (sort.value == 'ASC' ? '升序' : '降序')
+          text:
+            this.allColumn.find((v) => v.$attrs.prop == sort.key).$attrs.label +
+            '/' +
+            (sort.value == 'ASC' ? '升序' : '降序'),
         }
       })
     },
@@ -229,19 +312,24 @@ export default {
       this.addToHdQuery(this.hdQuery.vuerightQueryLs, this.rightLs)
       this.hdQuery.sorts = { params: this.sortLs }
       this.hdQuery.sort = ''
-      // 
+      //
       // console.log(this.hdQuery, this.leftLs, this.rightLs)
-      this.getHdComGrid().doQuery().then(() => {
-        this.visible = false
-      })
-
-
+      this.getHdComGrid()
+        .doQuery()
+        .then(() => {
+          this.visible = false
+        })
     },
     addToHdQuery(queryLs, inputLs) {
       for (let i = 0; i < inputLs.length; i++) {
         const input = inputLs[i]
         if (input.key) {
-          queryLs.push({ key: input.key, rel: input.rel, value: input.value, type: input.type })
+          queryLs.push({
+            key: input.key,
+            rel: input.rel,
+            value: input.value,
+            type: input.type,
+          })
         }
       }
     },
@@ -254,11 +342,12 @@ export default {
         par = par.$parent
       }
       return null
-    }
+    },
   },
   watch: {
     visible: function (val) {
-      if (!val) { // 隐藏时
+      if (!val) {
+        // 隐藏时
         if (!this.keepQueryUse) {
           this.hdQuery.vueleftQueryLs = []
           this.hdQuery.vuerightQueryLs = []
@@ -267,7 +356,7 @@ export default {
           this.keepQueryUse = false
         }
       }
-    }
-  }
+    },
+  },
 }
 </script>