Bläddra i källkod

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

XMLWAN 4 år sedan
förälder
incheckning
e9c56c777e

+ 1 - 1
src/xt_pages/outpatientCharges/summary.vue Visa fil

100
                     <template slot-scope="scope">
100
                     <template slot-scope="scope">
101
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
101
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
102
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
102
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
103
-                                   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) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
103
+                                   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)  ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
104
                             结算单
104
                             结算单
105
                         </el-button>
105
                         </el-button>
106
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
106
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue Visa fil

8
     <div class="app-container ">
8
     <div class="app-container ">
9
       <div id="dialysis-print-box">
9
       <div id="dialysis-print-box">
10
         <div class="dialysis-print-order">
10
         <div class="dialysis-print-order">
11
-         <div class="order-yy-name">{{orgname}}</div>
11
+         <div class="order-yy-name">{{orgName}}</div>
12
           <div class="order-title">药品出库登记表</div>
12
           <div class="order-title">药品出库登记表</div>
13
          
13
          
14
           <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
14
           <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>