11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -16,24 +16,16 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-<<<<<<< Updated upstream
-        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
-          <i class="iconfont icon-kccx navIcon"></i>
-          <p>采购管理</p>
-        </div>
-=======
-<<<<<<< Updated upstream
+
+
+
         <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
         </div> -->
-=======
-       <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
-        <i class="iconfont icon-kccx navIcon"></i>
-         <p>采购管理</p>
-       </div>
->>>>>>> Stashed changes
->>>>>>> Stashed changes
+
+
+
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/editGoodReturn.vue

@@ -824,66 +824,7 @@ export default {
         })
         .catch(() => {});
     },
-    getGoodReturnDetail() {
-      var id = this.$route.query.id;
-      getGoodReturnDetail(id).then((response) => {
-        if (response.data.state == 1) {
-          var out = response.data.data.cancelDetail;
-          console.log("out23322323232323", out);
-          this.warehouse_out_id = out.warehouse_out_id;
-          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.orderCancelDetail;
-          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 = orderInfo[i].supply_expiry_date;
-            orderInfo[i].supply_product_date = 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;
-                }
-              }
-            }
-    getGoodReturnDetail(){
+   getGoodReturnDetail(){
 
       var id = this.$route.query.id
       getGoodReturnDetail(id).then(response=>{
@@ -956,89 +897,77 @@ 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()
+    // 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
-                }
+    //         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();
+    //   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("保存成功!")
-            stockIn: this.recordInfo.tableList,
-            return_marke: this.return_remark,
-          };
-          console.log("start_time232233232", this.start_time);
-          console.log("arrage2323322323", this.arrearage);
-          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 = {
@@ -1064,7 +993,7 @@ export default {
 
        }
      })
-    }
+    },
     checkReturnOrder() {
       var params = {
         warehouse_out_id: this.warehouse_out_id,