[update] 修改企标制修订,任务转交

src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue

@@ -49,7 +49,7 @@
         :can-drag="true"
         :scroll="{x: '100%', y: yScrollHeight}"
         ref="table"
-        rowKey="id"
+        :rowKey="(record) => {return record.id + '-' + record.type}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -68,7 +68,7 @@
       </j-table>
     </div>
 
-    <!--  转办需要选人  -->
+    <!--  转交需要选人  -->
     <user-select-modal ref="userSelectModal" type="radio" @change="userSelectChange"></user-select-modal>
   </div>
 </template>
@@ -184,15 +184,19 @@ export default {
       if (this.loading) {
         return
       }
+      const params = []
+      const param = {}
+      param.id = fieldName.split('-')[0]
+      param.type = fieldName.split('-')[1]
+      param.transferUser = value
+      params.push(param)
       this.loading = true
-      const params = {}
-      params.id = fieldName.split('-')[0]
-      params.type = fieldName.split('-')[1]
-      params.transferUser = value
       basicInfoTransfer(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
+          this.dataSource = []
           this.loadData()
+          this.$forceUpdate()
         } else {
           this.$message.warning(res.message)
         }
@@ -211,76 +215,20 @@ export default {
     // 批量转交选完人的回调
     userSelectChange (value) {
       if (value) {
-        let func
+        const params = []
-        switch (this.currentTurnTo.prcType + '') {
+        for (const item of this.selectedRowKeys) {
-          // 标准法规入库/变更流程
+          const param = {}
-          case '1':
+          param.id = item.split('-')[0]
-            func = turnToStandardECProcess
+          param.type = item.split('-')[1]
-            break
+          param.transferUser = value
-          // 标准征求意见流程
+          params.push(param)
-          case '2':
-            func = transferConsultationProcess
-            break
-          // 项目合规评估流程
-          case '3':
-          // 未符合项跟踪流程
-          case '4':
-          // 法规合规评估
-          case '5':
-            func = processTransfer
-            break
-          // 法规采购流程
-          case '6':
-            func = transferProcurementProcess
-            break
-          // 企标立项、变更计划
-          case '7':
-            func = enterprisePlanApprovalTurnTo
-            break
-          // 年度制修订计划（各部门主动上报）
-          case '8':
-            func = activelyReportTurnTo
-            break
-          // 年度制修订计划（标准化发起）
-          case '9':
-            func = standardizationInitTurnTo
-            break
-          // 企标制修订流程
-          case '10':
-            func = enStandardEditTurnTo
-            break
-          // 企标更改流程
-          case '11':
-            func = enStandardChangeTurnTo
-            break
-          // 企标复审流程
-          case '12':
-            func = enStandardRecheckTurnTo
-            break
-          // 企标废止流程
-          case '13':
-            func = enStandardAnnulTurnTo
-            break
-          // 企标封存流程
-          case '14':
-            func = enStandardSealSaveTurnTo
-            break
-          // 已封存企标启用流程
-          case '15':
-            func = enStandardStartUseTurnTo
-            break
-          // 企标稽查计划
-          case '16':
-            func = transferInspectPlan
-            break
         }
-        const param = {}
+        basicInfoTransfer(params).then(res => {
-        param.userId = value
-        param.ids = this.selectedRowKeys.join(',')
-        func(param).then(res => {
           if (res.success) {
             this.$message.success(res.message)
+            this.dataSource = []
             this.loadData()
+            this.$forceUpdate()
           } else {
             this.$message.warning(res.message)
           }

src/views/personalCenter/taskCareOf/table/ProcessInfo.vue

@@ -53,9 +53,9 @@
     <div>
       <j-table
         :can-drag="true"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: yScrollHeight}"
         ref="table"
-        rowKey="id"
+        rowKey="taskId"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -65,6 +65,9 @@
 
       </j-table>
     </div>
+
+    <!--  转交需要选人  -->
+    <user-select-modal ref="userSelectModal" type="radio" @change="userSelectChange"></user-select-modal>
   </div>
 </template>
 
@@ -72,10 +75,35 @@
 import JTable from '@/components/jero/JTable'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import { basicInfoTransfer } from '../../../../api/personCenter'
+import UserSelectModal from '@/components/selection/UserSelectModal'
+import UserSelection from '@/components/selection/UserSelection'
+import {
+  ProcessType,
+  FGEntryChangeProcessNode,
+  ConsultationProcess,
+  ProjectComplianceEvaluationProcessNode,
+  NoMatchTrackingNodes,
+  ProcurementProcessNodes,
+  EsInitChangeNodes,
+  EsRevisionPlanActivityReportNodes,
+  EsRevisionPlanStandardizationInitNodes,
+  EsRevisionNodes,
+  EsChangeNodes,
+  EsRecheckNodes,
+  EsAnnulNodes,
+  EsSealSaveNodes,
+  EsStartUseNodes,
+  EsInspectionPlan,
+  EsInspectionProcess,
+  InspectionExtensionRequestProcess,
+  PermissionApply,
+  StandardPromotion,
+  PostMeetingManage
+} from '@/enums/commonEnums'
 
 export default {
   name: 'ProcessInfo',
-  components: { JTable },
+  components: { JTable, UserSelectModal, UserSelection },
   mixins: [JeroListMixin],
   computed: {
     yScrollHeight () {
@@ -123,7 +151,7 @@ export default {
           title: this.$t('personalCenter.taskCareOf.nodeName'),
           align: 'center',
           width: 180,
-          dataIndex: 'nodeName',
+          dataIndex: 'taskName',
           scopedSlots: { customRender: 'text' }
         },
         { // 用户
@@ -149,22 +177,111 @@ export default {
       ],
       url: {
         list: '/laws/taskTransfer/queryProcessDB'
+      },
+      // 每个流程不显示待办按钮的节点nodeId
+      notTurnToBtn: {
+        // 标准法规入库/变更流程
+        [ProcessType.FB_ENTRY_CHANGE.value]: [FGEntryChangeProcessNode.initiate.value],
+        // 征求意见流程
+        [ProcessType.CONSULTATION.value]: [ConsultationProcess.initiate.value],
+        // 项目合规评估流程
+        [ProcessType.PROJECT_COMPLIANCE_EVALUATION.value]: [ProjectComplianceEvaluationProcessNode.initiate.value],
+        // 未符合项跟踪流程
+        [ProcessType.NO_MATCH_TRACKING.value]: [NoMatchTrackingNodes.initial.value],
+        // 法规合规评估流程
+        [ProcessType.REGULATORY_COMPLIANCE_ASSESSMENT.value]: [],
+        // 法规采购流程
+        [ProcessType.LEGAL_PROCUREMENT.value]: [ProcurementProcessNodes.initiate.value, ProcurementProcessNodes.regulatoryEngineerConfirmation.value],
+        // 企标立项/变更计划
+        [ProcessType.ES_INIT_CHANGE.value]: [
+          EsInitChangeNodes.mainDrafterStart.value,
+          EsInitChangeNodes.mainDrafterCopy.value
+        ],
+        // 年度制修订-各部门主动上报
+        [ProcessType.ES_ANNUAL_REPORT.value]: [
+          EsRevisionPlanActivityReportNodes.standardizationStart.value,
+          EsRevisionPlanActivityReportNodes.standardizationSumUp.value
+        ],
+        // 年度制修订-标准化部门主动发起
+        [ProcessType.ES_ANNUAL_INIT.value]: [
+          EsRevisionPlanStandardizationInitNodes.standardizationStart.value,
+          EsRevisionPlanStandardizationInitNodes.standardizationUpdate.value,
+          EsRevisionPlanStandardizationInitNodes.mainDrafterEnterInfo.value,
+          EsRevisionPlanStandardizationInitNodes.standardizationSumUp.value,
+          EsRevisionPlanStandardizationInitNodes.standardizationTwoUpdate.value
+        ],
+        // 企标制修订流程
+        [ProcessType.ES_EDIT.value]: [
+          EsRevisionNodes.mainDrafterSend.value,
+          EsRevisionNodes.mainDrafterPublish.value
+        ],
+        // 企标更改流程
+        [ProcessType.ES_CHANGE.value]: [
+          EsChangeNodes.mainDrafterStart.value
+        ],
+        // 企标复审流程
+        [ProcessType.ES_RECHECK.value]: [
+          EsRecheckNodes.standardizationSelectContact.value,
+          EsRecheckNodes.initiatorStart.value
+        ],
+        // 企标废止流程
+        [ProcessType.ES_ABOLISH.value]: [
+          EsAnnulNodes.initiatorStart.value
+        ],
+        // 企标封存流程
+        [ProcessType.ES_ARCHIVE.value]: [
+          EsSealSaveNodes.initiatorStart.value
+        ],
+        // 已封存企标启用流程
+        [ProcessType.ES_ENABLE.value]: [
+          EsStartUseNodes.initiatorStart.value
+        ],
+        // 企标稽查计划
+        [ProcessType.ES_INSPECTION_PLAN.value]: [
+          EsInspectionPlan.initiate.value,
+          EsInspectionPlan.fillInComments.value,
+          EsInspectionPlan.liaisonCollect.value
+        ],
+        // 企标稽查流程
+        [ProcessType.ES_INSPECTION_PROCESS.value]: [EsInspectionProcess.initiate.value],
+        // 稽查延期申请流程
+        [ProcessType.INSPECTION_EXTENSION_REQUEST_PROCESS.value]: [InspectionExtensionRequestProcess.initiate.value],
+        // 企标稽查整改
+        [ProcessType.ES_INSPECTION_RECTIFICATION.value]: [],
+        // 权限申请流程
+        [ProcessType.PERMISSION_APPLY.value]: [PermissionApply.initiate.value],
+        // 标准宣贯流程
+        [ProcessType.STANDARD_PROMOTION.value]: [StandardPromotion.initiate.value],
+        // 会后管理流程
+        [ProcessType.POST_MEETING_MANAGE.value]: [PostMeetingManage.initiate.value]
       }
     }
   },
   methods: {
+    // 是否显示转办按钮
+    isShowTurnTo (record) {
+      if (record.prcType && record.nodeId) {
+        return !this.notTurnToBtn[record.prcType + ''].some(tt => record.nodeId.indexOf(tt) !== -1)
+      } else {
+        return false
+      }
+    },
     transferUserChange (value, fieldName) {
       if (this.loading) {
         return
       }
       this.loading = true
-      const params = {}
+      const params = []
-      params.taskId = fieldName
+      const param = {}
-      params.transferUser = value
+      param.taskId = fieldName
+      param.transferUser = value
+      params.push(param)
       basicInfoTransfer(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
+          this.dataSource = []
           this.loadData()
+          this.$forceUpdate()
         } else {
           this.$message.warning(res.message)
         }
@@ -172,6 +289,36 @@ export default {
         this.loading = false
       })
     },
+    // 批量转交
+    handleTransfer () {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning(this.$t('selectARecord'))
+      } else {
+        this.$refs.userSelectModal.open()
+      }
+    },
+    // 批量转交选完人的回调
+    userSelectChange (value) {
+      if (value) {
+        const params = []
+        for (const item of this.selectedRowKeys) {
+          const param = {}
+          param.taskId = item
+          param.transferUser = value
+          params.push(param)
+        }
+        basicInfoTransfer(params).then(res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.dataSource = []
+            this.loadData()
+            this.$forceUpdate()
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      }
+    }
   }
 }
 </script>

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue

@@ -157,6 +157,7 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.advices = this.dataSource
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验