From 7790aa0ad0f37fab2700d35c0d9e2ee869ecba9c Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 03 六月 2025 09:09:47 +0800
Subject: [PATCH] 入库新增

---
 src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue |   76 ++++++++++++-------------------------
 1 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue b/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
index 369a4ec..56cbcf2 100644
--- a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
@@ -78,43 +78,37 @@
         {
           title: '宸ュ叿缂栫爜',
           align: 'center',
-          dataIndex: 'toolingNum',
+          dataIndex: 'toolCode',
+          sorter: true,
+        },
+        {
+          title: '宸ュ叿缂栧彿',
+          align: 'center',
+          dataIndex: 'toolNum',
           sorter: true,
         },
         {
           title: '宸ュ叿鍚嶇О',
           align: 'center',
-          dataIndex: 'toolingName',
+          dataIndex: 'toolName',
           sorter: true,
         },
          {
-          title: '鍞竴缂栫爜',
+          title: '宸ュ叿绫诲瀷',
           align: 'center',
-          dataIndex: 'onlyCode',
+          dataIndex: 'applicationTypeName',
           sorter: true,
         },
         {
-          title: '鍏ュ簱鏁伴噺',
+          title: '鍨嬪彿/鍥惧彿',
           align: 'center',
-          dataIndex: 'inStorageQuantity',
+          dataIndex: 'toolModel',
           sorter: true,
         },
-        {
-          title: '宸ュ叿鍒嗙被',
+         {
+          title: '鏁伴噺',
           align: 'center',
-          dataIndex: 'toolingCategoryName',
-          sorter: true,
-        },
-        {
-          title: '瑙勬牸鍨嬪彿',
-          align: 'center',
-          dataIndex: 'model',
-          sorter: true,
-        },
-        {
-          title: '鍗曚綅',
-          align: 'center',
-          dataIndex: 'unitName',
+          dataIndex: 'quantity',
           sorter: true,
         },
       ],
@@ -135,16 +129,12 @@
         showSizeChanger: true,
         total: 0,
       },
-      isorter: {
-        column: 'num',
-        order: 'desc',
-      },
       departTree: [],
       visible: false,
       loading: false,
       url: {
         // list: '/base/tooling/list',
-         list: '/tms/baseTools/list',
+         list: '/tms/toolLedgerDetail/list',
          queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
       },
     }
@@ -176,6 +166,7 @@
       let that = this
       this.loading = true
       let params = this.getQueryParams() //鏌ヨ鏉′欢
+     params["status"] = "2"
       await getAction(this.url.list, params).then((res) => {
         if (res.success) {
           for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +191,7 @@
       this.loadData(1)
     },
     getQueryParams() {
-      let param = Object.assign({}, this.queryParam, this.isorter)
+      let param = Object.assign({}, this.queryParam)
       param.field = this.getQueryField()
       param.pageNo = this.ipagination.current
       param.pageSize = this.ipagination.pageSize
@@ -228,34 +219,17 @@
     },
     handleTableChange(pagination, filters, sorter) {
       //TODO 绛涢��
-      if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field
-        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
-      }
+      // if (Object.keys(sorter).length > 0) {
+      //   this.isorter.column = sorter.field
+      //   this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
+      // }
       this.ipagination = pagination
       this.loadData()
     },
     handleSubmit() {
-      if (this.selectionRows.length > 0) {
-         let params = this.getQueryParams() //鏌ヨ鏉′欢
-          params['onlyCode'] = this.selectionRows[0].onlyCode;
-        getAction(this.url.queryKnifeBom, params).then((res) => {
-        if (res.success) {
-          this.prepareKnifeDetailList = res.result
-          this.$bus.$emit('selectionRows', this.prepareKnifeDetailList)
-        }
-         
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false
-        
-      })
-        this.searchReset(0)
-        this.close()
-      } else {
-        this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
-      }
+      this.$bus.$emit('selectionRows', this.selectionRows)
+      this.searchReset(0)
+      this.close()
     },
     onSelectChange(selectionRows) {
       this.selectionRows = selectionRows

--
Gitblit v1.9.3