vue2-client 1.15.2 → 1.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -200,6 +200,13 @@ export default {
         return { id: null, name: 'Guest' }
       },
     },
+    // 父组件API（通用）,对象参数，可给里面任意塞父组件的方法
+    parentAPI: {
+      default: () => {
+        console.warn('getParentsThis is not provided.')
+        return null
+      }
+    }
   },
   data () {
     return {

package/src/base-client/components/common/XFormTable/demo.vue

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'userInfosCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -33,7 +33,7 @@ export default {
       // 当前记录
       record: {},
       // 选中的行keys
-      selectedKeys: ['813200000004', '72547', '72455', '72451'],
+      selectedKeys: [],
       selected: {
         keys: [],
         rows: []

package/src/base-client/components/common/XTable/XTable.vue

@@ -461,7 +461,9 @@ export default {
       clearSelectRowAfterQuery: false,
       selectedRowModalVisible: false,
       // 是否禁用右侧操作行为
-      disableAction: false
+      disableAction: false,
+      // 中文字段名列表
+      chineseQueryColumnArray: []
     }
   },
   props: {
@@ -743,7 +745,8 @@ export default {
         selectRowMode = 'default',
         tableSize = 'default',
         clearSelectRowAfterQuery = false,
-        disableAction = false
+        disableAction = false,
+        chineseQueryColumnArray = []
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
@@ -770,6 +773,10 @@ export default {
         this.showCustomSummary = true
         this.customSummaryArray = customTableSummaryArray
       }
+      this.chineseQueryColumnArray = chineseQueryColumnArray
+      if (this.summaryData.length > 0) {
+        this.sortSummaryData()
+      }
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
@@ -1386,6 +1393,15 @@ export default {
       await Promise.all(promises)
       return this.summaryData
     },
+    sortSummaryData () {
+      const result = this.summaryData
+      // 过滤出 result 中实际存在的 title，并按照 fieldsArray 的顺序排序
+      this.summaryData = [...result].sort((a, b) => {
+        const indexA = this.chineseQueryColumnArray.indexOf(a.title)
+        const indexB = this.chineseQueryColumnArray.indexOf(b.title)
+        return indexA - indexB
+      })
+    },
     showDrawer () {
       if (this.summaryUpdate) {
         this.summaryData.forEach(item => {

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -1,14 +1,15 @@
 <template>
   <a-card :bordered="false">
     <x-form-table
-      title="示例页面"
+      title="我的工单"
+      ref="xFormTable"
       :queryParamsName="queryParamsName"
       :fixed-query-form="{
         users_f_handler_id: currUser.id,
       }"
       @action="toDetail">
       <template slot="button">
-        <a-button @click="add">
+        <a-button @click="addApply">
           <a-icon type="plus"/>
           发起报建
         </a-button>
@@ -26,6 +27,7 @@
     <WorkflowDetail
       ref="workFlow"
       @success="success"
+      @nextClick="nextClick"
       @x-form-item-emit-func="handleFormItemEvent"
     >
     </WorkflowDetail>
@@ -66,10 +68,17 @@ export default {
     WorkflowDetail,
     AddressSelect
   },
+  provide () {
+    return {
+      parentAPI: {
+        setCancel: this.setCancel,
+      }
+    }
+  },
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'applyCRUD',
+      queryParamsName: 'ApplyProcessCRUD',
       // 发起报建弹框控制
       applyAddFlag: false,
       formState: false,
@@ -81,7 +90,8 @@ export default {
     ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    add () {
+    addApply () {
+      console.log('打开了吗')
       this.applyAddFlag = true
       this.$nextTick(
         () => {
@@ -99,6 +109,7 @@ export default {
       runLogic('addApply', formData).then(
         res => {
           this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
           this.applyAddFlag = false
         }
       ).catch(() => {
@@ -110,7 +121,7 @@ export default {
     },
     toDetail (record, id) {
       this.$refs.workFlow.init({
-        workflowId: record.twf_id
+        workflowId: record.ab_f_workflow_id
       })
     },
     handleFormItemEvent (func, data, value) {
@@ -120,7 +131,23 @@ export default {
       }
     },
     setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address })
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
+        res => {
+          if (res) {
+            // this.$message.success('提交成功！')
+            this.$refs.xFormTable.refreshTable(true)
+          }
+        }
+      )
     },
     // 协议作废
     setCancel (record) {
@@ -166,7 +193,7 @@ export default {
         ...formData,
       }
       console.log('==formData', data)
-      await runLogic('666', data, 'af-apply').then(() => {
+      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
         this.$message.success('操作成功')
         this.formState = false
       })

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>