From 3ace5663f861c0c5aa7cd1423d0c1ab0c8eff9af Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 25 Dec 2023 15:41:39 +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=EF=BC=8C=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BC=A0=E6=A0=87=E5=87=86id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workCenter.js                            |  3 +++
 .../EnterpriseRecheckPlanSelectionModal.vue      |  4 ++--
 .../modules/ContactInitBaseInfo.vue              |  2 ++
 .../modules/StandardizationInitBaseInfo.vue      |  2 ++
 .../modules/BaseInfoForm.vue                     | 16 +++++++++++++++-
 .../MainDrafterCollectUploadMinuteBaseInfo.vue   |  8 ++------
 .../modules/MainDrafterSentBaseInfo.vue          |  2 +-
 .../modules/ScorerMarkBaseInfo.vue               |  2 +-
 8 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index 435fb4bd..44ea323b 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -113,6 +113,8 @@ const enStandardRecheckGetDataById = (taskId, params) => getAction(`/process/es/
 const enStandardRecheckGetDataDraft = (params) => getAction('/process/es/recheck/draftHandle', params)
 // 根据dataId查询是否显示第一个节点的人员信息
 const enStandardRecheckIsShowFirstPerson = (params) => getAction('/process/es/recheck/isShowFirstNode', params)
+// 选择企标复审计划，列表获取
+const getEsRecheckPlanList = (params) => getAction('/process/es/recheck/page', params)
 
 // 企标废止流程
 // 保存
@@ -455,6 +457,7 @@ export {
   enStandardRecheckReject,
   enStandardRecheckGetDataDraft,
   enStandardRecheckIsShowFirstPerson,
+  getEsRecheckPlanList,
 
   enStandardAnnulGetDataById,
   enStandardAnnulSave,
diff --git a/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue b/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
index c0f62a73..f74e407f 100644
--- a/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
+++ b/src/components/selection/EnterpriseRecheckPlanSelectionModal.vue
@@ -92,7 +92,7 @@
 
 <script>
 import { queryDepartTreeList } from '@/api/api'
-import { getEnterpriseRecheckPlanPage } from '@/api/enterpriseStandardLibraryApi'
+import { getEsRecheckPlanList } from '@/api/workCenter'
 
 export default {
   name: 'EnterpriseRecheckPlanSelectionModal',
@@ -235,7 +235,7 @@ export default {
       }
       this.selectedRowKeys = []
       this.loading = true
-      getEnterpriseRecheckPlanPage(query).then((res) => {
+      getEsRecheckPlanList(query).then((res) => {
         if (res.success) {
           this.dataList = res.result.records
           this.ipagination.total = res.result.total
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
index c6f4178f..a1d3d612 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
@@ -212,6 +212,8 @@ export default {
     listChange (value) {
       console.log(value)
       this.loading = true
+      // 企标id
+      this.formInline.standardId = value[0].standardId
       // 企标编号
       this.formInline.standardNumber = value[0].standardNo
       // 企标名称
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
index 56e88e4b..63641cd5 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
@@ -128,6 +128,8 @@ export default {
     // 选完企标编号了，需要回显内容,返回流程名称
     listChange (value) {
       console.log(value)
+      // 企标id
+      this.formInline.standardId = value[0].standardId
       // 企标名称
       this.formInline.standardName = value[0].standardName
       // 主起草人赋值给联络人
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
index 4509dba4..faa45691 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
@@ -369,8 +369,8 @@ export default {
     }
   },
   mounted () {
-    this.getForm()
     this.getStandardGradeClassificationArr()
+    this.getForm()
   },
   methods: {
     initData (data) {
@@ -381,6 +381,20 @@ export default {
       }) : []
       this.isEditSetData = false
     },
+    getData () {
+      const formInline = Object.assign({}, this.formInline)
+      Object.keys(formInline).forEach(res => {
+        if (formInline[res] instanceof Array) {
+          if (formInline[res][0] instanceof Object) {
+            // 说明是树选择
+            formInline[res] = formInline[res].map(item => item.value).join(',')
+          } else {
+            formInline[res] = formInline[res].join(',')
+          }
+        }
+      })
+      return formInline
+    },
     // 外层获取数据要过校验,返回false表示没有通过校验
     async getDataValidate () {
       let data = {}
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
index 5b354b22..e3561271 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
@@ -284,7 +284,8 @@ export default {
       loading: false,
       fileMaxSize: undefined,
       image: false,
-      imageUrl: ''
+      imageUrl: '',
+      uploadName: ''
     }
   },
   methods: {
@@ -378,11 +379,6 @@ export default {
     },
     // 点击文件上传
     clickButtonToUpload (fieldName) {
-      if (fieldName === 'uploadAttachment') {
-        this.fileMaxSize = 10
-      } else {
-        this.fileMaxSize = undefined
-      }
       this.$refs.uploadFile.open(this.formInline[fieldName])
       this.uploadName = fieldName
     },
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue
index 3cff55a9..5ebc3416 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue
@@ -125,7 +125,7 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.otherDraftUserVOS = this.dataSource
-      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.formInline)
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
index ab23b796..fc30472e 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
@@ -313,7 +313,7 @@ export default {
         }
       }
       data.reviewMeetingDetails = arr
-      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.formInline)
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验