From 1b85e9d1b9481f9e4dace8839df2faf2bf26b51b Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 5 Jul 2024 14:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/components/TableModel/index.vue | 2 +- .../claimAndreturn/picking/outbound/index.vue | 2 +- .../forecastWaste/listing/index.vue | 4 +- .../newDevicesServiceCenterList.vue | 187 +++++++++--------- .../newDevices/newDevicesWarehousing.vue | 119 +++++------ .../component/addCompleteTools.vue | 2 + .../component/addCompleteTools.vue | 2 + .../newPurchase/serviceCenter/index.vue | 5 +- .../warehousing/newTools/index.vue | 5 +- 9 files changed, 174 insertions(+), 154 deletions(-) diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue index 96ce8dea..5172a445 100644 --- a/sgzb-ui/src/components/TableModel/index.vue +++ b/sgzb-ui/src/components/TableModel/index.vue @@ -183,9 +183,9 @@ export default { /* form 查询组件触发的自定义事件 */ async queryList(val, reset) { if (reset) { - this.pageParams.pageNum = 1 this.pageParams.pageSize = 10 } + this.pageParams.pageNum = 1 this.pageParams = Object.assign( val, this.pageParams, diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index 648c1315..33cbb896 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -1008,7 +1008,7 @@ export default { }) }, - //输入出库数量 + // 输入出库数量 checkNum(row) { let maxNum = row.outNum if (row.inputNum <= 1) { diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue index abb499d0..2f24fda4 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue @@ -83,14 +83,14 @@ @click="handleSubmitScrap(data)" >提交报废 - 驳回退料 + > --> - - - - - + + + + + - - - 通过 - - - 不通过 - - + + + 通过 + + + 不通过 + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + { - this.showBatchButtons = this.detailTableList.some(item => item.taskStatus === '122'); - }, { deep: true }); - }, - created() { + mounted() { + // 监听数据的变化，当 taskStatus 符合条件时显示批量按钮 + this.$watch( + 'detailTableList', + () => { + this.showBatchButtons = this.detailTableList.some( + (item) => item.taskStatus === '122', + ) + }, + { deep: true }, + ) + }, + created() { this.getList() this.getTypeList() }, @@ -640,10 +646,11 @@ export default { taskStatus: this.queryParams.taskState, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, + flag: 0, } - getPutInList(this.addDateRange(params)).then((response) => { - this.tableList = response.rows - this.total = response.total + getPutInList(this.addDateRange(params)).then((res) => { + this.tableList = res.data.rows + this.total = res.data.total this.loading = false }) }, @@ -701,9 +708,9 @@ export default { }, // 多选框选中数据 handleSelectionChange() { - console.log(this.ids) - this.ids = this.detailTableList.map((item) => item) // 假设数据的唯一标识为 id - console.log(this.ids) + console.log(this.ids) + this.ids = this.detailTableList.map((item) => item) // 假设数据的唯一标识为 id + console.log(this.ids) // this.single = selection.length != 1 // this.multiple = !selection.length }, diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue index 49be0d1f..267f6bf9 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue @@ -8,40 +8,39 @@ v-show="showSearch" label-width="100px" > + + + + + - - - - - - - - - - - + + + + + 入库审核未通过 - 部分已入库 + 部分已入库 @@ -195,9 +194,7 @@ size="mini" type="text" icon="el-icon-edit" - v-if=" - scope.row.taskStatus == '105' - " + v-if="scope.row.taskStatus == '105'" @click="handleUpdate(scope.row)" v-hasPermi="['warehousing:auditing']" >审核入库单 @@ -358,7 +358,7 @@ 待审核 已入库 已驳回 - 待审核 + 待审核 @@ -380,14 +380,20 @@ 通过 不通过 @@ -575,14 +581,14 @@ export default { //搜索下拉数据 typesList: [], modelList: [], - // 采购状态下拉数据 - statusList: [ - { label: '全部', taskStatus: null }, - { label: '入库审核中', taskStatus: 105 }, - { label: '入库审核未通过', taskStatus: 107 }, - { label: '部分已入库', taskStatus: 123 }, - { label: '已全部入库', taskStatus: 28 } - ], + // 采购状态下拉数据 + statusList: [ + { label: '全部', taskStatus: null }, + { label: '入库审核中', taskStatus: 105 }, + { label: '入库审核未通过', taskStatus: 107 }, + { label: '部分已入库', taskStatus: 123 }, + { label: '已全部入库', taskStatus: 28 }, + ], // 表格数据 tableList: [], detailTableList: [], @@ -606,6 +612,7 @@ export default { taskStatus: null, keyWord: '', typeId: '', + flag: 0, }, query: { pageNum: 1, @@ -647,8 +654,8 @@ export default { getList() { this.loading = true getPutInList(this.queryParams).then((response) => { - this.tableList = response.rows - this.total = response.total + this.tableList = response.data.rows + this.total = response.data.total this.loading = false }) }, diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue index 0097c662..11595c7e 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue @@ -168,6 +168,8 @@ export default { const queryParams = { id: this.editInfo.id, wholeTypeName: this.editInfo.wholeTypeName, + pageNum: 1, + pageSize: 99999, } const { data: res } = await queryCompleteSetToolsApi(queryParams) this.tempList = res.rows diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue index ec925cf9..5aef0017 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue @@ -168,6 +168,8 @@ export default { const queryParams = { id: this.editInfo.id, wholeTypeName: this.editInfo.wholeTypeName, + pageNum: 1, + pageSize: 99999, } const { data: res } = await queryCompleteSetToolsApi(queryParams) this.tempList = res.rows diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue index d218fe03..672cbd2f 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue @@ -653,10 +653,11 @@ export default { taskStatus: this.queryParams.taskState, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum, + flag: 0, } getPutInList(this.addDateRange(params)).then((response) => { - this.tableList = response.rows - this.total = response.total + this.tableList = response.data.rows + this.total = response.data.total this.loading = false }) }, diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue index 6d5e8fa8..050c8274 100644 --- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue @@ -609,6 +609,7 @@ export default { status: undefined, keyWord: '', typeId: '', + flag: 0, }, query: { pageNum: 1, @@ -657,8 +658,8 @@ export default { getList() { this.loading = true getPutInList(this.queryParams).then((response) => { - this.tableList = response.rows - this.total = response.total + this.tableList = response.data.rows + this.total = response.data.total this.loading = false }) },