11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -815,23 +815,23 @@ export default {
     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
-    checkPurchaseOrder() {
-      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(() => {});
-    },
+    // checkPurchaseOrder() {
+    //   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(() => {});
+    // },
     getPurchaseOrderDetail() {
       var id = this.$route.query.id;
       var ids = this.$route.query.ids;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -746,6 +746,7 @@ export default {
           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].count
             orderInfo[i].supply_price = orderInfo[i].price;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -62,12 +62,6 @@
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</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>
-          <el-button size="small" type="primary" @click="updateGoodReturn"
-            >保存</el-button
-          >
-          <el-button size="small" type="primary" @click="checkReturnOrder"
-            >审核</el-button
-          >
         </div>
       </div>
 
@@ -897,77 +891,39 @@ export default {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    // updateGoodReturn() {
-    //   var warehouse_out_id = this.$route.query.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
-    //             }
-
-    //   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();
+    updateGoodReturn(){
+      var warehouse_out_id = this.$route.query.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,
+          }
+          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("保存成功!");
+             }
+          })
 
-    //         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 = {
@@ -978,7 +934,7 @@ export default {
        if(response.data.state == 1){
         this.loading = false
         var msg = response.data.data.msg
-        this.$message.success("保存成功!")
+        this.$message.success("审核成功!")
        }
      })
     },
@@ -990,17 +946,12 @@ export default {
      }
      modefyReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-
+         this.loading = false
+         var msg = response.data.data.msg
+         this.$message.success("反审核成功!")
        }
      })
     },
-    checkReturnOrder() {
-      var params = {
-        warehouse_out_id: this.warehouse_out_id,
-        id: this.id,
-      };
-      checkReturnOrder(params).then((response) => {});
-    },
   },
   created() {
     const tempObj = {};