From d7a5ee8f058177f23dee48c27f4f36ae33ec512c Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 23 Apr 2026 20:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/teamManagement.vue        |  11 +-
 src/views/oem/oemCustomer/index.vue           |   3 +
 src/views/oem/oemCustomer/setCraftAbility.vue | 150 +++++++++++-------
 3 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index bd3c40ed..50da3e45 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -520,16 +520,7 @@ export default {
               },
             ],
           },
-          {
-            label: '修改时间',
-            prop: 'updateTime',
-            span: 12,
-            overflow: true,
-            search: false,
-             width: 150,
-             addDisplay: false,
-             editDisplay: false,
-          },
+          
         ],
       },
       selectionList: [],
diff --git a/src/views/oem/oemCustomer/index.vue b/src/views/oem/oemCustomer/index.vue
index 35484f56..b38aba31 100644
--- a/src/views/oem/oemCustomer/index.vue
+++ b/src/views/oem/oemCustomer/index.vue
@@ -160,6 +160,7 @@ export default {
             sortable: true,
             search: true,
             overHidden: true,
+            width: 120,
             rules: [
               {
                 required: true,
@@ -175,6 +176,7 @@ export default {
             search: false,
             overHidden: true,
             hide: true,
+            width: 120,
             rules: [
               {
                 required: true,
@@ -189,6 +191,7 @@ export default {
             sortable: true,
             search: false,
             overHidden: true,
+            width: 120,
             rules: [
               {
                 required: true,
diff --git a/src/views/oem/oemCustomer/setCraftAbility.vue b/src/views/oem/oemCustomer/setCraftAbility.vue
index aa246bd8..00118923 100644
--- a/src/views/oem/oemCustomer/setCraftAbility.vue
+++ b/src/views/oem/oemCustomer/setCraftAbility.vue
@@ -36,16 +36,52 @@
           </el-table-column>
           <el-table-column align="center" label="计划员" prop="planner">
             <template #default="scope">
-                <el-select v-model="scope.row.planner" remote filterable :remote-method="getPlanner">
+                <jhSelect
+                    :value="scope.row.planner"
+                    @input="val => (scope.row.planner = val)"
+                    placeholder="请搜索选择"
+                    api-url="/blade-system/user/page"
+                    echo-api="/blade-system/user/page"
+                    echoParamsKey="ids"
+                    echo-method="get"
+                    api-method="get"
+                    list-key="records"
+                    total-key="total"
+                    label-key="realName"
+                    value-key="id"
+                    search-key="id"
+                    :debounce-time="500"
+                    @change="changeTeacher"
+                    :title="'修改'"
+                />
+                <!-- <el-select v-model="scope.row.planner" remote filterable :remote-method="getPlanner">
                     <el-option v-for="item in plannerList" :key="item.id" :label="item.realName" :value="item.id"></el-option>
-                </el-select>
+                </el-select> -->
             </template>
           </el-table-column>
           <el-table-column align="center" label="调度员" prop="dispatcher">
             <template #default="scope">
-                <el-select v-model="scope.row.dispatcher" remote filterable :remote-method="getDispatcher">
+                <!-- <el-select v-model="scope.row.dispatcher" remote filterable :remote-method="getDispatcher">
                     <el-option v-for="item in dispatcherList" :key="item.id" :label="item.realName" :value="item.id"></el-option>
-                </el-select>
+                </el-select> -->
+                <jhSelect
+                    :value="scope.row.dispatcher"
+                    @input="val => (scope.row.dispatcher = val)"
+                    placeholder="请搜索选择"
+                    api-url="/blade-system/user/page"
+                    echo-api="/blade-system/user/page"
+                    echoParamsKey="ids"
+                    echo-method="get"
+                    api-method="get"
+                    list-key="records"
+                    total-key="total"
+                    label-key="realName"
+                    value-key="id"
+                    search-key="id"
+                    :debounce-time="500"
+                    @change="changeTeacher"
+                    :title="'修改'"
+                />
             </template>
           </el-table-column>
           <el-table-column align="center" label="是否大批量" prop="isBatch">
@@ -66,6 +102,7 @@
 </template>
 <script>
 import {getCraftAbility,getAbility,getAllUser,saveCraft} from "@/api/basicData/oemCustomer"
+import jhSelect from '@/components/jh-select/index.vue';
 export default {
     props: {
         setCraftAbilityOpen: {
@@ -77,6 +114,9 @@ export default {
             default: null
         }
     },
+    components: {
+        jhSelect
+    },
     data() {
         return {
             setCrewShow: false,
@@ -104,66 +144,66 @@ export default {
                 id:this.ocId
             })
             this.capacityList = res.data.data
-            const user = await getAllUser({current:1,size:9999})
-            this.plannerList = user.data.data.records
-            this.dispatcherList = user.data.data.records
+            // const user = await getAllUser({current:1,size:9999})
+            // this.plannerList = user.data.data.records
+            // this.dispatcherList = user.data.data.records
             this.capacityList.map(item =>{
-                item.dispatcher = item.dispatcher + ''
-                item.planner = item.planner + ''
+                item.dispatcher = item.dispatcher==null||item.dispatcher==-1?'':item.dispatcher + ''
+                item.planner = item.planner==null||item.planner==-1?'':item.planner + ''
                 item.isBatch = item.isBatch == '1' ? true : false
                 item._select = false
-                if(item.dispatcherName != ''){
-                    getAllUser({realName:item.dispatcherName}).then(res =>{
-                        const mergedData = [...this.dispatcherList, ...res.data.data.records];
-                        const uniqueData = Array.from(
-                        new Map(mergedData.map(item => [item.id, item])).values()
-                        );
-                        this.dispatcherList = uniqueData
-                    })
-                }
-                if(item.plannerName != ''){
-                    getAllUser({realName:item.plannerName}).then(res =>{
-                        const mergedData = [...this.plannerList, ...res.data.data.records];
-                        const uniqueData = Array.from(
-                        new Map(mergedData.map(item => [item.id, item])).values()
-                        );
-                        this.plannerList = uniqueData
-                    })
-                }
+                // if(item.dispatcherName != ''){
+                //     getAllUser({realName:item.dispatcherName}).then(res =>{
+                //         const mergedData = [...this.dispatcherList, ...res.data.data.records];
+                //         const uniqueData = Array.from(
+                //         new Map(mergedData.map(item => [item.id, item])).values()
+                //         );
+                //         this.dispatcherList = uniqueData
+                //     })
+                // }
+                // if(item.plannerName != ''){
+                //     getAllUser({realName:item.plannerName}).then(res =>{
+                //         const mergedData = [...this.plannerList, ...res.data.data.records];
+                //         const uniqueData = Array.from(
+                //         new Map(mergedData.map(item => [item.id, item])).values()
+                //         );
+                //         this.plannerList = uniqueData
+                //     })
+                // }
             })
             this.setCrewShow = this.setCraftAbilityOpen
         },
         getPlanner(query){
-            if(query == ''){
-                getAllUser({
-                    current:1,
-                    size:9999
-                }).then(res =>{
-                    this.plannerList = res.data.data.records
-                })
-            }else{
-                getAllUser({
-                    realName:query
-                }).then(res =>{
-                    this.plannerList = res.data.data.records
-                })
-            }
+            // if(query == ''){
+            //     getAllUser({
+            //         current:1,
+            //         size:9999
+            //     }).then(res =>{
+            //         this.plannerList = res.data.data.records
+            //     })
+            // }else{
+            //     getAllUser({
+            //         realName:query
+            //     }).then(res =>{
+            //         this.plannerList = res.data.data.records
+            //     })
+            // }
         },
         getDispatcher(query){
-            if(query == ''){
-                getAllUser({
-                    current:1,
-                    size:9999
-                }).then(res =>{
-                    this.dispatcherList = res.data.data.records
-                })
-            }else{
-                getAllUser({
-                    realName:query
-                }).then(res =>{
-                    this.dispatcherList = res.data.data.records
-                })
-            }
+            // if(query == ''){
+            //     getAllUser({
+            //         current:1,
+            //         size:9999
+            //     }).then(res =>{
+            //         this.dispatcherList = res.data.data.records
+            //     })
+            // }else{
+            //     getAllUser({
+            //         realName:query
+            //     }).then(res =>{
+            //         this.dispatcherList = res.data.data.records
+            //     })
+            // }
         },
         insertEvent(){
             const record = { _select: false };