three-trees-ui 1.0.56 → 1.0.58

package/src/mixins/querySqlPreview.js

@@ -14,6 +14,40 @@ export default {
       fileList: [],
       tableData: { selectRows: [], querys: '' },
       dialogExportVisible: false,
+      ChangeRecord: {
+        ChangeRecordVisible: false,
+        recordTableLoading: false,
+        recordList: [],
+        modifyRecord: {
+          pagination: {
+            pageBean: {
+              page: 1,
+              pageSize: 10,
+              total: 0,
+            },
+          },
+        },
+        modifyDetailDialogVisible: false,
+        currentModify: {},
+        currentTemplateKey: '',
+      },
+      initChangeRecord: {
+        ChangeRecordVisible: false,
+        recordTableLoading: false,
+        recordList: [],
+        modifyRecord: {
+          pagination: {
+            pageBean: {
+              page: 1,
+              pageSize: 10,
+              total: 0,
+            },
+          },
+        },
+        modifyDetailDialogVisible: false,
+        currentModify: {},
+        currentTemplateKey: '',
+      },
       isdefaultQuery: true,
       exportData: { getType: 'all', expField: [] },
       exportSellection: [],
@@ -48,15 +82,17 @@ export default {
       allSummaryConfig: {},
       customSummary: '',
       summaryTableData: [],
+      needRequestTotal: false, // 需不需要后端统计列表全部数据
+      tableDataTotal: {},
     }
   },
   watch: {
-    formKey: function(newVal) {
+    formKey: function (newVal) {
       if (newVal) {
         this.init()
       }
     },
-    'tableData.selectRows': function(newVal) {
+    'tableData.selectRows': function (newVal) {
       if (newVal.length > 0) {
         let me_ = this
         me_.uploadParams.id = []
@@ -173,7 +209,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function(newVal, oldVal) {
+              pInst.$watch(path, function (newVal, oldVal) {
                 _.debounce(() => {
                   if (newVal !== oldVal) {
                     _me.queryViewOptions.selectList[i].selectValue = newVal
@@ -317,7 +353,7 @@ export default {
       this.$router.push(url)
     },
 
-    handleSizeChange: function(size) {
+    handleSizeChange: function (size) {
       //每页下拉显示数据
       this.pagination.pageSize = size
       if (this.$refs.queryViewList) {
@@ -326,7 +362,7 @@ export default {
         this.search()
       }
     },
-    handleCurrentChange: function(currentPage) {
+    handleCurrentChange: function (currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       if (this.$refs.queryViewList) {
@@ -336,15 +372,17 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function(e) {
+    searchEnterFun: function (e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.pagination.page = 1
         this.search()
       }
     },
-    search(param, cb) {
-       !param && (param = {})
+    search(param, cb, isSearchBtn, needRequestTotal = false) {
+      // 不需要请求后端接口统计列表数据
+      this.needRequestTotal = needRequestTotal
+      !param && (param = {})
       param.pageBean = this.pagination
       const dataTemplateQueryVo = {
         queryFilter: param,
@@ -366,11 +404,20 @@ export default {
         param: dataTemplateQueryVo,
       }
       this.getQuerySqlViewByPagination(obj, cb)
-
-     
     },
     getQuerySqlViewByPagination(param, cb) {
-      debugger
+      if (this.needRequestTotal) {
+        // 调用后端接口更新 tableDataTotal
+        this.$requestConfig.getViewDataListTotal(param).then((res) => {
+          for (const key in res) {
+            const newKey = key.toLowerCase()
+            this.tableDataTotal[newKey] = res[key]
+          }
+          this.$nextTick(() => {
+            this.$refs.queryViewList && this.$refs.queryViewList.doLayout()
+          })
+        })
+      }
       this.$requestConfig
         .getQueryViewDataList(param)
         .then((response) => {
@@ -390,6 +437,9 @@ export default {
           if (this.queryView.summaryRegionHtml) {
             this.loadCompiledCustomSummary()
           }
+          this.$nextTick(() => {
+            this.$refs.queryViewList && this.$refs.queryViewList.doLayout()
+          })
         })
         .finally(() => {
           cb && cb()
@@ -677,7 +727,7 @@ export default {
     punchOrder() {
       this.$store
         .dispatch('storeProcess/downLoadToFile', 'Batchkeijyo')
-        .then(() => {})
+        .then(() => { })
     },
     beforeAvatarUpload(file) {
       var fileName = new Array()
@@ -704,7 +754,7 @@ export default {
       this.$message.success('送付状成功')
       window.location.reload()
     },
-    handlePreview() {},
+    handlePreview() { },
     //确定导出
     submitExport() {
       if (!this.exportData || this.exportData.expField.length < 1) {
@@ -979,10 +1029,81 @@ export default {
       )
       return checkField.length
         ? checkField.filter(
-            (field) =>
-              field.checked && ['序号', '操作'].indexOf(field.value) == -1
-          )
+          (field) =>
+            field.checked && ['序号', '操作'].indexOf(field.value) == -1
+        )
         : customColumns
     },
+    ChangeRecordDialogsShow(FormDataid, templateKey) {
+      this.ChangeRecord.ChangeRecordVisible = true
+      let param = {
+        pageBean: {
+          page: 1,
+          pageSize: 10,
+          showTotal: true,
+        },
+        sorter: [
+          {
+            direction: 'ASC',
+            property: 'modifyTime',
+          },
+        ],
+        querys: [
+          {
+            property: 'ref_id_',
+            value: FormDataid,
+            group: 'main',
+            operation: 'EQUAL',
+            relation: 'AND',
+          },
+        ],
+      }
+      this.ChangeRecord.currentTemplateKey = templateKey
+      this.ChangeRecord.recordTableLoading = true
+      this.$requestConfig.boDataModifyRecord(param).then((resp) => {
+        this.ChangeRecord.recordTableLoading = false
+        this.ChangeRecord.recordList = resp.rows
+        this.ChangeRecord.modifyRecord.pagination.pageBean = {
+          pageSize: resp.pageSize,
+          page: resp.page,
+          total: resp.total,
+        }
+      })
+    },
+    ChangeRecordDialogsClose() {
+      this.ChangeRecord = _.cloneDeep(this.initChangeRecord)
+    },
+    openModifyDetail(row) {
+      this.ChangeRecord.currentModify = row
+      this.ChangeRecord.modifyDetailDialogVisible = true
+    },
+    //查看修改记录详情
+    showModifyRecord(id, refId, templateKey) {
+      var url =
+        '/templateForm/' +
+        templateKey +
+        '/get?single=true' +
+        '&id=' +
+        refId +
+        '&startFlow=false&recordId=' +
+        id +
+        '&isNewPage=true'
+      window.open(this.$router.resolve(url).href, '_blank')
+    },
+    executeMethod(params) {
+      const executeMethodloading = this.$loading({
+        fullscreen: true,
+        lock: true,
+      })
+      this.$requestConfig.request(params).then((result) => {
+        executeMethodloading.close()
+        if (result) {
+          this.$message.success('执行成功！')
+        } else {
+          this.$message.error('执行失败！')
+        }
+        this.search()
+      })
+    },
   },
 }

package/src/mixins/templatePreview.js

@@ -220,6 +220,8 @@ export default {
       defaultCurrentInnerHeight: this.currentTableHeight
         ? window.innerHeight - 280
         : 0.85 * window.innerHeight,
+      needRequestTotal: false, // 需不需要后端统计列表全部数据
+      tableDataTotal: {},
     }
   },
   watch: {
@@ -1406,7 +1408,9 @@ export default {
       return params
     },
     //列表数据查询入口
-    search(param, cb, isSearchBtn) {
+    search(param, cb, isSearchBtn, needRequestTotal = false) {
+      // 不需要请求后端接口统计列表数据
+      this.needRequestTotal = needRequestTotal
       // 如果是高级查询，页码重置为首页
       if (isSearchBtn) {
         this.pagination.page = 1
@@ -1609,6 +1613,21 @@ export default {
       }
       dataTemplateQueryVo.refIdValue = params.refIdValue
       this.curSelectParams = dataTemplateQueryVo
+      if (this.needRequestTotal) {
+        // 调用后端接口更新 tableDataTotal
+        this.$requestConfig
+          .getDataTemplateDataListTotal(dataTemplateQueryVo)
+          .then((res) => {
+            for (const key in res) {
+              const newKey = key.toLowerCase()
+              this.tableDataTotal[newKey] = res[key]
+            }
+            this.$nextTick(() => {
+              this.$refs.multipleTemplateTable &&
+                this.$refs.multipleTemplateTable.doLayout()
+            })
+          })
+      }
       this.$requestConfig
         .getDataTemplateDataList(dataTemplateQueryVo)
         .then((response) => {
@@ -1630,6 +1649,8 @@ export default {
             if (this.pagination.page == 1) {
               this.$refs.multipleTemplateTable &&
                 this.$refs.multipleTemplateTable.calcTableHeight(300)
+              this.$refs.multipleTemplateTable &&
+                this.$refs.multipleTemplateTable.doLayout()
             }
           })
         })
@@ -2124,7 +2145,8 @@ export default {
       defId,
       isStartFlow,
       openType,
-      quitAfterSaving
+      quitAfterSaving,
+      needOpinion
     ) {
       let customTitleName =
         action == 'addFlow'
@@ -2245,6 +2267,7 @@ export default {
           dialogWidth: this.dialogWidth,
           dialogHeight: this.dialogHeight,
           quitAfterSaving,
+          needOpinion: needOpinion && action == 'edit' ? needOpinion : '',
         })
         // this.dataViewDialogVisible = true
         // this.$refs.dataViewDialog.$el.firstChild.style.height = 740 + 'px'
@@ -2258,6 +2281,7 @@ export default {
           query: {
             quitAfterSaving,
             customTitleName,
+            needOpinion,
           },
         })
       }
@@ -4023,7 +4047,8 @@ export default {
               parameter.defId,
               parameter.isStartFlow,
               parameter.openType,
-              parameter.quitAfterSaving
+              parameter.quitAfterSaving,
+              parameter.needOpinion
             )
           } else if (this.checkSelect()) {
             parameter.id = this.tableData.selectRows[0].id_