From 017e0e6498c00fb6e59d56dfa858b1ccc41d2574 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 14 Apr 2023 15:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=BA=93=E3=80=81=E8=B4=A6=E5=A4=96?=
 =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessSuppliesStrongerList.vue               | 15 +++++++++++----
 .../wastematerials/ProcessWasteMaterialsList.vue  | 14 +++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index e29b637..d9f5cad 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -70,7 +70,7 @@
         @change="handleTableChange">
 
           <span slot="merchandiseName" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="12"/>
+            <j-ellipsis :value="text" :length="39"/>
           </span>
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -145,18 +145,21 @@
           {
             title:'物料组',
             align:"center",
+            width: 90,
             dataIndex: 'materialClassify'
           },
           {
             title:'物料号',
             align:"center",
+            width:115,
             dataIndex: 'materialsNumber'
           },
 
           {
             title:'物料名称及规格型号',
-            width:200,
-            align:"center",
+            width:390,
+            align:"left",
+            // align:"conter",
             scopedSlots: { customRender: 'merchandiseName' },
             dataIndex: 'merchandiseName'
           },
@@ -174,16 +177,19 @@
           {
             title:'计量单位',
             align:"center",
+            width:70,
             dataIndex: 'materialsUnit'
           },
           {
             title:'分公司库房',
             align:"center",
+            width:90,
             dataIndex: 'materialQuantity',
           },
           {
             title:'项目部数量',
             align:"center",
+            width:90,
             dataIndex: 'itemQuantity',
             // customRender:function (t,r,index) {
             //   console.log(r)
@@ -222,13 +228,14 @@
           {
             title:'核算属性',
             align:"center",
+            width: 115,
             dataIndex: 'accountingAttributes_dictText'
           },
           {
             title: '明细',
             dataIndex: 'action',
             align:"center",
-            width:147,
+            width:90,
             scopedSlots: { customRender: 'action' }
           }
         ],
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index bbdb9d4..8ba6a2b 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -76,7 +76,7 @@
           @change="handleTableChange">
 
           <span slot="materialDescription" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="9"/>
+            <j-ellipsis :value="text" :length="39"/>
           </span>
           <span slot="type" slot-scope="text, record">
             <j-ellipsis :value="text" :length="9"/>
@@ -161,21 +161,26 @@
           {
             title:'部门',
             align:"center",
+            width:120,
             dataIndex: 'materialStorageId_dictText'
           },
           {
             title:'物料组',
             align:"center",
+            width:115,
             dataIndex: 'materialGroup'
           },
           {
             title:'物料编号',
             align:"center",
+            width:115,
             dataIndex: 'materialNumber'
           },
           {
             title:'物料名称及规格型号',
-            align:"center",
+            // align:"center",
+            align:"left",
+            width: 390,
             scopedSlots: { customRender: 'materialDescription' },
             dataIndex: 'materialDescription'
           },
@@ -194,11 +199,13 @@
           {
             title:'计量单位',
             align:"center",
+            width:90,
             dataIndex: 'materialsUnit'
           },
           {
             title:'现有数量',
             align:"center",
+            width:90,
             dataIndex: 'materialQuantity'
           },
           // {
@@ -209,13 +216,14 @@
           {
             title:'调拨数量',
             align:"center",
+            width:90,
             dataIndex: 'existingNumber'
           },
           {
             title: '查看详情',
             dataIndex: 'action',
             align:"center",
-            width:147,
+            width:90,
             scopedSlots: { customRender: 'action' }
           }
         ],