From 3eacfb613a9c4f72dd276e5adfa75c2a2027c560 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 8 Dec 2022 10:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=BA=93=E6=B7=BB=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=83=A8=E6=B6=88=E8=80=97=E6=95=B0=E9=87=8F,?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=87=BA=E5=BA=93=E6=98=BE=E7=A4=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=92=E6=A7=BD,=E7=BC=A9=E7=95=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ProcessMaterialsDeliveryDetail.vue       |  2 +-
 .../ProcessMaterialWarehousingListList.vue           | 11 ++++++++---
 .../ProcessMaterialsDeliveryListList.vue             | 10 +++++++++-
 .../suppliesstronger/ProcessSuppliesStrongerList.vue | 12 ++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
index 0c33d94..571fb80 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
@@ -250,7 +250,7 @@ export default {
           {
             title:'出库时间',
             align:"center",
-            dataIndex: 'createTime',
+            dataIndex: 'updateTime',
             width:150,
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
diff --git a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
index a41d056..2b3ad32 100644
--- a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
+++ b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
@@ -35,15 +35,19 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
+        :scroll="{y:460}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange">
+
 <!--        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
         <template slot="materialDescription" slot-scope="text, record">
-          <j-ellipsis :value="text" :length="15"/>
+          <j-ellipsis :value="text" :length="5"/>
+        </template>
+        <template slot="supplierId" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="5"/>
         </template>
 
         <!--        <template slot="htmlSlot" slot-scope="text">-->
@@ -141,8 +145,8 @@
           {
             title:'物料名称及规格型号',
             align:"center",
-            dataIndex: 'materialDescription',
             scopedSlots: { customRender: 'materialDescription' },
+            dataIndex: 'materialDescription',
           },
           // {
           //   title:'仓储地点_id',
@@ -208,6 +212,7 @@
           {
             title:'供应商',
             align:"center",
+            scopedSlots: { customRender: 'supplierId' },
             dataIndex: 'supplierId'
           },
           {
diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
index ffd9866..f7f107f 100644
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@@ -35,13 +35,19 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
+        :scroll="{y:460}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange">
 
+          <span slot="materialName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="5"/>
+          </span>
+          <span slot="supplierId" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="5"/>
+          </span>
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -146,6 +152,7 @@
             title:'物料名称及规格型号',
             align:"center",
             dataIndex: 'materialName',
+            scopedSlots: {customRender: 'materialName'},
           },
           {
             title:'单位',
@@ -166,6 +173,7 @@
             title:'供货商',
             align:"center",
             dataIndex: 'supplierId',
+            scopedSlots: {customRender: 'supplierId'},
           },
           {
             title:'单价',
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index b3bc0e9..8a489e2 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -192,6 +192,18 @@
             //   return 0;
             // }
           },
+          {
+            title:'项目部消耗数量',
+            align:"center",
+            dataIndex: 'usageQuantity',
+            // customRender:function (t,r,index) {
+            //   console.log(r)
+            //   if(r.itemQuantity === undefined){
+            //
+            //   }
+            //   return 0;
+            // }
+          },
           {
             title:'核算属性',
             align:"center",