11月14日 库存扣减更新

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -240,7 +240,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -615,6 +615,7 @@
           this.manufacturerList = response.data.data.manufacturerList
           this.dealerList = []
           this.dealerList = response.data.data.dealerList
+          console.log("供应商2332322332232323232323",this.dealerList)
 
         })
       },changeManufacturer(val) {

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -64,7 +64,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200" fixed="left">
+         <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
@@ -80,7 +80,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
-                    style="width:160px;"
+                    style="width:250px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -90,6 +90,8 @@
               </el-form-item>
             </template>
           </el-table-column>
+
+
           <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>规格&单位</span>
@@ -315,7 +317,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "耗材退库单" },
+        { path: false, name: "药品退库单" },
         { path: false, name: "新增退库单" }
       ],
       crumbs2: [

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -164,7 +164,20 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="140">
+          <el-table-column align="center" width="150">
+          <template slot="header" slot-scope="scope" >
+                <span >批号<span style="color: red">*</span></span>
+            </template>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 20px" :rules="tableRules.batch_number"  :prop="'recordData.' + scope.$index + '.batch_number'">
+                  <el-input
+                    placeholder="请输入批号"
+                    v-model="scope.row.batch_number"
+                  ></el-input>
+                </el-form-item>
+              </template>
+         </el-table-column>
+          <!-- <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope" >
               <span>批号</span>
               </template>
@@ -176,7 +189,7 @@
                     ></el-input>
                   </el-form-item>
                 </template>
-          </el-table-column>
+          </el-table-column> -->
                    
          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
@@ -413,6 +426,9 @@ export default {
         expiry_date:[
          {required:true,message:'有效日期不能为空',trigger:'blur'}
         ],
+        batch_number:[
+          {required:true,message:'批号不能为空',trigger:'blur'}
+        ],
       },
 
       total: "",
@@ -729,6 +745,7 @@ export default {
           console.log("000000000000",response.data.data.info)
           this.manufacturerList = manufacturerList
           var dealerList  = response.data.data.dealerList
+          console.log("供应商232322332322332232323",this.dealerList)
           this.dealerList = dealerList
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(

src/xt_pages/stock/drugs/query.vue

@@ -107,7 +107,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
@@ -128,14 +128,14 @@
         
         <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showThree">
            <template slot-scope="scope">
-            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showFour">
            <template slot-scope="scope">
-            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) >0">
                <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>         
             </div>
            </template>

src/xt_pages/stock/stockQuery.vue

@@ -512,7 +512,7 @@ export default {
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList
-        
+          console.log("outlist22323232233",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
         
@@ -539,8 +539,8 @@ export default {
            count = this.outCountList[i].count
          }
       }
-      return count
-    },
+     return count
+   },
    getAutoCount(id){
      var count= 0
      for(let i=0;i<this.autoCountList.length;i++){

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -247,6 +247,7 @@
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { getNextScheduleWeekDay,getAllZoneList } from "@/api/schedule";
 import WeekItem from "./WeekItem";
 const moment = require('moment')
@@ -303,6 +304,7 @@ export default {
       zone:"",
       // zoneList:[{id:0,name:"全部"}],
       zoneList:[],
+      start_time:moment().week(moment().week() + 1).startOf('week').unix()
     };
   },
   watch: {
@@ -357,12 +359,16 @@ export default {
         if(zone != 0){
           str = zone.join(",")
         }
+
+        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
           week_type:this.week_type,
           week_time:this.week_time,
           zone:str,
+          record_date:this.getTime(now_time)
         }
         // const params = {
         //   start_time:1609603200,
@@ -370,7 +376,7 @@ export default {
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         // }
-      console.log("params",params)
+      console.log("params0000000000",params)
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
@@ -662,7 +668,14 @@ export default {
         this.$router.push({
           path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
         })
-    }
+    },
+    getTime(val) {
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
   },
   components: {
     WeekItem
@@ -675,6 +688,7 @@ export default {
     // if (this.week_type == 0) {
     //   this.week_type = 7;
     // }
+
     this.getAllZoneList()
     this.org_id = this.$store.getters.xt_user.org.id
 

src/xt_pages/workforce/next_remind_print.vue

@@ -144,6 +144,8 @@
       BreadCrumb
     },
     created() {
+     var now_time = parseInt(this.week_type) * 86400 + this.start_time
+     this.now_time = now_time
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
@@ -160,8 +162,9 @@
           start_time:this.start_time,
           end_time:this.end_time,
           zone:this.zone,
+          record_date:this.getTime(now_time)
         }
-
+     console.log("prarms23232323",params)
         //  const params = {
         //   week_type:this.week_type,
         //   week_time:this.week_time,
@@ -215,9 +218,7 @@
         this.$message.error(err)
       })
 
-      var now_time = parseInt(this.week_type) * 86400 + this.start_time
-      console.log("now",now_time)
-      this.now_time = now_time
+    
     },
     methods: {
       getAdvice:function(doctor_advice) {

src/xt_pages/workforce/remind_print.vue

@@ -143,7 +143,7 @@
     created() {
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
-      console.log("org_id23322323",this.org_id)
+     //console.log("org_id23322323",this.org_id)
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit

src/xt_pages/workforce/remind_print_setting.vue

@@ -416,12 +416,14 @@
         // if(zone != 0){
         //   str = zone.join(",")
         // }
+        var now_time = parseInt(this.week_type) * 86400 + this.start_time
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
+          record_date:this.getTime(now_time)
         }
         // const params = {
         //   start_time:1609603200,