From 7cc68d65ee9be389d23f261681d09ed81d9be05a Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Sat, 28 Aug 2021 23:28:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=91=E5=AE=A4=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/template.js | 2 +-
src/components/drawerDialog/index.vue | 47 +++++++--
src/views/flow/template.vue | 13 +--
src/views/user/department.vue | 144 ++++++++++++++++++--------
4 files changed, 144 insertions(+), 62 deletions(-)
diff --git a/src/api/template.js b/src/api/template.js
index 3a54495..a2c2003 100644
--- a/src/api/template.js
+++ b/src/api/template.js
@@ -4,7 +4,7 @@ import qs from 'qs'
export default {
getList: (params) => {
return api({
- url: '/template/getTemplateList',
+ url: '/template/all',
method: 'get',
params: params
})
diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index e07870a..f42079d 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -198,9 +198,10 @@
>
@@ -214,9 +215,10 @@
>
@@ -841,15 +843,15 @@ export default {
}, {
value: 'JYBG',
label: '检验报告'
- }, {
- value: 'OTHER',
- label: '其他'
}, {
value: 'HZD',
label: '回执单'
}, {
value: 'RWD',
label: '任务单'
+ }, {
+ value: 'HGZ',
+ label: '合格证'
}
],
jylbList: [],
@@ -887,6 +889,33 @@ export default {
},
mounted() {},
methods: {
+ showHgzTemplate(item) {
+ if (item.tempCategory !== 'HGZ') {
+ return false
+ }
+ if (this.formTemplate.shebeizhongleidaima && this.formTemplate.shebeizhongleidaima !== item.shebeizhongleidaima) {
+ return false
+ }
+ if (this.formTemplate.jianyanleibie && this.formTemplate.jianyanleibie !== item.jianyanleibie) {
+ return false
+ }
+ return true
+ },
+ showJybgTemplate(item) {
+ if (item.tempCategory !== 'JYBG') {
+ return false
+ }
+ if (item.bglx !== 1) {
+ return false
+ }
+ if (this.formTemplate.shebeizhongleidaima && this.formTemplate.shebeizhongleidaima !== item.shebeizhongleidaima) {
+ return false
+ }
+ if (this.formTemplate.jianyanleibie && this.formTemplate.jianyanleibie !== item.jianyanleibie) {
+ return false
+ }
+ return true
+ },
changeTableMode() {
switch (this.form.tableMode) {
case 0:
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index a464fa7..e673f61 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -290,15 +290,15 @@ export default {
}, {
value: 'JYBG',
label: '检验报告'
- }, {
- value: 'OTHER',
- label: '其他'
}, {
value: 'HZD',
label: '回执单'
}, {
value: 'RWD',
label: '任务单'
+ }, {
+ value: 'HGZ',
+ label: '合格证'
}
],
formTemplate: {},
@@ -407,11 +407,8 @@ export default {
},
getParentList() {
this.api({
- url: '/template/getTemplateListByBglx',
- method: 'get',
- params: {
- bglx: 1
- }
+ url: '/template/all',
+ method: 'get'
}).then((data) => {
this.parentList = data
})
diff --git a/src/views/user/department.vue b/src/views/user/department.vue
index 0451d2f..10008d3 100644
--- a/src/views/user/department.vue
+++ b/src/views/user/department.vue
@@ -45,50 +45,106 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+