Browse Source

长沙南雅打印单问题修改

28169 2 years ago
parent
commit
235a4b0abc

+ 2 - 2
config/dev.env.js View File

7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
8
   ENV_CONFIG: '"dev"',
9
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
9
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
11
-  // BASE_API: '"http://localhost:9531"',
10
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
11
+  BASE_API: '"http://localhost:9531"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 2 - 2
config/index.js View File

27
     // can be overwritten by process.env.HOST
27
     // can be overwritten by process.env.HOST
28
     // if you want dev by ip, please set host: '0.0.0.0'
28
     // if you want dev by ip, please set host: '0.0.0.0'
29
 
29
 
30
-    host: 'xt.test.sgjyun.com',
30
+    // host: 'xt.test.sgjyun.com',
31
     //  host: 'xt.kuyicloud.com',
31
     //  host: 'xt.kuyicloud.com',
32
    // host: 'xt.test.sgjyun.com',
32
    // host: 'xt.test.sgjyun.com',
33
-  //  host: 'localhost',
33
+    host: 'localhost',
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35
     autoOpenBrowser: true,
35
     autoOpenBrowser: true,
36
     errorOverlay: true,
36
     errorOverlay: true,

+ 1 - 1
package.json View File

56
     "jszip": "3.1.5",
56
     "jszip": "3.1.5",
57
     "mockjs": "1.0.1-beta3",
57
     "mockjs": "1.0.1-beta3",
58
     "moment": "^2.24.0",
58
     "moment": "^2.24.0",
59
-    "node-sass": "^7.0.1",
59
+    "node-sass": "^8.0.0",
60
     "normalize.css": "7.0.0",
60
     "normalize.css": "7.0.0",
61
     "nprogress": "0.2.0",
61
     "nprogress": "0.2.0",
62
     "print-js": "^1.0.50",
62
     "print-js": "^1.0.50",

+ 8 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue View File

3379
         var leftAdvice = [];
3379
         var leftAdvice = [];
3380
         var rightAdvice = [];
3380
         var rightAdvice = [];
3381
         var adlen = advices.length;
3381
         var adlen = advices.length;
3382
-
3382
+        console.log("adlen----------------------",adlen)
3383
         var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
3383
         var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
3384
         for (var i = 0; i < halfLen; i++) {
3384
         for (var i = 0; i < halfLen; i++) {
3385
           leftAdvice.push(advices[i]);
3385
           leftAdvice.push(advices[i]);
3404
           this.advices.push(item);
3404
           this.advices.push(item);
3405
         }
3405
         }
3406
         this.loading = false;
3406
         this.loading = false;
3407
-        this.doctor_advices =
3408
-          response.data.data.advices == null ? [] : response.data.data.advices;
3407
+        this.doctor_advices =response.data.data.advices == null ? [] : response.data.data.advices;
3408
+        console.log("zhonguog---------------------------------",this.doctor_advices)
3409
         for (let index = 0; index < this.doctor_advices.length; index++) {
3409
         for (let index = 0; index < this.doctor_advices.length; index++) {
3410
           this.doctor_advices[index]["isShow"] = 2;
3410
           this.doctor_advices[index]["isShow"] = 2;
3411
         }
3411
         }
3505
         }
3505
         }
3506
 
3506
 
3507
         this.totollength = this.doctor_advices.length + this.monitors.length;
3507
         this.totollength = this.doctor_advices.length + this.monitors.length;
3508
-        if (this.totollength > 18) {
3508
+        console.log("totalpath-------------------------------",this.totollength)
3509
+        if (this.totollength > 58) {
3509
           var temp_advice_length = 17 - this.monitors.length;
3510
           var temp_advice_length = 17 - this.monitors.length;
3511
+          console.log("temp_advice_length-----------",temp_advice_length)
3510
           var doctor_advices_1 = [];
3512
           var doctor_advices_1 = [];
3511
           var doctor_advices_2 = [];
3513
           var doctor_advices_2 = [];
3512
           for (let index = 0; index < this.doctor_advices.length; index++) {
3514
           for (let index = 0; index < this.doctor_advices.length; index++) {
3513
             const element = this.doctor_advices[index];
3515
             const element = this.doctor_advices[index];
3516
+
3514
             if (temp_advice_length > index) {
3517
             if (temp_advice_length > index) {
3515
               doctor_advices_1.push(element);
3518
               doctor_advices_1.push(element);
3516
             } else {
3519
             } else {
3520
           this.doctor_advices = doctor_advices_1;
3523
           this.doctor_advices = doctor_advices_1;
3521
           this.doctor_advices_2 = doctor_advices_2;
3524
           this.doctor_advices_2 = doctor_advices_2;
3522
         }
3525
         }
3526
+        console.log("doctor_advice----------",this.doctor_advices)
3523
 
3527
 
3524
         this.patientInfo.name = this.nameSplit(this.patientInfo.name);
3528
         this.patientInfo.name = this.nameSplit(this.patientInfo.name);
3525
       } else {
3529
       } else {

+ 13 - 13
src/xt_permission.js View File

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))