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

src/store/modules/globalConfig.js

@@ -1826,6 +1826,9 @@ const global_config = {
       },{
         id: 29,
         name: '只'
+      },{
+        id: 30,
+        name: '次'
       },
 
     ],

src/xt_pages/dialysis/details/NavIgation.vue

@@ -206,7 +206,7 @@ export default {
 
   data() {
     return {
-      temp_schedual: null
+      temp_schedual: {}
     };
   },
   mounted() {},
@@ -578,7 +578,9 @@ export default {
         system_prescribe
       );
 
-      // this.temp_schedual = schedual
+      this.temp_schedual = schedual
+
+      console.log("排班列表2222222222222222",schedual)
     },
 
     add_monitor: function(monitor) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1593,7 +1593,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-
+        
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1632,9 +1632,9 @@
         // 入口
         var pre = pre
         console.log("香锅2222222",this.dialysisPrescription)
-     
+        console.log("列表2223323323223",this.schedual)
         this.dialysisPrescription.mode_id = this.$route.query.mode_id
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = 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 || this.$store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || this.$store.getters.xt_user.org_id == 9919)">结算单</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9919)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>