Merge branch 'dev'
Showing
5 changed files
with
29 additions
and
34 deletions
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | /* | 2 | /* |
3 | * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 | 3 | * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 |
4 | * @Autor: renchao | 4 | * @Autor: renchao |
5 | * @LastEditTime: 2023-07-21 10:30:53 | 5 | * @LastEditTime: 2023-08-16 15:16:49 |
6 | */ | 6 | */ |
7 | import axios from 'axios' | 7 | import axios from 'axios' |
8 | import Router from '@/router' | 8 | import Router from '@/router' |
... | @@ -54,10 +54,10 @@ service.interceptors.response.use( | ... | @@ -54,10 +54,10 @@ service.interceptors.response.use( |
54 | */ | 54 | */ |
55 | if (response.status == 200) { | 55 | if (response.status == 200) { |
56 | return response.data; | 56 | return response.data; |
57 | }else if (response.status == 2002){ | 57 | } else if (response.status == 2002) { |
58 | Message.error(response.message); | 58 | Message.error(response.message); |
59 | }else { | 59 | } else { |
60 | handleErrorData(response.data); | 60 | handleErrorData(response.status); |
61 | } | 61 | } |
62 | return response; | 62 | return response; |
63 | }, | 63 | }, |
... | @@ -97,26 +97,22 @@ service.interceptors.response.use( | ... | @@ -97,26 +97,22 @@ service.interceptors.response.use( |
97 | ) | 97 | ) |
98 | //对错误信息的处理函数 | 98 | //对错误信息的处理函数 |
99 | function handleErrorData (errMes) { | 99 | function handleErrorData (errMes) { |
100 | if (errMes.message) { | 100 | switch (errMes) { |
101 | Message.error(errMes.message); | 101 | case 401: |
102 | } else { | 102 | Message.error("未授权,请重新登录!"); |
103 | switch (errMes.code) { | 103 | break; |
104 | case 401: | 104 | case 403: |
105 | Message.error("未授权,请重新登录!"); | 105 | Message.error("拒绝访问"); |
106 | break; | 106 | break; |
107 | case 403: | 107 | case 404: |
108 | Message.error("拒绝访问"); | 108 | Message.error("很抱歉,资源未找到!"); |
109 | break; | 109 | break; |
110 | case 404: | 110 | case 500: |
111 | Message.error("很抱歉,资源未找到!"); | 111 | Message.error("服务器错误!"); |
112 | break; | 112 | break; |
113 | case 500: | 113 | default: |
114 | Message.error("服务器错误!"); | 114 | Message.error("服务正在联调中,请稍后!"); |
115 | break; | 115 | break; |
116 | default: | ||
117 | Message.error("服务正在联调中,请稍后!"); | ||
118 | break; | ||
119 | } | ||
120 | } | 116 | } |
121 | } | 117 | } |
122 | export default service | 118 | export default service | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-15 10:57:30 | 4 | * @LastEditTime: 2023-08-16 15:00:12 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="content"> | 7 | <div class="content"> |
... | @@ -46,7 +46,6 @@ | ... | @@ -46,7 +46,6 @@ |
46 | }, | 46 | }, |
47 | methods: { | 47 | methods: { |
48 | getBdcdyh (val) { | 48 | getBdcdyh (val) { |
49 | console.log(val, ';222222222222'); | ||
50 | // this.loadData(val); | 49 | // this.loadData(val); |
51 | }, | 50 | }, |
52 | /** | 51 | /** |
... | @@ -65,6 +64,8 @@ | ... | @@ -65,6 +64,8 @@ |
65 | this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 | 64 | this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 |
66 | this.loadComponent(this.defaultNode.form); | 65 | this.loadComponent(this.defaultNode.form); |
67 | }) | 66 | }) |
67 | } else { | ||
68 | this.$message.error(res.message); | ||
68 | } | 69 | } |
69 | }) | 70 | }) |
70 | this.currentSelectProps = { | 71 | this.currentSelectProps = { |
... | @@ -90,7 +91,6 @@ | ... | @@ -90,7 +91,6 @@ |
90 | * @author: renchao | 91 | * @author: renchao |
91 | */ | 92 | */ |
92 | loadComponent (form) { | 93 | loadComponent (form) { |
93 | console.log(form, 'form'); | ||
94 | this.componentTag = (r) => | 94 | this.componentTag = (r) => |
95 | require.ensure([], () => r(require("@/views/registerBook/" + form))) | 95 | require.ensure([], () => r(require("@/views/registerBook/" + form))) |
96 | } | 96 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-16 14:08:42 | 4 | * @LastEditTime: 2023-08-16 15:33:46 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -106,10 +106,10 @@ | ... | @@ -106,10 +106,10 @@ |
106 | this.isDisabled ? <el-button | 106 | this.isDisabled ? <el-button |
107 | icon="el-icon-view" | 107 | icon="el-icon-view" |
108 | type="text" | 108 | type="text" |
109 | onClick={() => { this.queryViewClick(scope.$index, scope.row) }} disabled={this.isDisabled} > 查看</el-button> : <el-button | 109 | onClick={() => { this.queryViewClick(scope.$index, scope.row) }} > 查看</el-button> : <el-button |
110 | icon="el-icon-edit-outline" | 110 | icon="el-icon-edit-outline" |
111 | type="text" | 111 | type="text" |
112 | onClick={() => { this.editClick(scope.$index, scope.row) }} disabled={this.isDisabled}>编辑</el-button> | 112 | onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button> |
113 | } | 113 | } |
114 | </div> | 114 | </div> |
115 | ) | 115 | ) | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: 受理信息 | 2 | * @Description: 受理信息 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-16 14:38:36 | 4 | * @LastEditTime: 2023-08-16 15:36:07 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="slxx"> | 7 | <div class="slxx"> |
... | @@ -345,7 +345,7 @@ | ... | @@ -345,7 +345,7 @@ |
345 | </el-form-item> | 345 | </el-form-item> |
346 | </el-col> | 346 | </el-col> |
347 | </el-row> | 347 | </el-row> |
348 | <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="viewEdit" | 348 | <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!viewEdit" |
349 | :gyfs="ruleForm.qlxx.gyfs" /> | 349 | :gyfs="ruleForm.qlxx.gyfs" /> |
350 | 350 | ||
351 | <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'"> | 351 | <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'"> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-02 09:53:35 | 4 | * @LastEditTime: 2023-08-16 14:59:46 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -239,7 +239,6 @@ | ... | @@ -239,7 +239,6 @@ |
239 | * @author: miaofang | 239 | * @author: miaofang |
240 | */ | 240 | */ |
241 | openBook (row) { | 241 | openBook (row) { |
242 | console.log("的急急急急急急"); | ||
243 | var param = { | 242 | var param = { |
244 | bdcdyid: row.bdcdyid, | 243 | bdcdyid: row.bdcdyid, |
245 | qllx: row.qllx, | 244 | qllx: row.qllx, | ... | ... |
-
Please register or sign in to post a comment