diff --git a/src/api/closeLoopDispose/index.js b/src/api/closeLoopDispose/index.js index 07c847c..b0aea83 100644 --- a/src/api/closeLoopDispose/index.js +++ b/src/api/closeLoopDispose/index.js @@ -23,4 +23,36 @@ export function get_backlog(data) { method: 'post', data }) +} +// 待办任务公司树查询 +export function get_backlog_company_tree(params) { + return request({ + url: '/closedloopdisposal/workflow/dept/list', + method: 'get', + params + }) +} +// 审批流程 +export function get_backlog_approve(data) { + return request({ + url: '/workflow/external/task/approve', + method: 'post', + data + }) +} +// 已办任务查询 +export function get_complete(data) { + return request({ + url: '/workflow/external/finishedList', + method: 'post', + data + }) +} +// 抄送我的查询 +export function get_copy(data) { + return request({ + url: '/workflow/external/copyList', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/assets/companyFile/230091.png b/src/assets/companyFile/230091.png new file mode 100644 index 0000000..9b7d2e9 Binary files /dev/null and b/src/assets/companyFile/230091.png differ diff --git a/src/utils/request.js b/src/utils/request.js index 2da54f2..38a4904 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ const request = axios.create({ baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - // baseURL: `http://${window.location.host}/zhapi`, + baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue index 7b4ce11..c6dcd73 100644 --- a/src/views/closeLoopDispose/components/backlog.vue +++ b/src/views/closeLoopDispose/components/backlog.vue @@ -39,10 +39,10 @@ - + @@ -126,6 +126,9 @@ export default { total: 0, }; }, + created() { + this.search_data(); + }, methods: { search_data() { let param = { @@ -142,6 +145,11 @@ export default { searchKey: this.search.word, }; get_backlog(param).then((res) => { + // 根据返回码值判断流程状态 + for( let i = 0; i /deep/.el-table { // width: 96vw; - height: 60vh; + height: 57vh; background: rgba(0, 0, 0, 0); border: 0.1px solid #3f5564; thead { diff --git a/src/views/closeLoopDispose/components/backlogDetail.vue b/src/views/closeLoopDispose/components/backlogDetail.vue index c1affe2..629bfeb 100644 --- a/src/views/closeLoopDispose/components/backlogDetail.vue +++ b/src/views/closeLoopDispose/components/backlogDetail.vue @@ -6,6 +6,7 @@ @@ -39,6 +40,11 @@ export default { activeName: "first", }; }, + methods:{ + back_home_page() { + this.$emit('back_home_page') + }, + } }; \ No newline at end of file diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue index bd70c07..0ef80c5 100644 --- a/src/views/closeLoopDispose/components/backlogDetailForm.vue +++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue @@ -68,15 +68,25 @@ - - - + + --> +
+
+ + {{ tag.name }} + +
+
+ +
+
- 处置完成 - 处置失败 + 处置完成 + 处置失败 @@ -86,8 +96,8 @@
@@ -97,42 +107,51 @@
-
{{ item.name }}
-
{{ item.team }}
+
{{ item.assigneeName }}
+
{{ item.candidate }}
处理意见:
-
{{ item.backlog_value }}
+
{{ item.comment }}
-
-
附件:
+ -
{{ item.attachment_value }}
-
+
抄送人:
-
{{ item.send_person }}
+
{{ item.assigneeName }}
时间:
-
{{ item.backlog_time }}
+
{{ item.createTime }}
+ @@ -465,7 +524,7 @@ export default { margin-left: 1vw; display: flex; .backlog_idea_person_img { - width: 10vw; + width: 15vw; height: 7vh; margin-left: 1.5vw; // border: 0.1px solid #3f5564; @@ -521,14 +580,37 @@ export default { } /deep/.el-form { margin-top: 1vh; + overflow: auto; + height: 24.5vh; + // border: 0.1px solid #3f5564; .el-form-item { + .push_company { + border: 0.1px solid #3f5564; + // height: 4vh; + display: flex; + justify-content: space-between; + .icon_btn { + width: 42px !important; + height: 4vh; + // border: 0.1px solid #3f5564; + color: #3f5564; + text-align: center; + line-height: 4vh; + cursor: pointer; + font-size: 16px; + } + .icon_btn:focus, + .icon_btn:hover { + text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); + } + } .el-form-item__label { text-align: center; color: #fff; } } .el-form-item__content { - width: 25vw; + width: 26vw; .el-input__inner { width: 25vw; border-radius: 0px; @@ -597,4 +679,23 @@ export default { background: #323f43 !important; } } +.el-form::-webkit-scrollbar { + display: none; + width: 6px; + background-color: #5e666a; + border-radius: 4px; +} +.el-form::-webkit-scrollbar-thumb { + display: none; + width: 5px; + background-color: #3c4b4a; + border-radius: 4px; +} +.el-tag { + color: #fff; + border-radius: 0px; + background: rgba(0, 0, 0, 0); + border: 0.1px solid #3f5564; + text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); +} \ No newline at end of file diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue index e69de29..035f407 100644 --- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue +++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue @@ -0,0 +1,303 @@ + + + \ No newline at end of file diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue index c76ab5a..3be4683 100644 --- a/src/views/closeLoopDispose/components/complete.vue +++ b/src/views/closeLoopDispose/components/complete.vue @@ -51,16 +51,16 @@
- + - + - + - + @@ -98,6 +98,7 @@