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

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -18,8 +18,8 @@
             <div style="position: absolute;top:60px;left:120px;"> {{ paramsObj.name }}</div>
             <div style="position: absolute;top:60px;left:210px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:60px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:60px;left:640px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
+            <div style="position: absolute;top:60px;left:640px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
@@ -115,6 +115,7 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
 export default {
     props:{
         paramsObj:Object
@@ -202,6 +203,15 @@ export default {
             this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
             console.log(this.zhongwen)
         },
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
 
     },
     watch:{

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                             <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                                         </el-table-column>
                                     </el-table>
-                                    <div>{{3*(2/3)}}</div>
+                                    <!-- <div>{{3*(2/3)}}</div> -->
                                 </div>
 
                             </el-tab-pane>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -190,7 +190,7 @@
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
-      </span>。
+      </span>
         </el-dialog>
         <el-dialog
                 class="centerDialog"
@@ -3577,7 +3577,7 @@
           this.$refs.prescriptions.open(1, this.saveLoading)
         } else if (index == 2) {
 
-          this.getPrescriptionList(this.patientInfo.id)
+          this.getPrescriptionList(this.patientInfo.id,1)
           // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
@@ -3585,7 +3585,7 @@
           this.$refs.prescriptions.open(4)
         } else if (index == 6) {
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-          this.getPrescriptionList(this.patientInfo.id)
+          this.getPrescriptionList(this.patientInfo.id,2)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
         }
@@ -3626,15 +3626,20 @@
         this.prescription_id = data
       },
 
-      getPrescriptionList(id) {
+      getPrescriptionList(id,type) {
         getPrescriptionList(id,2).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true
             var list = response.data.data.list
+            let arr = []
             for (let i = 0; i < list.length; i++) {
-              list[i].prescription_number = list[i].prescription_number + i
+              if(list[i].type == type){
+                list[i].prescription_number = list[i].prescription_number + i
+                arr.push(list[i])
+              }
+              
             }
-            this.tableData = list
+            this.tableData = arr
           }
         })
       },
@@ -3643,7 +3648,25 @@
       },
       handleClick() {
         if(this.titleType == "电子处方"){
-          this.getPatientInfo()
+          if(this.radio == 1){
+            this.un_cure_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }else if(this.radio == 2){
+            this.cure_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }else{
+            this.all_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }
         }
 
       },

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -24,7 +24,7 @@
                               highlight-current-row
                               ref="tab">
                         <el-table-column prop="name" label="姓名">
-                            <template slot-scope="scope">{{scope.row.name}}</template>
+                            <template slot-scope="scope">{{scope.row.name}}（{{ scope.row.dialysis_no }}）</template>
                         </el-table-column>
                     </el-table>
                 </div>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -35,7 +35,7 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices.slice(pageIndex * 5,(pageIndex * 5) + item.pageArr[pageIndex])" :key="index">
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{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> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <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;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -43,7 +43,7 @@
                </div>
                
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -5,9 +5,9 @@
         <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
         <div class="printTitle">治疗单</div>
         <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">深圳医保1档</span></div>
-            <div style="width:33%;display:flex;">电脑号：<span class="under_line">1111111</span></div>
-            <div style="width:33%;display:flex;">处方编号：<span class="under_line">8972392771</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line"></span></div>
+            <div style="width:33%;display:flex;">电脑号：<span class="under_line"></span></div>
+            <div style="width:33%;display:flex;">处方编号：<span class="under_line"></span></div>
         </div>
 
 
@@ -72,10 +72,10 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{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> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
               </div>
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
               </div>
               <div style="text-align:center;" >(以下空白)</div>
         </div>