From 701e7f846f9437adf99cf059f26770ef28b1e7a1 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 13 Nov 2023 09:41:31 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardAnnulFlow.vue           |  2 +-
 .../modules/BaseInfoForm.vue                  | 36 +++++++++----------
 .../FinishTimeChangeBaseInfoDrawer.vue        |  1 +
 .../EnterpriseStandardRecheckFlow.vue         |  2 +-
 .../EnterpriseStandardSealSaveFlow.vue        |  4 +--
 .../EnterpriseStandardStartUseFlow.vue        |  2 +-
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
index 9b87f4d8..0baa2050 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
@@ -313,7 +313,7 @@ export default {
             const paramObj = {} // 需要传给后端的数据
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
-            paramObj.dataList = [data.formInline]
+            paramObj.data = data.formInline
             enStandardAnnulApproval(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
index 889b2a94..8d6273f1 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
@@ -183,13 +183,14 @@
               </span>
             </div>
             <a-form-model-item class="item-model" prop="partName">
-              <a-tree-select v-model="formInline.partName"
-                             :disabled="disabled"
-                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                             style="width: 100%"
-                             :tree-data="partNameOptions"
-                             :label-in-value="false"
-                             :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')" />
+              <tree-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')"
+                              v-model="formInline.partName"
+                              @nameChange="treeSelectNameChange"
+                              filedName="partName"
+                              type="radio"
+                              :nameStr="formInline.partName_dictText"
+                              dict-id="1696007957666533377"
+                              :disabled="disabled" />
             </a-form-model-item>
           </div>
           <!--  主起草人  -->
@@ -332,17 +333,18 @@
 <script>
 import { StandardSource } from '@/enums/commonEnums'
 import { getTreeList, getEnterpriseStandardInfoById } from '@/api/enterpriseStandardLibraryApi'
-import { getFormDictTreeList } from '@/api/api'
 import StandardSelection from '@/components/selection/StandardSelection'
 import UserSelection from '@/components/selection/UserSelection'
 import UploadFile from '@/components/UploadFile'
+import TreeSelection from '@/components/selection/TreeSelection'
 
 export default {
   name: 'BaseInfoForm',
   components: {
     StandardSelection,
     UserSelection,
-    UploadFile
+    UploadFile,
+    TreeSelection
   },
   props: {
     disabled: {
@@ -366,7 +368,6 @@ export default {
       StandardSource,
       loading: false,
       standardSystemOptions: [], // 标准体系下拉框数据
-      partNameOptions: [], // 零部件名称下拉框数据
       formInline: {},
       rules: {
         // 企标编号
@@ -423,8 +424,6 @@ export default {
   mounted () {
     // 获取标准体系下拉框数据
     this.initStandardSystemOptions()
-    // 获取零部件名称下拉框数据
-    this.initPartNameOptions()
   },
   methods: {
     // 获取标准体系下拉框数据
@@ -435,14 +434,6 @@ export default {
         }
       })
     },
-    // 获取零部件名称下拉框数据
-    initPartNameOptions () {
-      getFormDictTreeList({ dictId: '1696821512600637441' }).then(res => {
-        if (res.success) {
-          this.partNameOptions = res.result
-        }
-      })
-    },
     // 选完企标编号了，需要回显内容
     listChange (value) {
       console.log(value)
@@ -472,6 +463,7 @@ export default {
           this.formInline.trialPeriod = result.trial_period
           // 零部件名称
           this.formInline.partName = result.part_name
+          this.formInline.partName_dictText = result.part_name_dictText
           // 主起草人
           this.formInline.mainDraftingUser = result.main_drafting_user
           this.formInline.mainDraftingUser_dictText = result.main_drafting_user_dictText
@@ -493,6 +485,10 @@ export default {
         this.loading = false
       })
     },
+    // 零部件名称选择完成的回调
+    treeSelectNameChange (value, fieldName) {
+      this.formInline[fieldName + '_dictText'] = value
+    },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {
       this.formInline[fieldName + '_dictText'] = value
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
index b676f7a6..a7112035 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
@@ -44,6 +44,7 @@
                          disabled
                          v-model="formInline.originEnStandardName"
                          :maxLength="50"
+                         @change="event => event.target.value = event.target.value.trim()"
                          :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
               </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index 16b9fb0f..d0823bc7 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -335,7 +335,7 @@ export default {
             const paramObj = {} // 需要传给后端的数据
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
-            paramObj.dataList = [data.formInline]
+            paramObj.data = data.formInline
             enStandardRecheckApproval(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
index 56406067..daa537cd 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
@@ -119,7 +119,7 @@ import {
   enStandardSealSaveApproval,
   enStandardSealSaveTurnTo,
   enStandardSealSaveAgree,
-  enStandardSealSaveReject,
+  enStandardSealSaveReject
 } from '@/api/workCenter'
 import BaseInfoForm from './modules/BaseInfoForm'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
@@ -313,7 +313,7 @@ export default {
             const paramObj = {} // 需要传给后端的数据
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
-            paramObj.dataList = [data.formInline]
+            paramObj.data = data.formInline
             enStandardSealSaveApproval(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
index 8692e7cf..9553e784 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
@@ -313,7 +313,7 @@ export default {
             const paramObj = {} // 需要传给后端的数据
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
-            paramObj.dataList = [data.formInline]
+            paramObj.data = data.formInline
             enStandardStartUseApproval(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)