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/batch_print/batch_print_order_twentyEight.vue

@@ -246,7 +246,7 @@
                         <tbody>
                         <tr>
                             <td width="80">活动性出血:</td>
-                            <td width="400">
+                            <td width="420">
                             <div>
                                
                                <label-box :isChecked="record.assessment_before_dislysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
@@ -634,7 +634,7 @@
                     </tr>
 
                     <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
-                        <td height="40px">
+                        <td height="30px">
                             <span v-if="advice[0].start_time">
                                 {{ getTime(advice[0].start_time, "{h}:{i}") }}
                             </span>
@@ -662,7 +662,7 @@
                                 <!-- </span> -->
                             </span>
                         </td>
-                        <td height="40px">
+                        <td height="30px">
                             <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
                                 {{getAdminUser(advice[0], 'advice_doctor')}}
                             </span>
@@ -670,7 +670,7 @@
                                 <img style="height:30px;" :src="setAdminUserES(advice[0], 'advice_doctor')" alt srcset />
                             </span>
                         </td>
-                        <td height="40px">
+                        <td height="30px">
                             <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
                                 {{getAdminUser(advice[0], 'execution_staff')}}
                             </span>
@@ -685,7 +685,7 @@
                              <img class="es-img" :src="setAdminUserES(advice[0], 'checker')" alt="" srcset="" style="height: 30px;" />
                           </span>
                         </td>
-                        <td height="40px">
+                        <td height="30px">
                             <span v-if="advice[0].execution_time">{{ getTime(advice[0].execution_time, "{h}:{i}") }}</span>
                         </td>
                     </tr>
@@ -1078,9 +1078,9 @@ export default {
             var dlegh = 0
             if (
               this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 8
+              this.records[recordIndex].monitor_records.length < 12
             ) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
+              dlegh = 12 - this.records[recordIndex].monitor_records.length
             } else {
               dlegh = 0
             }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -2010,8 +2010,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 9) {
-              var nl = 9 - this.monitors.length
+            if (this.monitors.length < 12) {
+              var nl = 12 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -262,7 +262,6 @@
             this.getPage()
         },
         deep: true,
-        immediate:true
       }
     }
 

src/xt_pages/outpatientCharges/summary.vue

@@ -96,7 +96,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="scope.row.order_status == 2">结算单</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 || this.$store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || this.$store.getters.xt_user.org_id == 9919)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -137,6 +137,16 @@
       <allListPrint :paramsObj='paramsObj'></allListPrint>
     </el-dialog>
 
+    <el-dialog
+            class="centerDialog"
+            width="1200px"
+            title="打印"
+            :visible.sync="statementVisible9504">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+      <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
+      <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -150,10 +160,12 @@
   import NewStatementPrint from './newStatementPrint'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
+  import NewStatementPrintTwo from './newStatementPrintTwo'
 
 
   export default {
     components: {
+      NewStatementPrintTwo,
       NewStatementPrint,
       BreadCrumb,
       listPrint,
@@ -163,6 +175,8 @@
       return {
         orderObj: {},
         statementVisible: false,
+        statementVisible9504:false,
+        orderObj9504:{},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
@@ -183,11 +197,22 @@
     },
     methods: {
       toPrint(row){
-        this.statementVisible = true
-        let obj = {
-          order_id: row.id
+        if(this.$store.getters.xt_user.org_id == 9504){
+          this.statementVisible9504 = true
+          let obj = {
+            order_id: row.id,
+            patient_id: row.patient_id,
+            record_time: this.getTimes(row.settle_accounts_date),
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          }
+          this.orderObj9504 = obj
+        }else {
+          this.statementVisible = true
+          let obj = {
+            order_id: row.id
+          }
+          this.orderObj = obj
         }
-        this.orderObj = obj
 
       },
       export_detail(){