Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.308"
+  "version": "1.0.317"
 }

package.json

@@ -17,6 +17,7 @@
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
   },
   "dependencies": {
+    "@types/better-scroll": "^1.12.1",
     "axios": "^0.19.0",
     "better-scroll": "^1.15.2",
     "cropperjs": "^1.4.3",

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1079,7 +1079,7 @@
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
           var treatment_mode_id = treatment_mode[keys].id
-            if(treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4 || treatment_mode_id === 5 || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16){
+            if(treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4  || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16){
                  this.zhiShow = false
                  this.totalShow = false
                  this.huShow =false