From d92527b614ee94522ac95aa023f5a11d2ce727d0 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 19 Aug 2024 15:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehousing/newTools/index.vue            | 75 ++++++++++---------
 vue.config.js                                 |  4 +-
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue
index a26b5de..c984c4a 100644
--- a/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -277,12 +277,12 @@
                 <!--        </el-col>-->
             </el-row>
             <el-table v-loading="loading" :data="detailTableList" border>
-                <!-- <el-table-column
+                <el-table-column
                     type="selection"
                     width="55"
                     align="center"
                     :selectable="selectable"
-                /> -->
+                />
                 <el-table-column
                     label="序号"
                     align="center"
@@ -729,42 +729,47 @@ export default {
             })
         },
         passAll() {
-            const params = {
-                pageNum: 1,
-                pageSize: 9999,
-                taskId: this.query.taskId,
-                dictName: this.query.dictName,
-            }
+            // const params = {
+            //     pageNum: 1,
+            //     pageSize: 9999,
+            //     taskId: this.query.taskId,
+            //     dictName: this.query.dictName,
+            // }
 
+            if (this.ids.length < 1) {
+                this.$message.error('请勾选需要入库的数据！')
+                return
+            }
             this.passLoading = true
-            getPutinDetailsList(params).then((res) => {
-                let deviceList = res.rows
-                deviceList.forEach((item) => {
-                    item.taskId = this.query.taskId
-                    item.typeId = item.typeId
-                    item.maId = item.maId
-                    item.inputNum = item.checkNum
-                    item.maCode = item.maCode
-                })
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '1',
-                    inputRecordList: deviceList,
-                }
-                changePutinStatus(param)
-                    .then((response) => {
-                        if (response.code == 200) {
-                            this.$modal.msgSuccess('审批成功')
-                            this.getDialogTable()
-                            this.getList()
-                        } else {
-                            this.$modal.msgSuccess('审批失败')
-                        }
-                    })
-                    .finally(() => {
-                        this.passLoading = false
-                    })
+            this.ids.forEach((item) => {
+                item.taskId = this.query.taskId
+                item.typeId = item.typeId
+                item.maId = item.maId
+                item.inputNum = item.checkNum
+                item.maCode = item.maCode
             })
+            let param = {
+                taskId: this.query.taskId,
+                checkResult: '1',
+                inputRecordList: deviceList,
+            }
+            changePutinStatus(param)
+                .then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+                .finally(() => {
+                    this.passLoading = false
+                })
+            // getPutinDetailsList(params).then((res) => {
+            //     let deviceList = res.rows
+
+            // })
         },
         //拒绝
         refused(row) {
diff --git a/vue.config.js b/vue.config.js
index 0673162..6ee22a5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,9 +42,9 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.141:39080`, //超
+        // target: `http://192.168.2.141:39080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
-        // target: `http://10.40.92.74:8080`,//旭/
+        target: `http://192.168.2.77:39080`,//旭/
         // target: `http://10.40.92.138:28080`, //帅
         // target: `http://192.168.2.218:39080`, //福
         // target: `http://192.168.2.120:39080`, //跃