11月14日 库存扣减更新

src/api/supply.js

@@ -9,10 +9,33 @@ export function getInitOrder(params) {
 }
 
 export function savePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount) {
-  console.log('data32323323232', data)
   return request({
     url: '/api/supply/savepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount,
     method: 'post',
     data: data
   })
 }
+
+export function getAllSupply(params) {
+  return request({
+    url: '/api/supply/getallsupply',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllPurchaseOrderList(params) {
+  return request({
+    url: '/api/supply/getallpurchaseorderlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function updatePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount, id, number) {
+  return request({
+    url: '/api/supply/updatepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&id=' + id + '&number=' + number,
+    method: 'post',
+    data: data
+  })
+}

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -79,6 +79,11 @@
              {{scope.row.warehousing_count}}{{scope.row.max_unit}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="零售价" align="center">
+           <template slot-scope="scope">
+              {{scope.row.retail_price}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
               {{scope.row.price}}

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,18 +38,7 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
-
-        <!-- <span>出入库方式:</span>
-        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
-            <el-option
-              v-for="(item,index) in stockType"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-        </el-select> -->
-        
-        
+  
       </div>
       
        <el-table
@@ -93,6 +82,11 @@
              <span> {{scope.row.price}}</span>
            </template>
         </el-table-column>
+         <el-table-column prop="drug_name" label="零售价" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/stock/stockInOrder.vue

@@ -208,11 +208,11 @@
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
-         <el-table-column label="零售价" align="center">
+         <!-- <el-table-column label="零售价" align="center">
           <template slot-scope="scope">
             {{ scope.row.packing_price}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price}}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -660,6 +660,7 @@
       }
       ,
       submit() {
+        console.log("res23322332",this.$refs)
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -3,7 +3,7 @@
 <div class="position">
     <bread-crumb :crumbs="crumbs"></bread-crumb>
 </div>
-<div class="app-container ">
+<div class="app-container"  v-loading="loading">
     <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
     <div>
         <span style="color:red">*</span><span>供应商:</span>
@@ -44,11 +44,13 @@
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
         ></el-date-picker>
-        <span>单据编码:</span>
+        <span>单据编码:{{number}}</span>
 
     </div>
     <div>
         <el-button size="small" type="primary" @click="savePurchaseOrder" v-show="showTwo">保存</el-button>
+        <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">打印</el-button>
+        <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">审核</el-button>
         <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">修改</el-button>
     </div>
     </div>
@@ -71,7 +73,7 @@
             <span>商品<span style="color: red">*</span></span>
         </template>
         <template slot-scope="scope">
-           <el-form-item required prop="name">
+           <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
             <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)">
                 <el-option
                     v-for="(item,index) in tabList"
@@ -106,8 +108,8 @@
             <span>数量<span style="color: red">*</span></span>
         </template>
         <template slot-scope="scope">
-          <el-form-item :rules="tableRules.supply_count" required prop="supply_count">
-          <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
+             <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
@@ -166,6 +168,9 @@
     </el-table-column>
   </el-table>
 </el-form>
+   <div style="margin-top:10px">
+      合计:{{getAllPrice()}} 元
+   </div>
    <div style="margin-top:10px">
         <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
 
@@ -178,8 +183,8 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-import {getInitOrder,savePurchaseOrder} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,savePurchaseOrder,updatePurchaseOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -241,8 +246,14 @@ return {
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
- },
-};
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+  };
 },
 methods:{
 
@@ -283,7 +294,7 @@ getInitOrder(){
 
         this.tabList.push(drugList[i])
         }
-
+        this.drugList = drugList
         var goodList =  response.data.data.goodList
         for(let i=0;i<goodList.length;i++){
         for(let j=0;j<this.manufactuerList.length;j++){
@@ -311,14 +322,15 @@ getInitOrder(){
 
         this.tabList.push(goodList[i])
         }
-    }
+        this.goodList = goodList
+    } 
     })
 },
 changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-
+    //var obj = {"id":0,"name":"合计","supply_name":"","supply_type":"","supply_specification_name":"","supply_total":"","supply_count":"","supply_price":"","supply_total_price":"","supply_manufacturer":"","supply_license_number":"","supply_remake":"","is_total":2}
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
         this.recordInfo.tableList[i].id = val.id
@@ -339,8 +351,10 @@ changeName(val){
         this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
         this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].is_total = val.is_total
      }
     }
+   
 
 },
 handleEdit(){
@@ -358,6 +372,7 @@ handleEdit(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
+    tempObj['is_total'] = 1
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -371,21 +386,17 @@ handleDelete: function(index, row) {
 
 
 savePurchaseOrder(){
-   // console.log("tablelsit323232",this.recordInfo.tableList)
-   console.log("hhh232323",this.$refs)
+    this.loading = true
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       return false
+    }
     this.$refs["tableForm"].validate((valid)=>{
       if(valid){
-        var params = {
-        supplier_name:this.supplier_name,
-        start_time:this.start_time,
-        end_time:this.end_time,
-        rate_of_concession:this.rate_of_concession,
-        discount_amount:this.discount_amount,
-        }
-        console.log("partam2332232332",params)
-        console.log("tablelsit323232",this.recordInfo.tableList)
         for(let i=0;i<this.recordInfo.tableList.length;i++){
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+            this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+            this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
                 this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
@@ -393,11 +404,48 @@ savePurchaseOrder(){
 
             }
         }
-        return
-        savePurchaseOrder(this.recordInfo.tableList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
+        var start = this.getTimes(this.start_time)
+        var end = this.getTimes(this.end_time)
+         const params = {
+            'stockIn': this.recordInfo.tableList
+         }
+       
+        savePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount).then(response=>{
             if(response.data.state == 1){
                 var order =  response.data.data.order
+                this.loading = false
                 this.$message.success("保存成功!")
+                var warehouseInfo = response.data.data.warehouseInfo
+                this.number  = warehouseInfo.number
+                this.id = warehouseInfo.id
+                this.recordInfo.tableList = []
+                var orderInfo = response.data.data.orderInfo
+                for(let i=0;i<orderInfo.length;i++){
+                  orderInfo[i].supply_count = orderInfo[i].count
+                  orderInfo[i].supply_price = orderInfo[i].price
+                  orderInfo[i].supply_remake = orderInfo[i].remark
+                }
+                console.log("orderINFO23323232",orderInfo)
+                this.recordInfo.tableList = orderInfo
+                // for(let i=0;i<orderInfo.length;i++){
+                //    orderInfo[i].name = "" 
+                //    orderInfo[i].supply_name = ""
+                //    orderInfo[i].supply_specification_name = ""
+                //   if(orderInfo[i].is_source == 1){
+                //     for(let j=0;j<this.drugList.length;j++){
+                //        if(orderInfo[i].project_id == this.drugList[j].id){
+                //           orderInfo[i].name = this.drugList[j].drug_name
+                //        }
+                //     }
+                //   }
+                //   if(orderInfo[i].is_source == 2){
+                //     for(let y=0;y<this.goodList.length;y++){
+                //        if(orderInfo[i].project_id = this.goodList[y].id){
+                //           orderInfo[i].name = this.goodList[y].good_name
+                //        }
+                //     }
+                //   }
+                // }
                 this.showTwo = false
                 this.showOne = true
             }
@@ -408,6 +456,7 @@ savePurchaseOrder(){
 
 },
 
+
 changeTypeName(){
 
 },
@@ -463,8 +512,46 @@ calculate: function(val) {
     }
     return Math.round(parseFloat(val) * 100) / 100;
   },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
  updatePurchaseOrder(){
-
+   this.$refs.validate((valid)=>{
+      if(valid){
+        for(let i=0;i<this.recordInfo.tableList.length;i++){
+           this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+           this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+           this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+           for(let j=0;j<this.manufactuerList.length;j++){
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              }
+           }
+        }
+        var start = this.getTimes(this.start_time)
+        var end = this.getTimes(this.end_time)
+         const params = {
+            'stockIn': this.recordInfo.tableList
+         }
+        updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
+           if(response.data.state == 1){
+             var warehousingInfo =  response.data.data.warehousingInfo
+             this.$message.success("修改成功!")
+           }
+        })
+      } 
+   })
+ },
+ getAllPrice(){
+   console.log("表哥2332323223323223",this.recordInfo.tableList)  
+   var total_price = 0
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+      total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
+   }  
+   return total_price.toFixed(2)
  }
 },
 created(){
@@ -482,6 +569,7 @@ created(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
+    tempObj['is_total'] = 1
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
 }

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -6,15 +6,7 @@
     <div class="app-container ">
       <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
         <div>
-          <el-select v-model="type_name" style="width:140px;margin-right:10px;" placeholder="请选择"
-          @change="changeTypeName">
-            <el-option
-              v-for="item in types"
-              :key="item.id"
-              :label="item.type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+        
           <el-date-picker
             size="small"
             v-model="start_time"
@@ -41,12 +33,22 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
+          <span>审核状态:</span>
+           <el-select v-model="check_id" style="width:140px;margin-right:10px;" placeholder="请选择"
+            @change="changeTypeName">
+            <el-option
+                v-for="item in checkList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+            </el-option>
+          </el-select>
           <el-input
             size="small"
             style="width: 200px;margin-left:10px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="耗材名称"
+            placeholder="订单编号或供应商名称"
           />
           <el-button
             size="small"
@@ -75,17 +77,17 @@
       >
         <el-table-column label="订单日期" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{getTimes(scope.row.document_date)}}</span>
          </template>
         </el-table-column>
         <el-table-column label="订单编号" align="center">
           <template slot-scope="scope">
-          
+            <span>{{scope.row.number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
         <el-table-column label="关联购货订单" align="center">
@@ -95,39 +97,39 @@
         </el-table-column>
         <el-table-column label="购物金额" align="center">
           <template slot-scope="scope">
-           
+             <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
           </template>
         </el-table-column>
 
        <el-table-column label="数量" align="center">
          <template slot-scope="scope">
-           
+           {{getAllCount(scope.row.orderInfo)}}
          </template>
        </el-table-column>
 
        <el-table-column label="订单状态" align="center">
          <template slot-scope="scope">
-         
-        
+           <span v-if="scope.row.is_check == 2">未审核</span>
+           <span v-if="scope.row.is_check == 1">已审核</span>
          </template>
        </el-table-column>
       
         <el-table-column label="交货日期" align="center">
          <template slot-scope="scope">
-         
+           {{getTimes(scope.row.delivery_date)}}
          </template>
        </el-table-column>
         
     
       <el-table-column label="制单人" align="center">
          <template slot-scope="scope">
-       
+          {{getDocName(scope.row.creater)}}
          </template>
        </el-table-column>
 
       <el-table-column label="审核人" align="center">
          <template slot-scope="scope">
-       
+          {{getDocName(scope.row.checker)}}
          </template>
        </el-table-column>
 
@@ -168,27 +170,13 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-
+import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
    components: {
      
    },
-  created() {
-    this.org_id =  this.$store.getters.xt_user.org_id
-
-    var start_time =  window.sessionStorage.getItem('start_time')
-    var end_time =  window.sessionStorage.getItem('end_time')
-
-    if(start_time !=null){
-      this.start_time = start_time
-    }
-    if(end_time!=null){
-      this.end_time = end_time
-    }
-    window.sessionStorage.removeItem('start_time')
-    window.sessionStorage.removeItem('end_time')
-  },
   components: {
     BreadCrumb
   },
@@ -203,7 +191,7 @@ export default {
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time: "",
+      end_time:new Date(),
       page: 1,
       limit: 10,
       goodType: [],
@@ -212,6 +200,14 @@ export default {
       types:[],
       tableList:[],
       type_name:"",
+      checkList:[
+        {id:0,name:"请选择"},
+        {id:1,name:"已审核"},
+        {id:2,name:"未审核"},
+      ],
+      supplyList:[],
+      check_id:0,
+      doctorList:[],
     };
   },
   methods:{
@@ -230,13 +226,102 @@ export default {
      search(){
 
      },
-     handleSizeChange(){
-
+     handleSizeChange(val){
+       this.limit = val
+       this.getlist()
+     },
+     handleCurrentChange(val){
+       this.page = val
+       this.getlist()
      },
-     handleCurrentChange(){
+     getAllSupply(){
+       getAllSupply().then(response=>{
+         if(response.data.state == 1){
+            var supplyList = response.data.data.supplyList
+            this.doctorList = response.data.data.doctorList
+            for(let i=0;i<supplyList.length;i++){
+              this.supplyList.push(supplyList[i])
+            }
+         }
+       })
+     },
+     changeTypeName(){
 
+     },
+     getTimes(time) {
+      if (time === '') {
+      return ''
+      }
+      return uParseTime(time, '{y}-{m}-{d}')
+     },
+     getlist(){
+        var params = {
+          check_id:this.check_id,
+          start_time:this.getTimes(this.start_time),
+          end_time:this.getTimes(this.end_time),
+          keyword:this.keywords,
+          page:this.page,
+          limit:this.limit,
+        }
+       getAllPurchaseOrderList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list 
+            console.log("list2332232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            this.total = total
+          }
+       })
+     },
+     getName(id){
+       var name = ""
+       for(let i=0;i<this.supplyList.length;i++){
+         if(id == this.supplyList[i].id){
+           name = this.supplyList[i].supplier_name
+         }
+       }
+       return name
+     },
+     getDocName(id){
+      var user_name = ""
+      for(let i=0;i<this.doctorList.length;i++){
+        if(id == this.doctorList[i].admin_user_id){
+          user_name = this.doctorList[i].user_name
+        }
+      }
+      return user_name
+     },
+     getAllBuyPrice(arr){
+       var buy_price = 0
+       if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            buy_price += (arr[i].count * arr[i].price)
+          }
+       }
+       return buy_price.toFixed(2)
+     },
+     getAllCount(arr){
+       var count = ""
+        if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].count
+          }
+       }
+       return count
      } 
-  }
+  },
+  created() {
+    var now = new Date(); //当前日期 
+    var nowMonth = now.getMonth(); //当前月 
+    var nowYear = now.getFullYear(); //当前年 
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1); 
+    this.start_time = monthStartDate
+    this.org_id =  this.$store.getters.xt_user.org_id
+    this.getAllSupply()
+    this.getlist()
+  },
+ 
 };
 </script>
 

src/xt_pages/supply/supplyQuery.vue

@@ -103,7 +103,7 @@
            
          </template>
        </el-table-column>
-       <el-table-column label="开户银行" align="center" v-if="showOne">
+       <el-table-column label="开户银行" align="center">
          <template slot-scope="scope">
          
           </span>
@@ -111,14 +111,14 @@
          </template>
        </el-table-column>
       
-        <el-table-column label="纳税人识别号" align="center" v-if="showThree">
+        <el-table-column label="纳税人识别号" align="center" >
          <template slot-scope="scope">
          
          </template>
        </el-table-column>
         
     
-      <el-table-column label="手机" align="center" v-if="showFour">
+      <el-table-column label="手机" align="center">
          <template slot-scope="scope">
        
          </template>
@@ -214,7 +214,25 @@ export default {
      toAdd(){
        console.log("res32323232323223",this.$refs)  
        this.$refs.addSupply.show()  
-     } 
+     },
+      changeTypeName(){
+
+     }, 
+     startTimeChange(){
+
+     },
+     endTimeChange(){
+
+     },
+     search(){
+
+     },
+     handleSizeChange(){
+
+     },
+     handleCurrentChange(){
+       
+     }
   }
 };
 </script>