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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
    // host: 'xt.test.sgjyun.com',
-  //  host: 'localhost',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package.json

@@ -56,7 +56,7 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^7.0.1",
+    "node-sass": "^8.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -837,13 +837,25 @@
             <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
-              {{
+              <span v-if="org_id==10345">
+                {{
+                predialysis.weight_before == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - predialysis.dry_weight
+                    ).toFixed(2)
+              }}kg
+              </span>
+              <span v-else>
+                {{
                 afterdialysis.weight_after == 0
                   ? 0
                   : (
                       afterdialysis.weight_after - predialysis.dry_weight
                     ).toFixed(2)
               }}kg
+              </span>
+              
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
             <td v-if="advice_index === 4">

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -3379,7 +3379,7 @@ export default {
         var leftAdvice = [];
         var rightAdvice = [];
         var adlen = advices.length;
-
+        console.log("adlen----------------------",adlen)
         var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
         for (var i = 0; i < halfLen; i++) {
           leftAdvice.push(advices[i]);
@@ -3404,8 +3404,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices;
+        this.doctor_advices =response.data.data.advices == null ? [] : response.data.data.advices;
+        console.log("zhonguog---------------------------------",this.doctor_advices)
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3505,12 +3505,15 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
+        console.log("totalpath-------------------------------",this.totollength)
+        if (this.totollength > 58) {
           var temp_advice_length = 17 - this.monitors.length;
+          console.log("temp_advice_length-----------",temp_advice_length)
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {
             const element = this.doctor_advices[index];
+
             if (temp_advice_length > index) {
               doctor_advices_1.push(element);
             } else {
@@ -3520,6 +3523,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
+        console.log("doctor_advice----------",this.doctor_advices)
 
         this.patientInfo.name = this.nameSplit(this.patientInfo.name);
       } else {