From 288f9a6ef852a46985bd27ebcb7e20aae1e357e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Tue, 28 Nov 2023 13:49:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E6=B3=95=E8=A7=84=E9=87=87=E8=B4=AD=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardEntryOrChangeProcess.vue          | 31 +++++++++++++------
 .../StandardProcurementProcess.vue            | 22 ++++++++-----
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 63b5fd48..77e7eb28 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -174,7 +174,7 @@
                                 v-model="formInline[item.dbFieldName]" :rows="4" />
                     <!--   6, 标准多选  -->
                     <standard-selection v-else-if="item.fieldShowType === FieldType.STANDARD_MORE.value"
-                                        :source="formInline.source"
+                                        :source="getStandardSource(item)"
                                         :disabledSourceSearch="true"
                                         :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
                                         :exclude-standard-numbers="excludeStandardFields.includes(item.dbFieldName) ? excludeStandardNumbers : null"
@@ -464,13 +464,21 @@ export default {
   },
   created () {
     if (this.$route.query.processInstanceId || this.$route.query.draftId) {
+      this.currentNode = this.$route.query.nodeId || FGEntryChangeProcessNode.initiate.value
       this.initProcessData()
     } else {
       this.currentNode = FGEntryChangeProcessNode.initiate.value
-      this.btnList = FGEntryChangeProcessNode.initiate.btn
       // 默认选中国内
       this.initDomesticStandardForm()
     }
+    // 获取按钮清单
+    const btnList = FGEntryChangeProcessNode.propertyOfValue('btn', this.currentNode)
+    if (btnList && btnList.length > 0) {
+      this.btnList = btnList
+    } else {
+      this.btnList = FGEntryChangeProcessNode.approve.btn
+    }
+    this.disabled = FGEntryChangeProcessNode.propertyOfValue('disabled', this.currentNode) || false
     // 获取人员信息
     this.getPersonInfoStructure(ProcessKey.FB_ENTRY_CHANGE.value, () => {
       this.initPersonInfoData(this.currentNode === FGEntryChangeProcessNode.initiate.value)
@@ -528,14 +536,6 @@ export default {
               this.formInline[field.dbFieldName] = this.formInline[field.dbFieldName] || null
             })
           })
-          // 获取按钮清单
-          const btnList = FGEntryChangeProcessNode.propertyOfValue('btn', this.$route.query.nodeId)
-          if (btnList && btnList.length > 0) {
-            this.btnList = btnList
-          } else {
-            this.btnList = FGEntryChangeProcessNode.approve.btn
-          }
-          this.disabled = FGEntryChangeProcessNode.propertyOfValue('disabled', this.$route.query.nodeId) || false
         } else {
           this.$message.warning(res.message)
           this.loading = false
@@ -1063,6 +1063,17 @@ export default {
       }).finally(() => {
         this.loading = false
       })
+    },
+    /**
+     * 处理关联海外标准的特殊逻辑
+     * @param item
+     * @returns {*|string}
+     */
+    getStandardSource (item) {
+      if (item.dbFieldName === 'associated_foreign_standards') {
+        return StandardSource.OVERSEAS.value
+      }
+      return this.formInline.source
     }
   }
 }
diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
index 420dce76..7a60ca5c 100644
--- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
+++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
@@ -252,7 +252,7 @@ export default {
   },
   created () {
     if (this.$route.query.processInstanceId || this.$route.query.draftId) {
-      this.currentNode = this.$route.query.nodeId
+      this.currentNode = this.$route.query.nodeId || ProcurementProcessNodes.initiate.value
       this.initProcessInfo()
     } else {
       this.currentNode = ProcurementProcessNodes.initiate.value
@@ -277,11 +277,17 @@ export default {
         this.$message.warning(this.$t('selectARecord'))
         return
       }
-      const data = JSON.parse(JSON.stringify(this.dataSource))
-      this.dataSource = data.map((tt, index) => {
-        return this.selectedRowKeys.includes(index) ? null : tt
-      }).filter(tt => !!tt)
-      this.selectedRowKeys = []
+      this.$confirm({
+        title: this.$t('confirmBatchDeletion'),
+        content: this.$t('deleteAData'),
+        onOk: () => {
+          const data = JSON.parse(JSON.stringify(this.dataSource))
+          this.dataSource = data.map((tt, index) => {
+            return this.selectedRowKeys.includes(index) ? null : tt
+          }).filter(tt => !!tt)
+          this.selectedRowKeys = []
+        }
+      })
     },
     handleEdit (record, index) {
       this.$refs.modalForm.edit(record, index)
@@ -290,7 +296,7 @@ export default {
       this.$confirm({
         title: this.$t('confirmDeletion'),
         content: this.$t('areYouSure'),
-        ok: () => {
+        onOk: () => {
           this.dataSource.splice(index, 1)
         }
       })
@@ -539,7 +545,7 @@ export default {
         // 销毁这个提示
         modalLoading.destroy()
       })
-    },
+    }
   }
 }
 </script>