Browse Source

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

See999 4 years ago
parent
commit
213ba23f27

+ 4 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

@@ -143,6 +143,7 @@
143 143
             v-if="
144 144
               isShow('超滤量') &&
145 145
                 (template_id == 6 ||
146
+                  template_id == 9 ||
146 147
                   template_id == 10 ||
147 148
                   template_id == 11 ||
148 149
                   template_id == 12 ||
@@ -178,6 +179,7 @@
178 179
             v-if="
179 180
               isShow('超滤量') &&
180 181
                 template_id != 6 &&
182
+                template_id !=9 &&
181 183
                 template_id != 10 &&
182 184
                 template_id != 11 &&
183 185
                 template_id != 12 &&
@@ -509,7 +511,7 @@
509 511
 
510 512
           <el-col
511 513
             :span="8"
512
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
514
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
513 515
             <el-form-item label="超滤量(ml):">
514 516
               <el-input v-model="form.ultrafiltration_volume"></el-input>
515 517
             </el-form-item>
@@ -517,7 +519,7 @@
517 519
 
518 520
           <el-col
519 521
             :span="8"
520
-            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
522
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
521 523
             <el-form-item label="超滤量(L):">
522 524
               <el-input v-model="form.ultrafiltration_volume"></el-input>
523 525
             </el-form-item>

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

@@ -14,8 +14,8 @@
14 14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
18
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
17
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
18
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
19 19
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30)" width="50px"> 超滤率 <br />(ml/h) </th>
20 20
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30" width="50px"> 超滤率 <br />(L/h) </th>
21 21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

+ 12 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue View File

@@ -789,6 +789,8 @@
789 789
           <td width="80" style="line-height:20px">TMP<br />{{monitors[0] && monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}}</td>
790 790
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
791 791
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
792
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">超滤量<br />ml</td>
793
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">透析液温度<br />℃</td>
792 794
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
793 795
         <td width="80">透析液温度<br/>℃</td>
794 796
         <td width="60">置换率<br/>ml/min</td> -->
@@ -836,6 +838,12 @@
836 838
           </td>
837 839
           <td>
838 840
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
841
+          </td>
842
+           <td v-if="org_id  == 10032">
843
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
844
+          </td>
845
+           <td v-if="org_id  == 10032">
846
+            &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
839 847
           </td>
840 848
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
841 849
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
@@ -843,6 +851,7 @@
843 851
           <td>
844 852
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
845 853
           </td>
854
+         
846 855
         </tr>
847 856
         </tbody>
848 857
       </table>
@@ -1740,7 +1749,8 @@ export default {
1740 1749
         doctorForm: {
1741 1750
           doctor: '',
1742 1751
           url: ''
1743
-        }
1752
+        },
1753
+        org_id:0,
1744 1754
       }
1745 1755
   },
1746 1756
     methods: {
@@ -2296,6 +2306,7 @@ export default {
2296 2306
     created() {
2297 2307
       var xtuser = this.$store.getters.xt_user
2298 2308
       this.orgname = xtuser.org.org_name
2309
+      this.org_id = xtuser.org.id
2299 2310
       // this.orgname = "遂溪方济医院";
2300 2311
       this.modeOptions = this.$store.getters.treatment_mode
2301 2312
       this.replacementWays = this.$store.getters.replacement_ways

+ 7 - 1
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue View File

@@ -103,7 +103,8 @@
103 103
           style="width:100%;"
104 104
           v-model="start_time"
105 105
           type="date"
106
-          placeholder="选择日期">
106
+          placeholder="选择日期"
107
+           :picker-options="pickerOptions0">
107 108
         </el-date-picker>
108 109
       </el-form-item>
109 110
       <el-form-item label="" prop="name" style="width:49%;">
@@ -273,6 +274,11 @@
273 274
         //   family_history:"",
274 275
 
275 276
         // },
277
+          pickerOptions0: {
278
+          disabledDate(time) {
279
+            return time.getTime() < Date.now() - 8.64e7;
280
+          }
281
+        },
276 282
         formValue:{
277 283
           temperature:"",
278 284
           blood_sugar:"",

+ 2 - 2
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

@@ -13,7 +13,7 @@
13 13
           </div>
14 14
           <div class="infoMain">
15 15
               <div style="margin-bottom: 10px;">门诊号:{{hisPatient.number?hisPatient.number:""}}</div>
16
-              <div style="margin-bottom: 10px;">科室:{{getDepart(hisPatient.departments)?getDepart(hisPatient.departments):''}}</div>
16
+              <div style="margin-bottom: 10px;">科室:{{getDepart(item.info.departments)?getDepart(item.info.departments):''}}</div>
17 17
               <div style="margin-bottom: 10px;">医保卡号:{{item.hisPatient.number?item.hisPatient.number:""}}</div>
18 18
               <div style="margin-bottom: 10px;">电话:{{item.patient.phone}}</div>
19 19
               <div>地址:{{item.patient.home_address}}</div>
@@ -23,7 +23,7 @@
23 23
               <div class="Rp">Rp:</div>
24 24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
25 25
                   <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
26
-                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
26
+                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
27 27
               </div>
28 28
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
29 29
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

+ 8 - 7
src/xt_pages/outpatientRegistration/registrationHistory.vue View File

@@ -102,10 +102,10 @@
102 102
                 </el-table-column>
103 103
                 <el-table-column align="center" prop="name" label="操作" width="180">
104 104
                     <template slot-scope="scope">
105
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
105
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
106 106
                       <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
107
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
108
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</el-button>  
107
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
108
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
109 109
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
110 110
                     </template>
111 111
                 </el-table-column>
@@ -250,7 +250,7 @@ export default {
250 250
             ],
251 251
             start_time:moment().format("YYYY-MM-DD"),
252 252
             end_time:moment().format("YYYY-MM-DD"),
253
-            limit:20,
253
+            limit:10,
254 254
             page:1,
255 255
             total:0,
256 256
             departMent:[],
@@ -352,7 +352,8 @@ export default {
352 352
             startUnix:'',
353 353
 
354 354
             dialogVisible:false,
355
-            form:{}
355
+            form:{},
356
+            is_Name:false
356 357
         }
357 358
     },
358 359
     created(){
@@ -410,11 +411,11 @@ export default {
410 411
         },
411 412
        handleSizeChange(val) {
412 413
           this.limit = val
413
-          this.getList()
414
+          this.getlist()
414 415
        },
415 416
         handleCurrentChange(val) {
416 417
         this.page = val
417
-        this.getList()
418
+        this.getlist()
418 419
         },
419 420
         getlist(){
420 421
           var params = {

+ 9 - 5
src/xt_pages/stock/stockOutOrder.vue View File

@@ -121,6 +121,7 @@
121 121
 
122 122
         <el-table-column label="操作" align="center" width="300px">
123 123
           <template slot-scope="scope">
124
+           
124 125
             <el-tooltip
125 126
               class="item"
126 127
               effect="dark"
@@ -129,8 +130,8 @@
129 130
             >
130 131
               <el-button
131 132
                 size="small"
132
-                type="primary"
133
-                icon="el-icon-search"
133
+                type="warning"
134
+                icon="el-icon-document"
134 135
                 @click="handleSearch(scope.row.id)"
135 136
               >
136 137
               </el-button>
@@ -695,6 +696,8 @@ export default {
695 696
     
696 697
     //新增
697 698
     handleSearch(id){ 
699
+      this.warehousingOutInfo.info = []
700
+      this.warehousingOutInfo.warehousingOutData = []
698 701
       this.GetOrderDetailOne(id)
699 702
       this.dialogVisible = true
700 703
     },
@@ -713,8 +716,9 @@ export default {
713 716
             for (let i = 0; i < response.data.data.list.length; i++) {
714 717
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
715 718
             }
719
+
716 720
             this.warehousingOutInfo.info = response.data.data.info
717
-            this.handleSpanTempArr()
721
+            // this.handleSpanTempArr()
718 722
           }
719 723
         })
720 724
      }, 
@@ -747,6 +751,7 @@ export default {
747 751
       }, 
748 752
 
749 753
     jump(id){
754
+      this.userList = []
750 755
       this.GetOrderDetail(id)
751 756
      
752 757
     },
@@ -755,7 +760,7 @@ export default {
755 760
         const params = {
756 761
           'id': order_id
757 762
         }
758
-        console.log("params 0---------",params)
763
+      
759 764
         getWarehouseOutUser(params).then(response => {
760 765
           if (response.data.state == 0) {
761 766
             this.$message.error(response.data.msg)
@@ -764,7 +769,6 @@ export default {
764 769
             var total = 0
765 770
             for (let i = 0; i < response.data.data.list.length; i++) {
766 771
               var obj = response.data.data.list[i]
767
-              console.log("obj---------",obj)
768 772
               obj['is_total'] = 0
769 773
               this.userList.push(obj)
770 774
               total = total + response.data.data.list[i].count