From c08fa0486a19012b26deef229bfb8eab1e1013f6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 23:20:50 +0800
Subject: [PATCH] art: 热处理入库

---
 src/views/lsw/LswMaterialInboundList.vue |  129 ++++++++++++++----------------------------
 1 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/src/views/lsw/LswMaterialInboundList.vue b/src/views/lsw/LswMaterialInboundList.vue
index c5ca76e..c676f89 100644
--- a/src/views/lsw/LswMaterialInboundList.vue
+++ b/src/views/lsw/LswMaterialInboundList.vue
@@ -5,6 +5,17 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery" >
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="绾胯竟搴�">
+              <j-dict-select-tag placeholder="璇烽�夋嫨绾胯竟搴�" v-model="queryParam.warehouseId"
+                                 dictCode="base_line_side_warehouse,warehouse_name,id,del_flag=0 and warehouse_status='1'"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="鍏ュ簱绫诲瀷">
+              <j-dict-select-tag placeholder="璇烽�夋嫨鍏ュ簱绫诲瀷" v-model="queryParam.inboundCategory" dictCode="material_inbound_category"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="鐗╂枡缂栫爜">
               <j-input placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" v-model="queryParam.materialNumber"></j-input>
             </a-form-item>
@@ -22,7 +33,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
             </span>
           </a-col>
         </a-row>
@@ -32,22 +43,16 @@
 
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <a-button @click="handleAdd('HEAT_TREATMENT_INBOUND')" type="primary" icon="plus">鐑鐞嗗叆搴�</a-button>
+      <a-button @click="handleAdd('SMALL_INNER_RING')" type="primary" icon="plus">灏忓唴鍦堝叆搴�</a-button>
+      <a-button @click="handleAdd('MATERIAL_INNER_TRANSFER')" type="primary" icon="plus">閽㈢悆璋冩嫧</a-button>
     </div>
-
     <!-- 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>
-
       <a-table
         ref="table"
         size="middle"
@@ -61,46 +66,11 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            涓嬭浇
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">缂栬緫</a>
-
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">璇︽儏</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a @click="handleDetail(record)">璇︽儏</a>
         </span>
-
       </a-table>
     </div>
 
@@ -137,12 +107,17 @@
             }
           },
           {
-            title:'浜х嚎',
+            title:'鏉ユ簮缂栫爜',
             align:"center",
-            dataIndex: 'factoryId_dictText'
+            dataIndex: 'originalCode'
           },
           {
-            title:'搴撳瓨鍦�',
+            title:'鏉ユ簮鍚嶇О',
+            align:"center",
+            dataIndex: 'originalName'
+          },
+          {
+            title:'绾胯竟搴�',
             align:"center",
             dataIndex: 'warehouseId_dictText'
           },
@@ -167,60 +142,44 @@
             dataIndex: 'quantity'
           },
           {
-            title:'鎺ユ敹浜�',
+            title:'鍏ュ簱绫诲瀷',
+            align:"center",
+            dataIndex: 'inboundCategory_dictText'
+          },
+          {
+            title:'鍏ュ簱浜�',
             align:"center",
             dataIndex: 'receiver'
           },
           {
-            title:'鎺ユ敹鏃堕棿',
+            title:'鍏ュ簱鏃堕棿',
             align:"center",
             dataIndex: 'receiveTime'
           },
-          // {
-          //   title: '鎿嶄綔',
-          //   dataIndex: 'action',
-          //   align:"center",
-          //   fixed:"right",
-          //   width:147,
-          //   scopedSlots: { customRender: 'action' }
-          // }
+          {
+            title: '鎿嶄綔',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
         ],
         url: {
-          list: "/lswmaterialinbound/lswMaterialInbound/list",
-          delete: "/lswmaterialinbound/lswMaterialInbound/delete",
-          deleteBatch: "/lswmaterialinbound/lswMaterialInbound/deleteBatch",
-          exportXlsUrl: "/lswmaterialinbound/lswMaterialInbound/exportXls",
-          importExcelUrl: "lswmaterialinbound/lswMaterialInbound/importExcel",
+          list: "/lsw/materialInbound/list",
         },
-        dictOptions:{},
-        superFieldList:[],
       }
     },
     created() {
-    this.getSuperFieldList();
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
     },
     methods: {
-      initDictConfig(){
-
+      handleAdd(inboundCategory) {
+        this.$refs.modalForm.add(inboundCategory);
+        this.$refs.modalForm.title = "鏂板";
+        this.$refs.modalForm.disableSubmit = false;
       },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
-        fieldList.push({type:'string',value:'factoryId',text:'浜х嚎ID',dictCode:''})
-        fieldList.push({type:'string',value:'warehouseId',text:'搴撳瓨鍦癐D',dictCode:''})
-        fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栫爜',dictCode:''})
-        fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
-        fieldList.push({type:'string',value:'batchNumber',text:'鎵规鍙�',dictCode:''})
-        fieldList.push({type:'int',value:'quantity',text:'鍏ュ簱鏁伴噺',dictCode:''})
-        fieldList.push({type:'string',value:'receiver',text:'鎺ユ敹浜�',dictCode:''})
-        fieldList.push({type:'datetime',value:'receiveTime',text:'鎺ユ敹鏃堕棿'})
-        this.superFieldList = fieldList
-      }
     }
   }
 </script>

--
Gitblit v1.9.3