From 87f8d807f8cdbd42787bfb7ba840262511302f67 Mon Sep 17 00:00:00 2001 From: zhouxain01 Date: Thu, 21 Dec 2023 17:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E8=AF=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/repairTest/brokenExamine/index.vue | 99 +++++++++---------- sgzb-ui/src/views/repairTest/repair/index.vue | 7 +- .../views/repairTest/testExamine/index.vue | 85 ++++++++-------- .../src/views/store/label/labelBinding.vue | 37 +++---- 4 files changed, 116 insertions(+), 112 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue index 882c29b5..4c7f18d9 100644 --- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue +++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue @@ -59,7 +59,7 @@ - + @@ -79,10 +79,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -126,7 +126,7 @@ plain icon="el-icon-plus" size="mini" - :disabled="multiple" + :disabled="!checkResultOne" v-hasPermi="['store:labelType:add']" @click="checkClick" >批量审核 + 查看 + 审核 @@ -304,13 +307,6 @@ > - - + -
@@ -502,10 +493,11 @@ import selectTree from '../repair/selectTree.vue' import Tree from '@/views/repairTest/repair/tree.vue' export default { name: "Dict", - components: { selectTree, Tree }, + components: { Tree, selectTree, }, dicts: ['sys_normal_disable'], data() { return { + checkResultOne: false, defaultData: null, selectionList: [], unitInfoSelectList: [], @@ -573,11 +565,12 @@ export default { getProjectSelectApi().then(res => { this.projectSelectList = res.data }) - getDicSelectApi({ value: 'wx_task' }).then(res => { + getDicSelectApi({ value: 'bf_task' }).then(res => { this.dicSelectList = res.data }) this.getTree() }, + methods: { /** 查询字典类型列表 */ getList() { @@ -596,10 +589,10 @@ export default { pageNum: this.dialogQueryParams.pageNum, pageSize: this.dialogQueryParams.pageSize, } - this.loading = true; + // this.loading = true; getRepairAuditListApi(params).then(response => { if (response.code == 200) { - this.loading = false; + // this.loading = false; this.open = true this.dialogList = response.rows this.dialogTotal = response.total; @@ -650,12 +643,12 @@ export default { getTree() { listPartTypeApi().then(response => { this.deptList = response.data + // this.deptList = this.handleTree(response.data, "id"); }); getMaTypeSelectApi().then(response => { this.deptTypeList = response.data }); }, - /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -665,9 +658,8 @@ export default { resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - // this.$refs.mychild.clearSelect(); - this.queryParams.type = '' this.$refs.mychildSon.inputValue = ''; + this.queryParams.type = '' this.handleQuery(); }, /** 新增按钮操作 */ @@ -679,11 +671,11 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.selectionList = selection + this.checkResultOne = selection.every(item => item.taskStatus == 58); this.ids = selection.map(item => item.dictId) this.single = selection.length != 1 this.multiple = !selection.length }, - handleSee(row, type) { this.dialogTitle = '查看' this.rowObj = row @@ -710,6 +702,7 @@ export default { }, submitOpenOneForm() { this.openOne = false + this.open = false // val 1代表对话框中审核 2代表批量审核 if (this.checkResult == 1) { let taskIdList = [] @@ -719,11 +712,11 @@ export default { taskIdList: taskIdList } addDetailsAuditApi(params).then(res => { - if (res.code == 200) { - this.openTwo = true - this.openTextThree = '审批通过！' - this.getdialogList() - } + this.openTwo = true + this.open = false + this.openTextThree = '审批通过！' + // this.getdialogList() + this.getList() }).catch(() => { }) } if (this.checkResult == 2) { @@ -736,14 +729,20 @@ export default { taskIdList: taskIdList } addDetailsAuditApi(params).then(res => { - if (res.code == 200) { - this.openTwo = true - this.openTextThree = '审批通过！' - this.getList() - } + this.openTwo = true + this.openTextThree = '审批通过！' + this.getList() }).catch(() => { }) } }, + openTextThreeClose() { + this.open = false + this.openOne = false + this.openTwo = false + this.openThree = false + this.openFour = false + this.getList() + }, submitOpenOneFeturn() { this.openOne = false @@ -759,7 +758,6 @@ export default { }, formSubmit() { this.$refs.form.validate(valid => { - console.log('this.checkResult', this.checkResult); if (valid) { if (this.checkResult == 1) { let taskIdList = [] @@ -770,11 +768,12 @@ export default { remark: this.form.remark } addDetailsAuditApi(params).then(res => { - if (res.code == 200) { - this.$refs.form.resetFields(); - this.formCancel() - this.getdialogList() - } + this.$refs.form.resetFields(); + this.formCancel() + this.open = false + this.openThree = false + // this.getdialogList() + this.getList() }).catch(() => { }) } if (this.checkResult == 2) { @@ -788,12 +787,12 @@ export default { remark: this.form.remark } addDetailsAuditApi(params).then(res => { - if (res.code == 200) { - this.$refs.form.resetFields(); - this.openThree = false - this.openFour = false - this.getList() - } + // if (res.code == 200) { + this.$refs.form.resetFields(); + this.openThree = false + this.openFour = false + this.getList() + // } }).catch(() => { }) } } else { diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue index 763b366f..908315ea 100644 --- a/sgzb-ui/src/views/repairTest/repair/index.vue +++ b/sgzb-ui/src/views/repairTest/repair/index.vue @@ -143,7 +143,6 @@ >导出 --> - @@ -788,12 +787,12 @@ export default { typeName: this.dialogQueryParams.typeName, type: this.dialogQueryParams.type, } - this.loading = true; + // this.loading = true; getRepairMaTypeListApi(this.addDateRange(params)).then(res => { if (res.code == 200) { this.repairList = res.rows; this.dialogTotal = res.total; - this.loading = false; + // this.loading = false; } }) }, diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue index 8beab6cb..16e367cb 100644 --- a/sgzb-ui/src/views/repairTest/testExamine/index.vue +++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue @@ -1,4 +1,3 @@ -