From d32439011c54c1b2bb7a55dab17be664c38fa76f Mon Sep 17 00:00:00 2001 From: xiaobai <857694115@qq.com> Date: Fri, 20 Aug 2021 17:09:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=91=E5=AE=A4=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=9B=9E=E6=98=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ysjl/2000/2100/zbg/dj/edit.vue | 36 +- src/views/ysjl/2000/2100/zbg/jj/dxgz.vue | 740 --------------------- src/views/ysjl/2000/2100/zbg/nd/edit.vue | 48 +- src/views/ysjl/2000/2200/zbg/dj/edit.vue | 31 +- src/views/ysjl/2000/2200/zbg/nd/tuoche.vue | 28 +- src/views/ysjl/2000/2300/zbg/jj/cyqp.vue | 29 +- src/views/ysjl/2000/2400/zbg/jj/edit.vue | 27 + src/views/ysjl/7000/jj/edit.vue | 36 +- src/views/ysjl/8000/dj/edit.vue | 24 + src/views/ysjl/F000/dj/edit.vue | 4 +- 10 files changed, 235 insertions(+), 768 deletions(-) delete mode 100644 src/views/ysjl/2000/2100/zbg/jj/dxgz.vue diff --git a/src/views/ysjl/2000/2100/zbg/dj/edit.vue b/src/views/ysjl/2000/2100/zbg/dj/edit.vue index dedb2e7..8b04ac6 100644 --- a/src/views/ysjl/2000/2100/zbg/dj/edit.vue +++ b/src/views/ysjl/2000/2100/zbg/dj/edit.vue @@ -343,6 +343,17 @@ + + + + + @@ -1043,6 +1054,8 @@ import Utils from '@/utils/contact' import pictureUpload from '@/components/Upload' import SliceUpload from '@/components/SliceUpload' import Symbols from '@/views/common/Symbols' +import { getDepartmentTreeList } from '@/api/common' + export default { name: 'RqDjYsjl', components: { SignName, Sticky, jyfa, pictureUpload, SliceUpload, Symbols }, @@ -1075,6 +1088,7 @@ export default { state: this.$route.query.state, ysjl: {}, departmentId: this.$route.query.departmentId, + departmemtArr: [], param: {}, checkedTab: 'third', // 表格合并相关 @@ -1144,6 +1158,7 @@ export default { } // 获取区划 this.getArea() + this.getDepartmentArr() }, mounted() { // 下面的监听事件的名字由于需要添加主原始记录的主键，所以暂不生成监听事件，保存后会刷新页面会执行下面的监听事件 @@ -1161,6 +1176,14 @@ export default { }) }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -1176,6 +1199,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.departmentId = this.ysjl.departmentId this.param = data.param ? data.param : {} // 设置初始值 const tempTime = new Date() @@ -1266,13 +1290,14 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data + this.departmentId = this.ysjl.departmentId if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -1564,9 +1589,10 @@ export default { data: { ysjl: this.ysjl, param: this.param, - jyxm: jyxm, - bgjyxm: jyxm, - state: operation + cyJyxm:{ + jyxm: jyxm, + bgjyxm: jyxm, + } } }).then(data => { // 刷新任务列表，原始记录待办，原始记录已办，检验报告 diff --git a/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue b/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue deleted file mode 100644 index 13c34c6..0000000 --- a/src/views/ysjl/2000/2100/zbg/jj/dxgz.vue +++ /dev/null @@ -1,740 +0,0 @@ - - - diff --git a/src/views/ysjl/2000/2100/zbg/nd/edit.vue b/src/views/ysjl/2000/2100/zbg/nd/edit.vue index 426fad1..1d51cb2 100644 --- a/src/views/ysjl/2000/2100/zbg/nd/edit.vue +++ b/src/views/ysjl/2000/2100/zbg/nd/edit.vue @@ -206,7 +206,18 @@ - + + + + + + @@ -260,9 +271,9 @@ - + @@ -270,11 +281,11 @@ import Utils from '@/utils/contact.js' // 导入签名方法 import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' -import SliceUpload from '@/components/SliceUpload' import Symbols from '@/views/common/Symbols' +import { getDepartmentTreeList } from '@/api/common' export default { name: 'RqNdYsjl', - components: { SignName, Sticky, SliceUpload, Symbols }, + components: { SignName, Sticky, Symbols }, data() { return { edit: false, // 页面编辑状态 @@ -313,7 +324,9 @@ export default { nblb: this.$route.query.neibuleibie, type: 'YSJL' }, - djjgs: ['无'] + djjgs: ['无'], + departmentId: '', + departmemtArr: [] } }, computed: { @@ -340,8 +353,17 @@ export default { // 年度检查检验项目 this.getJyxm(1) this.getArea() + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -357,6 +379,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.departmentId = this.ysjl.departmentId this.param = data.param ? data.param : {} const tempTime = new Date() this.ysjl.jianyanjieshuriqi = tempTime @@ -370,13 +393,14 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data + this.departmentId = this.ysjl.departmentId if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -512,10 +536,10 @@ export default { data: { ysjl: this.ysjl, param: this.param, - jyxm: jyxm, - bgjyxm: jyxm, - flag: operation - } + cyJyxm: { + bgjyxm: jyxm, + jyxm: jyxm + }} }).then(data => { // 刷新任务列表，原始记录待办，原始记录已办，检验报告 Utils.$emit('task-list') diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue index 04205f8..d8bce7c 100644 --- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue +++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue @@ -360,6 +360,19 @@ + + + + + + + @@ -798,6 +811,7 @@ import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' import Utils from '../../../../../../utils/contact.js' import jyfa from '@/views/ysjl/addJyfa' +import { getDepartmentTreeList } from '@/api/common' export default { name: 'RqDjGcYsjl', components: { SignName, Sticky, jyfa }, @@ -875,7 +889,8 @@ export default { value: '', similarVisible: false, similarTableData: [], - djjgs: ['无'] + djjgs: ['无'], + departmemtArr: [] } }, computed: { @@ -908,8 +923,17 @@ export default { this.getUserList(this.$route.query.departmentId) } this.getArea() + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -925,6 +949,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.templateId = this.ysjl.departmentId this.param = data.param ? data.param : {} const tempTime = new Date() this.$set(this.ysjl, 'jianyankaishiriqi', this.dateFormat(new Date())) @@ -955,6 +980,7 @@ export default { } }).then(data => { this.ysjl = data + this.templateId = this.ysjl.departmentId if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -1159,9 +1185,10 @@ export default { data: { ysjl: this.ysjl, param: this.param, + cyJyxm:{ jyxm: jyxm, bgjyxm: jyxm, - flag: operation + } } }).then(data => { Utils.$emit('bggl-daiban-list') diff --git a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue index f08a23b..a461d1a 100644 --- a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue +++ b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue @@ -221,6 +221,19 @@ + + + + + + + @@ -280,6 +293,7 @@ import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' import Utils from '../../../../../../utils/contact.js' +import { getDepartmentTreeList } from '@/api/common' export default { name: 'RqNdTuoche', @@ -344,7 +358,8 @@ export default { } } ], - djjgs: ['无'] + djjgs: ['无'], + departmemtArr: [] } }, computed: { @@ -372,8 +387,17 @@ export default { // 提取检验项目 this.getJyxm(1) this.getArea() + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -389,6 +413,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.departmentId = this.ysjl.departmentId this.param = data.param ? data.param : {} const tempTime = new Date() this.ysjl.createTime = tempTime @@ -415,6 +440,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/2000/2300/zbg/jj/cyqp.vue b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue index 86d5706..0f43138 100644 --- a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue +++ b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue @@ -146,6 +146,19 @@ + + + + + + + @@ -220,6 +233,8 @@ import Sticky from '@/components/Sticky' import SignName from '@/views/common/SignName' import Utils from '@/utils/contact.js' +import { getDepartmentTreeList } from '@/api/common' + export default { name: 'CyqpAjYsjl', components: { SignName, Sticky }, @@ -273,7 +288,8 @@ export default { ], isRepeat: false, users: [], - djjgs: ['无'] + djjgs: ['无'], + departmemtArr: [] } }, // computed: { @@ -313,8 +329,17 @@ export default { if (!this.ysjl.jilubianhao) { this.getMaxBh() } + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -330,6 +355,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.departmentId = this.ysjl.departmentId this.param = data.param ? data.param : {} const tempTime = new Date() this.$set(this.ysjl, 'jianyanjielun', '符合') @@ -351,6 +377,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/2000/2400/zbg/jj/edit.vue b/src/views/ysjl/2000/2400/zbg/jj/edit.vue index a024a27..a67f721 100644 --- a/src/views/ysjl/2000/2400/zbg/jj/edit.vue +++ b/src/views/ysjl/2000/2400/zbg/jj/edit.vue @@ -295,6 +295,19 @@ + + + + + + + @@ -446,6 +459,8 @@ import Utils from '@/utils/contact.js' import SliceUpload from '@/components/SliceUpload' import Symbols from '@/views/common/Symbols' import jyfa from '@/views/ysjl/addJyfa' +import { getDepartmentTreeList } from '@/api/common' + export default { name: 'YcJdYsjl', components: { SignName, Sticky, SliceUpload, Symbols, jyfa }, @@ -476,6 +491,7 @@ export default { state: this.$route.query.state, ysjl: {}, departmentId: this.$route.query.departmentId, + departmemtArr: [], param: {}, jyxm: 'ycjd', checkedTab: 'first', @@ -565,8 +581,17 @@ export default { this.getUserList(this.$route.query.departmentId) this.getJyxm() this.getArea() + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, initYsjl() { this.api({ url: '/ysjl/initYsjl', @@ -582,6 +607,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.departmentId = this.ysjl.departmentId this.param = data.param ? data.param : {} // 设置初始值 const tempTime = new Date() @@ -606,6 +632,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/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue index 0ee3d0a..5ad4623 100644 --- a/src/views/ysjl/7000/jj/edit.vue +++ b/src/views/ysjl/7000/jj/edit.vue @@ -164,6 +164,19 @@ + + + + + + + @@ -226,7 +239,7 @@ import SignName from '@/views/common/SignName' import Utils from '@/utils/contact' import merge from 'webpack-merge' import SliceUpload from '@/components/SliceUpload' - +import { getDepartmentTreeList } from '@/api/common' export default { name: 'YlgdyjYsjl', components: { SignName, Sticky, SliceUpload }, @@ -241,6 +254,7 @@ export default { state: this.$route.query.state, jianyanrenyuan: '', departmentId: this.$route.query.departmentId, + departmemtArr: [], isRepeat: false, edit: false, bgfyData: [], @@ -322,8 +336,17 @@ export default { this.getMaxBh() } this.getJyxm(1) + this.getDepartmentArr() }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, init() { this.api({ url: '/ysjl/initYsjl', @@ -339,6 +362,7 @@ export default { } }).then(data => { this.ysjl = data.ysjl + this.templateId = this.ysjl.departmentId this.param = data.param this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd') this.ysjl.jianyanjielun = '符合' @@ -430,13 +454,14 @@ export default { }, getYsjl(id) { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data + this.templateId = this.ysjl.departmentId this.complexShow = true if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) @@ -564,8 +589,9 @@ export default { data: { ysjl: this.ysjl, param: this.param, - jyxm: JSON.stringify(this.tableData), - flag: operation + cyJyxm:{ + jyxm: JSON.stringify(this.tableData), + } } }).then(data => { Utils.$emit('mission-list') diff --git a/src/views/ysjl/8000/dj/edit.vue b/src/views/ysjl/8000/dj/edit.vue index fcfedfa..c1959f7 100644 --- a/src/views/ysjl/8000/dj/edit.vue +++ b/src/views/ysjl/8000/dj/edit.vue @@ -392,6 +392,19 @@ + + + + + + + @@ -768,6 +781,7 @@ import Sticky from '@/components/Sticky' import jyfa from '../../addJyfa' import SignName from '@/views/common/SignName' import Utils from '../../../../utils/contact.js' +import { getDepartmentTreeList } from '@/api/common' export default { name: 'GdDjYsjl', components: { SignName, Sticky, jyfa }, @@ -793,6 +807,7 @@ export default { // 页面状态 {create=> 创建，update=> 更新} state: this.$route.params.state, ysjl: this.$route.query.ysjl, + departmemtArr: [], departmentId: this.$route.query.ysjl.departmentId, param: (this.$route.query.param === null || this.$route.query.param === undefined) ? Object.assign({}, this.defaultParam) : this.$route.query.param, checkedTab: 'first', @@ -908,6 +923,7 @@ export default { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } }) + this.getDepartmentArr() }, mounted() { const that = this @@ -916,6 +932,14 @@ export default { }) }, methods: { + getDepartmentArr() { + getDepartmentTreeList().then(res => { + this.departmemtArr = res + }) + }, + handleChange(v) { + this.ysjl.departmentId = v[1] + }, // 签名方法 singNameValue(data) { this.jianyanrenyuan = data.name diff --git a/src/views/ysjl/F000/dj/edit.vue b/src/views/ysjl/F000/dj/edit.vue index 01cb1f8..6bf7fd7 100644 --- a/src/views/ysjl/F000/dj/edit.vue +++ b/src/views/ysjl/F000/dj/edit.vue @@ -505,13 +505,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data this.ysjl.xiacijianyanriqishuoming = '—' if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)