11月14日 库存扣减更新

src/components/Popup/index.vue

@@ -29,8 +29,7 @@
           </p>
           <div v-for="(item, index) in orderList" :key="index">
             <li>
-              购货单 {{ item.good_number }}
-              <router-link tag="span" to=""> </router-link>
+              购货单 {{ item.good_number}}<a @click="toClick(item.id)">点击查看</a>
             </li>
           </div>
         </div>
@@ -44,9 +43,6 @@
 </template>
 
 <script>
-import Vue from "vue";
-import router from "vue-router";
-Vue.use(router);
 export default {
   name: "Popup",
   data() {
@@ -57,19 +53,16 @@ export default {
       content: "",
       btnText: "关闭",
       orderList: [],
-      id: 0,
     };
   },
   created() {},
   methods: {
     btnClick() {
-      this.click1();
+      this.click();
       this.show = false;
     },
-    toClick_1(id) {
-      // this.toClick(id);
-      // return id;
-      console.log(this.router)
+    toClick(id) {
+      this.$router.push("/good/order/edit?id=" + id);
     },
   },
 };

src/xt_pages/supply/components/Popup.vue

@@ -49,7 +49,8 @@ export default {
       this.show = false;
     },
     toClick_1(id) {
-      this.$router.push("/good/order/edit?id=" + id);
+
+      this.$router.push({path:"/good/order/edit?id=" + id});
     },
   },
 };

src/xt_pages/supply/components/addGoodReturn.vue

@@ -64,7 +64,7 @@
             type="primary"
             @click="saveGoodReturn"
             v-show="showOne"
-            >保存</el-button
+            >存</el-button
           >
           <el-button
             size="small"
@@ -778,62 +778,6 @@ export default {
         })
         .catch(() => {});
     },
-    getGoodOrderDetail(){
-
-        var id = this.$route.query.id
-        var ids = this.$route.query.ids
-      getGoodOrderDetail(id,ids).then(response=>{
-        if(response.data.state == 1){
-          var out = response.data.data.out
-          this.is_check = out.is_check
-          this.id = out.id
-          this.supplier_name = out.supplier_id
-          this.rate_of_concession = out.rate_of_concession
-          this.discount_amount = out.discount_amount
-          this.payment = out.payment
-          this.arrearage = out.arrearage
-          this.start_time = this.getTimes(out.document_date)
-          var orderInfo = response.data.data.list
-          console.log("orderINFO233232232332",orderInfo)
-          var drugList = response.data.data.drugList
-          var goodList = response.data.data.goodList
-          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
-              orderInfo[i].type =  orderInfo[i].is_source
-              orderInfo[i].project_id =  orderInfo[i].project_id
-              orderInfo[i].supply_unit =  orderInfo[i].supply_unit
-              orderInfo[i].order_number =  orderInfo[i].order_number
-              orderInfo[i].good_number = orderInfo[i].good_number
-              orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
-              orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
-              orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
-            if(orderInfo[i].is_source == 1){
-              for(let j=0;j<drugList.length;j++){
-                  if( orderInfo[i].project_id == drugList[j].id){
-                    if(drugList[j].max_unit!=drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                      orderInfo[i].unitList[1].name = drugList[j].min_unit
-                    }
-                    if(drugList[j].max_unit ==drugList[j].min_unit){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = drugList[j].max_unit
-                    }
-
-                  }
-              }
-              }
-            if(orderInfo[i].is_source == 2){
-              for(let j=0;j<goodList.length;j++){
-                  if(orderInfo[i].project_id == goodList[j].id){
-                      orderInfo[i].unitList = [{id:1,name:""}]
-                      orderInfo[i].unitList[0].name = goodList[j].packing_unit
-                  }
-              }
-            }
     getGoodOrderDetail() {
       var id = this.$route.query.id;
       getGoodOrderDetail(id).then((response) => {
@@ -906,185 +850,90 @@ export default {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    saveGoodReturn() {
-      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();
-
+    saveGoodReturnOrder(){
+      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].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;
+              if (this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id) {
+                this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name;
               }
             }
-          }
-          var params = {
+           var params = {
             stockIn:this.recordInfo.tableList,
             return_marke:this.return_remark,
-          }
-          console.log("start_time232233232",this.start_time)
+           }
+           saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
+             if(response.data.state == 1){
+                this.loading = false
+                this.showOne = false
+                this.showTwo = true
+                this.$message.success("保存成功!")
+                var warehouseCancel = response.data.data.warehouseCancel
+                var out = response.data.data.cancelOrder
+                this.id = out.id
+                this.supplier_name = out.supplier_id
+                this.rate_of_concession = out.rate_of_concession
+                this.discount_amount = out.discount_amount
+                this.payment = out.payment
+                this.arrearage = out.arrearage
+                this.start_time = this.getTimes(out.document_date)
+                var orderInfo = response.data.data.list
+                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
+                  orderInfo[i].type =  orderInfo[i].is_source
+                  orderInfo[i].project_id =  orderInfo[i].project_id
+                  orderInfo[i].supply_unit =  orderInfo[i].supply_unit
+                  orderInfo[i].order_number =  orderInfo[i].order_number
+                  orderInfo[i].good_number = orderInfo[i].good_number
+                  orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
+                  orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
+                  orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+                   if(orderInfo[i].is_source == 1){
+                     for(let j=0;j<this.drugList.length;j++){
+                        if(orderInfo[i].project_id == this.drugList[j].id){
+                           if(this.drugList[j].max_unit!=this.drugList[j].min_unit){
+                              orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                              orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                              orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                           }
 
-          saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
-            if(response.data.state == 1){
-               this.loading = false
-               this.showOne = false
-               this.showTwo = true
-               this.$message.success("保存成功!")
-               var warehouseCancel = response.data.data.warehouseCancel
-               var out = response.data.data.cancelOrder
-               this.id = out.id
-               this.supplier_name = out.supplier_id
-               this.rate_of_concession = out.rate_of_concession
-               this.discount_amount = out.discount_amount
-               this.payment = out.payment
-               this.arrearage = out.arrearage
-               this.start_time = this.getTimes(out.document_date)
-               var orderInfo = response.data.data.list
-               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
-                orderInfo[i].type =  orderInfo[i].is_source
-                orderInfo[i].project_id =  orderInfo[i].project_id
-                orderInfo[i].supply_unit =  orderInfo[i].supply_unit
-                orderInfo[i].order_number =  orderInfo[i].order_number
-                orderInfo[i].good_number = orderInfo[i].good_number
-                orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
-                orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
-                orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
-                if(orderInfo[i].is_source == 1){
-                  for(let j=0;j<this.drugList.length;j++){
-                      if( orderInfo[i].project_id == this.drugList[j].id){
-                        if(this.drugList[j].max_unit!=this.drugList[j].min_unit){
-                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
-                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
-                          orderInfo[i].unitList[1].name = this.drugList[j].min_unit
-                        }
-                        if(this.drugList[j].max_unit ==this.drugList[j].min_unit){
-                          orderInfo[i].unitList = [{id:1,name:""}]
-                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
-                        }
+                           if(this.drugList[j].max_unit ==this.drugList[j].min_unit){
+                            orderInfo[i].unitList = [{id:1,name:""}]
+                            orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                           }
 
-                      }
-                  }
-                  }
-                if(orderInfo[i].is_source == 2){
-                  for(let j=0;j<this.goodList.length;j++){
-                      if(orderInfo[i].project_id == this.goodList[j].id){
-                          orderInfo[i].unitList = [{id:1,name:""}]
-                          orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
-                      }
-                  }
-                }
-            stockIn: this.recordInfo.tableList,
-            return_marke: this.return_remark,
-          };
-          console.log("start_time232233232", this.start_time);
+                          
 
-          saveGoodReturnOrder(
-            params,
-            warehouse_out_id,
-            this.start_time,
-            this.rate_of_concession,
-            this.discount_amount,
-            this.arrearage,
-            this.payment,
-            this.supplier_name
-          ).then((response) => {
-            if (response.data.state == 1) {
-              this.loading = false;
-              this.showOne = false;
-              this.showTwo = true;
-              this.$message.success("保存成功!");
-              var warehouseCancel = response.data.data.warehouseCancel;
-              var out = response.data.data.cancelOrder;
-              this.id = out.id;
-              this.supplier_name = out.supplier_id;
-              this.rate_of_concession = out.rate_of_concession;
-              this.discount_amount = out.discount_amount;
-              this.payment = out.payment;
-              this.arrearage = out.arrearage;
-              this.start_time = this.getTimes(out.document_date);
-              var orderInfo = response.data.data.list;
-              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;
-                orderInfo[i].type = orderInfo[i].is_source;
-                orderInfo[i].project_id = orderInfo[i].project_id;
-                orderInfo[i].supply_unit = orderInfo[i].supply_unit;
-                orderInfo[i].order_number = orderInfo[i].order_number;
-                orderInfo[i].good_number = orderInfo[i].good_number;
-                orderInfo[i].supply_total_price = (
-                  orderInfo[i].count * orderInfo[i].price
-                ).toFixed(2);
-                orderInfo[i].supply_expiry_date = this.getTimes(
-                  orderInfo[i].supply_expiry_date
-                );
-                orderInfo[i].supply_product_date = this.getTimes(
-                  orderInfo[i].supply_product_date
-                );
-                if (orderInfo[i].is_source == 1) {
-                  for (let j = 0; j < this.drugList.length; j++) {
-                    if (orderInfo[i].project_id == this.drugList[j].id) {
-                      if (
-                        this.drugList[j].max_unit != this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList = [
-                          { id: 1, name: "" },
-                          { id: 2, name: "" },
-                        ];
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
-                        orderInfo[i].unitList[1].name =
-                          this.drugList[j].min_unit;
-                      }
-                      if (
-                        this.drugList[j].max_unit == this.drugList[j].min_unit
-                      ) {
-                        orderInfo[i].unitList = [{ id: 1, name: "" }];
-                        orderInfo[i].unitList[0].name =
-                          this.drugList[j].max_unit;
-                      }
-                    }
-                  }
-                }
-                if (orderInfo[i].is_source == 2) {
-                  for (let j = 0; j < this.goodList.length; j++) {
-                    if (orderInfo[i].project_id == this.goodList[j].id) {
-                      orderInfo[i].unitList = [{ id: 1, name: "" }];
-                      orderInfo[i].unitList[0].name =
-                        this.goodList[j].packing_unit;
+                        }
+                     }
+                   }
+                  if(orderInfo[i].is_source == 2){
+                    for(let j=0;j<this.goodList.length;j++){
+                        if(orderInfo[i].project_id == this.goodList[j].id){
+                            orderInfo[i].unitList = [{id:1,name:""}]
+                            orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
+                        }
                     }
                   }
                 }
-              }
-              this.recordInfo.tableList = [];
-              this.recordInfo.tableList = orderInfo;
-            }
-          });
+             }
+           })
+          }
         }
-      });
-    },
+      })
+    }
+   
   },
   created() {
     const tempObj = {};