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/dialysisPrintOrder.vue

@@ -511,7 +511,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -262,7 +262,7 @@
                     </td>
                     <td width='30'></td>
                     <td width='50'>导管：</td>
-                    <td width='60'>官腔外露</td>
+                    <td width='60'>管腔外露</td>
                     <td width="60">
                       <div class="under-line">
                         &nbsp;
@@ -573,15 +573,12 @@
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
-            <td width="100">穿刺/开管护士:</td>
+            <td width="100">穿刺护士:</td>
             <td width="100">
 
                 <div>
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
-                    /
-                    <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)}}</span>
-                    <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
             <td width="70">核对护士:</td>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -1205,11 +1205,7 @@
           }
         }
 
-        if (this.curPrescriptions.addition != null) {
-          for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count)
-          }
-        }
+
         return total.toFixed(2)
 
       }, getMonthTotalOne() {
@@ -1230,11 +1226,6 @@
           }
         }
 
-        if (this.curMonthPrescriptions.addition != null) {
-          for (let b = 0; b < this.curMonthPrescriptions.addition.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.addition[b].price * this.curMonthPrescriptions.addition[b].count)
-          }
-        }
         return total.toFixed(2)
 
       },
@@ -1252,11 +1243,7 @@
               total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total)
             }
           }
-          if (this.prescriptions[i].addition != null) {
-            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
-              total = parseFloat(total) + parseFloat(this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count)
-            }
-          }
+
         }
         return total.toFixed(2)
 
@@ -1275,11 +1262,7 @@
             }
           }
 
-          if (this.month_prescriptions[i].addition != null) {
-            for (let b = 0; b < this.month_prescriptions[i].addition.length; b++) {
-              total = parseFloat(total) + parseFloat(this.month_prescriptions[i].addition[a].price * this.month_prescriptions[i].addition[b].count)
-            }
-          }
+
         }
         return total.toFixed(2)
 
@@ -1374,9 +1357,7 @@
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
                 ids.push(this.prescriptions[i].advices[a].id)
               }
-              for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
-                ids.push(this.prescriptions[i].addition[a].id)
-              }
+
 
               for (let a = 0; a < this.prescriptions[i].project.length; a++) {
                 ids.push(this.prescriptions[i].project[a].id)
@@ -1394,10 +1375,6 @@
                 ids.push(this.month_prescriptions[i].advices[a].id)
               }
 
-              for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
-                ids.push(this.month_prescriptions[i].addition[a].id)
-              }
-
               for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
                 ids.push(this.month_prescriptions[i].project[a].id)
               }
@@ -1832,9 +1809,6 @@
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
                 ids.push(this.prescriptions[i].advices[a].id)
               }
-              for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
-                ids.push(this.prescriptions[i].addition[a].id)
-              }
 
               for (let a = 0; a < this.prescriptions[i].project.length; a++) {
                 ids.push(this.prescriptions[i].project[a].id)
@@ -1850,9 +1824,6 @@
                 ids.push(this.month_prescriptions[i].advices[a].id)
               }
 
-              for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
-                ids.push(this.month_prescriptions[i].addition[a].id)
-              }
 
               for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
                 ids.push(this.month_prescriptions[i].project[a].id)
@@ -1922,9 +1893,6 @@
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
                 ids.push(this.prescriptions[i].advices[a].id)
               }
-              for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
-                ids.push(this.prescriptions[i].addition[a].id)
-              }
 
               for (let a = 0; a < this.prescriptions[i].project.length; a++) {
                 ids.push(this.prescriptions[i].project[a].id)
@@ -1941,9 +1909,6 @@
                 ids.push(this.month_prescriptions[i].advices[a].id)
               }
 
-              for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
-                ids.push(this.month_prescriptions[i].addition[a].id)
-              }
 
               for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
                 ids.push(this.month_prescriptions[i].project[a].id)
@@ -2545,17 +2510,7 @@
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
-          //附加收费
-          for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price: month_prescriptions[i].addition[a].price
-
-            }
-            additions_ids.push(obj)
-            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
-          }
 
         }
 
@@ -2631,23 +2586,6 @@
           projects.push(obj)
         }
 
-        for (let i = 0; i < additions_ids.length; i++) {
-          let obj = {}
-          let count = 0
-          if (addition_month_prescriptions.addition) {
-            for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-              if (additions_ids[i].price == addition_month_prescriptions.addition[a].price && additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
-                obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-                obj['id'] = addition_month_prescriptions.addition[a].id
-                obj['item_id'] = addition_month_prescriptions.addition[a].item_id
-                count = count + addition_month_prescriptions.addition[a].count
-                obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
-              }
-            }
-            obj['count'] = count
-            additions.push(obj)
-          }
-        }
 
         let p1 = {
           name: '处方' + 1,
@@ -2843,16 +2781,7 @@
                 tempProject.push(obj)
               }
 
-              for (let b = 0; b < prescription.addition.length; b++) {
-                let obj = {
-                  id: prescription.addition[b].id,
-                  item_name: prescription.addition[b].item_name,
-                  price: prescription.addition[b].price,
-                  count: prescription.addition[b].count,
-                  item_id: prescription.addition[b].item_id
-                }
-                tempAddition.push(obj)
-              }
+
               let index = i + 1
               let obj = {
                 id: prescription.id,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1185,8 +1185,8 @@
             var drugs = response.data.data.drugs
             for(let i=0;i<drugs.length;i++){
                 drugs[i].count = 0
-              if(drugs[i].stock_in.length > 0){
-                if(drugs[i].stock_in != null) {
+              if(drugs[i].stock_in != null) {
+                if(drugs[i].stock_in.length > 0){
                   for (let j = 0; j < drugs[i].stock_in.length; j++) {
                     drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
                   }

src/xt_pages/outpatientTool/labelPrint.vue

@@ -194,7 +194,7 @@
         this.current_project_name = row.project_name
         this.current_name = row.patient_name
         this.$nextTick(() => {
-          JsBarcode('#barcode',row.p_project_id, {
+          JsBarcode('#barcode',row.id, {
             format: 'CODE39',
             lineColor: '#000',
             background: '#EBEEF5',