From 49a2df483743be8f986b09d116d4533eb3c0ed9b Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 15:21:43 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bggl/8000/jj/azjj.vue | 2 +- src/views/bggl/components/original_db_list.vue | 14 +++++++------- src/views/bggl/yiban_list.vue | 2 +- src/views/ysjl/components/original_yb_list.vue | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/bggl/8000/jj/azjj.vue b/src/views/bggl/8000/jj/azjj.vue index ecf6738..41d57c9 100644 --- a/src/views/bggl/8000/jj/azjj.vue +++ b/src/views/bggl/8000/jj/azjj.vue @@ -753,7 +753,7 @@ export default { } let url = '' this.ysjl.bglx = 1 - this.ysjl.cjState = 'bggl' + this.ysjl.cjState = 'jybg' this.ysjl.zfState = '0' this.ysjl.jianyanxiangmu = 'azjj' this.ysjl.jlprintState = 0 diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index 7749288..63660af 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -620,13 +620,13 @@ export default { }, delReport() { // 批量删除 - this.ysjlId = '' if (this.multipleSelection.length === 0) { this.$message('请在列表选择要删除的数据。') return false } let linkname = '' let revertRenwuByYsjlIds = '' + const ids = [] for (let i = 0; i < this.multipleSelection.length; i++) { if (i === 0 && this.multipleSelection[i].flowstatus === 1) { linkname = this.multipleSelection[i].flowstatus @@ -638,10 +638,7 @@ export default { if (this.multipleSelection[i].shebeileibiedaima === '2100' && this.multipleSelection[i].jianyanleibie === 'DJ') { revertRenwuByYsjlIds = this.multipleSelection[i].id + ',' + revertRenwuByYsjlIds } - this.ysjlId = this.multipleSelection[i].id + ',' + this.ysjlId - if (i + 1 === this.multipleSelection.length) { - this.ysjlId = this.ysjlId.substring(0, this.ysjlId.length - 1) - } + ids.push(this.multipleSelection[i].id) } this.$confirm('确定删除当前选中报告?', '提示', { confirmButtonText: '确定', @@ -650,9 +647,12 @@ export default { }).then(() => { this.api({ url: '/ysjl/delReport', - method: 'post', + method: 'delete', params: { - ids: this.ysjlId + ids: ids + }, + paramsSerializer: function(params) { + return require('qs').stringify(params, { indices: false }) } }).then(() => { this.$message({ diff --git a/src/views/bggl/yiban_list.vue b/src/views/bggl/yiban_list.vue index aa2eb02..983cb9e 100644 --- a/src/views/bggl/yiban_list.vue +++ b/src/views/bggl/yiban_list.vue @@ -144,7 +144,7 @@ export default { }, methods: { getList() { - this.listQuery.cjState = 'bggl' + this.listQuery.cjState = 'jybg' this.api({ url: '/ysjl/getListDoneJybg', method: 'get', diff --git a/src/views/ysjl/components/original_yb_list.vue b/src/views/ysjl/components/original_yb_list.vue index 94b8d23..d93bb2e 100644 --- a/src/views/ysjl/components/original_yb_list.vue +++ b/src/views/ysjl/components/original_yb_list.vue @@ -143,7 +143,7 @@ export default { }, methods: { getList() { - this.listQuery.cjState = 'bggl' + this.listQuery.cjState = 'jybg' this.api({ url: '/ysjl/getListDoneYsjl', method: 'get', From 3485063e7d487aadbcfd88895342b6305d9ad728 Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 16:49:52 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84=E7=AD=BE=E5=90=8D=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bggl/components/original_db_list.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index 63660af..b442847 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -469,7 +469,7 @@ export default { dialogSignVisible: false, passForm: { password: '', - signDate: new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate() + signDate: this.formatter.dateFormat('YYYY-MM-dd') }, isBatchSign: false, // 标记是否为批量签名 listCopy: [], @@ -1048,11 +1048,6 @@ export default { } }, qianming() { - // 锅炉制造科室人员发送报告不输入签名密码 - if (this.$store.getters.departmentId === 74) { - this.sign() - return - } this.api({ url: '/user/validationPwd', method: 'post', From e4da9ef544e69e07b7fed581c4fa7056d466dd07 Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 17:09:53 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bggl/components/original_db_list.vue | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index b442847..1f12098 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -660,10 +660,6 @@ export default { type: 'success', duration: 1000, onClose: () => { - // 修改16版任务状态 - if (revertRenwuByYsjlIds) { - this.common.updRenwuState(revertRenwuByYsjlIds, 0, false) - } this.getList() // 刷新原始记录待办，原始记录已办列表，任务列表 Utils.$emit('task-list') @@ -701,7 +697,7 @@ export default { } } this.ysjlId = arr - if (this.ysjlId !== '') { + if (this.ysjlId.length) { this.dialogBohuiVisible = true } }, @@ -749,15 +745,15 @@ export default { const nblb = this.multipleSelection[0].neibuleibie const sbzldm = this.multipleSelection[0].shebeizhongleidaima const bglx = this.multipleSelection[0].bglx + this.ysjlId = [] for (let i = 0; i < this.multipleSelection.length; i++) { + this.ysjlId.push(this.multipleSelection[i].id) if (i === 0) { linkname = this.multipleSelection[i].flowstatus - this.ysjlId = this.multipleSelection[i].id if (this.multipleSelection[i].bglx === 1) { parentIds = this.multipleSelection[i].id } } else { - this.ysjlId = this.ysjlId + ',' + this.multipleSelection[i].id if (this.multipleSelection[i].bglx === 1) { parentIds = parentIds + ',' + this.multipleSelection[i].id } @@ -873,22 +869,24 @@ export default { this.$message('只能选择单人处理下一环节。') return false } - let linkname = '' - for (let i = 0; i < this.multipleSelectionLink.length; i++) { - if (i === 0) { - linkname = this.multipleSelectionLink[i].flowstatus - } - if (linkname !== this.multipleSelectionLink[i].flowstatus) { + const flowstatus = this.multipleSelection[0].flowstatus + for (let i = 1; i < this.multipleSelection.length; i++) { + if (flowstatus !== this.multipleSelection[i].flowstatus) { this.$message('请选择同环节进行发送。') return false } } - this.multipleSelectionLink[0].ysjlId = this.ysjlId const _vue = this + const link = this.multipleSelectionLink[0] this.api({ url: '/flow/send', method: 'post', - data: this.multipleSelectionLink[0] + data: { + ysjlIds: this.ysjlId, + userId: link.userId, + currentLink: flowstatus, + nextValue: link.nextValue + } }).then(() => { this.dialogFormVisible = false this.$message({ From 89e018819218f6d44aed581b23f0c233b75fc3ef Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 17:23:09 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=88=97=E5=AF=B9=E5=BA=94=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawerDialog/index.vue | 42 +++++++++++++++++---------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue index bbaff9b..3ddab06 100644 --- a/src/components/drawerDialog/index.vue +++ b/src/components/drawerDialog/index.vue @@ -262,12 +262,12 @@
- 模板详情 + 模板配置 新增 @@ -373,7 +373,7 @@ icon="el-icon-edit" circle title="编辑" - @click="editFnTem(scope.row)" + @click="editTemplateSettingFn(scope.row)" /> @@ -398,12 +398,12 @@
- 模板详情 + 检验项目列配置{{ templateSettingLabel }} 新增 @@ -441,7 +441,7 @@ icon="el-icon-edit" circle title="编辑" - @click="editFn(scope.row)" + @click="editTemplateJyxmFn(scope.row)" /> @@ -883,7 +883,8 @@ export default { total1: 0, jyxmModes: ['检验项目', '附表', '不合格整改检验项目', '大型起重机械检验项目', '报告检验项目'], writeModes: ['CN模式', 'DN模式', 'KV模式', 'CFI模式', 'SA模式'], - affiliatedAddModes: ['固定表格', '附页文件', 'word自动切换'] + affiliatedAddModes: ['固定表格', '附页文件', 'word自动切换'], + templateSettingLabel: '' } }, mounted() {}, @@ -957,15 +958,24 @@ export default { affiliatedAddMode: 0 } }, - addTemFn() { + addTemplateSettingFn() { this.initTemplateSettingForm() this.dialogVisible1 = true }, - editFnTem(row) { + editTemplateSettingFn(row) { this.form = this.common.deepCopy(row) this.dialogVisible1 = true }, - addtemFn() { + addTemplateJyxmFn() { + this.$set(this, 'formLabelAlign', { + field: '', + fieldMode: 0, + indexFromRight: '', + templateId: '', // 模板id + templateSettingId: '', // 配置id + alias: '', + underlineStitching: false + }) this.dialogVisible = true }, getList() { @@ -988,14 +998,14 @@ export default { } }) }, - deleteModelFn(row) { + deleteTemplateSettingFn(row) { TemplateApi.deleteModuleFn({ ids: [row.id] }).then((data) => { this.getList() }) }, - deleteFn(row, index) { + deleteTemplateJyxmFn(row, index) { const arr = [] arr.push(row.id) TemplateApi.deleteTemplateJyxm({ @@ -1037,7 +1047,7 @@ export default { toggleFn(val) { this.multipleSelection = val }, - editFn(row) { + editTemplateJyxmFn(row) { this.dialogVisible = true this.formLabelAlign = this.common.deepCopy(row) }, @@ -1260,6 +1270,7 @@ export default { return false } this.templateSettingId = row.id + this.templateSettingLabel = this.jyxmModes[row.jyxmMode] + '-' + row.sort this.$refs.settingList.toggleRowSelection(row) this.getDemoList() }, @@ -1286,6 +1297,7 @@ export default { beforeClose(done) { this.list.length = 0 this.gridData.length = 0 + this.templateSettingLabel = '' this.clearForm() this.$emit('closeTemplateDrawer') } From 006b42f15ae474a322bff80150a4c3379cdfceee Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 21:14:08 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ysjl/3000/common/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue index 841e0b8..fd772bd 100644 --- a/src/views/ysjl/3000/common/index.vue +++ b/src/views/ysjl/3000/common/index.vue @@ -255,9 +255,9 @@ - + From 90a74d8a52e078af5f05bde10c5d96e52cd0561b Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Fri, 27 Aug 2021 21:20:47 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BE=A4=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/flow/definition.vue | 188 ++++++++++++++++++++-------------- 1 file changed, 109 insertions(+), 79 deletions(-) diff --git a/src/views/flow/definition.vue b/src/views/flow/definition.vue index 03246b3..715e50f 100644 --- a/src/views/flow/definition.vue +++ b/src/views/flow/definition.vue @@ -30,12 +30,12 @@ @@ -93,7 +93,7 @@ @@ -549,32 +549,6 @@ export default { }) }) }, - viewHzd(bjdId) { - this.preview({ - url: '/print/generatePdfHzd', - method: 'get', - params: { - bjdId: bjdId - } - }).then((data) => { - data = data.replace(/\\/g, '/') - if (data) { - this.$router.push({ - path: - '/preview/hzd?src=' + - this.$store.getters.prodName + - '/static/web/viewer.html?file=' + - encodeURIComponent(data) - }) - } else { - this.$message({ - message: 'PDF预览错误！', - type: 'error', - duration: 3 * 1000 - }) - } - }) - }, errorBjd() { // 异常收回 this.$confirm('报检项目将进行异常收回，是否继续?', '提示', { diff --git a/src/views/bjd/jj_list.vue b/src/views/bjd/jj_list.vue index af6a7c0..fa32db9 100644 --- a/src/views/bjd/jj_list.vue +++ b/src/views/bjd/jj_list.vue @@ -166,7 +166,7 @@ @@ -438,29 +438,6 @@ export default { viewInfo(reason) { this.$message({ message: reason, type: 'info' }) }, - viewHzd(bjdid) { - this.apibjd({ - url: '/bjd/printHzd', - method: 'get', - params: { - bjdIds: bjdid - } - }).then(data => { - this.preview({ - url: '/print/generatePdfListing', - method: 'post', - data: { - info: data.bjd, - paramList: data.renwu, - viewType: 'HZD' - } - }).then(data => { - data = data.replace(/\\/g, '/') - // router.push({ path: '/preview/1/1/urlPath?src=' + store.getters.prodName + '/static/web/viewer.html?file=' + encodeURIComponent(data) + '&v=' + Math.random() }) - window.open(data) - }) - }) - }, errorBjd() { // 异常收回 this.$confirm('报检项目将进行异常收回，是否继续?', '提示', { diff --git a/src/views/bjd/qy_list.vue b/src/views/bjd/qy_list.vue index 6ff799b..0ee8503 100644 --- a/src/views/bjd/qy_list.vue +++ b/src/views/bjd/qy_list.vue @@ -119,7 +119,7 @@ @@ -342,29 +342,6 @@ export default { viewInfo(reason) { this.$message({ message: reason, type: 'info' }) }, - viewHzd(bjdid) { - this.apibjd({ - url: '/bjd/printHzd', - method: 'get', - params: { - bjdIds: bjdid - } - }).then(data => { - this.preview({ - url: '/print/generatePdfListing', - method: 'post', - data: { - info: data.bjd, - paramList: data.renwu, - viewType: 'HZD' - } - }).then(data => { - data = data.replace(/\\/g, '/') - // router.push({ path: '/preview/1/1/urlPath?src=' + store.getters.prodName + '/static/web/viewer.html?file=' + encodeURIComponent(data) + '&v=' + Math.random() }) - window.open(data) - }) - }) - }, errorBjd() { // 异常收回 this.$confirm('报检项目将进行异常收回，是否继续?', '提示', { diff --git a/src/views/bjd/sjse/upload_list.vue b/src/views/bjd/sjse/upload_list.vue deleted file mode 100644 index 429d021..0000000 --- a/src/views/bjd/sjse/upload_list.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/src/views/bjd/sjse/upload_list_20200721.vue b/src/views/bjd/sjse/upload_list_20200721.vue deleted file mode 100644 index 9d27fa9..0000000 --- a/src/views/bjd/sjse/upload_list_20200721.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - diff --git a/src/views/bjd/sjse/upload_list_param.vue b/src/views/bjd/sjse/upload_list_param.vue deleted file mode 100644 index 7df3072..0000000 --- a/src/views/bjd/sjse/upload_list_param.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - diff --git a/src/views/bjd/sjse/upload_list_xingshi.vue b/src/views/bjd/sjse/upload_list_xingshi.vue deleted file mode 100644 index 28b6b98..0000000 --- a/src/views/bjd/sjse/upload_list_xingshi.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - - - From 8095ecf783b81819c321ee3086fb5311bdfd6b9a Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Sat, 28 Aug 2021 11:31:27 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/qiye_list.vue | 178 ----------------------------------- 1 file changed, 178 deletions(-) delete mode 100644 src/views/task/qiye_list.vue diff --git a/src/views/task/qiye_list.vue b/src/views/task/qiye_list.vue deleted file mode 100644 index 8ade26a..0000000 --- a/src/views/task/qiye_list.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - From 48ebaa045172292f015bd8c0c6d2d9378a4b44ff Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Sat, 28 Aug 2021 11:43:22 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bggl/components/original_db_list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index b20c75a..bb6a7ef 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -888,7 +888,7 @@ export default { ysjlIds: this.ysjlId, userId: link.userId, currentLink: flowstatus, - nextValue: link.nextValue + nextValue: flowstatus + 1 } }).then(() => { this.dialogFormVisible = false From 105e9cdc7e58cb189fec241ff69904b1977b81ba Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Sat, 28 Aug 2021 14:34:22 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bggl/components/original_db_list.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/bggl/components/original_db_list.vue b/src/views/bggl/components/original_db_list.vue index bb6a7ef..1df42fd 100644 --- a/src/views/bggl/components/original_db_list.vue +++ b/src/views/bggl/components/original_db_list.vue @@ -914,6 +914,9 @@ export default { method: 'post', params: { ids: ysjlId + }, + paramsSerializer: function(params) { + return qs.stringify(params, { indices: false }) } }).then(() => { this.$message({ From 8597bcf85afed36862621e9bd999011efc465a51 Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Sat, 28 Aug 2021 14:35:22 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index e78fef8..0e2c34e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,12 +31,6 @@ export const constantRouterMap = [{ import ('@/views/404'), hidden: true }, -{ - path: '/viewhzd/:id', - component: () => - import ('@/views/bjd/view_hzd'), - hidden: true -}, { path: '/showGrantInfo', component: () => From fd9b36cd5e1c46d6611ad9710b1210b58cd2ea4b Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Sat, 28 Aug 2021 15:39:06 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E6=9A=82=E7=A7=BB=E9=99=A4=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/role.vue | 2 +- src/views/user/user.vue | 44 +---------------------------------------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/views/user/role.vue b/src/views/user/role.vue index 012e153..f2016b9 100644 --- a/src/views/user/role.vue +++ b/src/views/user/role.vue @@ -56,7 +56,7 @@ -