修改

src/views/newDemo/index.vue

@@ -56,10 +56,7 @@ export default {
           this.$message.success('平铺')
           break;
         case '2':
-          this.$message.success('跳转')
-          setTimeout(() => {
-            window.open(item.route_info)
-          }, 2000);
+          this.$router.push(item.route_info)
           break;
         case '3':
           this.$message.success('弹框')

src/views/table/advanceQuery.vue → src/views/table/components/advanceQuery.vue

@@ -18,10 +18,7 @@
               <template slot-scope="scope">
                 <el-form-item :prop="'params.' + scope.$index + '.' + col.prop" :rules="paramsForm.validateRules[col.prop]">
                   <template v-if="col.prop === 'comparisonOperator' || col.inputType[scope.$index] === 'select'">
-                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" :disabled="
-                          (scope.$index < 2 && col.prop === 'comparisonOperator') ||
-                          (col.prop === 'paramValue' && paramsForm.disabled[scope.$index])
-                        " @change="
+                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" @change="
                           value => {
                             selectChangeHandler(value, scope.$index, index)
                           }
@@ -30,10 +27,7 @@
                     </el-select>
                   </template>
                   <template v-else-if="col.inputType === 'select'">
-                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" :disabled="
-                          scope.$index < 2 &&
-                          ['leftBrackets', 'paramKey', 'rightBrackets', 'connector'].includes(col.prop)
-                        " @change="
+                    <el-select v-model="scope.row[col.prop]" placeholder="请选择" @change="
                           value => {
                             selectChangeHandler(value, scope.$index, index)
                           }
@@ -62,10 +56,9 @@
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
               <template slot-scope="scope">
-                <el-popconfirm v-if="scope.$index > 1" title="是否要删除这一行？" @confirm="deleteParam(scope.$index)">
+                <el-popconfirm title="是否要删除这一行？" @confirm="deleteParam(scope.$index)">
                   <span slot="reference" class="clickable-delete">删除</span>
                 </el-popconfirm>
-                <span v-else>固定</span>
               </template>
             </el-table-column>
           </el-table>
@@ -125,6 +118,12 @@ const comparisonOperatorOptions = [
 export default {
   name: 'AdvancedNew',
   components: { Search, SimpleTable, Dialog },
+  props: {
+    tableColMunt: {
+      type: Array,
+      default: () => []
+    }
+  },
   data () {
     return {
       queryString: '',
@@ -140,24 +139,7 @@ export default {
       tableData: [],
       dialogFlag: false,
       paramsForm: {
-        params: [
-          {
-            leftBrackets: '',
-            paramKey: 'flightDate',
-            comparisonOperator: '>=',
-            paramValue: parseTime(new Date(), '{y}-{m}-{d}'),
-            rightBrackets: '',
-            connector: 'and'
-          },
-          {
-            leftBrackets: '',
-            paramKey: 'flightDate',
-            comparisonOperator: '<=',
-            paramValue: parseTime(new Date(), '{y}-{m}-{d}'),
-            rightBrackets: '',
-            connector: 'and'
-          }
-        ],
+        params: [],
         validateRules: {
           paramKey: [{ required: true, message: '请选择项', trigger: ['change', ['change', 'blur']] }],
           paramValue: [{ required: true, message: '请选择或输入值', trigger: ['change', 'blur'] }]
@@ -252,13 +234,20 @@ export default {
     // },
     tableCols: {
       handler (arr) {
-        this.getColumnSet(arr)
+        console.log(arr)
+        // this.getColumnSet(arr)
       },
       deep: true
-    }
+    },
   },
   mounted () {
-    this.queryTableData()
+    this.getColumnSet(this.tableColMunt)
+    // const datas = this.tableColMunt
+    // datas.forEach(item => {
+    //   item.label = item.columnLabel
+    //   item.value = item.columnName
+    // })
+    // this.paramsTableCols[1].options = datas
   },
   deactivated () {
     this.loading = false
@@ -336,6 +325,9 @@ export default {
     dialogHide () {
       this.$emit('dialogHide')
     },
+    sendColData () {
+      this.$emit('getColData', this.queryString)
+    },
     addParamsHandler () {
       this.paramsTableCols[3].inputType.push('text')
       this.paramsForm.params.push({
@@ -349,7 +341,9 @@ export default {
     },
     selectChangeHandler (value, rowIndex, colIndex) {
       if (colIndex === 1) {
+        const datas = this.tableColMunt.filter(item => item.columnName == value)
         const { dataType, options } = this.columnSet[value]
+        // const { dataType, options } = datas[0]
         if (dataType === 'date') {
           this.paramsTableCols[2].options[rowIndex] = comparisonOperatorOptions.slice(0, 5).reverse()
           this.paramsTableCols[3].inputType[rowIndex] = 'date'
@@ -427,42 +421,25 @@ export default {
     },
     advancedQueryHandler (singleJump) {
       try {
-        if (this.dialogFlag) {
-          this.$refs['paramsForm'].validate(valid => {
-            if (!valid) {
-              throw new Error()
-            }
-          })
-        }
-        let bracketsDifference = 0
-        const paramsRowNum = this.paramsForm.params.length
-        const queryString = this.paramsForm.params.reduce(
-          (preString, { leftBrackets, paramKey, comparisonOperator, paramValue, rightBrackets, connector }, index) => {
-            bracketsDifference += leftBrackets.length - rightBrackets.length
-            if (bracketsDifference < 0) {
-              throw new Error('左右括号不匹配！')
-            }
-            preString += leftBrackets + paramKey + ` ${comparisonOperator} `
-            if (!['is Null', 'is not Null'].includes(comparisonOperator)) {
-              if (comparisonOperator === 'like') {
-                preString += `\'%${paramValue}%\'`
-              } else if (this.columnSet[paramKey].dataType === 'number') {
-                preString += paramValue
-              } else {
-                preString += `\'${paramValue}\'`
-              }
-            }
-            preString += rightBrackets + (index < paramsRowNum - 1 ? ` ${connector} ` : '')
-            return preString
-          },
-          ''
-        )
-        if (bracketsDifference !== 0) {
-          throw new Error('左右括号不匹配！')
-        }
+        this.$refs['paramsForm'].validate(valid => {
+          if (!valid) {
+            throw new Error()
+          }
+        })
+        const queryString = []
+        this.paramsForm.params.forEach(item => {
+          const obj = {
+            left: item['leftBrackets'],
+            column: item['paramKey'],
+            comparator: item['comparisonOperator'],
+            value: item['paramValue'],
+            right: item['rightBrackets'],
+            connector: item['connector']
+          }
+          queryString.push(obj)
+        })
         this.queryString = queryString
-        this.resetTable()
-        this.queryTableData(singleJump)
+        this.sendColData()
         this.dialogHide()
       } catch (error) {
         error.message && this.$message.error(error.message)
@@ -483,7 +460,7 @@ export default {
     async getColumnSet (columnSet) {
       const reflect = {}
       columnSet.forEach(async column => {
-        if (column.needSearch && !this.columnSet[column.columnName]) {
+        if (!this.columnSet[column.columnName]) {
           this.columnSet[column.columnName] = column
           if ((column.listqueryTemplateID ?? '') !== '' && !this.columnSet[column.columnName].options) {
             if (reflect[column.listqueryTemplateID]) {

src/views/table/components/authButton.vue

@@ -0,0 +1,42 @@
+<script>
+export default {
+  name: 'MenuItem',
+  functional: true,
+  props: {
+    auth: {
+      type: Object,
+      require: true,
+      default: () => { }
+    },
+    row: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  render (h, context) {
+    const { auth, row } = context.props
+    const vnodes = []
+    if (auth && Object.keys(auth).length) {
+      if (auth.show_type == 1) {
+        vnodes.push(<el-button size="small" plain={true} onClick={() => auth.service_type == '1' ? context.parent.handleQuery() : auth.service_type == '2' ? context.parent.handleAdd() : auth.service_type == '3' ? context.parent.handleEdit(row) : context.parent.handleRemove(row)} type={auth.service_type != '4' ? 'primary' : 'danger'}>{auth.auth_name}</el-button>)
+      } else if (auth.show_type == 3) {
+        vnodes.push(<el-button size="small" icon={auth.show_icon} plain={true} onClick={() => auth.service_type == '1' ? context.parent.handleQuery() : auth.service_type == '2' ? context.parent.handleAdd() : auth.service_type == '3' ? context.parent.handleEdit(row) : context.parent.handleRemove(row)} type={auth.service_type != '4' ? 'primary' : 'danger'}>{auth.auth_name}</el-button>)
+      }
+      else {
+        vnodes.push(<el-button size="small" icon={auth.show_icon} plain={true} onClick={() => auth.service_type == '1' ? context.parent.handleQuery() : auth.service_type == '2' ? context.parent.handleAdd() : auth.service_type == '3' ? context.parent.handleEdit(row) : context.parent.handleRemove(row)} type={auth.service_type != '4' ? 'primary' : 'danger'}></el-button>)
+      }
+    } else {
+      vnodes.push(<span></span>)
+    }
+    return vnodes
+  }
+}
+</script>
+
+<style scoped>
+.sub-el-icon {
+  color: currentColor;
+  width: 1em;
+  height: 1em;
+}
+</style>

src/views/table/index.vue

@@ -4,16 +4,8 @@
       <div class="flex">
         <div class="manageTitle">{{ pageTitle }}</div>
         <div>
-          <template v-if="Object.keys(btnAddObj).length">
-            <el-button size="small" v-if="btnAddObj.show_type == 1" @click="handleAdd" plain type="primary">{{ btnAddObj.auth_name }}</el-button>
-            <el-button size="small" v-else-if="btnAddObj.show_type == 2" :icon="btnAddObj.show_icon" @click="handleAdd" plain type="primary"></el-button>
-            <el-button size="small" v-else-if="btnAddObj.show_type == 3" :icon="btnAddObj.show_icon" @click="handleAdd" plain type="primary">{{ btnAddObj.auth_name }}</el-button>
-          </template>
-          <template v-if="Object.keys(btnQueryObj).length">
-            <el-button size="small" v-if="btnQueryObj.show_type == 1" @click="handleQuery" plain type="primary">{{ btnQueryObj.auth_name }}</el-button>
-            <el-button size="small" v-else-if="btnQueryObj.show_type == 2" :icon="btnQueryObj.show_icon" @click="handleQuery" plain type="primary"></el-button>
-            <el-button size="small" v-else-if="btnQueryObj.show_type == 3" :icon="btnQueryObj.show_icon" @click="handleQuery" plain type="primary">{{ btnQueryObj.auth_name }}</el-button>
-          </template>
+          <auth-button :auth="btnAddObj" />
+          <auth-button :auth="btnQueryObj" />
         </div>
       </div>
       <template v-if="tableData.length || tableCols.length">
@@ -49,16 +41,8 @@
             <el-table-column fixed="right" label="操作" :width="fixedWidth">
               <template slot-scope="scope">
                 <div class="hd-td">
-                  <template v-if="Object.keys(btnEditObj).length">
-                    <el-button size="small" v-if="btnEditObj.show_type == 1" @click="handleEdit(scope.row)" plain type="primary">{{ btnEditObj.auth_name }}</el-button>
-                    <el-button size="small" v-else-if="btnEditObj.show_type == 2" :icon="btnEditObj.show_icon" @click="handleEdit(scope.row)" plain type="primary"></el-button>
-                    <el-button size="small" v-else-if="btnEditObj.show_type == 3" :icon="btnEditObj.show_icon" @click="handleEdit(scope.row)" plain type="primary">{{ btnEditObj.auth_name }}</el-button>
-                  </template>
-                  <template v-if="Object.keys(btnDelObj).length">
-                    <el-button size="small" v-if="btnDelObj.show_type == 1" @click="handleRemove(scope.row)" plain type="danger">{{ btnDelObj.auth_name }}</el-button>
-                    <el-button size="small" v-else-if="btnDelObj.show_type == 2" :icon="btnDelObj.show_icon" @click="handleRemove(scope.row)" plain type="danger"></el-button>
-                    <el-button size="small" v-else-if="btnDelObj.show_type == 3" :icon="btnDelObj.show_icon" @click="handleRemove(scope.row)" plain type="danger">{{ btnDelObj.auth_name }}</el-button>
-                  </template>
+                  <auth-button :auth="btnEditObj" :row="scope.row" />
+                  <auth-button :auth="btnDelObj" :row="scope.row" />
                 </div>
               </template>
             </el-table-column>
@@ -134,7 +118,7 @@
       </Dialog>
       <!--高级查询-->
       <Dialog :flag="dialogFlag" width="852px">
-        <AdvanceQuery @dialogHide="dialogHide" />
+        <AdvanceQuery :tableColMunt="tableCols" @getColData="getColData" @dialogHide="dialogHide" />
       </Dialog>
     </div>
   </div>
@@ -144,7 +128,8 @@
 import { setTableFilters } from "@/utils/table";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import NoData from "@/components/nodata";
-import AdvanceQuery from './advanceQuery.vue';
+import AdvanceQuery from './components/advanceQuery.vue';
+import AuthButton from './components/authButton.vue';
 import { translateDataToTreeAllTreeMsg, getAuthData } from "@/utils/validate";
 import { Query, newData, modifyData, moveData } from "@/api/webApi";
 export default {
@@ -198,7 +183,7 @@ export default {
       default: "180px",
     },
   },
-  components: { Dialog, NoData, AdvanceQuery },
+  components: { Dialog, NoData, AdvanceQuery, AuthButton },
   data () {
     return {
       pageTitle: '',
@@ -357,7 +342,7 @@ export default {
           this.$message.warning('平铺功能开发中')
           break;
         case '2':
-          window.open(url)
+          this.$router.push(url)
           break;
         default:
           break;
@@ -457,15 +442,20 @@ export default {
         this.tableForm[data] = null;
       }
     },
+    //获取高级查询条件
+    getColData (val) {
+      this.resetTable()
+      this.getQuery(this.queryId, val);
+    },
     //获取表格数据
-    async getQuery (id) {
+    async getQuery (id, dataContent = this.dataContent) {
       try {
         this.loading = true;
         const { code, returnData, columnset } = await Query({
           serviceId: id,
           page: ++this.page,
           pageSize: this.pageSize,
-          dataContent: this.dataContent,
+          dataContent,
         });
         if (code == 0) {
           if (returnData.length === 0) {