From 6d4cd4ebf74e2a8abab4c907fa08e741a2045528 Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Fri, 20 Aug 2021 11:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=94=85=E7=82=89=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E7=A7=91?=
=?UTF-8?q?=E5=AE=A4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ysjl/1000/common/sz/gyscl.vue | 25 +++++++++++++++++++++++
src/views/ysjl/1000/dj/nb/gynb.vue | 6 ++++++
src/views/ysjl/1000/dj/sy/sysy.vue | 26 ++++++++++++++++++++++++
src/views/ysjl/1000/dj/wb/gywb.vue | 27 +++++++++++++++++++++++++
4 files changed, 84 insertions(+)
diff --git a/src/views/ysjl/1000/common/sz/gyscl.vue b/src/views/ysjl/1000/common/sz/gyscl.vue
index 65f63c8..c319928 100644
--- a/src/views/ysjl/1000/common/sz/gyscl.vue
+++ b/src/views/ysjl/1000/common/sz/gyscl.vue
@@ -339,6 +339,17 @@
+
+
+
+
+
@@ -434,6 +445,8 @@ import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact'
import Bzz from '../../common/gysclJyxmBzz.js'
+import { getDepartmentTreeList } from '@/api/common'
+
export default {
name: 'GlGysclYsjl',
components: { SignName, Sticky },
@@ -484,6 +497,7 @@ export default {
}
],
multipleSelection: [],
+ departmemtArr: [],
ysjlId: this.$route.query.id,
tableData: [] // 存储报告检验项目
}
@@ -513,8 +527,17 @@ export default {
this.getYsjl(this.ysjlId)
this.getJyxmInfoByYsjl()
}
+ this.getDepartmentArr()
},
methods: {
+ getDepartmentArr() {
+ getDepartmentTreeList().then(res => {
+ this.departmemtArr = res
+ })
+ },
+ handleChange(v) {
+ this.ysjl.departmentId = v[1]
+ },
initYsjl() {
this.api({
url: '/ysjl/initYsjl',
@@ -530,6 +553,7 @@ export default {
}
}).then(data => {
this.ysjl = data.ysjl
+ this.departmentId = this.ysjl.departmentId
this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
this.getXcjyrq()
@@ -558,6 +582,7 @@ export default {
}
}).then(data => {
this.ysjl = data
+ this.departmentId = this.ysjl.departmentId
if (this.ysjl.jianyanrenyuan) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
}
diff --git a/src/views/ysjl/1000/dj/nb/gynb.vue b/src/views/ysjl/1000/dj/nb/gynb.vue
index 91d3897..bd5b10d 100644
--- a/src/views/ysjl/1000/dj/nb/gynb.vue
+++ b/src/views/ysjl/1000/dj/nb/gynb.vue
@@ -292,6 +292,7 @@
v-model="ysjl.departmentId"
:options="departmemtArr"
:props="{ value: 'id', label: 'name', checkStrictly: true }"
+ :show-all-levels="false"
@change="handleChange"
/>
@@ -423,6 +424,9 @@ export default {
this.departmemtArr = res
})
},
+ handleChange(v) {
+ this.ysjl.departmentId = v[1]
+ },
// 签名方法
singNameValue(data) {
this.jianyanrenyuan = data.name
@@ -461,6 +465,7 @@ export default {
}
}).then(data => {
this.ysjl = data.ysjl
+ this.departmentId = this.ysjl.departmentId
this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
this.getXcjyrq()
@@ -488,6 +493,7 @@ export default {
}
}).then(data => {
this.ysjl = data
+ this.departmentId = this.ysjl.departmentId
if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
}
diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue
index 4badb8b..07ee012 100644
--- a/src/views/ysjl/1000/dj/sy/sysy.vue
+++ b/src/views/ysjl/1000/dj/sy/sysy.vue
@@ -230,6 +230,19 @@
+
+
+
+
+
+
+
@@ -267,6 +280,7 @@ import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact'
import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common'
export default {
name: 'GlSysyYsjl',
components: { SignName, Sticky },
@@ -286,6 +300,7 @@ export default {
state: this.$route.query.state,
jianyanrenyuan: '',
departmentId: this.$store.getters.departmentId,
+ departmemtArr: [],
isRepeat: false,
edit: false,
checkedTab: 'first',
@@ -337,11 +352,20 @@ export default {
}
this.getJyxm(1)
this.getUserList()
+ this.getDepartmentArr()
},
beforeDestroy() {
window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
},
methods: {
+ getDepartmentArr() {
+ getDepartmentTreeList().then(res => {
+ this.departmemtArr = res
+ })
+ },
+ handleChange(v) {
+ this.ysjl.departmentId = v[1]
+ },
// 签名方法
singNameValue(data) {
this.jianyanrenyuan = data.name
@@ -388,6 +412,7 @@ export default {
}
}).then(data => {
this.ysjl = data.ysjl
+ this.departmentId = this.ysjl.departmentId
this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
this.ysjl.jilubianhao = this.jilubianhao
this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误
@@ -413,6 +438,7 @@ export default {
}
}).then(data => {
this.ysjl = data
+ this.departmentId = this.ysjl.departmentId
if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
}
diff --git a/src/views/ysjl/1000/dj/wb/gywb.vue b/src/views/ysjl/1000/dj/wb/gywb.vue
index cba5080..b691c8f 100644
--- a/src/views/ysjl/1000/dj/wb/gywb.vue
+++ b/src/views/ysjl/1000/dj/wb/gywb.vue
@@ -289,6 +289,19 @@
+
+
+
+
+
+
+
@@ -327,6 +340,8 @@ import Sticky from '@/components/Sticky'
import SignName from '@/views/common/SignName'
import Utils from '@/utils/contact'
import merge from 'webpack-merge'
+import { getDepartmentTreeList } from '@/api/common.js'
+
export default {
name: 'GlGywbYsjl',
components: { SignName, Sticky },
@@ -347,6 +362,7 @@ export default {
sybjSData: [],
tableData: [],
users: [],
+ tree: [],
checkedTab: 'first',
ysjlId: this.$route.query.id,
// 表格合并相关
@@ -415,11 +431,20 @@ export default {
this.getJyxm(1)
}
this.getUserList()
+ this.getDepartment()
},
beforeDestroy() {
window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
},
methods: {
+ getDepartment() {
+ getDepartmentTreeList().then(res => {
+ this.tree = res
+ })
+ },
+ handleChange(v) {
+ this.ysjl.departmentId = v[1]
+ },
// 签名方法
singNameValue(data) {
this.jianyanrenyuan = data.name
@@ -444,6 +469,7 @@ export default {
}
}).then(data => {
this.ysjl = data.ysjl
+ this.departmentId = this.ysjl.departmentId
this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
this.getXcjyrq()
this.ysjl.jilubianhao = this.jilubianhao
@@ -474,6 +500,7 @@ export default {
}
}).then(data => {
this.ysjl = data
+ this.departmentId = this.ysjl.departmentId
if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
}