From dda917177d840b9bf8c6c3103971fb516452f930 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Sat, 16 May 2026 17:08:33 +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        | 43 +++++++++----------
 .../binTransfer/components/addEditDialog.vue  |  2 +-
 .../components/addDialog.vue                  |  4 +-
 .../basic/nonSameFurnace.vue                  | 10 +++--
 .../basic/oemProcess.vue                      |  2 +-
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index f6d07a7a..2e7741d3 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -16,7 +16,6 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      :before-open="beforeOpen"
       @on-load="onLoad"
       @sort-change="sortChange"
       :permission="permissionList"
@@ -384,7 +383,7 @@ export default {
             label: '班组长',
             prop: 'teamLeader',
             search: false,
-            type: 'select',
+            // type: 'select',
             sortable: 'custom',
             filter: true,
             span: 12,
@@ -396,12 +395,12 @@ export default {
                 trigger: 'blur',
               },
             ],
-            dicUrl: '/api/blade-system/user/page?current=1&size=9999',
-            props: {
-              label: 'realName',
-              value: 'id',
-              res: 'data.records',
-            },
+            // dicUrl: '/api/blade-system/user/page?current=1&size=9999',
+            // props: {
+            //   label: 'realName',
+            //   value: 'id',
+            //   res: 'data.records',
+            // },
           },
           {
             label: '计划员',
@@ -409,7 +408,7 @@ export default {
             search: false,
             sortable: 'custom',
             filter: true,
-            type: 'select',
+            // type: 'select',
             span: 12,
             width: 100,
             rules: [
@@ -419,12 +418,12 @@ export default {
                 trigger: 'blur',
               },
             ],
-            dicUrl: '/api/blade-system/user/page?current=1&size=9999',
-            props: {
-              label: 'realName',
-              value: 'id',
-              res: 'data.records',
-            },
+            // dicUrl: '/api/blade-system/user/page?current=1&size=9999',
+            // props: {
+            //   label: 'realName',
+            //   value: 'id',
+            //   res: 'data.records',
+            // },
           },
           {
             label: '调度员',
@@ -433,7 +432,7 @@ export default {
             sortable: 'custom',
             filter: true,
             remote: true,
-            type: 'select',
+            // type: 'select',
             span: 12,
             width: 100,
             rules: [
@@ -443,12 +442,12 @@ export default {
                 trigger: 'blur',
               },
             ],
-            dicUrl: '/api/blade-system/user/page?current=1&size=9999&realName={{key}}',
-            props: {
-              label: 'realName',
-              value: 'id',
-              res: 'data.records',
-            },
+            // dicUrl: '/api/blade-system/user/page?current=1&size=9999&realName={{key}}',
+            // props: {
+            //   label: 'realName',
+            //   value: 'id',
+            //   res: 'data.records',
+            // },
           },
           {
             label: '班组人员',
diff --git a/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue b/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue
index da60b404..9c92b1c0 100644
--- a/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue
+++ b/src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
+  <el-dialog :title="title" append-to-body :modelValue="openShow" width="90%" @close="closeDialog">
     <div style="margin-bottom: 12px" v-if="title == '新增'">
       <el-button type="primary" @click="addTable">插入一行</el-button>
       <el-button type="danger" @click="delTable">删除选中行</el-button>
diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
index 518b8b10..4304d726 100644
--- a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
+++ b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
@@ -113,8 +113,8 @@ export default {
 
                 column: [
                     {
-                        label: '车间订单号',
-                        prop: 'woCode',
+                        label: '生产单号',
+                        prop: 'yoCode',
                         width: 150,
                         search: false,
                     },
diff --git a/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue b/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
index 7f0527c0..694e62f9 100644
--- a/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
+++ b/src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
@@ -133,6 +133,8 @@ export default {
             span: 12,
             type: 'select',
             filterable: true,
+            hide:true,
+            width:150,
             dicUrl: '/blade-scheduling/processSet/findList',
             props: {
               label: 'name',
@@ -155,8 +157,8 @@ export default {
             search: false,
             sortable: 'custom',
             span: 12,
-            hide:true,
             display:false,
+            width:150,
           },
           {
             label: '工艺能力',
@@ -167,6 +169,7 @@ export default {
             width:120,
             type: 'select',
             filterable: true,
+            hide:true,
             dicUrl: '/blade-scheduling/craftAbility/findList',
             props: {
               label: 'caName',
@@ -189,8 +192,9 @@ export default {
             search: false,
             sortable: 'custom',
             span: 12,
-            hide:true,
-            display:false
+            // hide:true,
+            display:false,
+            width: 120,
           },
           {
             label: '影响因素',
diff --git a/src/views/productionSchedulingPlan/basic/oemProcess.vue b/src/views/productionSchedulingPlan/basic/oemProcess.vue
index 20676f1f..3ac46935 100644
--- a/src/views/productionSchedulingPlan/basic/oemProcess.vue
+++ b/src/views/productionSchedulingPlan/basic/oemProcess.vue
@@ -195,7 +195,7 @@ export default {
             return false
         }
          const item = val.dic.find(dic => dic.id === val.value);
-         this.form.processName = selectedNames.name
+         this.form.processName = item.name
         // // 筛选选中id对应的名称并拼接
         // const selectedNames = val.value.map(id => {
         //     const item = val.dic.find(dic => dic.id === id);