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

src/router/modules/dialysis.js

@@ -89,28 +89,28 @@ export default {
     //     noCache: true
     //   }
     // },
-    // {
-    //   path: '/dialysis/dialysisParameters_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisParameters_print',
-    //   meta: {
-    //     title: 'dialysisParameters_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/allSummary_print',
-    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'allSummary_print',
-    //   meta: {
-    //     title: 'allSummary_print',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/dialysisParameters_print',
+      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisParameters_print',
+      meta: {
+        title: 'dialysisParameters_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/allSummary_print',
+      component: () => import('@/xt_pages/dialysis/allSummary_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummary_print',
+      meta: {
+        title: 'allSummary_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/xt_pages/dialysis/consumableDrugs.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
-                    <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+<!--                <el-tab-pane label="透析药品" name="second">-->
+<!--                    <dialysis-drugs></dialysis-drugs>-->
+<!--                </el-tab-pane>-->
                 <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/consumableDrugs_print.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="first">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
-                    <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+<!--                <el-tab-pane label="透析药品" name="second">-->
+<!--                    <dialysis-drugs></dialysis-drugs>-->
+<!--                </el-tab-pane>-->
                 <el-tab-pane label="透析参数" name="third">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/stock/stockOutOrder.vue

@@ -121,7 +121,7 @@
 
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
-           
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -215,7 +215,7 @@
          <el-row :gutter="12" style="margin-top: 10px">
           <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
                     border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-                  
+
           >
             <el-table-column min-width="35" align="center">
               <template slot="header" slot-scope="scope">
@@ -286,7 +286,7 @@
               <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
               </template>
             </el-table-column>
-             
+
 
 
           </el-table>
@@ -308,7 +308,7 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
-     
+
       <div class="cell clearfix">
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
@@ -365,12 +365,12 @@
       <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
   </el-dialog>
-  
+
 
 
   <!-- 编辑 -->
-  
-  
+
+
   </div>
 </template>
 
@@ -414,7 +414,7 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();
-   
+
     this.fetchAllAdminUsers();
   },
   data() {
@@ -562,7 +562,7 @@ export default {
       } else {
         this.GetWarehouseOut();
       }
-      this.GetWarehouseOut();
+
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
@@ -608,7 +608,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
+
       this.$router.push({
         name: "stockOutDetail",
         query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
@@ -706,19 +706,19 @@ export default {
         .catch(() => {});
     },
 
- 
 
-    
+
+
     //新增
-    handleSearch(id,row){ 
+    handleSearch(id,row){
       console.log("row2233r5",row)
       this.warehousingOutInfo.info = []
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)
       this.GetTotalCount(row.warehouse_out_time)
-      
+
     },
-  
+
     //获取出库单详情数据
     GetOrderDetailOne(id) {
         const params = {
@@ -738,7 +738,7 @@ export default {
             // this.handleSpanTempArr()
           }
         })
-     }, 
+     },
 
       getTypeName: function(id) {
         let name = ''
@@ -775,19 +775,19 @@ export default {
             return this.manufacturer[i].manufacturer_name
           }
         }
-      }, 
+      },
 
     jump(id){
       this.userList = []
       this.GetOrderDetail(id)
-     
+
     },
 
      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
-      
+
         getWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -815,7 +815,7 @@ export default {
       },
 
       editRecord(){
-     
+
       },
       deleteRecord(){
 
@@ -836,7 +836,7 @@ export default {
       },
 
      getOutStockCount(id){
-         var count = 0 
+         var count = 0
          for(let i=0;i<this.stockCount.length;i++){
             if(id == this.stockCount[i].good_id){
               count = this.stockCount[i].count