From c37ec233353bd6c73fdc55c7d0daeeb852a34ea1 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 22 Sep 2020 15:57:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/record/approval-add-or-update.vue | 7 +-- .../modules/result/record/lzresultrecord.vue | 9 +++- .../result/record/lzresultrecordapp.vue | 43 ++++++++++++------- .../modules/result/record/recorddetail.vue | 2 +- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue index 56ca723..eebef23 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -23,9 +23,10 @@ - 通过 - 通过 - 驳回 + 通过 + 通过 + 驳回 + 申述 diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index c5cae7d..8be95eb 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -138,6 +138,10 @@ export default { return '审批通过' } else if (status === 5) { return '驳回' + } else if (status === 6) { + return '申述中' + } else if (status === 7) { + return '己终止' } return '' }, @@ -183,7 +187,10 @@ export default { {value: '1', label: '审批中'}, {value: '2', label: '拒绝'}, {value: '3', label: '审批中'}, - {value: '4', label: '审批通过'} + {value: '4', label: '审批通过'}, + {value: '5', label: '驳回'}, + {value: '6', label: '申述中'}, + {value: '7', label: '己终止'} ], departmentList1: [], departmentList2: [], diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 96eba4e..8afef62 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -63,8 +63,6 @@ - - @@ -73,7 +71,7 @@ 查询 - + - - 提交 + + 批量操作 - - - + + + - + { recordIdsSubmit({ - 'recordIds': this.recordIdsSelect.join(',') + 'recordIds': this.recordIdsSelect.join(','), + 'batchOpt': this.dataForm.batchOpt }).then(data => { this.alertInfo(data.msg) this.getDataList() @@ -347,6 +358,7 @@ export default { if (data && data.code === 0) { this.dataList = data.page.list this.totalPage = data.page.totalCount + this.departmentLevel = data.departmentLevel if (this.isChangeDepartmentrtment === 0) { this.departmentList1 = data.departmentList1 this.departmentList2 = data.departmentList2 @@ -400,7 +412,6 @@ export default { this.pageIndex = val this.getDataList() }, - // 多选 selectionChangeHandle (val) { this.dataListSelections = val diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 5e4e9b2..91abc06 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -50,7 +50,7 @@ -
+
From 2b4b5ac06a935458e964a5f9b6a6816c7c726822 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 22 Sep 2020 16:41:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/device-manage/device-list.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/modules/device-manage/device-list.vue b/src/views/modules/device-manage/device-list.vue index c49980b..4f39934 100644 --- a/src/views/modules/device-manage/device-list.vue +++ b/src/views/modules/device-manage/device-list.vue @@ -6,6 +6,7 @@ v-model="specReq.count" :disabled="departmentReaderOnly" @change="changeDepartment(0)" + style="width:100px" > @@ -36,6 +37,7 @@ :disabled="departmentReaderOnly" placeholder="请选择" @change="changeDepartment(3)" + style="width:100px" > @@ -82,6 +86,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" @change="changeInData" + style="width:300px" > From 922c2beeeb9b903f867ccf8171ce5ffd7d6cfb7d Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 22 Sep 2020 17:55:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api_flow_manager.js | 10 + .../result/record/approval-add-or-update.vue | 10 - .../modules/result/record/recorddetail.vue | 2 +- .../role/lzflowmanager-add-or-update.vue | 111 +++++++++++ .../modules/result/role/lzflowmanager.vue | 177 ++++++++++++++++++ 5 files changed, 299 insertions(+), 11 deletions(-) create mode 100644 src/api/api_flow_manager.js create mode 100644 src/views/modules/result/role/lzflowmanager-add-or-update.vue create mode 100644 src/views/modules/result/role/lzflowmanager.vue diff --git a/src/api/api_flow_manager.js b/src/api/api_flow_manager.js new file mode 100644 index 0000000..7c87ace --- /dev/null +++ b/src/api/api_flow_manager.js @@ -0,0 +1,10 @@ +import http from '../utils/http' + +// 获取侧边菜单栏 +export const apiGetFlowList = params => { + return http({url: '/lz_management/user/lzflowmanager/list', method: 'get', params}) +} + +export const apiFlowInfo = params => { + return http({url: `/lz_management/user/lzflowmanager/info/${params}`, method: 'post'}) +} diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue index eebef23..e5b2889 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -6,16 +6,6 @@ -
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 91abc06..454b47e 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -47,7 +47,7 @@
- +
diff --git a/src/views/modules/result/role/lzflowmanager-add-or-update.vue b/src/views/modules/result/role/lzflowmanager-add-or-update.vue new file mode 100644 index 0000000..19f5e09 --- /dev/null +++ b/src/views/modules/result/role/lzflowmanager-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/modules/result/role/lzflowmanager.vue b/src/views/modules/result/role/lzflowmanager.vue new file mode 100644 index 0000000..775a8fd --- /dev/null +++ b/src/views/modules/result/role/lzflowmanager.vue @@ -0,0 +1,177 @@ + + +