From c77a9fc8831d811d8210ed46519a0866a48e1919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Mon, 20 Nov 2023 22:40:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/feedback/index.vue | 23 +++++++++++++++++------ src/views/mes/pro/schedule/proTask.vue | 2 +- src/views/mes/qc/defectrecord/index.vue | 10 ++++------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 75be9eb..d75427e 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -428,11 +428,11 @@ export default { itemCode: null, itemName: null, specification: null, - quantity: null, - quantityUncheck: null, - quantityFeedback: null, - quantityQualified: null, - quantityUnquanlified: null, + quantity: 0, + quantityUncheck: 0, + quantityFeedback: 0, + quantityQualified: 0, + quantityUnquanlified: 0, userName: null, nickName: null, feedbackChannel: null, @@ -535,7 +535,7 @@ export default { } }); }, - //执行 + //审批通过执行 handleExecute(){ const recordIds = this.form.recordId; this.$modal.confirm('确认执行报工？').then(function() { @@ -546,6 +546,17 @@ export default { this.open = false; }).catch(() => {}); }, + //审批不通过，拒绝 + handleReject(){ + this.form.status = "PREPARE"; + if (this.form.recordId != null) { + updateFeedback(this.form).then(response => { + this.$modal.msgSuccess("提交成功"); + this.open = false; + this.getList(); + }); + } + }, /** 删除按钮操作 */ handleDelete(row) { const recordIds = row.recordId || this.ids; diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue index e2f2c4a..bc7ed19 100644 --- a/src/views/mes/pro/schedule/proTask.vue +++ b/src/views/mes/pro/schedule/proTask.vue @@ -1,6 +1,6 @@ - + @@ -77,7 +75,7 @@ />
返回 - 确 定 + 确 定 取 消
From a83b9723ae80f725a204a35746ba7ba01e2f0c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=93=E8=B1=86=E8=B1=86?= <3346088772@qq.comcd> Date: Thu, 23 Nov 2023 17:31:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?log=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- .env.staging | 2 +- public/index.html | 2 +- src/assets/images/login_title.png | Bin 7891 -> 8180 bytes src/assets/images/logo-small.png | Bin 30414 -> 30505 bytes src/assets/images/logo_white.png | Bin 76748 -> 65412 bytes src/layout/components/Sidebar/Logo.vue | 2 +- src/views/login.vue | 10 +++++++++- vue.config.js | 2 +- 10 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index f173e70..a61ffc3 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 机加大师 +VUE_APP_TITLE = 智造大师 # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index fc4438e..63b8337 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 机加大师 +VUE_APP_TITLE = 智造大师 # 生产环境配置 ENV = 'production' diff --git a/.env.staging b/.env.staging index 282bbca..525bf3a 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 机加大师 +VUE_APP_TITLE = 智造大师 NODE_ENV = production diff --git a/public/index.html b/public/index.html index 596873b..6f7abbb 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ <%= webpackConfig.name %> - 机加大师 + 智造大师