Bläddra i källkod

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

陈少旭 7 månader sedan
förälder
incheckning
c8e37bb547

+ 9 - 0
src/api/drug/drug_stock.js Visa fil

@@ -670,4 +670,13 @@ export function getDrugPatientName(params){
670 670
     method:"Get",
671 671
     params:params,
672 672
   })
673
+}
674
+
675
+export function ModityDrugCodeWarehouseInfo(data){
676
+ 
677
+  return request({
678
+    url:"/api/drug/modifydrugcodewarehouseinfo",
679
+    method:"post",
680
+    data:data,
681
+  })
673 682
 }

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Visa fil

@@ -1763,11 +1763,11 @@
1763 1763
                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
1764 1764
                           <span v-if="org_id ==0||org_id==10683">置换液速度</span>
1765 1765
                             <br />
1766
-                            <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
1766
+                            <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
1767 1767
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
1768 1768
                               <span v-if="org_id ==0||org_id==10683">(ml/h)</span>
1769 1769
                             </span>
1770
-                            <span v-if="org_id==10598 || org_id == 10567 || org_id ==10724">L</span>
1770
+                            <span v-if="org_id==10598 || org_id == 10567 || org_id ==10724 || org_id == 10644">L</span>
1771 1771
                           </td>
1772 1772
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
1773 1773
                           <td

+ 1 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue Visa fil

@@ -536,7 +536,7 @@
536 536
           :disabled="selecting_schs.length == 0"
537 537
           @click="batchPrintAction"
538 538
           type="primary"
539
-          >批量打印81</el-button>
539
+          >批量打印</el-button>
540 540
       </template>
541 541
     </div>
542 542
     <div class="app-container">

+ 5 - 5
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Visa fil

@@ -783,7 +783,7 @@
783 783
                 org_id!=10558 &&
784 784
                 org_id!=10517 && 
785 785
                 org_id!=10414 && 
786
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567) ||
786
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644) ||
787 787
                 org_id == 9779 ||
788 788
                 template_id == 11 ||
789 789
                 template_id == 20 ||
@@ -815,7 +815,7 @@
815 815
             width="100"
816 816
             v-if="
817 817
               isShow('置换量') &&
818
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
818
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644) &&
819 819
               template_id != 9779 &&
820 820
               template_id != 11 &&
821 821
               template_id != 20 &&
@@ -1995,7 +1995,7 @@
1995 1995
             :span="8"
1996 1996
             v-if="
1997 1997
               isShow('置换量') &&
1998
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
1998
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644) &&
1999 1999
               org_id != 9779 &&
2000 2000
               template_id != 11 &&
2001 2001
               template_id != 20 &&
@@ -2027,7 +2027,7 @@
2027 2027
                 org_id != 9919 &&
2028 2028
                 org_id != 10191 &&
2029 2029
                 org_id != 10551 &&
2030
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567) ||
2030
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644) ||
2031 2031
                 org_id == 9779 ||
2032 2032
                 template_id == 11 ||
2033 2033
                 template_id == 20 ||
@@ -2042,7 +2042,7 @@
2042 2042
                 org_id ==10432 ||
2043 2043
                 org_id ==10445 ||
2044 2044
                 org_id == 10395) &&
2045
-                org_id!=10694 && org_id!=10697
2045
+                org_id!=10694 && org_id!=10697 
2046 2046
             "
2047 2047
           >
2048 2048
             <el-form-item label="置换量(ml):" :prop="isName('置换量')"

+ 3 - 3
src/xt_pages/dialysis/details/dialysisMonitoring.vue Visa fil

@@ -34,8 +34,8 @@
34 34
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
35 35
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
36 36
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
37
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567" width="92px"  > 置换量(ml)  </th>
38
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567" width="92px" > 置换量(L) </th>
37
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>
38
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" width="92px" > 置换量(L) </th>
39 39
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
40 40
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
41 41
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>
@@ -108,7 +108,7 @@
108 108
           <td v-if="isShow('透析液温度1')"> {{ monitor.dialysate_temperature_one ? monitor.dialysate_temperature_one : "/" }} </td>
109 109
           <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "0" }} </td>
110 110
           <td v-if="isShow('置换率1')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "/" }} </td>
111
-          <td v-if="isShow('置换量')"> {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
111
+          <td v-if="isShow('置换量')"> {{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }} </td>
112 112
           <td v-if="isShow('置换量1')"> {{ monitor.displacement_quantity_one ? monitor.displacement_quantity_one : "/" }} </td>
113 113
           <td v-if="isShow('SpO₂')"> {{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }} </td>
114 114
           <td v-if="isShow('SpO₂') && org_id == 9829" width="92px" >{{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }} </td>

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Visa fil

@@ -1857,11 +1857,11 @@
1857 1857
                           <span v-if="org_id == 10683">置换液速度</span>
1858 1858
                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
1859 1859
                           <br />
1860
-                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
1860
+                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
1861 1861
                             <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
1862 1862
                             <span v-if="org_id==10683">(ml/h)</span>
1863 1863
                           </span>
1864
-                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724">(L)</span>
1864
+                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724 || org_id == 10644">(L)</span>
1865 1865
                         </td>
1866 1866
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
1867 1867
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0 || org_id == 10724">KT/V</td>

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue Visa fil

@@ -182,6 +182,7 @@
182 182
           抗凝药物 
183 183
           <div class="inline_block under_line" style="width:92%;text-align: left;">
184 184
             <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
185
+            <label-box :isChecked="prescription.anticoagulant == '甲磺酸萘莫司他' ? true : false" showValue="甲磺酸萘莫司他"></label-box>&nbsp;
185 186
             <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
186 187
             (<label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="钙"></label-box>
187 188
               <label-box :isChecked="prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="钠"></label-box>)
@@ -422,7 +423,7 @@
422 423
                 <td width="40">TMP</td>
423 424
                 <td width="40">电导率</td>
424 425
                 <td width="40">温度</td>
425
-                <td width="40">透析液流量</td>
426
+                <!-- <td width="40">透析液流量</td> -->
426 427
                 <td width="40">UF/hr</td>
427 428
                 <td width="200">病情变化处理方式及结果</td>
428 429
               </tr>
@@ -442,7 +443,7 @@
442 443
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
443 444
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
444 445
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
445
-                <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td>
446
+                <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
446 447
                 <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
447 448
                 <td>
448 449
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>

+ 7 - 7
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Visa fil

@@ -1664,7 +1664,7 @@ export default {
1664 1664
       ) {
1665 1665
         const obj14 ='预透时间'
1666 1666
         checkDate.push(obj14)
1667
-      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
1667
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' &&
1668 1668
             this.prescription.dialysis_dialyszers ==''
1669 1669
       ) {
1670 1670
         const obj15 ='透析(滤)器'
@@ -1707,17 +1707,17 @@ export default {
1707 1707
       ) {
1708 1708
         const obj27 ='首剂'
1709 1709
         checkDate.push(obj27)
1710
-      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1 
1710
+      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1
1711 1711
             && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
1712 1712
       ) {
1713 1713
         const obj28 ='总量'
1714 1714
         checkDate.push(obj28)
1715
-      } if (this.dialysisOrder.DeviceNumber.number == 0 && 
1715
+      } if (this.dialysisOrder.DeviceNumber.number == 0 &&
1716 1716
             this.patientInfo.DialysisSchedule.device_number.number ==''
1717 1717
       ) {
1718 1718
         const obj29 ='透析机号'
1719 1719
         checkDate.push(obj29)
1720
-      } if (this.patientInfo.DialysisSchedule.bed_id == 0 && 
1720
+      } if (this.patientInfo.DialysisSchedule.bed_id == 0 &&
1721 1721
             this.dialysisOrder && this.dialysisOrder.bed_id ==0
1722 1722
       ) {
1723 1723
         const obj30 ='型号'
@@ -1849,14 +1849,14 @@ export default {
1849 1849
           ){
1850 1850
             const obj58 = '监测第'+((i*1)+1)+'行置换率'
1851 1851
             monearr.push(obj58)
1852
-          } 
1852
+          }
1853 1853
           // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
1854 1854
           //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
1855 1855
           //   monearr.push(obj54)
1856
-          // }  
1856
+          // }
1857 1857
           if(this.monitors[i].sodium_concentration ==0 ){
1858 1858
             // this.monitors[i].temperature == 0
1859
-            const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
1859
+            const obj59 = '监测第'+((i*1)+1)+'行钠浓度'
1860 1860
             monearr.push(obj59)
1861 1861
           } if(this.monitors[i].pulse_frequency ==0){
1862 1862
             const obj60 = '监测第'+((i*1)+1)+'行脉搏'

+ 1 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Visa fil

@@ -5773,7 +5773,7 @@ export default {
5773 5773
       this.$refs.prescriptions.open_three()
5774 5774
     },
5775 5775
     open(index) {
5776
-
5776
+      console.log("index",index)
5777 5777
       this.index = index
5778 5778
       if (index == 1) {
5779 5779
         this.$refs.prescriptions.open(1, this.saveLoading)

+ 69 - 2
src/xt_pages/stock/drugs/components/drugInOrder.vue Visa fil

@@ -169,6 +169,14 @@
169 169
             {{scope.row.total_price}}
170 170
           </template>
171 171
         </el-table-column>
172
+
173
+        <el-table-column label="药品追溯码" width="150" align="center">
174
+            <template slot-scope="scope">
175
+              <div  @click="changeDrugCode(scope.row,scope.$index)">
176
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
177
+              </div>
178
+            </template>
179
+          </el-table-column>
172 180
       </el-table>
173 181
 
174 182
       <el-pagination
@@ -183,6 +191,26 @@
183 191
       >
184 192
       </el-pagination>
185 193
     <!-- </el-row> -->
194
+
195
+    <el-dialog
196
+      title="药品追溯码"
197
+      :visible.sync="dialogVisible"
198
+      width="40%">
199
+      <span>
200
+        <el-input
201
+         @keyup.native="changeText"
202
+          type="textarea"
203
+          placeholder="请输入内容"
204
+          v-model="textarea"
205
+          :rows="10"
206
+        >
207
+        </el-input>
208
+      </span>
209
+      <span slot="footer" class="dialog-footer">
210
+        <el-button @click="dialogVisible = false">取 消</el-button>
211
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
212
+      </span>
213
+    </el-dialog>
186 214
   </div>
187 215
 </template>
188 216
 
@@ -190,7 +218,7 @@
190 218
 import { uParseTime } from "@/utils/tools";
191 219
 import { fetchAllAdminUsers } from "@/api/doctor";
192 220
 import { GetAllConfig } from "@/api/stock";
193
-import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
221
+import { getDrugIndetail,getDrugWarehouseInfoPrint,ModityDrugCodeWarehouseInfo} from "@/api/drug/drug_stock"
194 222
 export default {
195 223
   name: "stockInDetail",
196 224
 
@@ -232,7 +260,7 @@ export default {
232 260
     //获取入库单数据
233 261
     this.getlist()
234 262
     this.getDrugWarehouseInfoPrint() 
235
-
263
+    
236 264
   },
237 265
   data() {
238 266
     return {
@@ -269,9 +297,48 @@ export default {
269 297
       drugTypeList:[],
270 298
       storehouse_id:0,
271 299
       houseList:[],
300
+      dialogVisible:false,
301
+      currentRow:{},
302
+      currentIndex:0,
303
+      textarea:"",
304
+      id:0,
272 305
     };
273 306
   },
274 307
   methods: {
308
+    changeText(event){
309
+      // 检查是否为特定的按键,例如回车键,来确认扫码枪输入完成
310
+      if (event.key === 'Enter') {
311
+        var textarea = ""
312
+        textarea += this.textarea + ","
313
+        this.textarea = textarea
314
+
315
+      }
316
+   },
317
+    changeDrugCode(row,index){
318
+      this.textarea=""
319
+      this.textarea = row.drug_code
320
+      this.currentRow = row
321
+      this.currentIndex =index
322
+      this.id = row.id
323
+      this.dialogVisible = true
324
+    },
325
+    saveTextArea(){
326
+        var params = {
327
+           id:this.id,
328
+           drug_code:this.textarea,
329
+        }
330
+        console.log("params=-==---",params)
331
+       ModityDrugCodeWarehouseInfo(params).then(response=>{
332
+          if(response.data.state == 1){
333
+            var info =  response.data.data.info
334
+            this.$message.success("保存成功!")
335
+            this.dialogVisible = false
336
+            this.getlist()
337
+          }
338
+       })
339
+   
340
+     
341
+    },
275 342
     changeType: function(val) {
276 343
      
277 344
       this.order_type = val;

+ 9 - 10
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue Visa fil

@@ -341,9 +341,8 @@
341 341
 
342 342
           <el-table-column label="药品追溯码" width="150" align="center">
343 343
             <template slot-scope="scope">
344
-              <!-- <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input> -->
345 344
               <div  @click="changeDrugCode(scope.row,scope.$index)">
346
-                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input>
345
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
347 346
               </div>
348 347
             </template>
349 348
           </el-table-column>
@@ -354,7 +353,7 @@
354 353
             </template>
355 354
           </el-table-column>
356 355
 
357
-         
356
+
358 357
 
359 358
           <el-table-column
360 359
             label="操作"
@@ -553,7 +552,7 @@ export default {
553 552
 
554 553
       for(let i=0;i<this.recordInfo.recordData.length;i++){
555 554
          if(this.currentIndex == i){
556
-           this.recordInfo.recordData[i].drug_code = this.textarea 
555
+           this.recordInfo.recordData[i].drug_code = this.textarea
557 556
          }
558 557
       }
559 558
       this.dialogVisible = false
@@ -782,7 +781,7 @@ export default {
782 781
             stockIn: this.recordInfo.recordData
783 782
           };
784 783
           console.log("params---------",params)
785
-         
784
+
786 785
           EditDrugWarehouse(
787 786
             params,
788 787
             this.warehousing_time,
@@ -903,7 +902,7 @@ export default {
903 902
            if(response.data.data.info[i].dealer == 0){
904 903
                response.data.data.info[i].dealer = ""
905 904
             }
906
-           
905
+
907 906
             response.data.data.info[i].unitList = []
908 907
             var obj = {id:1,name:""}
909 908
             var objOne = {id:2,name:""}
@@ -911,7 +910,7 @@ export default {
911 910
             objOne.name = response.data.data.info[i].drug.min_unit
912 911
             response.data.data.info[i].unitList.push(obj)
913 912
             response.data.data.info[i].unitList.push(objOne)
914
-            
913
+
915 914
 
916 915
             this.recordInfo.recordData.push(response.data.data.info[i]);
917 916
 
@@ -927,7 +926,7 @@ export default {
927 926
                }
928 927
             }
929 928
 
930
-          
929
+
931 930
           }
932 931
           this.warehouse = response.data.data.warehousing;
933 932
           this.storehouse_id = response.data.data.warehousing.storehouse_id
@@ -1081,10 +1080,10 @@ export default {
1081 1080
         }
1082 1081
     },
1083 1082
     getTotalPirce(){
1084
-      
1083
+
1085 1084
       var total_price = 0
1086 1085
       if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
1087
-        
1086
+
1088 1087
         for(let i=0;i<this.recordInfo.recordData.length;i++){
1089 1088
            total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
1090 1089
         }

+ 6 - 4
src/xt_pages/user/components/PatientDetail.vue Visa fil

@@ -1348,7 +1348,7 @@
1348 1348
                     {{ patientPrint.id_card_no }}
1349 1349
                   </td>
1350 1350
                 </tr>
1351
-                 <tr>
1351
+                <tr>
1352 1352
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
1353 1353
                     联系人
1354 1354
                   </td>
@@ -1476,7 +1476,7 @@
1476 1476
                   </td>
1477 1477
                   <td colspan="9">
1478 1478
                     <div
1479
-                      class="td_proj_content td_align_left"
1479
+                      class="td_proj_content td_align_left wrapper"
1480 1480
                       v-html="patientPrint.diagnose"
1481 1481
                     ></div>
1482 1482
                   </td>
@@ -1820,11 +1820,10 @@ export default {
1820 1820
     printThisInfo() {
1821 1821
       var ptime = Math.round(new Date().getTime() / 1000);
1822 1822
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
1823
-
1824 1823
       const style =
1825 1824
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
1826 1825
       const style1 =
1827
-        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
1826
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} .wrapper {white-space: pre-wrap;} }";
1828 1827
       if(this.org_id != 10206 && this.org_id !=0){
1829 1828
         console.log('1111111');
1830 1829
 
@@ -2721,4 +2720,7 @@ export default {
2721 2720
 .el-select-dropdown {
2722 2721
   z-index: 998 !important;
2723 2722
 }
2723
+.wrapper {
2724
+  white-space: pre-wrap;
2725
+}
2724 2726
 </style>