11月14日 库存扣减更新

src/api/supply.js

@@ -312,3 +312,27 @@ export function deleteGoodOrderById(params) {
     params: params
   })
 }
+
+export function deleteReturnOrder(id, params) {
+  return request({
+    url: '/api/supply/deletereturnorder?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deleteReturnOrderById(id, params) {
+  return request({
+    url: '/api/supply/deletereturnorderbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function modefyReturnOrder(params) {
+  return request({
+    url: '/api/supply/modefyreturnorder',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/supply/components/addGoodReturn.vue

@@ -40,22 +40,8 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="startTimeChange"
           ></el-date-picker>
-          <!-- <span>交货日期:</span>
-        <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="endTimeChange"
-        ></el-date-picker> -->
+         
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
@@ -69,11 +55,11 @@
           <el-button
             size="small"
             type="primary"
-            @click=""
+            @click="updateGoodReturn"
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="checkReturnOrder">审核</el-button>
           <!-- <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder">审核</el-button>
         <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button> -->
@@ -385,6 +371,8 @@ import {
   getInitOrder,
   getGoodOrderDetail,
   saveGoodReturnOrder,
+  checkReturnOrder,
+  updateGoodReturn
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -444,6 +432,7 @@ export default {
       is_check: 0,
       dialogVisible: false,
       return_remark: "",
+      warehouse_out_id:0,
     };
   },
   methods: {
@@ -639,12 +628,6 @@ export default {
         this.recordInfo.tableList.splice(index, 1);
       }
     },
-
-    changeTypeName() {},
-    startTimeChange() {},
-    endTimeChange() {},
-    search() {},
-
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -693,53 +676,7 @@ export default {
       }
       return uParseTime(time, "{y}-{m}-{d}");
     },
-    updatePurchaseOrder() {
-      this.loading = true;
-      if (this.supplier_name == 0 || this.supplier_name == "") {
-        this.$message.error("供应商不能为空!");
-        this.loading = false;
-        return false;
-      }
-      this.$refs["tableForm"].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();
-            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString();
-            this.recordInfo.tableList[i].supply_price =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,
-          };
-          console.log("param23232332", params);
-
-          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) {
-              this.loading = false;
-              var warehousingInfo = response.data.data.warehousingInfo;
-              this.$message.success("保存成功!");
-            }
-          });
-        }
-      });
-    },
+   
     getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
@@ -894,6 +831,7 @@ export default {
                 var warehouseCancel = response.data.data.warehouseCancel
                 var out = response.data.data.cancelOrder
                 this.id = out.id
+                this.warehouse_out_id = out.warehouse_out_id
                 this.supplier_name = out.supplier_id
                 this.rate_of_concession = out.rate_of_concession
                 this.discount_amount = out.discount_amount
@@ -946,6 +884,56 @@ export default {
           
         }
       })
+    },
+    updateGoodReturn(){
+      var warehouse_out_id = this.id;
+      this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+          this.loading = true
+          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_price = this.recordInfo.tableList[i].supply_price.toString()
+            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.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
+                }
+                if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+                  this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+                }
+
+            }
+          }
+          var params = {
+            stockIn:this.recordInfo.tableList,
+            return_marke:this.return_remark,
+          }
+          console.log("start_time232233232",this.start_time)
+          console.log("arrage2323322323",params)
+          updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
+            if(response.data.state == 1){
+               var msg = response.data.msg
+               this.loading = false
+               this.$message.success("保存成功!")
+            }
+          })
+        }
+      })
+    },
+    checkReturnOrder(){
+      this.loading = true
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     checkReturnOrder(params).then(response=>{
+       if(response.data.state == 1){
+        this.loading = false
+        var msg = response.data.data.msg
+        this.$message.success("保存成功!")
+       }
+     })
     }
    
   },

src/xt_pages/supply/components/editGoodReturn.vue

@@ -60,7 +60,8 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</el-button>
-          <el-button size="small" type="primary" @click="checkReturnOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="checkReturnOrder" v-if="is_check == 2">审核</el-button>
+          <el-button size="small" type="primary" @click="modefyReturnOrder" v-if="is_check == 1">反审核</el-button>
         </div>
       </div>
 
@@ -159,7 +160,7 @@
           <el-table-column label="可退数量" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_specification_name"
+                v-model="scope.row.count"
                 style="width: 150px"
                 :disabled="true"
               ></el-input>
@@ -168,7 +169,6 @@
           <el-table-column label="数量" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>数量<span style="color: red">*</span></span>
-
             </template>
             <template slot-scope="scope">
               <el-form-item
@@ -338,7 +338,9 @@ import {
   getInitOrder,
   getGoodReturnDetail,
   updateGoodReturn,
-  checkReturnOrder
+  checkReturnOrder,
+  deleteReturnOrderById,
+  modefyReturnOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -584,22 +586,42 @@ export default {
       tempObj["supply_expiry_date"] = ""
       tempObj["warehousing_id"] =0
       tempObj["warehouse_info_id"] =0
+      tempObj["count"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
-        this.$message.error("只有一条记录的时候无法删除");
-        return;
-      } else {
-        this.recordInfo.tableList.splice(index, 1);
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        } else {
+          this.recordInfo.tableList.splice(index, 1);
+        }
+      }
+      if(row.id >0){
+       if(this.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteReturnOrderById(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.recordInfo.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        }).catch(() => {
+       }) 
       }
+    
     },
-
-    changeTypeName() {},
-    startTimeChange() {},
-    endTimeChange() {},
-    search() {},
-
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -716,24 +738,6 @@ export default {
       }
       return total_price.toFixed(2);
     },
-    checkPurchaseOrder(id, index) {
-      this.$confirm("是否审核?", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      })
-        .then(() => {
-          checkPurchaseOrder(this.id).then((response) => {
-            if (response.data.state == 1) {
-              var info = response.data.data.info;
-              this.disabled = true;
-              this.$message.success("审核成功!");
-              this.getPurchaseOrderDetail();
-            }
-          });
-        })
-        .catch(() => {});
-    },
     getGoodReturnDetail(){
       
       var id = this.$route.query.id
@@ -742,6 +746,7 @@ export default {
           var out = response.data.data.cancelDetail
           console.log("out23322323232323",out)
           this.warehouse_out_id = out.warehouse_out_id
+          this.number = out.number
           this.is_check = out.is_check
           this.id = out.id
           this.supplier_name = out.supplier_id
@@ -751,12 +756,16 @@ export default {
           this.arrearage = out.arrearage
           this.start_time = this.getTimes(out.document_date)
           var orderInfo = response.data.data.orderCancelDetail
-          console.log("orderINFO233232232332",orderInfo)
+          if(out.is_check == 1){
+            this.disabled = true
+          }
+          console.log("退库单详情",orderInfo)
           var drugList = response.data.data.drugList
           var goodList = response.data.data.goodList
           for(let i=0;i< orderInfo.length;i++){
-              
+              orderInfo[i].id = orderInfo[i].id
               orderInfo[i].supply_count =  orderInfo[i].count
+              orderInfo[i].count = orderInfo[i].source_count
               orderInfo[i].supply_price =  orderInfo[i].price
               orderInfo[i].supply_remake =  orderInfo[i].remark
               orderInfo[i].type =  orderInfo[i].is_source
@@ -812,7 +821,7 @@ export default {
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
             this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
             this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.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
@@ -824,11 +833,11 @@ export default {
             }
           }
           var params = {
-            "stockIn":this.recordInfo.tableList,
-            "return_marke":this.return_remark,
+            stockIn:this.recordInfo.tableList,
+            return_marke:this.return_remark,
           }
           console.log("start_time232233232",this.start_time)
-          console.log("arrage2323322323",this.arrearage)
+          console.log("arrage2323322323",params)
           updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
             if(response.data.state == 1){
                var msg = response.data.msg
@@ -840,16 +849,30 @@ export default {
       })
     },
     checkReturnOrder(){
+      this.loading = true
      var params = {
        warehouse_out_id:this.warehouse_out_id,
        id:this.id,
      }
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
+        this.loading = false
         var msg = response.data.data.msg
         this.$message.success("保存成功!")
        }
      })
+    },
+    modefyReturnOrder(){
+      this.loading = true
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     modefyReturnOrder(params).then(response=>{
+       if(response.data.state == 1){
+         
+       }
+     })
     }
   },
   created() {
@@ -875,6 +898,7 @@ export default {
     tempObj["supply_expiry_date"] = ""
     tempObj["warehousing_id"] =0
     tempObj["warehouse_info_id"] =0
+    tempObj["count"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/supply/goodreturn.vue

@@ -120,7 +120,7 @@
        </el-table-column> -->
        <el-table-column label="源数量" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+           {{scope.row.source_count}}
          </template>
        </el-table-column>
 
@@ -183,7 +183,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllGoodReturnOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodReturnOrderList,deleteReturnOrder} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -324,6 +324,32 @@ export default {
      },
      editGoodReturn(id){
        this.$router.push({path:"/good/return/edit?id="+id})
+     },
+     toClickOne(val,index){
+       if(val.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       if(val.cancelOut.length >0 ){
+         this.$message.error("已关联单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteReturnOrder(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        }).catch(() => {
+       }) 
      }
   },
   created() {