diff --git a/src/utils/request.js b/src/utils/request.js index affd2a5..17c8c35 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ //baseURL: 'http://172.18.113.50:8080/zhapi', - //baseURL: 'http://172.18.11//.13:8080/zhapi', // 孙强 + //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue index d0a4eae..5fe8016 100644 --- a/src/views/closeLoopDispose/components/backlog.vue +++ b/src/views/closeLoopDispose/components/backlog.vue @@ -38,7 +38,7 @@ - + @@ -223,7 +223,7 @@ export default { // return "#FDA722"; case "审核完成": return "#2eb9ef"; - case "驳回完成": + case "驳回": return "#e55b5b"; } }, @@ -235,7 +235,7 @@ export default { case 2 : return "审核完成"; case 3 : - return "驳回完成"; + return "驳回"; } }, handleSizeChange(val) { diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue index 4052bfd..aa9726b 100644 --- a/src/views/closeLoopDispose/components/backlogDetailForm.vue +++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue @@ -117,7 +117,7 @@ 处理意见: - {{ item.comment }} + {{ item.comment.comment }} 处理意见: - {{ item.comment }} + {{ item.comment.comment }} diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue index 0bc1b61..d0f301d 100644 --- a/src/views/closeLoopDispose/components/copy.vue +++ b/src/views/closeLoopDispose/components/copy.vue @@ -255,7 +255,7 @@ export default { // return "#FDA722"; case "审核完成": return "#2eb9ef"; - case "驳回完成": + case "驳回": return "#e55b5b"; } }, @@ -267,7 +267,7 @@ export default { case 2 : return "审核完成"; case 3 : - return "驳回完成"; + return "驳回"; } }, handleSizeChange(val) { diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue index 33ae73c..c5d8ed2 100644 --- a/src/views/closeLoopDispose/components/copyDetailForm.vue +++ b/src/views/closeLoopDispose/components/copyDetailForm.vue @@ -85,7 +85,7 @@ 处理意见: - {{ item.comment }} + {{ item.comment.comment }} diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue index 03e95cf..3fd1a6e 100644 --- a/src/views/closeLoopDispose/components/myCourse.vue +++ b/src/views/closeLoopDispose/components/myCourse.vue @@ -3,10 +3,10 @@ - + @@ -36,6 +36,10 @@ placeholder="请选择关键词" > + + 搜索 + 重置 + @@ -176,10 +180,12 @@ export default { }; get_my_course(param).then((res) => { // 根据返回码值判断流程状态 - for( let i = 0; i 处理意见: - {{ item.comment }} + {{ item.comment.comment }}