Merge remote-tracking branch 'origin/main'

src/api/workCenter.js

@@ -222,7 +222,7 @@ const refusalInspectPlan = (params) => postAction('/process/esInspectPlanFlow/fl
 // 审批
 const approvalInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowApproval', params)
 // 转办
-const transferInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowTransfer', params)
+const transferInspectPlan = (params) => getAction('/process/esInspectPlanFlow/flowTransfer', params)
 // 保存
 const saveInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowSave', params)
 // 稽查计划表-添加

src/views/system/UserAnnouncementDetail.vue

@@ -7,9 +7,7 @@
           <span>{{ $t('message.my.notificationTime') }}：{{ model.sendTime }}</span>
         </div>
       </div>
-      <div class="msg-content">
-        {{ model.msgContent }}
-      </div>
+      <div class="msg-content" v-html="model.msgContent"></div>
     </div>
   </internal-detail-page>
 </template>

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -226,9 +226,8 @@ export default {
     // 查询人员信息
     this.getPersonInfoStructure(ProcessKey.ES_Inspection_Plan.value)
     // 如果是待办进来，就获取详情数据
-    const { projectId, taskId } = this.$route.query
-    if (projectId || taskId) {
-      this.loadPage({ projectId, taskId })
+    if (this.$route.query.projectId) {
+      this.loadPage()
       return
     }
     this.getProjectId()
@@ -253,9 +252,14 @@ export default {
     /**
      * 获取页面详情
      */
-    loadPage (params) {
-      this.currentNode = this.$route.query.nodeId
-      this.projectId = this.$route.query.projectId
+    loadPage () {
+      let { projectId, taskId, nodeId } = this.$route.query
+      // 草稿进来没有nodeId，就默认发起节点
+      if (!nodeId) {
+        nodeId = EsInspectionPlan.initiate.value
+      }
+      this.currentNode = nodeId
+      this.projectId = projectId
       this.initPersonInfoData(this.currentNode === EsInspectionPlan.initiate.value)
       switch (this.currentNode) {
         case EsInspectionPlan.initiate.value:
@@ -275,14 +279,25 @@ export default {
           break
       }
       this.loading = true
-      getInspectPlanDetail(params).then(res => {
+      getInspectPlanDetail({
+        projectId,
+        taskId
+      }).then(res => {
         if (res.success) {
           const data = res.result || {}
           this.info = data
-          this.processInfoForm.setFieldsValue({
-            prcName: data.processAll.prcName,
-            dueTime: data.processAll.dueTime,
-            prcMes: data.processAll.prcMes
+          this.$nextTick(() => {
+            this.processInfoForm.setFieldsValue({
+              prcName: data.processAll.prcName,
+              dueTime: data.processAll.dueTime,
+              prcMes: data.processAll.prcMes
+            })
+          })
+          this.$nextTick(() => {
+            this.approvalInfoForm.setFieldsValue({
+              commitText: data.processApprovalRecord.commitText,
+              commitFile: data.processApprovalRecord.commitFile
+            })
           })
         }
       }).finally(() => {
@@ -334,6 +349,9 @@ export default {
             if (params.map.pass) {
               params.map.pass = params.map.pass + '' === '1'
             }
+            if (params.map.involveList && typeof params.map.involveList === 'string') {
+              params.map.involveList = params.map.involveList.split(',')
+            }
             resolve(params)
           }).catch(err => {
             reject(err)
@@ -354,7 +372,7 @@ export default {
             personnelObj.opinionFillList = this.$refs.inspectionPlanTable.dataSource.map(item => item.objectOfConsultation)
           }
           params.processAll = Object.assign({}, this.info.processAll, this.processInfoForm.getFieldsValue())
-          if (params.processAll.dueTime && params.processAll.dueTime.includes(' 00:00:00')) {
+          if (params.processAll.dueTime && !params.processAll.dueTime.includes(' 00:00:00')) {
             params.processAll.dueTime = params.processAll.dueTime + ' 00:00:00'
           }
           params.processAll.projectId = this.projectId
@@ -365,6 +383,9 @@ export default {
           if (params.map.pass) {
             params.map.pass = params.map.pass + '' === '1'
           }
+          if (params.map.involveList && typeof params.map.involveList === 'string') {
+            params.map.involveList = params.map.involveList.split(',')
+          }
           resolve(params)
         }
       })
@@ -378,17 +399,14 @@ export default {
     /**
      * 转办
      */
-    continueTurnTo () {
+    continueTurnTo (userId) {
       if (this.loading) return
       this.loading = true
-      // const params = {
-      //   taskId: this.$route.query.taskId,
-      //   userId: this.$route.query.taskId,
-      // }
-      this.getPageParams().then(res => {
-        console.log(res)
-        return transferInspectPlan(res)
-      }).then(res => {
+      const params = {
+        taskId: this.$route.query.taskId,
+        userId
+      }
+      transferInspectPlan(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
           this.goBack()

src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue

@@ -52,7 +52,7 @@
           <!--  所属部门  -->
           <a-form-item :label="$t('workCenter.esInspectionPlan.department')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-select-depart :placeholder="$t('pleaseSelect') + $t('workCenter.esInspectionPlan.inspectionBasisStandardNumber')"
-                             multi :disabled="disabled"
+                             :disabled="disabled"
                              v-decorator="['belongDept', validatorRules.department]" />
           </a-form-item>
           <!--  计划稽查日期  -->

src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue

@@ -4,7 +4,7 @@
       <!--  新增  -->
       <a-button icon="plus" type="primary" @click="handleAdd" v-has="'enterpriseStandard:add'">{{ $t('newlyAdded') }}</a-button>
       <!--  导入  -->
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :data="projectId" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button icon="upload" type="primary" ghost v-has="'enterpriseStandard:upload'">{{ $t('import') }}</a-button>
       </a-upload>
       <!--  批量删除  -->
@@ -45,14 +45,14 @@
         <!--  操作  -->
         <template slot="action" slot-scope="{text, record, index}">
           <!--  编辑 and 删除:节点1 或 节点3 或 节点2且当前登录人是创建人  -->
-          <template v-if="isInitiateOrLiaisonCollect || (currentNode === EsInspectionPlan.fillInComments.value && $store.getters.userInfo.id === record.userId)">
+          <template v-if="isInitiateOrLiaisonCollect || (currentNode === EsInspectionPlan.fillInComments.value && $store.getters.userInfo.username === record.createBy)">
             <a @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
             <a-divider type="vertical" />
             <a @click="handleDelete(record, index)" >{{ $t('delete') }}</a>
           </template>
           <!--  意见 or 填写意见：节点2非自己创建的就是意见和填写意见  -->
           <template v-else-if="currentNode === EsInspectionPlan.fillInComments.value">
-            <a v-if="record.processEsInspectPlanOpinionList.length" @click="handleShowOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.opinion') }}</a>
+            <a v-if="record.processEsInspectPlanOpinionList && record.processEsInspectPlanOpinionList.length" @click="handleShowOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.opinion') }}</a>
             <a v-else @click="handleWriteOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.writeOpinion') }}</a>
           </template>
         </template>