Przeglądaj źródła

feat: 修改取参

aXin-0810 2 lat temu
rodzic
commit
ed2daf4a67
1 zmienionych plików z 8 dodań i 3 usunięć
  1. 8 3
      src/components/template/template-page-1.vue

+ 8 - 3
src/components/template/template-page-1.vue

@@ -515,6 +515,12 @@ export default {
           this.$message.error('操作失败')
           this.$message.error('操作失败')
         })
         })
     },
     },
+    getParams() {
+      var querylist_ = this.$refs.zjpage.$refs.dynamicCondition.jiexi(
+        JSON.parse(JSON.stringify(this.$refs.zjpage.$refs.dynamicCondition.queryData))
+      )
+      return this.$refs.zjpage.parameterAnalysis({ querylist: querylist_ })
+    },
     // 导出
     // 导出
     export() {
     export() {
       this.columnList = this.$refs.zjpage.columnList
       this.columnList = this.$refs.zjpage.columnList
@@ -530,13 +536,12 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
         background: 'rgba(0, 0, 0, 0.7)'
       })
       })
       this.evens[0][0].loading = true
       this.evens[0][0].loading = true
-      var querylist = this.$refs.zjpage.$refs.dynamicCondition.jiexi(
-        JSON.parse(JSON.stringify(this.$refs.zjpage.$refs.dynamicCondition.queryData))
-      )
+      var { querylist, ...p } = this.getParams()
       this.exportList(
       this.exportList(
         {
         {
           ...this.parameter,
           ...this.parameter,
           pageSize: -1,
           pageSize: -1,
+          ...p,
           params: querylist.map(item => {
           params: querylist.map(item => {
             item.param = item.param.replace(/>=/g, '')
             item.param = item.param.replace(/>=/g, '')
             item.param = item.param.replace(/<=/g, '')
             item.param = item.param.replace(/<=/g, '')