From f502ec3294014431c120bec8ce03f7df610b8921 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Mon, 6 May 2024 17:30:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=201454=20=E5=86=85=E9=83=A8=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=8F=AA=E8=83=BD=E6=B7=BB=E5=8A=A0=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/repairTest/repair/dialogOneForm.vue | 16 +++++++++------- sgzb-ui/vue.config.js | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue index 5fef4495..df37e51d 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue @@ -47,12 +47,10 @@ style="width: 350px" type="textarea"> - - -
添加配件 + 删除
@@ -114,13 +112,10 @@ style="width: 350px" type="textarea"> - - - -
添加配件 + 删除
@@ -320,6 +315,13 @@ export default { key: Date.now() }); }, + delDomain(domain, type) { + if (type == 1) { + this.dynamicValidateForm.premiumList = this.dynamicValidateForm.premiumList.filter(item => item.key != domain.key); + } else { + this.dynamicValidateFormTwo.premiumListTwo = this.dynamicValidateFormTwo.premiumListTwo.filter(item => item.key != domain.key); + } + }, addDomainTwo() { this.dynamicValidateFormTwo.premiumListTwo.push({ selected: "N", diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index b86cbf64..c531fe7d 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - // target: `http://10.40.92.153:8080`, //帅 - target: `http://10.40.92.5:28080`, //福 + target: `http://10.40.92.140:28080`, //帅 + // target: `http://10.40.92.5:28080`, //福 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; From 40ec1a1fc7c09d5958aa2449ca9f8dbbde912725 Mon Sep 17 00:00:00 2001 From: hhui <13856223047@163.com> Date: Mon, 6 May 2024 17:34:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E7=BB=B4=E4=BF=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/repairTest/repair/dialogOneForm.vue | 8 ++++---- .../repairTest/repair/dialogThreeForm.vue | 6 +++--- .../views/repairTest/repair/dialogTwoForm.vue | 7 +++---- sgzb-ui/src/views/repairTest/repair/upload.vue | 18 +++--------------- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue index df37e51d..6c7c5ea7 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue @@ -237,11 +237,11 @@ export default { }, //正则校验配件数量--维修数量 numberIntegerValidator(rule, value, callback) { - const reg = /^\+?[1-9][0-9]*$/; - if (value === '' || reg.test(value)) { - callback(); + const reg = /^\+?[1-9][0-9]*$/ + if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) { + callback() } else { - callback(new Error('请输入大于0的正整数')); + callback(new Error('请输入大于0的并且小于维修总量的正整数')) } }, getTree() { diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue index 3d2e7cff..aacd246b 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue @@ -65,7 +65,7 @@ - + - + @@ -149,33 +110,15 @@ - + - + - + @@ -192,17 +135,9 @@ - + @@ -260,34 +195,18 @@ - + - + - + @@ -298,25 +217,11 @@ --> - + @@ -396,6 +296,8 @@ export default { query: { pageNum: 1, pageSize: 10, + keyWord: '', + typeId: '' }, // 表单参数 form: {}, @@ -498,6 +400,7 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { // this.reset(); + this.query.keyWord = '' this.query.taskId = row.id this.getDialogTable() this.open = true @@ -506,6 +409,7 @@ export default { }, //查看 handleView(row) { + this.query.keyWord = '' this.query.taskId = row.id this.getDialogTable() this.open = true @@ -613,7 +517,7 @@ export default { }, /** 提交按钮 */ - submitForm: function() { + submitForm: function () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.dictId != undefined) { From 2051c7c8d2dfb8951a9be5aa7311e0057f21e47c Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Mon, 6 May 2024 17:52:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=201474=20=E5=BE=85=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=97=B6=EF=BC=8C=E8=8B=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=B6=85=E8=BF=873=E5=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=EF=BC=8C=E5=BC=B9=E5=87=BA2=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue index aacd246b..4cfe0162 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue @@ -28,7 +28,7 @@ @fileListChange="fileListChange" > --> 点击上传 @@ -76,7 +76,7 @@ @fileListChange="fileListChange" > --> 点击上传 @@ -176,11 +176,6 @@ export default { handlePreview(file) { console.log('file') }, - handleExceed(files, fileList) { - this.$message.warning( - `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件` - ) - }, beforeRemove(file, fileList) { // return this.$confirm(`确定移除 ${file.name}?`); }, From b86f8fd839c0b9d442979031e30ca1c312a1b3f4 Mon Sep 17 00:00:00 2001 From: hhui <13856223047@163.com> Date: Mon, 6 May 2024 17:56:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E6=8A=A5=E5=BA=9F=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/repairTest/brokenExamine/index.vue | 1554 +++++++---------- 1 file changed, 596 insertions(+), 958 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue index abc6751a..e40f12b3 100644 --- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue +++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue @@ -1,53 +1,23 @@