Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/utils/request.js

@@ -6,23 +6,23 @@ import store from '@/store'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 60000, // request timeout
+  timeout: 30000, // request timeout
   withCredentials: true
 })
 
 // request interceptor
-service.interceptors.request.use(config => {
+// service.interceptors.request.use(config => {
 //   Do something before request is sent
-  if (store.getters.token) {
+//   if (store.getters.token) {
 //     让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
-    config.headers['token_cookie'] = ""
-  }
-  return config
-}, error => {
+//     config.headers['X-Token'] = getToken()
+//   }
+//   return config
+// }, error => {
 //   Do something with request error
-  console.log(error) // for debug
-  Promise.reject(error)
-})
+//   console.log(error) // for debug
+//   Promise.reject(error)
+// })
 
 // respone interceptor
 service.interceptors.response.use(

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1012,6 +1012,7 @@
           >
           </DialysisPrintOrderFortyTwo>
 
+          </DialysisPrintOrderFortyTwo>
           <DialysisPrintOrderFortyThree
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 43"
@@ -1023,7 +1024,7 @@
             v-if="org_template_info.template_id == 44"
           >
           </DialysisPrintOrderFortyFour>
-          
+
           <DialysisPrintOrderFortyFive
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 45"