huangyw 2 lat temu
rodzic
commit
e6f98c4554

+ 3 - 2
config/dev.env.js Wyświetl plik

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:9529"',  
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"',
15
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
15
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
16
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
16
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
17
 }
17
 }
18
+

+ 2 - 2
config/index.js Wyświetl plik

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: 'localhost',
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,
37
     notifyOnErrors: false,
37
     notifyOnErrors: false,

+ 39 - 31
package-lock.json Wyświetl plik

37
       }
37
       }
38
     },
38
     },
39
     "@babel/helper-validator-identifier": {
39
     "@babel/helper-validator-identifier": {
40
-      "version": "7.16.7",
41
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
42
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
40
+      "version": "7.18.6",
41
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
42
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
43
     },
43
     },
44
     "@babel/highlight": {
44
     "@babel/highlight": {
45
-      "version": "7.17.12",
46
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
47
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
45
+      "version": "7.18.6",
46
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
47
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
48
       "requires": {
48
       "requires": {
49
-        "@babel/helper-validator-identifier": "^7.16.7",
49
+        "@babel/helper-validator-identifier": "^7.18.6",
50
         "chalk": "^2.0.0",
50
         "chalk": "^2.0.0",
51
         "js-tokens": "^4.0.0"
51
         "js-tokens": "^4.0.0"
52
       },
52
       },
459
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
459
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
460
     },
460
     },
461
     "are-we-there-yet": {
461
     "are-we-there-yet": {
462
-      "version": "3.0.0",
463
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
464
-      "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
462
+      "version": "3.0.1",
463
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
464
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
465
       "requires": {
465
       "requires": {
466
         "delegates": "^1.0.0",
466
         "delegates": "^1.0.0",
467
         "readable-stream": "^3.6.0"
467
         "readable-stream": "^3.6.0"
6600
     "ip": {
6600
     "ip": {
6601
       "version": "1.1.5",
6601
       "version": "1.1.5",
6602
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
6602
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
6603
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
6603
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
6604
+      "dev": true
6604
     },
6605
     },
6605
     "ipaddr.js": {
6606
     "ipaddr.js": {
6606
       "version": "1.8.0",
6607
       "version": "1.8.0",
6660
       "dev": true
6661
       "dev": true
6661
     },
6662
     },
6662
     "is-core-module": {
6663
     "is-core-module": {
6663
-      "version": "2.9.0",
6664
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
6665
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
6664
+      "version": "2.10.0",
6665
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
6666
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
6666
       "requires": {
6667
       "requires": {
6667
         "has": "^1.0.3"
6668
         "has": "^1.0.3"
6668
       }
6669
       }
7970
       }
7971
       }
7971
     },
7972
     },
7972
     "minipass": {
7973
     "minipass": {
7973
-      "version": "3.3.3",
7974
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz",
7975
-      "integrity": "sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==",
7974
+      "version": "3.3.4",
7975
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
7976
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
7976
       "requires": {
7977
       "requires": {
7977
         "yallist": "^4.0.0"
7978
         "yallist": "^4.0.0"
7978
       },
7979
       },
8440
       },
8441
       },
8441
       "dependencies": {
8442
       "dependencies": {
8442
         "@babel/code-frame": {
8443
         "@babel/code-frame": {
8443
-          "version": "7.16.7",
8444
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
8445
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
8444
+          "version": "7.18.6",
8445
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
8446
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
8446
           "requires": {
8447
           "requires": {
8447
-            "@babel/highlight": "^7.16.7"
8448
+            "@babel/highlight": "^7.18.6"
8448
           }
8449
           }
8449
         },
8450
         },
8450
         "ansi-styles": {
8451
         "ansi-styles": {
12256
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
12257
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
12257
     },
12258
     },
12258
     "psl": {
12259
     "psl": {
12259
-      "version": "1.8.0",
12260
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
12261
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
12260
+      "version": "1.9.0",
12261
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
12262
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
12262
     },
12263
     },
12263
     "public-encrypt": {
12264
     "public-encrypt": {
12264
       "version": "4.0.3",
12265
       "version": "4.0.3",
13090
           }
13091
           }
13091
         },
13092
         },
13092
         "yargs-parser": {
13093
         "yargs-parser": {
13093
-          "version": "21.0.1",
13094
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
13095
-          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
13094
+          "version": "21.1.1",
13095
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
13096
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
13096
         }
13097
         }
13097
       }
13098
       }
13098
     },
13099
     },
13683
       }
13684
       }
13684
     },
13685
     },
13685
     "socks": {
13686
     "socks": {
13686
-      "version": "2.6.2",
13687
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
13688
-      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
13687
+      "version": "2.7.0",
13688
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
13689
+      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
13689
       "requires": {
13690
       "requires": {
13690
-        "ip": "^1.1.5",
13691
+        "ip": "^2.0.0",
13691
         "smart-buffer": "^4.2.0"
13692
         "smart-buffer": "^4.2.0"
13693
+      },
13694
+      "dependencies": {
13695
+        "ip": {
13696
+          "version": "2.0.0",
13697
+          "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
13698
+          "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
13699
+        }
13692
       }
13700
       }
13693
     },
13701
     },
13694
     "socks-proxy-agent": {
13702
     "socks-proxy-agent": {

+ 0 - 1
package.json Wyświetl plik

105
     "html-webpack-plugin": "2.30.1",
105
     "html-webpack-plugin": "2.30.1",
106
     "lint-staged": "7.2.0",
106
     "lint-staged": "7.2.0",
107
     "node-notifier": "5.1.2",
107
     "node-notifier": "5.1.2",
108
-    "node-sass": "^4.14.1",
109
     "optimize-css-assets-webpack-plugin": "3.2.0",
108
     "optimize-css-assets-webpack-plugin": "3.2.0",
110
     "ora": "1.3.0",
109
     "ora": "1.3.0",
111
     "portfinder": "1.0.13",
110
     "portfinder": "1.0.13",

Plik diff jest za duży
+ 505 - 405
src/xt_pages/outpatientDoctorStation/batch_mode_template.vue


+ 2 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Wyświetl plik

2160
         if (tab == 'more') {
2160
         if (tab == 'more') {
2161
           return false
2161
           return false
2162
         }
2162
         }
2163
-      }, open_three() {
2163
+      }, 
2164
+      open_three() {
2164
         for (let i = 0; i < this.prescriptions.length; i++) {
2165
         for (let i = 0; i < this.prescriptions.length; i++) {
2165
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
2166
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
2166
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
2167
             if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {

Plik diff jest za duży
+ 579 - 506
src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue


+ 14 - 13
src/xt_permission.js Wyświetl plik

11
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
11
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
+  
14
   // 线上注释
15
   // 线上注释
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
16
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
17
+    store.dispatch('VerifyConfigList', []).then(() => {
18
+      next()
19
+    })
20
+  }
21
+  if (store.getters.permission_routers === undefined) {
22
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
23
+      next()
24
+    })
25
+  } else {
26
+    next()
27
+  }
28
+  return
28
   // 线上注释
29
   // 线上注释
29
   NProgress.start()
30
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
31
   // console.log(store.getters.current_role_urls.indexOf(to.path))