11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -865,9 +865,7 @@ export default {
             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].supply_total_price = (
-              orderInfo[i].count * orderInfo[i].price
-            ).toFixed(2);
+            orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2);
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {

src/xt_pages/supply/components/addGoodReturn.vue

@@ -348,9 +348,7 @@ export default {
       ],
       showTwo: false,
       showOne: true,
-      recordInfo: {
-        tableList: [1],
-      },
+      recordInfo: {tableList: []},
       keywords: "",
       total: 0,
       multipleSelection: [],
@@ -572,6 +570,7 @@ export default {
       tempObj["is_total"] = 1;
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
+      tempObj["order_number"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -646,26 +645,14 @@ export default {
       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();
+            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;
+              if (this.recordInfo.tableList[i].supply_manufacturer ==this.manufactuerList[j].manufacturer_name) {
+                this.recordInfo.tableList[i].manufacturer_id =this.manufactuerList[j].id;
               }
             }
           }
@@ -698,9 +685,7 @@ export default {
     getAllPrice() {
       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;
+        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
       return total_price.toFixed(2);
@@ -726,7 +711,8 @@ export default {
     getGoodOrderDetail(){
       
         var id = this.$route.query.id
-      getGoodOrderDetail(id).then(response=>{
+        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
@@ -811,8 +797,8 @@ 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)
           
@@ -895,10 +881,16 @@ export default {
     tempObj["is_total"] = 1;
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
+    tempObj["order_number"] = ""
     this.recordInfo.tableList.push(tempObj);
+    console.log("即哪里地方2",this.recordInfo.tableList)
     this.getInitOrder();
-    //获取购货单列表
-    this.getGoodOrderDetail();
+    if(parseInt(this.$route.query.id) > 0){
+     
+     //获取购货单列表
+      this.getGoodOrderDetail();
+    }
+ 
   },
 };
 </script>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -39,7 +39,6 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="startTimeChange"
           ></el-date-picker>
           <!-- <span>交货日期:</span> -->
           <!-- <el-date-picker
@@ -1084,8 +1083,9 @@ export default {
           console.log("drugList233223232323232", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
           console.log("cancelOrderList2323322322332", cancelOrderList);
+          var ids =""
           if(cancelList.length == 0){
-            this.$router.push({ path: "/good/return/add?id=" + this.id });
+            this.$router.push({ path: "/good/return/add?id=" + this.id+"&ids="+ids });
           }
           if (cancelList.length > 0) {
             var outList = response.data.data.outList;
@@ -1134,15 +1134,18 @@ export default {
                 }
               }
               console.log("newAr2332232323", newArr)
-
+           
+            var arr = []
+            var total = 0;
+            var str = "";
                 //如果采购单有数据，则需要比较数量
             if (newArr.length > 0) {
-              for (let i = 0; i < purcaseOrder.length; i++) {
+              for (let i = 0; i < outList.length; i++) {
                 for (let j = 0; j < newArr.length; j++) {
-                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
-                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
-                    if (purcaseOrder[i].count > newArr[j].count) {
-                      arr.push(purcaseOrder[i].project_id);
+                  if (outList[i].project_id == newArr[j].project_id) {
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
+                    if (outList[i].count > newArr[j].count) {
+                      arr.push(outList[i].project_id);
                     }
                   }
                 }
@@ -1154,9 +1157,9 @@ export default {
                 return;
               }
 
-              if (total != goodOrder.length) {
+              if (total != cancelOrderList.length) {
                 str = arr.join(",");
-                this.$router.push({ path: "/good/order/add?id=" + id + "&ids=" + str});
+                this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
               }
              }
             }
@@ -1181,12 +1184,14 @@ export default {
             this.$message.success("反审核成功!");
           }
           if (msg == 2) {
+            var cancelList = response.data.data.cancelList
+            console.log("cancelLIST2332322332232323",cancelList)
             this.$message.error("该单有自动出库或生成了退货单,反审核失败!");
+            return 
           }
 
           var purcaseOrder = response.data.data.purcaseOrder;
           console.log("采购订单", purcaseOrder);
-
           var goodOrder = response.data.data.goodOrder;
           console.log("采购单", goodOrder);
           var drugList = response.data.data.drugList;
@@ -1202,8 +1207,7 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (purcaseOrder[i].is_source == 1) {
                 if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
-                  purcaseOrder[i].count =
-                    purcaseOrder[i].count * drugList[j].min_number;
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number;
                 }
               }
             }

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -344,20 +344,6 @@
       </div>
     </div>
 
-    <!-- <el-dialog
-  title="系统提示"
-  :visible.sync="dialogVisible"
-  width="30%">
-  <span>
-    采购订单{{number}}已有以下关联数据,不能反审核
-    <div v-for="(item,index) in orderList" :key="index">
-        <li>采购单{{item.good_number}}</li> <a @click="toClick(item.id)">点击查看</a>
-    </div>
-  </span>
-  <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-  </span>
-  </el-dialog> -->
   </div>
 </template>
 
@@ -540,19 +526,11 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =
-              goodList[i].good_name +
-              " " +
-              goodList[i].specification_name +
-              " " +
-              goodList[i].manufacturer;
+            goodList[i].supply_name =goodList[i].good_name +" " +goodList[i].specification_name +" " + goodList[i].manufacturer;
             goodList[i].supply_type = goodList[i].good_type_id;
-            goodList[i].supply_specification_name =
-              goodList[i].specification_name;
+            goodList[i].supply_specification_name =goodList[i].specification_name;
             goodList[i].supply_price = goodList[i].buy_price;
-            goodList[i].supply_total = this.getTotalStockCount(
-              goodList[i].good_warehouse_info
-            );
+            goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info);
             goodList[i].supply_count = "";
             goodList[i].supply_total_price = "";
             goodList[i].supply_manufacturer = goodList[i].manufacturer;
@@ -583,8 +561,7 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =
-            val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name =val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
@@ -594,15 +571,10 @@ export default {
               : "";
           }
 
-          this.recordInfo.tableList[i].supply_price = val.supply_price
-            ? val.supply_price
-            : "";
-          this.recordInfo.tableList[i].supply_total_price =
-            val.supply_total_price ? val.supply_total_price : "";
-          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_price = val.supply_price? val.supply_price: "";
+          this.recordInfo.tableList[i].supply_total_price =val.supply_total_price ? val.supply_total_price : "";
+          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;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
@@ -709,19 +681,11 @@ export default {
           console.log("生产厂商", this.recordInfo.tableList);
           console.log("生产上次", this.manufactuerList);
           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();
+            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 ==
@@ -974,9 +938,7 @@ export default {
 
               if (total != goodOrder.length) {
                 str = arr.join(",");
-                this.$router.push({
-                  path: "/good/order/add?id=" + id + "&ids=" + str,
-                });
+                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
               }
             }
           }

src/xt_pages/supply/goodreturn.vue

@@ -95,12 +95,12 @@
          </el-table-column>
         <el-table-column label="关联购货订单号" align="center" width="200">
           <template slot-scope="scope">
-            <span v-if="scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].order_number}}</span>
+            <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].order_number}}</span>
           </template>
         </el-table-column>
            <el-table-column label="源采购单号" align="center" width="200">
           <template slot-scope="scope">
-             <span v-if="scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].good_number}}</span>
+             <span v-if="scope.row.cancelOrder!=undefined && scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].good_number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="购货金额" align="center" width="200">