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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1689,12 +1689,12 @@ export default {
       for (let i = 0; i < this.month_prescriptions.length; i++) {
         if (this.month_prescriptions[i].advices != null) {
           for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-            total = total + this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number
+            total = total.toFixed(2) + (this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number).toFixed(2)
           }
         }
         if (this.month_prescriptions[i].project != null) {
           for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
-            total = total + this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total
+            total = total.toFixed(2) + (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total).toFixed(2)
           }
         }
 

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -182,7 +182,7 @@ export default {
                 this.list = res.data.data
                 console.log('res',this.list)
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 this.smalltoBIG(this.totalPrice)
                 var data = new Date(res.data.data.date * 1000);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;

src/xt_pages/hospitalStation/summary.vue

@@ -150,7 +150,6 @@
                     style="margin-top:20px;float: right"
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="total"
-
             >
             </el-pagination>
         </div>
@@ -622,7 +621,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1086,7 +1086,11 @@ export default {
     },
     changeTimeTwo() {
       this.getPatientList()
-      this.form.diagnosis_time = this.record_date + ' ' + '00:00:00'
+      var nowDate = new Date()
+      var nowHours = nowDate.getHours()
+      var nowMinutes = nowDate.getMinutes()
+      var nowSeconds = nowDate.getSeconds()
+      this.form.diagnosis_time = this.record_date + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes) + ':' + (nowSeconds < 10 ? '0' + nowSeconds : nowSeconds)
     },
     comfirmPWDialog() {
       var that = this