Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/router/modules/dialysis.js

@@ -480,7 +480,7 @@ export default {
       }
     },
     {
-      path: '/dialysis/print/batch/twentyFive',                            
+      path: '/dialysis/print/batch/twentyFive',
       component: () =>
         import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
       hidden: true,
@@ -491,18 +491,18 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/print/batch/twentySeven',
-      component: () =>
-      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysis_batch_twentySeven',
-      meta: {
-        title: '批量打印',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/print/batch/twentySeven',
+    //   component: () =>
+    //   import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
+    //   hidden: true,
+    //   is_menu: false,
+    //   name: 'dialysis_batch_twentySeven',
+    //   meta: {
+    //     title: '批量打印',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/print/batch/twentyEight',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -573,7 +573,7 @@ import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
-
+const moment = require('moment')
 export default {
   name: "Patient",
   data() {
@@ -697,6 +697,7 @@ export default {
       if(search_value != ''){
         this.patient_search_keyword = search_value
         this.listQuery.keywords = search_value
+       
         this.getSchedualPatientList();
         var date = new Date();
         this.time = date;
@@ -711,9 +712,22 @@ export default {
         }
         var nowDate = year + "-" + month + "-" + day;
         var date = new Date(nowDate + " 00:00:00");
+
         this.listQuery.schedul_time = date.getTime();
         this.getAllZone();
         this.getTemplateInfo();
+      }else {
+        var start_month = moment().startOf('month').format('YYYY-MM-DD')
+        var start_time = this.getTimestamp(start_month)
+        this.listQuery.start_time = start_time
+        var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+        var end_time = this.getTimestamp(end_month)
+        this.listQuery.end_time = end_time
+        this.getSchedualPatientList()
+      
+        this.getAllZone();
+        this.getTemplateInfo();
+
       }
     }else {
       var date = new Date();
@@ -730,6 +744,12 @@ export default {
       var nowDate = year + "-" + month + "-" + day;
       var date = new Date(nowDate + " 00:00:00");
       this.listQuery.schedul_time = date.getTime();
+      var start_month = moment().startOf('month').format('YYYY-MM-DD')
+      var start_time = this.getTimestamp(start_month)
+      this.listQuery.start_time = start_time
+      var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+      var end_time = this.getTimestamp(end_month)
+      this.listQuery.end_time = end_time
       this.getAllZone();
       this.getSchedualPatientList();
       this.getTemplateInfo();
@@ -778,6 +798,7 @@ export default {
       this.getSchedualPatientList();
     },
     changeStartTime(){
+     
       this.getSchedualPatientList()
     },
     changeEndTime(){
@@ -795,12 +816,19 @@ export default {
         }
       });
     },
+    getTimestamp(time) { //把时间日期转成时间戳
+
+      return (new Date(time)).getTime()
+    },
     getSchedualPatientList: function() {
       this.loading = true;
       if (this.search_mode == 1) {
         this.listQuery.keywords = "";
+      
+
       } else {
         this.listQuery.schedul_time = "";
+       
       }
       console.log("params332322332323232",this.listQuery)
       this.SchedualPatientsTableData = [];
@@ -892,6 +920,7 @@ export default {
     changeSearchMode: function() {
       if (this.search_mode == 1) {
         this.search_mode = 2;
+        
       } else {
         this.search_mode = 1;
         var date = new Date();
@@ -908,6 +937,7 @@ export default {
         var nowDate = year + "-" + month + "-" + day;
         var date = new Date(nowDate + " 00:00:00");
         this.listQuery.schedul_time = date.getTime();
+       
         this.getAllZone();
         this.getSchedualPatientList();
         this.getTemplateInfo();

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1220,10 +1220,10 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 62">
           </DialysisPrintOrderSixtyTwo>
-          <DialysisPrintOrderSixtyThree
+          <!-- <DialysisPrintOrderSixtyThree
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 63">
-          </DialysisPrintOrderSixtyThree>
+          </DialysisPrintOrderSixtyThree> -->
         </div>
       </el-container>
     </div>
@@ -1304,11 +1304,11 @@ import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine"
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
-import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
+// import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
 export default {
   name: "dialysisPrintOrder",
   components: {
-    DialysisPrintOrderSixtyThree,
+    // DialysisPrintOrderSixtyThree,
     DialysisPrintOrderSixtyTwo,
     DialysisPrintOrderSixtyOne,
     DialysisPrintOrderSixty,

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

@@ -1004,7 +1004,8 @@ export default {
    }
   },
    open(){
-    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    // this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     this.drugTypeList = []

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

@@ -1016,7 +1016,8 @@ export default {
   },
    open(){
    
-    this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     this.drugTypeList = []

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -303,7 +303,10 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end:none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
+                    <span v-if="is_sys == 1 || is_sys == 5">
+                      {{getBatchNumber(item.warehousing_detail_id)}}
+                    </span> 
+                     <span v-if="is_sys == 12">{{getBatchNumber(item.warehousing_detail_id)}}</span>
                     <span v-if="is_sys == 0">{{getBatchNumberOne(item.batch_number)}}</span>
                   </td>
                </tr>
@@ -1218,6 +1221,7 @@ export default {
           if (is_sys == 1) {
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
+                 drugFlowList[i].childOne = []
                  drugFlowList[i].child = []
                 if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) {
                    drugFlowList[i].count =drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number;
@@ -1227,12 +1231,12 @@ export default {
                 }
                 for(let j=0;j<drugListOne.length;j++){
                    if(drugFlowList[i].drug_id == drugListOne[j].drug_id){
-                       drugFlowList[i].child.push(drugListOne[j])
+                       drugFlowList[i].childOne.push(drugListOne[j])
                    }
                 }
               }
             }
-            console.log("数据元23322323232323322332我的",drugFlowList)
+          
             this.drugFlowList = drugFlowList;
           }
 
@@ -1240,6 +1244,7 @@ export default {
             var flowlist = response.data.data.flowlist;
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
+               flowlist[i].childOne = []
                flowlist[i].child = []
               if (flowlist[i].count_unit == flowlist[i].max_unit) {
                 flowlist[i].count = flowlist[i].count * flowlist[i].min_number;
@@ -1248,24 +1253,8 @@ export default {
               if (flowlist[i].count_unit == flowlist[i].min_unit) {
                 flowlist[i].count = flowlist[i].count;
               }
-              // if(list[i].is_sys == 1){
-              //  for(let j=0;j<drugListOne.length;j++){
-              //   if(flowlist[i].drug_id == drugListOne[j].drug_id){
-              //     flowlist[i].child.push(drugListOne[j])
-              //   }
-              //  }
-              // }
-              // if(list[i].is_sys == 0){
-              //  for(let j=0;j<drugListTwo.length;j++){
-              //   if(flowlist[i].drug_id == drugListTwo[j].drug_id){
-              //     flowlist[i].child.push(drugListTwo[j])
-              //   }
-              //  }
-              // }
-             
             }
             this.drugFlowList = flowlist;
-            console.log("数据我的喔喔喔喔喔喔",this.drugFlowList)
           }
 
           for (let i = 0; i < list.length; i++) {
@@ -1277,23 +1266,79 @@ export default {
               list[i].number = "";
             }
             list[i].child = []
+            list[i].childOne = []
             if(list[i].is_sys == 1 ){
               for(let j=0;j<drugListOne.length;j++){
                 if(list[i].drug_id == drugListOne[j].drug_id){
-                  list[i].child.push(drugListOne[j])
+                  list[i].childOne.push(drugListOne[j])
                 }
              }
             }
             if(list[i].is_sys == 0 || list[i].is_sys == 5  || list[i].is_sys == 12){
               for(let j=0;j<drugListTwo.length;j++){
                 if(list[i].drug_id == drugListTwo[j].drug_id){
-                  list[i].child.push(drugListTwo[j])
+                  list[i].childOne.push(drugListTwo[j])
                 }
                }
             }
           }
-         console.log("list2332323232232323",list)
+
+     
+         
+        console.log("is_sys2332232323wo",is_sys)
+        if(is_sys == 1 || is_sys == 5){
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+               list[i].childOne[j].over_count_total = this.getOutCountSix(list[i].childOne[j].warehousing_detail_id,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
+            }
+          }
+
+         for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+               if(list[i].childOne[j].over_count_total !=""){
+                   list[i].child.push(list[i].childOne[j])
+               } 
+            }
+          }
           this.tableList = list;
+        }
+
+        if(is_sys == 12){
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+               list[i].childOne[j].over_count_total = this.getOutCountSeven(list[i].childOne[j].warehousing_detail_id,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
+            }
+          }
+
+         for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+               if(list[i].childOne[j].over_count_total !=""){
+                   list[i].child.push(list[i].childOne[j])
+               } 
+            }
+          }
+          this.tableList = list;
+        }
+
+        if(is_sys == 0){
+          console.log("list999992332232323",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id))
+               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
+            }
+          }
+
+         for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].childOne.length;j++){
+               if(list[i].childOne[j].over_count_total !=""){
+                   list[i].child.push(list[i].childOne[j])
+               } 
+            }
+          }
+          this.tableList = list;
+        }
+        
 
         }
       });
@@ -1488,12 +1533,11 @@ export default {
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
           this.outInfoList = response.data.data.outInfoList
-          console.log("outInfoList2233232232",this.outInfoList)
         }
       });
     },
     toExport() {
-      console.log("exportlist23323232233",this.exportList)
+
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
@@ -1656,14 +1700,11 @@ export default {
       var total = 0
       var max_str = ""
       var min_str = ""
-      console.log("outlist",this.outList)
-      console.log("warehouse_info_id",warehouse_info_id)
       for(let j=0;j<this.outList.length;j++){
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
            arr.push(this.outList[j])
         }
       }
-       console.log("arr23322332",arr)
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            total +=arr[i].count
@@ -1692,8 +1733,6 @@ export default {
       var total = 0
       var max_str = ""
       var min_str = ""
-      console.log("outlist",this.outList)
-      console.log("warehouse_info_id",warehouse_info_id)
       for(let j=0;j<this.outList.length;j++){
         if(this.outList[i].count_unit == max_unit){
            this.outList[i].count = this.outList[i].count * min_number
@@ -1702,7 +1741,6 @@ export default {
            arr.push(this.outList[j])
         }
       }
-       console.log("arr23322332",arr)
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
 
@@ -1912,14 +1950,12 @@ export default {
            arr.push(this.tabList[j])
         }
       }
-      console.log("Arr233322332",arr) 
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            total +=arr[i].count
          }
       }
       price = retail_price
-      console.log("price",price)
       if (total < min_number) {
         min_str = total
       }
@@ -1935,10 +1971,7 @@ export default {
           min_str = (total % min_number)
         }
       }
-      console.log("max_str2323232323",max_str)
-      console.log("min_str",min_str)
-      console.log("max_unit",max_unit)
-      console.log("min",min_unit)
+
 
       if(max_unit!=min_unit){
         all_price = max_str  * price + min_str * price
@@ -1946,7 +1979,6 @@ export default {
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
-      console.log("arr_pirce",all_price)
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -682,7 +682,8 @@ export default {
     }
    },
    open(){
-    this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []

src/xt_pages/stock/stockOutOrder.vue

@@ -281,7 +281,7 @@
             </template>
           </el-table-column> -->
 
-          <el-table-column label="出库数量" align="center">
+          <el-table-column label="仓库名称" align="center">
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
@@ -1446,17 +1446,21 @@ export default {
           this.tableShow = true;
           var list = response.data.data.list;
           this.flowList = response.data.data.stockFlowList
+          console.log("出库数据233223232323wo",this.flowList)
           this.stockFlowListGroup = response.data.data.stockFlowListGroup
+          console.log("分组2332223233wode",this.stockFlowListGroup)
           var cancelInfolist = response.data.data.cancelInfolist
           this.cancelInfoList = cancelInfolist
     
           this.tableList = [];
+          var tableArr = []
           for (let i = 0; i < list.length; i++) {
             list[i].child= []
             list[i].childOne = []
+            list[i].childTwo= []
             for(let z=0;z<this.stockFlowListGroup.length;z++){
               if(list[i].good_id == this.stockFlowListGroup[z].good_id){
-                 list[i].childOne.push(this.stockFlowListGroup[z])
+                 list[i].childTwo.push(this.stockFlowListGroup[z])
               }
             }
             for(let j=0;j<this.flowList.length;j++){
@@ -1465,9 +1469,30 @@ export default {
               }
             }
            
-            this.tableList.push(list[i]);
+             tableArr.push(list[i]);
+          }
+
+  // {{(getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)}}
+          if(tableArr!=null && tableArr.length>0){
+            for(let i=0;i<tableArr.length;i++){
+              for(let j=0;j<tableArr[i].childTwo.length;j++){
+                tableArr[i].childTwo[j].over_count_total = this.getAllStockCount(tableArr[i].child,tableArr[i].childTwo[j].warehousing_id) - this.getCancelInfo(tableArr[i].childTwo[j].warehousing_id,tableArr[i].childTwo[j].good_id)
+              }
+            }
           }
-          console.log("tablielist2332323",this.tableList)
+
+          for(let i=0;i<tableArr.length;i++){
+            for(let j=0;j<tableArr[i].childTwo.length;j++){
+               if(tableArr[i].childTwo[j].over_count_total >0){
+                 tableArr[i].childOne.push(tableArr[i].childTwo[j])
+               }
+            }
+          }
+          console.log("tableARR",tableArr)
+          console.log("tablielist2332323", this.tableList)
+           this.tableList = tableArr
+        
+
         }
       });
     },