11月14日 库存扣减更新

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -597,9 +597,10 @@ export default {
           this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
           this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
         }
-      
-       
+    
        }
+       console.log("数据23323",this.tableData)
+       
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){
          obj.total_price += this.tableData[i].total

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -42,14 +42,14 @@
                 <span>{{item.count_unit}}</span>
               </td>
               <td style="line-height:50px">
-                  {{item.last_price}}
+                  {{item.price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.last_price).toFixed(2)}}
+                {{(item.count * item.price).toFixed(2)}}
              </td>
              <td>{{item.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
-             <td>{{(getTime(item.expiry_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
@@ -319,6 +319,7 @@
             var warehousing = response.data.data.warehousing
             console.log("ware2232",warehousing)
             this.warehouseList = warehousing
+          
             for(let i=0;i<info.length;i++){
                info[i].child = []
               for(let j=0;j<warehousing.length;j++){
@@ -341,7 +342,7 @@
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehouse_out_id){
-             count +=this.warehouseList[i].count * this.warehouseList[i].last_price
+             count +=this.warehouseList[i].count * this.warehouseList[i].price
           }
         }
         return count

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-  <div style="float:right">
+  <div style="float:right;margin-right:10px">
     <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
   </div>
   <div id="dialysis-print-box">
@@ -11,15 +11,15 @@
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               性别:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
@@ -28,7 +28,7 @@
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               年龄:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
@@ -36,19 +36,19 @@
                  {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               婚姻:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-                 <span v-if="patient.marital_status == 0">未婚</span>
-                 <span v-if="patient.marital_status == 1">已婚</span>
-                 <span v-if="patient.marital_status == 2">未婚</span>
+                 <span v-if="patient.marital_status == 0"></span>
+                 <span v-if="patient.marital_status == 1">未婚</span>
+                 <span v-if="patient.marital_status == 2">已婚</span>
                  <span v-if="patient.marital_status == 3">离异</span>
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               职业: 
             </td>
              <td style="text-align:center;width:50px" colspan="1">
@@ -56,7 +56,7 @@
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               电话:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
@@ -67,10 +67,10 @@
           </tr>
 
           <tr>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               住址:
             </td>   
-            <td style="text-align:center;" colspan="11">
+            <td style="text-align:center;width:300px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.home_address}}
@@ -78,26 +78,26 @@
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               入院时间:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:300px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:200px" colspan="1">
               出院时间:
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:300px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px"  colspan="1">
+            <td style="text-align:center;width:100px"  colspan="2">
               住院天数:
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                {{getTimeDay(hosDetail.admission_time,hosDetail.discharge_time)}}
                
@@ -105,9 +105,8 @@
             </td>
             <td style="text-align:center;width:50px" colspan="2">
               转归:
-            
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.lapseto == 1">留治</span>
                 <span v-if="patient.lapseto == 2">转归</span>
@@ -383,7 +382,7 @@ export default {
       var name = ""
       for(let i=0;i<this.educationOptions.length;i++){
           if(id == this.educationOptions[i].id){
-              name = this.educationOptions[i].name
+           name = this.educationOptions[i].name
           }
       }
       return name
@@ -396,7 +395,7 @@ export default {
   },
  
   created() {
-    this.educationOptions = getDataConfig("patient", "education_types");
+    this.educationOptions = getDataConfig("patient", "profession_options");
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
     var id = this.$route.query.id

src/xt_pages/workforce/next_remind_print.vue

@@ -14,7 +14,8 @@
         </el-col>
       </el-row>
     </div>
-    <div class="app-container" style="background-color: white;">
+    <div class="app-container" style="background-color: white;"  v-loading="loading"
+      element-loading-text="加载中">
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
@@ -137,7 +138,8 @@
         now_time:0,
         zone:"",
         pre_status:0,
-        printObj:{}
+        printObj:{},
+        loading: false,
       }
     },
     components: {
@@ -156,6 +158,7 @@
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
+      this.loading = true;
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
@@ -178,6 +181,7 @@
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
+        this.loading = false
          var scheduleData = resp.data.schedule
 
           if(this.pre_status == 0){
@@ -210,6 +214,7 @@
             var arr =   newList.sort(this.compare('sort'))
             console.log("打印",arr)
             this.scheduleData = arr
+           
           }
         } else {
           this.$message.error(resp.msg)