XMLWAN 3 年之前
父節點
當前提交
c09fc40519
共有 2 個文件被更改,包括 25 次插入24 次删除
  1. 15 14
      src/xt_pages/stock/drugs/components/drugInOrder.vue
  2. 10 10
      src/xt_pages/stock/drugs/components/drugOutDetail.vue

+ 15 - 14
src/xt_pages/stock/drugs/components/drugInOrder.vue 查看文件

@@ -224,20 +224,19 @@ export default {
224 224
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
225 225
       "-" +
226 226
       (nowDay < 10 ? "0" + nowDay : nowDay);
227
-    //  var start = window.sessionStorage.getItem('start_in_time')
228
-    //  console.log("start23323232322323",start)
229
-    //   var end =  window.sessionStorage.getItem('end_in_time')
230
-    //  if(start!= "null"){
231
-    //     console.log("hh232h23h32h3232322323")
232
-    //     this.start_time = start
233
-    //  }
234 227
      
228
+    var start_time =  window.sessionStorage.getItem('drug_start_in_time')
235 229
     
236
-    //  if(end != "null"){
237
-       
238
-    //     this.end_time = end
239
-    //  }
240
-   
230
+    var end_time =  window.sessionStorage.getItem('drug_end_in_time')
231
+    if(start_time !=null){
232
+      console.log("hh232323232红红火火")
233
+      this.start_time = start_time
234
+    }
235
+    if(end_time!=null){
236
+      this.end_time = end_time
237
+    }
238
+    window.sessionStorage.removeItem('drug_start_in_time')
239
+    window.sessionStorage.removeItem('drug_end_in_time')  
241 240
     this.GetConfigInfo()
242 241
     this.fetchAllAdminUsers()
243 242
     //获取入库单数据
@@ -333,6 +332,7 @@ export default {
333 332
         this.$message.error("结束时间不能小于开始时间");
334 333
         this.start_time = "";
335 334
       } else {
335
+        window.sessionStorage.setItem('drug_start_in_time',this.start_time)
336 336
         this.getlist()
337 337
         this.getDrugWarehouseInfoPrint()
338 338
       }
@@ -343,6 +343,7 @@ export default {
343 343
         this.$message.error("结束时间不能小于开始时间");
344 344
         this.end_time = "";
345 345
       } else {
346
+        window.sessionStorage.setItem('drug_end_in_time',this.end_time)
346 347
         this.getlist()
347 348
         this.getDrugWarehouseInfoPrint()
348 349
       }
@@ -460,8 +461,8 @@ export default {
460 461
       })
461 462
     },
462 463
     PrintAction(){
463
-      // window.sessionStorage.setItem('start_in_time',this.start_time)
464
-      // window.sessionStorage.setItem('end_in_time',this.end_time)
464
+      window.sessionStorage.setItem('drug_start_in_time',this.start_time)
465
+      window.sessionStorage.setItem('drug_end_in_time',this.end_time)
465 466
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
466 467
     },
467 468
     select(){

+ 10 - 10
src/xt_pages/stock/drugs/components/drugOutDetail.vue 查看文件

@@ -179,7 +179,7 @@
179 179
             {{scope.row.count}}
180 180
           </template>
181 181
         </el-table-column>
182
-        <el-table-column label="总价" align="center">
182
+        <el-table-column label="总价5555" align="center">
183 183
           <template slot-scope="scope">
184 184
             <!-- {{scope.row.price * scope.row.count}} -->
185 185
             {{scope.row.total_price}}
@@ -232,16 +232,16 @@ export default {
232 232
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
233 233
       "-" +
234 234
       (nowDay < 10 ? "0" + nowDay : nowDay);
235
-    // var start = window.sessionStorage.getItem('start_out_time')
236
-    // console.log("start",start)
237
-    //  var end =  window.sessionStorage.getItem('end_out_time')
238
-    // if(start!="null"){
239
-    //    this.start_time = start   
240
-    // }
241
-    // if(end!="null"){
235
+    var start_time = window.sessionStorage.getItem('start_out_time')
236
+    console.log("start",start)
237
+     var end_time =  window.sessionStorage.getItem('end_out_time')
238
+    if(start_time!=null){
239
+       this.start_time = start_time   
240
+    }
241
+    if(end_time!=null){
242 242
      
243
-    //   this.end_time = end
244
-    // }
243
+      this.end_time = end_time
244
+    }
245 245
     
246 246
     this.getDrugOutOrderPrint()
247 247
     this.GetConfigInfo();