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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -612,7 +612,8 @@
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
-                            {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+                            <span v-if="dialysisOrder && monitor.operate_time == dialysisOrder.end_time">{{ monitor.end }}</span> 
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
                       </td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3279,8 +3279,8 @@
           for (let c = 0; c < big_prescriptions.length; c++) {
             const inner_prescription = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
-              var prescription = response.data.data.prescription[i]
-
+              var prescription = JSON.parse(JSON.stringify(response.data.data.prescription))[i]
+              console.log('prescription',prescription)
               if (big_prescriptions[c].med_type == prescription.med_type) {
                 const tempAdvice = []
                 const tempProject = []
@@ -3356,18 +3356,18 @@
                   order_status: prescription.order_status,
                   type: prescription.type,
                   med_type: prescription.med_type,
-                  order: prescription.order
+                  order: JSON.parse(JSON.stringify(prescription.order))
                 }
                 // inner_prescription.push(obj)
                 big_prescriptions[c].prescriptions.push(obj)
-
+                console.log('obj',obj)
                 this.prescriptions.push(obj)
               }
             }
           }
-
-          this.big_prescriptions = big_prescriptions
-
+          console.log('000000002222222',big_prescriptions)
+          this.big_prescriptions = JSON.parse(JSON.stringify(big_prescriptions))
+            console.log('00000000',this.big_prescriptions)
           for (let i = 0; i < this.big_prescriptions.length; i++) {
             if (this.big_prescriptions[i].med_type == '11') {
               this.big_prescriptions[i]['is_true'] = 1
@@ -3382,7 +3382,7 @@
                   prescriptions: []
                 }
                 const arr = []
-                arr.push(this.big_prescriptions[i].prescriptions[b])
+                arr.push(JSON.parse(JSON.stringify(this.big_prescriptions))[i].prescriptions[b])
                 obj.prescriptions = arr
                 this.big_prescriptions.push(obj)
               }
@@ -3396,23 +3396,24 @@
               this.big_prescriptions.splice(i, 1)
             }
           }
-          // console.log(this.big_prescriptions)
+          console.log(22222,this.big_prescriptions)
+          console.log(333333,this.big_prescriptions[0].prescriptions[0].order.order_status)
 
           for (let i = 0; i < this.big_prescriptions.length; i++) {
             if (this.big_prescriptions[i].prescriptions.length > 0) {
-              this.big_prescriptions[i]['curPrescriptions'] = this.big_prescriptions[i].prescriptions[0]
+              this.big_prescriptions[i]['curPrescriptions'] = JSON.parse(JSON.stringify(this.big_prescriptions[i].prescriptions[0])) 
             } else {
               this.big_prescriptions[i]['curPrescriptions'] = {}
             }
-            this.big_prescriptions[i]['total'] = this.getTotalThree(this.big_prescriptions[i])
+            this.big_prescriptions[i]['total'] = this.getTotalThree(JSON.parse(JSON.stringify(this.big_prescriptions[i])))
           }
 
           if (this.big_prescriptions.length > 0) {
             this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
           }
 
-          console.log(this.big_prescriptions)
-          console.log(this.big_prescriptions[0].curPrescriptions.order_status)
+          console.log(333,this.big_prescriptions)
+          console.log(444,this.big_prescriptions[0].curPrescriptions.order.order_status)
 
           //
           // if (this.prescriptions.length > 0) {

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -6,6 +6,7 @@
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
                 <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span></div>
+                <div style="margin-left:2px;">电脑号：<span style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
@@ -14,7 +15,6 @@
                   <div>年龄：<span style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
                   </div>
-                  <div style="margin-left:2px;">电脑号：<span style="display:inline-block;width:80px;">{{info.psn_no ? info.psn_no : ''}}</span></div>
                   <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>
@@ -113,6 +113,7 @@
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span></div>
                 <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span></div>
+                <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
@@ -121,7 +122,6 @@
                   <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                   </div>
-                  <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
                   <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>