新分支

package-lock.json

@@ -14394,6 +14394,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
+    "vue-calendar-component": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
+      "integrity": "sha512-BJh7xOBzM7QVcapcN4EbPQ1eZ8Pii1/oy+dzqjZTilRSIDD7SRPdFpnUJwZvs8lCrhtBAyJbYFsdm2SogXWHVQ=="
+    },
     "vue-clipboard": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/vue-clipboard/-/vue-clipboard-0.0.1.tgz",

package.json

@@ -73,6 +73,7 @@
     "sortablejs": "1.7.0",
     "v-fit-columns": "^0.2.0",
     "vue": "2.5.16",
+    "vue-calendar-component": "^2.8.2",
     "vue-clipboard": "0.0.1",
     "vue-clipboard2": "^0.3.1",
     "vue-count-to": "1.0.13",

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -98,7 +98,9 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-             {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            <!-- <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span> -->
+            {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
           </template>
 
         </el-table-column>

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -42,6 +42,8 @@
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
                   {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
+                  <!-- <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span> -->
                 </td>
                </tr>
               </tbody>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -372,7 +372,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460)">
+        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460 || org_id ==10551)">
           <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>

src/xt_pages/dialysis/details/index.vue

@@ -1266,6 +1266,7 @@ import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
 import Calendar from 'vue-calendar-component'
 import data from '../../../store/modules/data'
+import patient from '../../../router/modules/patient'
 export default {
   name: 'index',
   components: {
@@ -1416,6 +1417,7 @@ export default {
       
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
+      start_time_one:"",
       orderList:[]
     }
   },
@@ -2984,8 +2986,11 @@ export default {
     },
     viewDayWork(val){
       console.log("val33333333333333",val)
+      console.log("开始时间",)
       var patient_id = this.$route.query.patient_id
-      var start_time = this.timestamp(this.start_time)
+      var start_time = this.timestamp(moment(this.time_value).format('YYYY-MM-DD'))
+      console.log("patienet_id",patient_id)
+      console.log("start_Time",start_time)
       this.$router.push({
         path: "/dialysis/details",
         query: { patient_id:patient_id , date: start_time}
@@ -3006,8 +3011,11 @@ export default {
         this.time_value = newValue
         this.getmonth(this.time_value)
         console.log('yyyyyyyyyyy',moment(this.time_value).format('YYYY-MM-DD'),moment(oldValue).format('YYYY-MM-DD'))
-
+        this.start_time = ""
         this.start_time = moment(this.time_value).format('YYYY-MM-DD')
+        this.start_time_one = moment(this.time_value).format('YYYY-MM-DD')
+
+        this.end_time= ""
         this.end_time =   moment(oldValue).format('YYYY-MM-DD')
 
       }

src/xt_pages/dialysis/longSignPrint.vue

@@ -32,7 +32,7 @@
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
@@ -54,7 +54,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617|| org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1492,11 +1492,12 @@ export default {
               ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
           } else {
             tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
+            
           }
         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
         }
 
         if (isChild == 1) {

src/xt_pages/dialysis/signPrint.vue

@@ -31,7 +31,7 @@
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
@@ -53,7 +53,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2824,7 +2824,12 @@
                       style="flex: 1"
                       v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                     >
-
+                      <span v-if="org_id!=10460">
+                          透析中入量(L)：
+                       </span>
+                      <span v-if="org_id==10460">
+                        透析中入量(ml)：
+                      </span>
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"
@@ -2835,12 +2840,7 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=10460">
-                          透析中入量(L)：
-                        </span>
-                        <span v-if="org_id==10460">
-                          透析中入量(ml)：
-                        </span>
+                      
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                     </div>
 

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button> 
+          @click="toJiaBan">首拼</el-button>  -->