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

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -7,7 +7,8 @@
         <div>透析号：{{ patient.dialysis_no }}</div>
         <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
         <div>年龄：{{ patient.age }} 岁</div>
-        <div v-if="$store.getters.xt_user.org_id  == 10644">开方日期：{{ gettime(order.setl_time) }}
+        <div v-if="$store.getters.xt_user.org_id  == 10644 || 
+              $store.getters.xt_user.org_id  == 0">开方日期：{{ getTimes(order.settle_accounts_date) }}
           <!-- {{ hospital.in_hosptial_time }} 至
           {{ hospital.out_hosptial_time }} -->
         </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -1,14 +1,14 @@
 <template>
   <div id='invoice-print' style="position: relative;">
     <div>
-      <div style="position: absolute;top:60px;left:30px">
+      <div style="position: absolute;top:50px;left:30px">
         阜阳经沃血液透析中心
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:'80px',left:'30px'}">
+        <div :style="{position: 'absolute',top:'70px',left:'30px'}">
           {{paramsObj.name}}
         </div>
-        <div :style="{position: 'absolute',top:'80px',left:'200px'}">
+        <div :style="{position: 'absolute',top:'70px',left:'200px'}">
           {{list.order.fa_piao_number}}
         </div>
       </div>
@@ -19,7 +19,7 @@
         <div :style="{position: 'absolute',top:'100px',left:'190px'}">
           
         </div>
-        <div :style="{position: 'absolute',top:'100px',left:'300px'}">
+        <div :style="{position: 'absolute',top:'90px',left:'300px'}">
         {{printDate}}
         </div>
       </div>
@@ -62,12 +62,12 @@
       </div>
     <!--金额 -->
     <div style="display: flex;">
-      <div :style="{position: 'absolute',top:'310px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
-      <div :style="{position: 'absolute',top:'310px',left:'270px'}">个人支付：{{list.order.psn_cash_pay}}</div>
+      <div :style="{position: 'absolute',top:'300px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
+      <div :style="{position: 'absolute',top:'300px',left:'270px'}">个人支付：{{list.order.psn_cash_pay}}</div>
     </div>
-    <div :style="{position: 'absolute',top:'330px',left:'190px'}">{{zhongwen}}</div>
-    <div :style="{position: 'absolute',top:'350px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
-    <div :style="{position: 'absolute',top:'370px',left:'300px'}">{{list.order.acct_pay}}</div>
+    <div :style="{position: 'absolute',top:'320px',left:'190px'}">{{zhongwen}}</div>
+    <div :style="{position: 'absolute',top:'340px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
+    <div :style="{position: 'absolute',top:'360px',left:'300px'}">{{list.order.acct_pay}}</div>
     <div style="display: flex;">
       <div :style="{position: 'absolute',top:'390px',left:'106px'}">{{list.admin_user_name}}</div>
       <div :style="{position: 'absolute',top:'390px',left:'300px'}">{{list.order_number}}</div>

src/xt_pages/stock/drugs/historyDrugInvetory.vue

@@ -19,7 +19,7 @@
                 style="width: 200px"
                 v-model="keywords"
                 class="filter-item"
-                placeholder="请输入耗材名称"
+                placeholder="请输入药品名称"
                 clearable
               />
               <el-button
@@ -294,7 +294,7 @@
         var now_in_number = 0
         stock_in_number = row.warehousing_count * row.XtBaseDrug.min_number
 
-        now_in_number = row.last_stock_max_number * row.XtBaseDrug.min_number + row.last_stock_min_number
+        now_in_number = parseInt(row.last_stock_max_number * row.XtBaseDrug.min_number) +parseInt(row.last_stock_min_number) 
        if(parseInt(row.last_stock_max_number)<0 && parseInt(row.last_stock_min_number)<0){
         this.$message.error("盘点后数量不能为负数!")
         return false

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -47,11 +47,11 @@
                  {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="80"  align="center">
+            <!-- <el-table-column prop="name" label="单位" width="80"  align="center">
                 <template slot-scope="scope">
                   {{scope.row.warehousing_unit}}
                </template>
-            </el-table-column>
+            </el-table-column> -->
           
             <el-table-column prop="name" label="进价" width="80"  align="center">
                 <template slot-scope="scope">

src/xt_pages/stock/historyInventory.vue

@@ -282,6 +282,7 @@
        })
      },
      UpdateWarehouseInfo(row){
+    
        if(parseInt(row.last_stock_count)<0){
         this.$message.error("盘点后数量不能为负数!")
         return false