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/treatTemplate/printOne.vue

@@ -1,6 +1,6 @@
 <template>
     <div id='prescription-print' class="prescription-print">
-        <div class="printTitle">{{orgname}}&nbsp;&nbsp; 血液透析中心医药费收据及收费项目清单</div>
+        <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
         <div class="infoMain">
             <div class="infoP">医院(药店)编号：</div>
             <div class="infoP">名称：血液透析中心</div>
@@ -32,7 +32,7 @@
                         <p style="width:50%;">材料费</p>
                         <p style="width:50%;"></p>
                     </div>
-                    <div class="chargeUl" style="border-top:1px solid #000;"> 
+                    <div class="chargeUl" style="border-top:1px solid #000;">
                         <p style="width:50%;">费用合计</p>
                         <p style="width:50%;">{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:""}}</p>
                     </div>
@@ -50,7 +50,7 @@
                     </div>
                 </div>
                 <div style="width:80%;display:flex;height:300px;">
-                  
+
                     <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                         <p v-for="(item,i) in prescription[0].advices" :key="i" class="chargeP">{{item.advice_name}}</p>
                     </div>
@@ -68,7 +68,7 @@
                     </div>
                 </div>
             </div>
-            
+
         </div>
         <div class="moneyBox">
             <p>实收金：{{list.order_info.medfee_sumamt?list.order_info.medfee_sumamt:''}}</p>
@@ -92,7 +92,7 @@ export default {
           prescription:[],
           patient:{},
           orgname:""
-      } 
+      }
     },
     props:{
         paramsObj:Object
@@ -142,7 +142,7 @@ export default {
             this.record_date = record_date
             var prescription_id = this.paramsObj.prescription_id
             this.prescription_id = prescription_id
-            
+
         },
         deep:true
         }
@@ -154,7 +154,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -202,7 +202,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2264,16 +2264,20 @@
         for (let i = 0; i < this.teamList.length; i++) {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
-              this.$message.error('改处方存在相同的项目，无法添加相同的项目')
+              this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
               return
             }
           }
         }
 
+        console.log( this.curDrugs)
+        console.log( this.curPrescriptions.advices)
+
+
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-            if (this.curDrugs[i].id == this.curPrescriptions.advices[i].id) {
-              this.$message.error('改处方存在相同的药品，无法添加相同的药品')
+            if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
+              this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
               return
 
             }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -14,7 +14,7 @@
         </div>
 
         <div class="printTitle">{{orgname}}</div>
-        <div class="printTitle">血液透析中心处方、治疗单</div>
+        <div class="printTitle">处方、治疗单</div>
 
         <div class="infoTitle">
             <div>门诊编号：</div>
@@ -151,7 +151,7 @@
                     <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
                     <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
                 </div>
-                
+
                 <div class="prescriptionBox">
                     <table style="width:100%;text-align:center;line-height:25px;">
                         <tr>
@@ -237,7 +237,7 @@ export default {
         prescriptionInfo:[],
         projectList:[],
         prescriptions:[],
-        settlement: 
+        settlement:
          [
           {value: 1,label: '医保'},
           {value: 2,label: '自费'},
@@ -305,7 +305,7 @@ export default {
             this.prescriptions = advicePrint
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
-            this.projectList = projectlist       
+            this.projectList = projectlist
             this.hisPatient = response.data.data.hisPatient
 
           }
@@ -349,7 +349,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -359,7 +359,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -396,7 +396,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;