From 785aba4f6030ce7bd352460961898f29c7d53584 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 10 Sep 2025 16:47:04 +0800
Subject: [PATCH] =?UTF-8?q?v1.9=20=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contract/purchaseApprovers.vue | 28 ++++++++++++-------
 src/views/contract/addContractList.vue        |  2 +-
 src/views/mall/shopManageList.vue             | 21 +++++++-------
 src/views/oa/newOaWorkflowDetailList.vue      |  8 ++++--
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/components/contract/purchaseApprovers.vue b/src/components/contract/purchaseApprovers.vue
index a8dd9595b..7e07a400c 100644
--- a/src/components/contract/purchaseApprovers.vue
+++ b/src/components/contract/purchaseApprovers.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="box-card">
-    <div slot="header" class="clearfix">
+    <div slot="header" class="flex justify-between">
       <span>{{ $t('purchaseApprovers.title') }}</span>
     </div>
 
@@ -34,29 +34,27 @@
         </el-form-item>
       </el-form>
     </div>
+    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff" />
+
   </el-card>
 </template>
 
 <script>
 import { getFirstStaff } from '@/api/contract/contractChangeDetailApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import SelectStaff from '@/components/staff/SelectStaff'
 
 export default {
   name: 'PurchaseApprovers',
   props: {
-    callBackListener: {
-      type: String,
-      default: ''
-    },
-    callBackFunction: {
-      type: String,
-      default: ''
-    },
     flowType: {
       type: String,
       default: '60006'
     }
   },
+  components: {
+    SelectStaff
+  },
   data() {
     return {
       purchaseApproversInfo: {
@@ -117,8 +115,18 @@ export default {
         this.$emit(this.callBackListener, this.callBackFunction, this.purchaseApproversInfo)
       }
     },
+    handleSelectStaff(staff) {
+      this.purchaseApproversInfo.staffId = staff.userId
+      this.purchaseApproversInfo.staffName = staff.userName
+      this.$emit('notify3', {
+        staffId: staff.userId,
+        staffName: staff.userName
+      })
+
+    },
     chooseStaff() {
-      this.$emit('openSelectStaff', this.purchaseApproversInfo)
+      this.$refs.selectStaff.open(this.purchaseApproversInfo)
+
     }
   }
 }
diff --git a/src/views/contract/addContractList.vue b/src/views/contract/addContractList.vue
index dab4ba75a..339cacace 100644
--- a/src/views/contract/addContractList.vue
+++ b/src/views/contract/addContractList.vue
@@ -182,7 +182,7 @@
 
     <!-- Related Rooms -->
     <el-card class="box-card" style="margin-top:20px">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('contract.relatedRooms') }}</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="_selectRoom">
           <i class="el-icon-plus"></i>{{ $t('contract.add') }}
diff --git a/src/views/mall/shopManageList.vue b/src/views/mall/shopManageList.vue
index e9d64a718..59863edb7 100644
--- a/src/views/mall/shopManageList.vue
+++ b/src/views/mall/shopManageList.vue
@@ -11,8 +11,8 @@
             @keyup.enter.native="handleSearch" />
         </el-col>
         <el-col :span="6">
-          <el-select v-model="searchForm.storeType" style="width: 100%;" :placeholder="$t('shopManage.search.storeType')" clearable>
-            <el-option v-for="item in storeTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
+          <el-select v-model="searchForm.shopType" style="width: 100%;" :placeholder="$t('shopManage.search.storeType')" clearable>
+            <el-option v-for="item in shopTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -60,7 +60,8 @@
 </template>
 
 <script>
-import { getShopList, getStoreTypes } from '@/api/mall/shopManageApi'
+import { getShopList } from '@/api/mall/shopManageApi'
+import {getDict} from '@/api/community/communityApi'
 import ShopWithdraw from '@/components/mall/ShopWithdraw'
 
 export default {
@@ -73,11 +74,11 @@ export default {
       loading: false,
       searchForm: {
         shopName: '',
-        storeType: '',
+        shopType: '',
         state: '',
         mallApiCode: 'queryShopsByAdminBmoImpl'
       },
-      storeTypes: [],
+      shopTypes: [],
       tableData: [],
       page: {
         current: 1,
@@ -87,7 +88,7 @@ export default {
     }
   },
   created() {
-    this.getStoreTypes()
+    this.getShopTypes()
     this.getList()
   },
   methods: {
@@ -108,12 +109,12 @@ export default {
         this.loading = false
       }
     },
-    async getStoreTypes() {
+    async getShopTypes() {
       try {
-        const data = await getStoreTypes()
-        this.storeTypes = data
+        const data = await getDict('s_shop','stop_type')
+        this.shopTypes = data
       } catch (error) {
-        this.$message.error(this.$t('shopManage.fetchStoreTypesError'))
+        this.$message.error(this.$t('shopManage.fetchShopTypesError'))
       }
     },
     handleSearch() {
diff --git a/src/views/oa/newOaWorkflowDetailList.vue b/src/views/oa/newOaWorkflowDetailList.vue
index f236f878d..49ff8f687 100644
--- a/src/views/oa/newOaWorkflowDetailList.vue
+++ b/src/views/oa/newOaWorkflowDetailList.vue
@@ -158,14 +158,16 @@
       </el-col>
     </el-row>
 
-    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff"/>
+    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff" />
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import { queryOaWorkflowForm, queryOaWorkflowFormData, queryOaWorkflowUser, 
-  getNextTask, auditOaWorkflow, listRunWorkflowImage } from '@/api/oa/newOaWorkflowDetailApi'
+import {
+  queryOaWorkflowForm, queryOaWorkflowFormData, queryOaWorkflowUser,
+  getNextTask, auditOaWorkflow, listRunWorkflowImage
+} from '@/api/oa/newOaWorkflowDetailApi'
 import SelectStaff from '@/components/staff/SelectStaff'
 
 export default {