From 00d981595e5c91b2f18534242fc4114bd2ba396a Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Thu, 27 Feb 2025 10:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/instockOrderCopy/index.vue  | 23 ++++++++++++++++++---
 src/views/wms/linkage/index.vue           | 21 +++++++++++++++++--
 src/views/wms/outstockOrderCopy/index.vue | 25 +++++++++++++++++++----
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 1e26ccd..c635982 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -188,7 +188,7 @@
             />
           </el-select>
         </el-form-item> -->
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -222,7 +222,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" prop="materialId">
+          <el-table-column label="物料编码" prop="materialId">
             <template #default="scope">
               <el-select
                 v-model="scope.row.materialId"
@@ -231,7 +231,24 @@
               >
                 <el-option
                   v-for="i in materialList"
-                  :label="i.materialCode"
+                  :label="i.materialCode +'('+ i.materialName+')'"
+                  :value="i.materialId"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="物料名称">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialId"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialName"
                   :value="i.materialId"
                   :key="i.materialId"
                 />
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index be29ccb..9d9e52c 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -213,7 +213,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" prop="materialId">
+          <el-table-column label="物料code" prop="materialId">
             <template #default="scope">
               <el-select
                 v-model="scope.row.materialId"
@@ -222,7 +222,24 @@
               >
                 <el-option
                   v-for="i in materialList"
-                  :label="i.materialCode"
+                  :label="i.materialCode+'('+i.materialName+')'"
+                  :value="i.materialId"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="物料名称">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialId"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialName"
                   :value="i.materialId"
                   :key="i.materialId"
                 />
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index a8fcb42..9febed9 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -195,7 +195,7 @@
         </el-row>
         <el-table :data="dialogtable" style="width: 100%">
           <el-table-column label="物料大类" prop="materialCategories">
-            <el-select v-model="dialogForm.materialCategories" placeholder="" :disabled="true">
+            <el-select v-model="dialogForm.materialCategories" placeholder="" :disabled="true" style="width: 200px;">
             <el-option
                 v-for="dict in material_mategories"
                 :key="dict.value"
@@ -204,7 +204,7 @@
             ></el-option>
           </el-select>
           </el-table-column>
-          <el-table-column label="物料名称" prop="materialId">
+          <el-table-column label="物料code" prop="materialId">
             <template #default="scope">
               <el-select
                 v-model="scope.row.materialId"
@@ -213,7 +213,24 @@
               >
                 <el-option
                   v-for="i in materialList"
-                  :label="i.materialCode"
+                  :label="i.materialCode+'('+i.materialName+')'"
+                  :value="i.materialId"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="物料名称">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialId"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialName"
                   :value="i.materialId"
                   :key="i.materialId"
                 />
@@ -222,7 +239,7 @@
           </el-table-column>
           <el-table-column label="出库数量" prop="outstockQty">
             <template #default="scope">
-              <el-input v-model="scope.row.outstockQty" placeholder="请输入出库数量" />
+              <el-input v-model="scope.row.outstockQty" placeholder="请输入出库数量" style="width: 200px;"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="200">