From 83863f7e2213b61d5f1a20655670550b88ec9dee Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sun, 28 Apr 2024 16:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E9=98=BF=E8=83=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/components/TableModel/index.vue | 2 +- .../claimAndRefund/return/returnInDetail.vue | 1822 ++++++++++------- .../scrapManage/component/auditingDetails.vue | 2 +- .../forecastWaste/auditing/config.js | 2 +- .../forecastWaste/auditing/index.vue | 1 + .../forecastWaste/auditingReturn/config.js | 4 +- .../forecastWaste/auditingReturn/index.vue | 100 +- .../forecastWaste/listing/index.vue | 28 +- 8 files changed, 1155 insertions(+), 806 deletions(-) diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue index de7bbf14..9af0289d 100644 --- a/sgzb-ui/src/components/TableModel/index.vue +++ b/sgzb-ui/src/components/TableModel/index.vue @@ -132,7 +132,7 @@ data() { return { total: 0, - tableList: [], + tableList: [{ demo: 123 }], /* 分页参数 */ pageParams: { pageNum: 1, diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue index b7f12573..54c09d13 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue @@ -1,7 +1,14 @@ diff --git a/sgzb-ui/src/views/scrapManage/component/auditingDetails.vue b/sgzb-ui/src/views/scrapManage/component/auditingDetails.vue index 1ab70fe6..ec51987f 100644 --- a/sgzb-ui/src/views/scrapManage/component/auditingDetails.vue +++ b/sgzb-ui/src/views/scrapManage/component/auditingDetails.vue @@ -20,7 +20,7 @@ diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js index 5d3671b9..463327cc 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js @@ -64,7 +64,7 @@ export const dialogConfig = { innerTitle: '', innerVisible: false, handleColShow: false, // 是否显示操作列 - pageShow: false, // 是否显示分页组件 + pageShow: true, // 是否显示分页组件 isSelShow: false,// 表格是否需要复选框 isFormShow: true, // 是否显示表单查询组件 formLabel: [ diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue index e817bbed..80b74b05 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue @@ -114,6 +114,7 @@ @@ -30,7 +32,47 @@ @closeDialogInner="closeDialogInner" > @@ -41,6 +83,7 @@ import DialogModel from '@/components/DialogModel' import SelDepart from '../../component/selDepart.vue' import { config, dialogConfig } from './config' + import { receiveView } from '@/api/claimAndRefund/return' export default { name: 'auditingReturn', components: { @@ -48,36 +91,37 @@ DialogModel, SelDepart, }, + props: { + sendParams: { + type: Object, + default: () => { + return {} + }, + }, + }, data() { return { config, dialogConfig, - handleBtn: [ - { btn_title: '查看', id: 1 }, - { btn_title: '编辑退料', id: 2 }, - { btn_title: '撤回', id: 3 }, - ], + receiveView, } }, methods: { /* 按钮操作 */ - handleBtnEvent(data, id) { - switch (id) { - case 1: - this.dialogConfig.outerTitle = '查看' - this.dialogConfig.outerWidth = '70%' - break - case 2: - this.dialogConfig.outerTitle = '编辑退料' - this.dialogConfig.outerWidth = '70%' - break - case 3: - this.dialogConfig.outerTitle = '撤回' - - break - } + handlePreview(row) { + this.dialogConfig.outerTitle = '查看' + this.dialogConfig.handleColShow = false + this.dialogConfig.outerWidth = '70%' this.dialogConfig.outerVisible = true }, + handleEdit(row) { + this.dialogConfig.outerTitle = '编辑退料' + this.dialogConfig.handleColShow = true + this.dialogConfig.outerWidth = '70%' + this.dialogConfig.outerVisible = true + }, + handleRevoke(row) {}, + getTableSelectionChange() {}, closeDialog(val) { this.dialogConfig.outerVisible = val diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue index 37d66485..8cf71529 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue @@ -129,7 +129,7 @@ 驳回退料 返回 - + @@ -173,6 +173,7 @@ deptIds: [], }, auditingList: [], + sendParamsAuditing: {}, } }, created() { @@ -200,21 +201,26 @@ this.dialogConfig.outerVisible = true }, handleReject(row) { + this.sendParamsAuditing.taskId = row.taskId this.temp = !this.temp }, /* 关闭选择审批部门弹框 */ async closeDepartSel(val, list) { - if (list.length > 1) { - list.map((e) => { - this.submitScrapParams.deptIds.push(e.id) - }) - const res = await submitScrapApi(this.submitScrapParams) - if (res.code == 200) { - this.$message.success('已提交成功') - this.dialogConfig.outerVisible = val - this.$refs.listingTbRef.getList() - } + console.log(list, '选择的部门---') + + if (list.length < 1) { + this.$message.error('请选择审批部门') + return + } + list.map((e) => { + this.submitScrapParams.deptIds.push(e.id) + }) + const res = await submitScrapApi(this.submitScrapParams) + if (res.code == 200) { + this.$message.success('已提交成功') + this.dialogConfig.outerVisible = val + this.$refs.listingTbRef.getList() } this.submitScrapParams.deptIds = this.submitScrapParams.taskIdList = []