From 2baeb787d852e50a0d6836242685b2f957e998b8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 28 Dec 2023 17:21:00 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B,=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=BD=AC=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/workCenter/zh.js              |  3 +-
 .../EnterprisePlanSelectionModal.vue          |  8 +-
 .../EnterpriseRecheckPlanSelectionModal.vue   |  8 +-
 .../taskCareOf/table/ProcessInfo.vue          | 99 ++-----------------
 .../EnterpriseStandardRevisionFlow.vue        |  2 +-
 .../modules/DepartLiaisonIssueBaseInfo.vue    | 15 ++-
 .../MainDrafterUploadMinuteBaseInfo.vue       | 77 +++++++++------
 7 files changed, 86 insertions(+), 126 deletions(-)

diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 2ccaa018..c59281aa 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -153,7 +153,8 @@ module.exports = {
     approverHeadEngineer: '审批(总工程师)',
     releaseDate: '发布日期',
     implementationDate: '实施日期',
-    esPlan: '企标计划'
+    esPlan: '企标计划',
+    deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期早'
   },
   // 企标更改流程
   enStandardChange: {
diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue
index 3130693f..4a0c9f7c 100644
--- a/src/components/selection/EnterprisePlanSelectionModal.vue
+++ b/src/components/selection/EnterprisePlanSelectionModal.vue
@@ -78,7 +78,8 @@
         :data-source="dataList"
         :pagination="ipagination"
         :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :loading="loading">
+        :loading="loading"
+        @change="handleTableChange">
 
         <template slot="text" slot-scope="text">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -344,6 +345,11 @@ export default {
         this.loading = false
       })
     },
+    handleTableChange (pagination) {
+      // 分页、排序、筛选变化时触发
+      this.ipagination = pagination
+      this.replacePage()
+    },
     searchQuery () {
       this.replacePage()
     },
diff --git a/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue b/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
index f74e407f..6eb73c2a 100644
--- a/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
+++ b/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
@@ -62,7 +62,8 @@
         :data-source="dataList"
         :pagination="ipagination"
         :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :loading="loading">
+        :loading="loading"
+        @change="handleTableChange">
 
         <template slot="text" slot-scope="text">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -247,6 +248,11 @@ export default {
         this.loading = false
       })
     },
+    handleTableChange (pagination) {
+      // 分页、排序、筛选变化时触发
+      this.ipagination = pagination
+      this.replacePage()
+    },
     searchQuery () {
       this.replacePage()
     },
diff --git a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
index 110e654e..1026f269 100644
--- a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
+++ b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
@@ -167,106 +167,25 @@ export default {
           width: 300,
           dataIndex: 'transferUser',
           customRender: (value, row, index) => {
-            return <user-selection v-model={this.dataSource[index].transferUser}
-              nameStr={this.dataSource[index].transferUser_dictText}
-              filedName={this.dataSource[index].taskId}
-              onChange={this.transferUserChange}
-              disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
+            if (row.state) {
+              return <user-selection v-model={this.dataSource[index].transferUser}
+                                     nameStr={this.dataSource[index].transferUser_dictText}
+                                     filedName={this.dataSource[index].taskId}
+                                     onChange={this.transferUserChange}
+                                     disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
+            } else {
+              return this.global.emptyLine
+            }
           }
         }
       ],
       url: {
         // todo数据源还未确认
         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
diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
index 90401cd6..ed72ce0b 100644
--- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
@@ -571,7 +571,7 @@ export default {
             // 企标计划id
             param.data.espId = data.formInline.espId
             // data的id
-            param.data.id = this.model.data.id || ''
+            param.data.id = this.model.data ? this.model.data.id : ''
             let func
             if (this.$route.query.taskId) {
               // 有taskId说明是驳回的提交
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
index fc132d9f..cf70abc1 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
@@ -116,7 +116,20 @@ export default {
       let data = {}
       await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          data = Object.assign({}, this.formInline)
+          // 有征求意见稿计划完成日期和征求意见截止日期，需要征求意见截止日期比计划完成日期早
+          if (JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate && this.formInline.adviceDeadline) {
+            const planDate = new Date(Date.parse(JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate))
+            const deadlineDate = new Date(Date.parse(this.formInline.adviceDeadline))
+            if (deadlineDate < planDate) {
+              // 截止日期比完成日期早
+              data = Object.assign({}, this.formInline)
+            } else {
+              this.$message.warning(this.$t('workCenter.enStandardRevision.deadlineNeedGreaterThan'))
+              data = false
+            }
+          } else {
+            data = Object.assign({}, this.formInline)
+          }
         } else {
           data = false
         }
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
index be2a20c8..863513fd 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue
@@ -260,46 +260,61 @@ export default {
       standardGradeClassification: [] // 企标级别映射数据
     }
   },
-  mounted () {
+  created () {
     this.getStandardGradeClassificationArr()
   },
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      // 给表单赋值,在线编辑不知道要怎么赋值？
-      this.formInline = Object.assign({}, data)
-      // 设置授权部门是否可更改和可选范围
-      // 基础信息中的标准等级分类
-      const gradeClassification = JSON.parse(data.businessJson).grade_classification
-      // 基础信息中的授权部门
-      const authDept = JSON.parse(data.businessJson).auth_dept
-      if (gradeClassification === StandardGradeClassify.ZERO_LEVEL.value) {
-        // 选的是0级，授权部门带出发起时填写的数据不可编辑
-        this.formInline.authDept = authDept
-        this.authDeptDisabled = true
-      } else if (gradeClassification === StandardGradeClassify.ONE_LEVEL.value) {
-        // 选的是1级，授权部门带出发起时填写的数据
-        this.formInline.authDept = authDept
-        // 设置可选择项
-        this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',')
-        // 设置授权部门可编辑
-        this.authDeptDisabled = false
-      } else if (gradeClassification === StandardGradeClassify.TWO_LEVEL.value) {
-        // 选的是2级，授权部门带出发起时填写的数据
-        this.formInline.authDept = authDept
-        // 设置可选择项
-        this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',')
-        // 设置授权部门可编辑
-        this.authDeptDisabled = false
-      } else if (gradeClassification === StandardGradeClassify.THREE_LEVEL.value) {
-        // 选的是3级，授权部门带出发起时填写的数据,不可编辑
-        this.formInline.authDept = authDept
-        this.authDeptDisabled = true
-      }
       // 给表单赋值
       this.$nextTick(() => {
         this.$refs.baseInfoForm.initData(data)
       })
+      setTimeout(() => {
+        // 给表单赋值,在线编辑不知道要怎么赋值？
+        this.formInline = Object.assign({}, data)
+        // 设置授权部门是否可更改和可选范围
+        // 基础信息中的标准等级分类
+        const gradeClassification = JSON.parse(data.businessJson).grade_classification
+        // 基础信息中的授权部门
+        const authDept = JSON.parse(data.businessJson).auth_dept
+        console.log(gradeClassification, authDept)
+        if (gradeClassification === StandardGradeClassify.ZERO_LEVEL.value) {
+          // 选的是0级，授权部门带出发起时填写的数据不可编辑
+          if (!this.formInline.authDept) {
+            // 没有数据，说明不是驳回或者保存，带入发起的
+            this.formInline.authDept = authDept
+          }
+          this.authDeptDisabled = true
+        } else if (gradeClassification === StandardGradeClassify.ONE_LEVEL.value) {
+          // 选的是1级，授权部门带出发起时填写的数据
+          if (!this.formInline.authDept) {
+            // 没有数据，说明不是驳回或者保存，带入发起的
+            this.formInline.authDept = authDept
+          }
+          // 设置可选择项
+          this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',')
+          // 设置授权部门可编辑
+          this.authDeptDisabled = false
+        } else if (gradeClassification === StandardGradeClassify.TWO_LEVEL.value) {
+          // 选的是2级，授权部门带出发起时填写的数据
+          if (!this.formInline.authDept) {
+            // 没有数据，说明不是驳回或者保存，带入发起的
+            this.formInline.authDept = authDept
+          }
+          // 设置可选择项
+          this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',')
+          // 设置授权部门可编辑
+          this.authDeptDisabled = false
+        } else if (gradeClassification === StandardGradeClassify.THREE_LEVEL.value) {
+          // 选的是3级，授权部门带出发起时填写的数据,不可编辑
+          if (!this.formInline.authDept) {
+            // 没有数据，说明不是驳回或者保存，带入发起的
+            this.formInline.authDept = authDept
+          }
+          this.authDeptDisabled = true
+        }
+      }, 500)
     },
     // 外层要获取数据
     getData () {