From 00466683fbd8e38725e3a307ad3c6d533df8b45a Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 25 Nov 2022 18:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessSuppliesStrongerLists.vue           | 16 +++++++++++-----
 .../ProcessWasteMaterialsList.vue              |  6 +++---
 .../ProcessWasteMaterialsLists.vue             | 18 ++++++++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index d8c3ee5..21463a0 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -129,10 +129,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -144,8 +144,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
+<!--        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
+
         <span slot="processId" slot-scope="text, record">
           <a href="javascript:void(0);" @click="jumpLink(text,record)">
             <j-ellipsis :value="text" :length="7"/>
@@ -363,6 +364,11 @@
             align:"center",
             dataIndex: 'supplierBatch'
           },
+          {
+            title:'来源',
+            align:"center",
+            dataIndex: 'state'
+          },
           {
             title:'是否到货',
             align:"center",
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 9cb2bea..a2e8fa3 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -40,9 +40,9 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
         <a-button type="primary" icon="download" @click="handleExportXls('账外物资库')">导出</a-button>
-<!--        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--          <a-button type="primary" icon="import">导入</a-button>-->
-<!--        </a-upload>-->
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-upload>
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
         <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
       </div>
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index a18aa0a..819dc45 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -70,7 +70,7 @@
         </a-form>
       </div>
       <div class="table-operator">
-        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
 
 
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -80,10 +80,10 @@
 
       <!-- table区域-begin -->
       <div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </div>
+<!--        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--          <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--        </div>-->
 
         <a-table
           ref="table"
@@ -94,9 +94,10 @@
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           class="j-table-force-nowrap"
           @change="handleTableChange">
+<!--          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
+
 
           <span slot="supplierName" slot-scope="text, record">
             <j-ellipsis :value="text" :length="10"/>
@@ -270,6 +271,11 @@
             align:"center",
             dataIndex: 'expirationDate'
           },
+          {
+            title:'来源',
+            align:"center",
+            dataIndex: 'state'
+          },
           {
             title:'入库时间',
             align:"center",