vue2-client 1.15.24 → 1.15.26-1

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

@@ -0,0 +1,203 @@
+<template>
+  <div id="beingProcessed">
+    <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>
+  </div>
+</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'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect,
+    XFormGroup,
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        chargeAdd: this.chargeAdd,
+        addUser: this.addUser,
+        editUser: this.editUser,
+        addContract: this.addContract,
+        addcharge: this.addcharge,
+        updateFormData: this.updateFormData,
+        chargeCancel: this.chargeCancel,
+        chargeBatchRefund: this.chargeBatchRefund,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  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
+      })
+    },
+    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, refreshFn) {
+      this.$refs.cancelContract.setCancel(record, refreshFn)
+    },
+    // 增值收费新增
+    chargeAdd (refreshFn) {
+      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 协议新增
+    addContract (refreshFn) {
+      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 新增用户
+    addUser (refreshFn) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
+        this.$message.success('只有团购报建流程才可以新增用户信息!')
+        return
+      }
+      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 编辑用户
+    editUser (record, refreshFn) {
+      this.$refs.addUser.editUser(record, refreshFn)
+    },
+    // 新增收费
+    addcharge (refreshFn) {
+      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 报装缴费页面初始化
+    updateFormData (workflowId) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
+        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+        })
+      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
+        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
+        })
+      }
+    },
+    // 增值收费单个数据的撤销功能
+    chargeCancel (record, refreshFn) {
+      this.$refs.cancel.chargeCancel(record, refreshFn)
+    },
+    // 批量撤销(退费)
+    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
+      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
+        this.$message.warn('请选择要退费的记录', 5)
+        return
+      }
+      const workflowId = this.$refs.workFlow.workflowId
+      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
+    }
+  }
+}
+</script>

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

@@ -67,6 +67,7 @@
           <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
             <x-tab
               v-if="showTab"
+              :compProp="{ buttonState: { extra: true }, disableAction: false }"
               :local-config="tabDesigner"
               :extra-data="{ workflowId:workflowId }"
               :body-style="{ padding: 0 }"
@@ -390,9 +391,14 @@ export default {
           return true
         }
       } else {
+        // 当前进行节点的数据
         const step = this.stepsForChild.find(item => item.id === this.activeStepId)
         // 检查角色和部门权限
         if (step && step.properties && step.properties.chargePerson) {
+          // 如果当前节点的负责人选项中有设置选择人员 当前节点就只能由上一步设置的负责人操作
+          if (step.properties.chargePerson.needSelectPerson) {
+            return step.handler === this.currUser.name
+          }
           if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
             // 使用some方法判断当前人员是否满足任一条件
             return step.properties.chargePerson.personList.some(item => {
@@ -774,6 +780,12 @@ export default {
             this.loadingHistory = true
             this.currentStepId = this.preBtnTo
             this.activeStepId = this.preBtnTo
+
+            // 新增：重置按钮状态
+            this.stepDone = false
+            this.beforeStepActive = false
+            this.operationType = 'submit'
+
             this.$emit('refresh')
             this.onClose()
             this.init()

package/src/pages/XTreeOneProExample/index.vue

@@ -1,67 +1,67 @@
-<template>
-  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
-    <x-add-native-form ref="nativeForm" />
-  </x-tree-view>
-</template>
-
-<script>
-
-import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
-import { mapState } from 'vuex'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm,
-    XTreeView,
-  },
-  data () {
-    return {
-      currentItem: undefined,
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  mounted () {
-    this.initView()
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$refs.xTreeView.init({
-        configName: 'templateTreeConfig',
-        serviceName: 'af-his',
-        env: 'dev',
-      })
-    },
-    itemChecked (node) {
-      this.currentItem = node
-      if (node.type === 'all' || node.type === 'folder') {
-        this.$refs.nativeForm.close()
-        return
-      }
-      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          showSubmitBtn: false,
-          title: '收费',
-          businessType: '新增',
-          getDataParams: {
-            content: {
-              pms_patient_id: 1,
-              template_id: node.id
-            }
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
+    <x-add-native-form ref="nativeForm" />
+  </x-tree-view>
+</template>
+
+<script>
+
+import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
+import { mapState } from 'vuex'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm,
+    XTreeView,
+  },
+  data () {
+    return {
+      currentItem: undefined,
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  mounted () {
+    this.initView()
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$refs.xTreeView.init({
+        configName: 'templateTreeConfig',
+        serviceName: 'af-his',
+        env: 'dev',
+      })
+    },
+    itemChecked (node) {
+      this.currentItem = node
+      if (node.type === 'all' || node.type === 'folder') {
+        this.$refs.nativeForm.close()
+        return
+      }
+      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          showSubmitBtn: false,
+          title: '收费',
+          businessType: '新增',
+          getDataParams: {
+            content: {
+              pms_patient_id: 1,
+              template_id: node.id
+            }
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/test/request.test.js

@@ -1,17 +1,17 @@
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import { test, describe } from '@jest/globals'
-
-describe('请求加密模块', () => {
-  const VALID_KEY = 'a964287a2cef8781ed76bd63dcadd578'
-  const TEST_PAYLOAD = {
-    username: 'admin',
-    password: 'P@ssw0rd_测试',
-    timestamp: Date.now()
-  }
-
-  // CBC加密测试
-  test('应生成有效的加密字符串', () => {
-    const encrypted = EncryptUtil.AESEncryptCBC(TEST_PAYLOAD, VALID_KEY)
-    console.log(encrypted)
-  })
-})
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import { test, describe } from '@jest/globals'
+
+describe('请求加密模块', () => {
+  const VALID_KEY = 'a964287a2cef8781ed76bd63dcadd578'
+  const TEST_PAYLOAD = {
+    username: 'admin',
+    password: 'P@ssw0rd_测试',
+    timestamp: Date.now()
+  }
+
+  // CBC加密测试
+  test('应生成有效的加密字符串', () => {
+    const encrypted = EncryptUtil.AESEncryptCBC(TEST_PAYLOAD, VALID_KEY)
+    console.log(encrypted)
+  })
+})