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.1.68"
+  "version": "1.1.107"
 }

config/dev.env.js

@@ -4,9 +4,11 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
+  BASE_API: '"https://api.xt.kuyicloud.com"'
+
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
-   BASE_API: '"http://api.xt.test.sgjyun.com"'
+   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'
 
 })

src/pages/main/dialog/OrdersDialog.vue

@@ -16,12 +16,15 @@
           @click="execAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
         >执行</span>
+
         <span
         id="fontSize"
           v-if="isShowMofifyExce"
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >修改执行</span>
+
+
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
@@ -388,7 +391,9 @@
         // if(!this.isPremission){
         //   Toast.fail('你没有权限修改医嘱！')
         // }else{
-          this.nowExecTime = new Date(this.currentAdvices[0].start_time * 1000)
+
+
+        this.nowExecTime = new Date(this.currentAdvices[0].execution_time * 1000)
           this.$refs.mofify_exec_time.open()
 
         // }
@@ -675,7 +680,7 @@
               Toast.fail(response.data.msg)
               return false
             } else {
-              Toast.success('执行成功！')
+              Toast.success('修改成功！')
               var advice = response.data.data.advice
               if (this.current_select_object == 1) {
                 var ids = this.currentAdviceIdsStr.split(',')

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -822,8 +822,8 @@
                 </div>
                 <div class="inline_block">
                   &emsp;实际超滤量：
-                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
-                    {{getFloat(afterdialysis.actual_ultrafiltration)}}
+                  <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.actual_ultrafiltration)">
+                    {{getFloat(prescription.ultrafiltration)}}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{'/'}}

src/pages/main/today/TodayTab.vue

@@ -765,7 +765,7 @@ import {parseTime} from '@/utils'
 
           this.double_check = double_check == null ? {id: ''} : double_check
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
-          
+
           this.last_assessment_after_dislysis =
               last_assessment_after_dislysis == null
                 ? {id: ''}

src/pages/main/today/statOrder.vue

@@ -38,32 +38,13 @@
             >
               <span>{{ advice.advice_name }}</span>
 
-              <span
-                >{{ advice.drug_spec }}{{ advice.drug_spec_unit }} *
-                {{ advice.prescribing_number
-                }}{{ advice.prescribing_number_unit }}</span
-              >
-              <span v-if="advice.advice_desc"
-                >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
-              >
-              <span v-if="advice.prescribing_number"
-                >{{ advice.prescribing_number
-                }}{{ advice.prescribing_number_unit }}</span
-              >
-              <span v-if="advice.single_dose"
-                >单次用量{{ advice.single_dose
-                }}{{ advice.single_dose_unit }}</span
-              >
-
-              <span v-if="advice.parent_id == 0">{{
-                advice.delivery_way
-              }}</span>
-              <span v-if="advice.parent_id == 0">{{
-                advice.execution_frequency
-              }}</span>
-              <span v-if="advice.parent_id == 0 && advice.remark.length > 0"
-                >({{ advice.remark }})</span
-              >
+              <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
+              <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+              <span v-if="advice.single_dose && template_id == 6" >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+              <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+              <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
+              <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
+              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
             </td>
 
             <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>