vue2-client 1.15.27 → 1.15.28

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,211 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议作废功能  -->
+    <a-modal
+      v-model="formState"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="作废"
+      :destroyOnClose="true"
+      width="55vw">
+      <x-add-native-form
+        ref="xCancelForm"
+        @onSubmit="submit"
+      />
+      <template #footer>
+        <a-button key="back" @click="formState = false">取消</a-button>
+        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
+      </template>
+    </a-modal>
+  </a-card>
+</template>
+
 <script>
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '376'
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect
+  },
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        updateFormData: this.updateFormData,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      formState: false,
+      submitLoading: false,
+      cancelRecord: {}
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
-    },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id,
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      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) {
+      this.cancelRecord = record
+      this.formState = true
+      this.$nextTick(() => {
+        getConfigByName('setCancelForm', 'af-apply', (config) => {
+          if (this.$refs.xCancelForm) {
+            this.$refs.xCancelForm.init({
+              formItems: config.formJson,
+              title: '补充协议作废',
+              businessType: '修改',
+              showSubmitBtn: false,
+              ...config
+            })
+            if (this.$refs.xCancelForm) {
+              console.log(record)
+              // this.$refs.xCancelForm.setForm(recordData)
+            }
+          } else {
+            console.error('xCancelForm组件未加载完成')
+            // 延迟重试
+            setTimeout(() => {
+              this.setCancel(record)
+            }, 100)
+          }
+        })
+      })
+    },
+    async formSubmit () {
+      this.submitLoading = true
+      const formData = await this.$refs.xCancelForm.asyncSubmit()
+      try {
+        await this.submit(formData)
+      } catch (error) {
+        this.$message.error('表单验证失败，请检查填写内容')
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    async submit (formData) {
+      const data = {
+        ...formData,
+      }
+      console.log('==formData', data)
+      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
+        this.$message.success('操作成功')
+        this.formState = false
+      })
+    },
+    updateFormData (workflowId) {
+      runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+        console.log('>>>> res==', res)
+        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: 1200 })
+      })
+      console.log()
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -1,204 +1,132 @@
 <template>
   <a-card :bordered="false">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-    <!--  协议作废功能  -->
-    <a-modal
-      v-model="formState"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="作废"
-      :destroyOnClose="true"
-      width="55vw">
-      <x-add-native-form
-        ref="xCancelForm"
-        @onSubmit="submit"
-      />
-      <template #footer>
-        <a-button key="back" @click="formState = false">取消</a-button>
-        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
-      </template>
-    </a-modal>
+    <a-tabs default-active-key="1">
+      <!-- 业务审核 Tab -->
+      <a-tab-pane key="1" tab="业务审核">
+        <x-form-table
+          title="业务审核"
+          :queryParamsName="queryParamsName"
+          :fixedAddForm="fixedAddForm"
+          :fixedQueryForm="fixedQueryForm"
+          @audit="audit"
+          serviceName="af-revenue"
+          ref="xFormTable">
+        </x-form-table>
+        <WorkflowDetail ref="workFlow" @success="confirmAudit" @nextClick="nextClick"></WorkflowDetail>
+      </a-tab-pane>
+
+      <!-- 我负责的 Tab -->
+      <a-tab-pane key="2" tab="我参与的">
+        <x-form-table
+          title="我参与的业务"
+          :queryParamsName="queryParamsName2"
+          :fixedQueryForm="fixedQueryForm2"
+          @check="check"
+          serviceName="af-revenue"
+          ref="xFormTable">
+        </x-form-table>
+      </a-tab-pane>
+    </a-tabs>
   </a-card>
 </template>
 
 <script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
 import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import { runLogic } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'Apply',
+  name: 'UnitManage',
   components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect
-  },
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-      }
-    }
+    XFormTable, XDescriptions, XAddNativeForm, WorkflowDetail
   },
   data () {
     return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      formState: false,
-      submitLoading: false,
-      cancelRecord: {}
+      // 查询配置名称
+      queryParamsName: 'businessAuditCRUD',
+      queryParamsName2: 'participatedCRUD',
+      // 新增表单固定值
+      fixedAddForm: {},
+      fixedQueryForm: {},
+      fixedQueryForm2: {},
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示详情抽屉
+      detailVisible: false
     }
   },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  created () {
+  },
+  mounted () {
+    this.fixedQueryForm = {
+      ws_f_handler: this.currUser.name
+    }
+    this.fixedQueryForm2 = {
+      a_f_handler: this.currUser.name
+    }
   },
   methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id,
-        stepId: record.ws_f_step_id
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      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
+      if (formStep === '管理员审核') {
+        const data = {
+          workflowId,
+          form
+        }
+        runLogic('auditFinish', { data: data }, 'af-revenue').then(
+          res => {
+            if (res) {
+              this.$message.success('审核完成！！！')
+              this.formModalVisible = false
+              this.$refs.xFormTable.refreshTable(true)
+            }
+          }
+        )
       }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
+    },
+    confirmAudit (param) {
+      runLogic('auditFinish', { data: param }, 'af-revenue').then(
         res => {
           if (res) {
-            // this.$message.success('提交成功！')
+            this.$message.success('审核完成！！！')
+            this.formModalVisible = false
             this.$refs.xFormTable.refreshTable(true)
           }
         }
       )
     },
-    // 协议作废
-    setCancel (record) {
-      this.cancelRecord = record
-      this.formState = true
-      this.$nextTick(() => {
-        getConfigByName('setCancelForm', 'af-apply', (config) => {
-          if (this.$refs.xCancelForm) {
-            this.$refs.xCancelForm.init({
-              formItems: config.formJson,
-              title: '补充协议作废',
-              businessType: '修改',
-              showSubmitBtn: false,
-              ...config
-            })
-            if (this.$refs.xCancelForm) {
-              console.log(record)
-              // this.$refs.xCancelForm.setForm(recordData)
-            }
-          } else {
-            console.error('xCancelForm组件未加载完成')
-            // 延迟重试
-            setTimeout(() => {
-              this.setCancel(record)
-            }, 100)
-          }
-        })
+    audit (record, id, type) {
+      console.log(record, id, type)
+      console.log(this.$refs.workFlow)
+      this.detailVisible = true
+      this.$refs.workFlow.init({
+        workflowId: record.w_id
       })
     },
-    async formSubmit () {
-      this.submitLoading = true
-      const formData = await this.$refs.xCancelForm.asyncSubmit()
-      try {
-        await this.submit(formData)
-      } catch (error) {
-        this.$message.error('表单验证失败，请检查填写内容')
-      } finally {
-        this.submitLoading = false
-      }
-    },
-    async submit (formData) {
-      const data = {
-        ...formData,
-      }
-      console.log('==formData', data)
-      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
-        this.$message.success('操作成功')
-        this.formState = false
+    check (record, id, type) {
+      console.log(record, id, type)
+      console.log(this.$refs.workFlow)
+      this.detailVisible = true
+      this.$refs.workFlow.init({
+        workflowId: record.a_id
       })
+    },
+    onClose () {
+      this.detailVisible = false
     }
-  }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
 }
 </script>
+
+<style scoped lang="less">
+:deep(.ant-statistic-content-value) {
+  color: @primary-color;
+}
+</style>

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -1051,39 +1051,34 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         // 调整逻辑：formData中只显示流程配置表单中定义过的显示列，多余冗余的存储列不进行页面展示
-        const formData = {}
+        const formDataArr = []
+        const dataObj = formCompletedDataPreview.data || {}
         const currentStepDefine = this.stepsDefine.find(item => item.id === stepId)
         const isKeyHandle = currentStepDefine?.properties?.form?.isKeyHandle || false
-        for (const key in formCompletedDataPreview.data) {
-          for (let i = 0; i < this.targetStepDefine.length; i++) {
-            const stepDefine = this.targetStepDefine[i]
-            // 兼容下旧代码，这里是否处理key根据表单配置中的isKeyHandle来决定，也有另一种情况如果处理完的key在表单中已经重复会将未处理的key直接存进去（新增表单的逻辑）
-            // 所以两种都判断下命中任意一个都算
-            if (key === this.getRealKey(stepDefine.model, isKeyHandle) || key === stepDefine.model) {
-              if (!['FilesId', 'Images'].includes(key)) {
-                // 读取字典值
-                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                    if (item.value === formData[key]) {
-                      formData[stepDefine.name] = item.label
-                      break
-                    }
-                  }
-                } else {
-                  formData[stepDefine.name] = formCompletedDataPreview.data[key]
-                }
-              }
-              // if (key !== stepDefine.name) {
-              //   delete formData[key]
-              // }
-              break
+        for (let i = 0; i < this.targetStepDefine.length; i++) {
+          const stepDefine = this.targetStepDefine[i]
+          const key = this.getRealKey(stepDefine.model, isKeyHandle)
+          if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+            let value = dataObj[key]
+            // 字典值处理
+            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
+              const dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+              const dictItem = dictList.find(item => item.value === value)
+              value = dictItem ? dictItem.label : value
             }
+            formDataArr.push({ label: stepDefine.name, value })
           }
         }
-        if (Object.keys(formData).length > 0) {
-          formCompletedDataPreview.data = formData
+        // 如果一个都没匹配上，兼容旧逻辑：把原对象转成数组
+        if (formDataArr.length === 0 && dataObj && typeof dataObj === 'object') {
+          for (const key in dataObj) {
+            if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+              formDataArr.push({ label: key, value: dataObj[key] })
+            }
+          }
         }
-        if (!Object.keys(formCompletedDataPreview.data).length) {
+        formCompletedDataPreview.data = formDataArr.length > 0 ? formDataArr : null
+        if (!formCompletedDataPreview.data) {
           formCompletedDataPreview.data = null
         }
         // 备注

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowPreview.vue

@@ -11,12 +11,12 @@
           填写历史
         </p>
         <a-descriptions-item
-          v-for="(value, key) in formCompletedDataPreview.data"
-          :key="key"
-          v-show="key !== '附件上传' && key !== '__expressionRs'"
+          v-for="(item, idx) in formCompletedDataPreview.data"
+          :key="item.label || idx"
+          v-show="item.label !== '附件上传' && item.label !== '__expressionRs'"
         >
-          <span slot="label" style="color: #000">{{ key }}</span>
-          <div style="white-space: pre-wrap">{{ value }}</div>
+          <span slot="label" style="color: #000">{{ item.label }}</span>
+          <div style="white-space: pre-wrap">{{ item.value }}</div>
         </a-descriptions-item>
       </a-descriptions>
       <a-descriptions