src/views/cost/csotSettlement/costApplyList.vue

@@ -333,7 +333,7 @@ export default {
         /** 批量导出月结明细表 */
         handleBatchExport() {
             console.log('批量导出月结明细表')
-            this.exportParams = []
+
             if (this.ids.length < 1) {
                 this.$message.error('请勾选需要导出的数据！')
                 return
@@ -348,6 +348,7 @@ export default {
             })
 
             this.exportDialogVisible = true
+            this.$refs.tableRef.clearSelection()
         },
         /** 关闭弹框 */
         handleCloseDialog() {
@@ -368,7 +369,6 @@ export default {
             )
 
             this.exportDialogVisible = false
-            this.$refs.tableRef.clearSelection()
         },
         /** 月结记录 */
         handleMonthRecord(row) {

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,47 +729,42 @@ export default {
             })
         },
         passAll() {
-            // 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
-            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 = {
+            const params = {
+                pageNum: 1,
+                pageSize: 9999,
                 taskId: this.query.taskId,
-                checkResult: '1',
-                inputRecordList: deviceList,
+                dictName: this.query.dictName,
             }
-            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
 
-            // })
+            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
+                    })
+            })
         },
         //拒绝
         refused(row) {

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://192.168.2.77:39080`,//旭/
+        // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.138:28080`, //帅
         // target: `http://192.168.2.218:39080`, //福
         // target: `http://192.168.2.120:39080`, //跃