vue2-client 1.14.22 → 1.14.24

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

@@ -69,12 +69,12 @@
                 </div>
               </a-alert>
               <!-- 任务时间提示 -->
-<!--              <a-alert-->
-<!--                v-if="taskIsOverdue"-->
-<!--                type="warning"-->
-<!--                message="当前任务已超过限定完成时间，联系发起人修改完成时间后即可提交"-->
-<!--                show-icon-->
-<!--                style="margin-bottom: 14px"/>-->
+              <!--              <a-alert-->
+              <!--                v-if="taskIsOverdue"-->
+              <!--                type="warning"-->
+              <!--                message="当前任务已超过限定完成时间，联系发起人修改完成时间后即可提交"-->
+              <!--                show-icon-->
+              <!--                style="margin-bottom: 14px"/>-->
               <!--    当前步骤，填写表单    -->
               <x-add-native-form
                 v-if="stepDefine.length > 0"
@@ -88,7 +88,7 @@
                     <a-radio value="skip">{{ stepNextBtnTitle }}</a-radio>
                   </a-radio-group>
                 </a-form-item>
-                <a-form-item label="指定下一环节处理人" required>
+                <a-form-item label="指定下一环节处理人" required v-if="needSelectPerson">
                   <a-select
                     v-model="checkedChargePerson"
                     placeholder="请选择或搜索"
@@ -209,7 +209,7 @@
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { post, postByServiceName } from '@vue2-client/services/api/restTools'
+import { postByServiceName } from '@vue2-client/services/api/restTools'
 import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
 import { formatDate } from '@vue2-client/utils/util'
 // import { commonApi } from '@vue2-client/services/api/common'
@@ -222,7 +222,7 @@ import WorkflowListResolution from './WorkflowListResolution'
 import { commonApi } from '@vue2-client/services/api'
 
 export default {
-  name: 'ApplyHandle',
+  name: 'WorkFlowHandle',
   components: {
     WorkflowListResolution,
     XAddNativeForm,
@@ -237,9 +237,30 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
       const step = this.stepsForChild[this.currentStepId - 1]
+
+      // 检查角色和部门权限
+      if (step && step.properties && step.properties.chargePerson) {
+        if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
+          // 使用some方法判断当前人员是否满足任一条件
+          return step.properties.chargePerson.personList.some(item => {
+            if (item.type === 'role') {
+              // 检查rolestr是否存在并包含指定角色
+              return this.currUser.rolestr && this.currUser.rolestr.includes(item.name)
+            }
+            if (item.type === 'department') {
+              // 检查parentname是否存在并包含指定部门
+              return this.currUser.parentname && this.currUser.parentname.includes(item.name)
+            }
+            return false
+          })
+        }
+      }
+
+      // 检查handler是否包含当前用户
       if (step && step.handler) {
         return step.handler.includes(this.currUser.name)
       }
+
       return false
     }
   },
@@ -325,7 +346,11 @@ export default {
       // 操作类型，提交到下一步或跳过
       operationType: 'submit',
       // 获取微信推送是否成功信息
-      information: []
+      information: [],
+      // 是否需要选择人员
+      needSelectPerson: true,
+      // 下一环节人员信息
+      chargePerson: {}
     }
   },
   async mounted () {
@@ -404,6 +429,7 @@ export default {
       })
         .then(res => {
           res.state = this.stepsForChild[res.id - 1].name
+          this.currentStepId = res.id
           this.currentStep = res
           this.getDirection()
         }, err => {
@@ -552,11 +578,6 @@ export default {
     },
     // 分析当前节点，能通向的节点
     resolveDirections () {
-      for (let i = 0; i < this.stepsDefine.length; i++) {
-        if (this.stepsDefine[i].name === this.currentStep.state) {
-          this.currentStepId = this.stepsDefine[i].id
-        }
-      }
       let hasBack = false
       if (this.stepsDefine[this.currentStepId - 1]?.properties?.actions) {
         this.currentDirections = this.stepsDefine[this.currentStepId - 1].properties.actions.filter((item) => {
@@ -611,7 +632,7 @@ export default {
       this.stepDefine = this.stepsDefine[this.currentStep.id - 1].properties.form.formJson
       this.showForm = true
       this.$nextTick(() => {
-        this.$refs.xAddForm.init({
+        this.$refs.xAddForm && this.$refs.xAddForm.init({
           businessType: '修改',
           formItems: this.stepDefine,
           layout: this.stepsDefine[this.currentStep.id - 1].properties.form.xAddFormLayout,
@@ -750,14 +771,22 @@ export default {
         stepId,
         name: this.getStepNameByStepId(stepId),
         handler: stepHandler,
-        deadline: this.deadline
+        handlerId: this.checkedChargePerson,
+        needSelectPerson: this.needSelectPerson,
+        personList: this.chargePerson.personList,
+        deadline: this.deadline,
+        submitUser: this.currUser.name,
+        submitUserId: this.currUser.id
       }
     },
     // 获取当前选择的负责人
     getStepHandler () {
       let stepHandler
       if (this.checkedChargePerson) {
-        stepHandler = this.checkedChargePerson.split('_')[0]
+        // 使用 value 找到对应的 label
+        stepHandler = this.chargePersonOptions.find(item => item.value === this.checkedChargePerson[0]).label
+      } else if (this.chargePerson.personList.length > 0) {
+        stepHandler = this.chargePerson.personList.map(item => item.name).join(',')
       }
       return stepHandler
     },
@@ -835,25 +864,66 @@ export default {
     async setChargePersonOptions (stepId) {
       this.checkedChargePerson = undefined
       const defineProperties = this.stepsDefine[stepId - 1].properties
+      // chargePerson 改造  旧数据类型是 {chrgePerson: {role: '1', department: '1'}}
+      // 新数据类型是
+      // "chargePerson": {
+      //     "personList": [
+      //         {
+      //             "type": "department",
+      //             "name": "营业厅"
+      //         },
+      //         {
+      //             "type": "role",
+      //             "name": "管理员"
+      //         }
+      //     ],
+      //     "needSelectPerson": true
+      // }
       const chargePerson = defineProperties.chargePerson
-      let chargePersonOptions = []
-      // 获取所有用户信息
-      const allUser = await post(commonApi.getAllUserOptionList, {})
-      if (chargePerson.role) {
-        // 根据角色获取人员
-        chargePersonOptions = allUser.filter(item => item.rolestr && item.rolestr.includes(chargePerson.role)).map(item => {
-          return { label: item.label, value: item.label }
-        })
-      } else if (chargePerson.department) {
-        // 根据部门获取人员
-        chargePersonOptions = allUser.filter(item => item.depname === chargePerson.department).map(item => {
-          return { label: item.label, value: item.label }
-        })
+      // 如果是旧的格式 转换成新的格式后再作处理
+      if (chargePerson.role || chargePerson.department) {
+        chargePerson.needSelectPerson = true
+        chargePerson.personList = [{ type: chargePerson.role ? 'role' : 'department', name: chargePerson.role || chargePerson.department }]
+      }
+      this.needSelectPerson = chargePerson.needSelectPerson
+      this.chargePerson = chargePerson
+      const chargePersonOptions = []
+      // 如果需要选择人员 则在这里选择人员 否则 后台选择人员 这里不处理
+      if (chargePerson.needSelectPerson) {
+        // 获取所有用户信息
+        const allUser = await postByServiceName(commonApi.getAllUserOptionList, {})
+
+        // 使用reduce累积结果
+        const options = chargePerson.personList.reduce((acc, personItem) => {
+          let filteredUsers = []
+
+          if (personItem.type === 'role') {
+            // 根据角色获取人员
+            filteredUsers = allUser.filter(user =>
+              user.rolestr && user.rolestr.includes(personItem.name)
+            ).map(user => {
+              return { label: user.label, value: user.id }
+            })
+          } else if (personItem.type === 'department') {
+            // 根据部门获取人员
+            filteredUsers = allUser.filter(user =>
+              user.depname === personItem.name
+            ).map(user => {
+              return { label: user.label, value: user.id }
+            })
+          }
+
+          return [...acc, ...filteredUsers]
+        }, [])
+
+        // 去重处理
+        const uniqueOptions = Array.from(new Map(options.map(item => [item.value, item])).values())
+        chargePersonOptions.push(...uniqueOptions)
       }
       this.chargePersonOptions = chargePersonOptions
       // 默认选中下一环节负责人
       if (this.chargePersonOptions.length === 1) {
-        this.checkedChargePerson = this.chargePersonOptions[0].key
+        this.checkedChargePerson = this.chargePersonOptions[0].value
       }
     }
   },