Pārlūkot izejas kodu

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

csx 4 gadus atpakaļ
vecāks
revīzija
999dc5c2c0

+ 2 - 2
config/prod.env.js Parādīt failu

@@ -1,9 +1,9 @@
1 1
 "use strict";
2 2
 module.exports = {
3 3
   NODE_ENV: '"production"',
4
-  BASE_API: '"https://api.xt.kuyicloud.com"'
4
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
5 5
 
6
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
6
+   BASE_API: '"http://api.xt.test.sgjyun.com"'
7 7
   // http://api.xt.test.sgjyun.com
8 8
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9 9
 };

+ 2 - 2
src/pages/main/PatientBox.vue Parādīt failu

@@ -234,13 +234,13 @@ export default {
234 234
       }
235 235
     },
236 236
     age: function(schedual) {
237
-      if (schedual.patient.age == 0) {
237
+      if (schedual.patient.birthday != 0) {
238 238
         return jsGetAge(
239 239
           parseTime(schedual.patient.birthday, "{y}-{m}-{d}"),
240 240
           "-"
241 241
         );
242 242
       } else {
243
-        return schedual.patient.age;
243
+        return ''
244 244
       }
245 245
 
246 246
       // var now = new Date();

+ 3 - 7
src/pages/main/template/DialysisPrintOrderFive.vue Parādīt failu

@@ -1660,14 +1660,10 @@
1660 1660
         }
1661 1661
         return ''
1662 1662
       }, getAge: function(val) {
1663
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1664
-          if (val.age == 0) {
1665
-            return jsGetAge(val.birth, '-')
1666
-          } else {
1667
-            return val.age
1668
-          }
1669
-        } else {
1663
+        if (val.birthday != 0) {
1670 1664
           return jsGetAge(val.birth, '-')
1665
+        } else {
1666
+          return ''
1671 1667
         }
1672 1668
       }, newAdviceGroupObject: function() {
1673 1669
         return Object.assign(

+ 6 - 6
src/pages/main/template/DialysisPrintOrderOne.vue Parādīt failu

@@ -1459,15 +1459,15 @@
1459 1459
         }
1460 1460
         return ''
1461 1461
       }, getAge: function(val) {
1462
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1463
-          if (val.age == 0) {
1462
+        // if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1463
+          if (val.birthday != 0) {
1464 1464
             return jsGetAge(val.birth, '-')
1465 1465
           } else {
1466
-            return val.age
1466
+            return ''
1467 1467
           }
1468
-        } else {
1469
-          return jsGetAge(val.birth, '-')
1470
-        }
1468
+        // } else {
1469
+        //   return jsGetAge(val.birth, '-')
1470
+        // }
1471 1471
       }, newAdviceGroupObject: function() {
1472 1472
         return Object.assign(
1473 1473
           {},

+ 3 - 7
src/pages/main/template/DialysisPrintOrderSix.vue Parādīt failu

@@ -1354,14 +1354,10 @@
1354 1354
         }
1355 1355
         return ''
1356 1356
       }, getAge: function(val) {
1357
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1358
-          if (val.age == 0) {
1359
-            return jsGetAge(val.birth, '-')
1360
-          } else {
1361
-            return val.age
1362
-          }
1363
-        } else {
1357
+        if (val.birthday != 0) {
1364 1358
           return jsGetAge(val.birth, '-')
1359
+        } else {
1360
+          return ''
1365 1361
         }
1366 1362
       }, newAdviceGroupObject: function() {
1367 1363
         return Object.assign(

+ 3 - 7
src/pages/main/template/DialysisPrintOrderTwo.vue Parādīt failu

@@ -1579,14 +1579,10 @@
1579 1579
         }
1580 1580
         return ''
1581 1581
       }, getAge: function(val) {
1582
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1583
-          if (val.age == 0) {
1584
-            return jsGetAge(val.birth, '-')
1585
-          } else {
1586
-            return val.age
1587
-          }
1588
-        } else {
1582
+        if (val.birthday != 0) {
1589 1583
           return jsGetAge(val.birth, '-')
1584
+        } else {
1585
+          return ''
1590 1586
         }
1591 1587
       }, newAdviceGroupObject: function() {
1592 1588
         return Object.assign(

+ 4 - 3
src/pages/main/today/detailsInfo.vue Parādīt failu

@@ -115,10 +115,11 @@ export default {
115 115
       return parseTime(this.$route.query.date, "{y}/{m}/{d}");
116 116
     },
117 117
     age: function() {
118
-      if (this.patient.age == 0) {
119
-        return jsGetAge(parseTime(this.patient.birthday, "{y}-{m}-{d}"), "-");
118
+      if (this.patient.birthday == 0) {
119
+        return ''
120 120
       } else {
121
-        return this.patient.age;
121
+        return jsGetAge(parseTime(this.patient.birthday, "{y}-{m}-{d}"), "-");
122
+
122 123
       }
123 124
     },
124 125
     source: function() {