fix 标准入库/变更、标准征求意见、法规采购流程保存

src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue

@@ -140,6 +140,7 @@ import { downloadFile, getFileAccessHttpUrl } from '../../../api/manage.js'
 import { previewPdf } from '../../../utils/previewPdf.js'
 import { Base64 } from 'js-base64'
 import { kkFilePreview } from '../../../utils/kkFilePreview'
+import { previewFileCurrentWindowByFileId } from '../../../utils/util'
 
 // 国内标准权限
 const DomesticStandardPermission = {
@@ -251,6 +252,16 @@ export default {
     }
   },
   async created () {
+    // 如果是要直接看文件
+    // if (this.$route.query.viewFile) {
+    //   // TODO 这里需要调一个接口，通过标准id按规则获取文件
+    //   const fileId = '1734843741558288385'
+    //   previewFileCurrentWindowByFileId(fileId).then(() => {
+    //   }).catch((message) => {
+    //     this.$message.warning(message)
+    //   })
+    //   return
+    // }
     await this.initForm()
     this.initDetailData()
   },

src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue

@@ -140,7 +140,8 @@
                 <user-selection v-decorator="['moduleOwnerId', validatorRules.moduleOwnerId]"
                                 :name-str="dispatchInfo.moduleOwnerId_dictText"
                                 type="checkbox"
-                                :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.moduleOwner')" />
+                                :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.moduleOwner')"
+                                @nameChange="handleModuleOwnerNameChange" />
               </a-form-item>
             </div>
             <!--下发人员类型选了模块负责人或者模块负责人分发节点都显示这个选项-->
@@ -151,7 +152,8 @@
                 <user-selection v-decorator="['designEngineerId', validatorRules.designEngineerId]"
                                 :name-str="dispatchInfo.designEngineerId_dictText"
                                 type="checkbox"
-                                :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')" />
+                                :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')"
+                                @nameChange="handleDesignEngineerNameChange" />
               </a-form-item>
             </div>
           </div>
@@ -977,6 +979,7 @@ export default {
         basicServiceInfo = Object.assign(this.basicServiceInfo, this.basicServiceInfoForm.getFieldsValue())
         // 流程审批信息
         approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
+        approvalInfo.finishFlag = 1 // 保存——1；提交/同意/驳回——2
         // 业务分派信息
         if (this.showDispatchInformation) {
           dispatchInfo = Object.assign(this.dispatchInfo, this.dispatchInfoForm.getFieldsValue())
@@ -1012,6 +1015,7 @@ export default {
         this.approvalInfoForm.validateFields((errors, values) => {
           if (!errors) {
             approvalInfo = Object.assign(this.approvalInfo, values)
+            approvalInfo.finishFlag = 2 // 保存——1；提交/同意/驳回——2
           } else {
             flag = false
           }
@@ -1248,6 +1252,20 @@ export default {
      */
     consultationDueDateDisabledDate (current) {
       return current && current < moment().subtract(1, 'days').endOf('day')
+    },
+    /**
+     * 模块负责人名字
+     * @param name
+     */
+    handleModuleOwnerNameChange (name) {
+      this.dispatchInfo.moduleOwnerId_dictText = name
+    },
+    /**
+     * 设计工程师名字
+     * @param name
+     */
+    handleDesignEngineerNameChange (name) {
+      this.dispatchInfo.designEngineerId_dictText = name
     }
   }
 }

src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue

@@ -846,6 +846,7 @@ export default {
         if (!errors) {
           formData.basicTaskInfoDTO = Object.assign(this.approvalInfo, values)
           formData.basicTaskInfoDTO.taskId = this.$route.query.taskId
+          formData.basicTaskInfoDTO.finishFlag = 2 // 保存——1；提交/同意/驳回——2
         } else {
           flag = false
           this.$message.warning(this.$t('pleaseEnterRemarks'))
@@ -890,7 +891,10 @@ export default {
           businessMap: formInline,
           id: this.businessId
         }, // 业务信息
-        basicTaskInfoDTO: Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue(), { taskId: this.$route.query.taskId }), // 流程审批信息
+        basicTaskInfoDTO: Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue(), {
+          taskId: this.$route.query.taskId,
+          finishFlag: 1 // 保存——1；提交/同意/驳回——2
+        }), // 流程审批信息
         userInfoMap: this.$refs.personnelInfo.getDataObj() // 用户信息
       }
       const params = { ...formData.basicProcessInfoDTO, ...this.formInline, ...formData.basicTaskInfoDTO }

src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue

@@ -364,6 +364,7 @@ export default {
         businessInfo = this.dataSource
         approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue())
         approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId
+        approvalInfo.finishFlag = 1 // 保存——1；提交/同意/驳回——2
         userInfoMap = this.$refs.personnelInfo.getDataObj()
         const params = { ...processInfo, ...businessInfo, ...approvalInfo, ...userInfoMap }
         if (!Object.values(params).some(tt => !!tt || (tt && tt.length > 0))) {
@@ -391,6 +392,7 @@ export default {
           if (!errors) {
             approvalInfo = Object.assign(this.approvalInfo, values)
             approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId
+            approvalInfo.finishFlag = 2 // 保存——1；提交/同意/驳回——2
           } else {
             flag = false
             this.$message.warning(this.$t('pleaseEnterRemarks'))