11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill 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>-->
+        <!-- <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="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/Popup.vue

@@ -16,8 +16,9 @@
           </p>
           <div v-for="(item, index) in orderList" :key="index">
             <li>
-              {{content_2}} {{ item.good_number }}
-              <a style="color: blue" @click="toClick_1(item.id)">点击查看</a>
+              {{content_2}} {{ item.good_number }}  
+             <span v-if="type == 1"><a style="color: blue" @click="toClick_1(item.id)">点击查看</a> </span> 
+             <span v-if="type == 2"><a style="color: blue" @click="toClick_2(item.id)">点击查看</a> </span> 
             </li>
           </div>
         </div>
@@ -31,7 +32,7 @@
 
 <script>
 export default {
-  props: ["content_2", "content_1","content","number", "orderList"], //props接收
+  props: ["content_2", "content_1","content","number", "orderList","type"], //props接收
   name: "Popup",
   data() {
     return {
@@ -46,12 +47,14 @@ export default {
   created() {},
   methods: {
     btnClick() {
-      this.show = false;
+      this.dialogVisible = false;
     },
     toClick_1(id) {
-
       this.$router.push({path:"/good/order/edit?id=" + id});
     },
+    toClick_2(id){
+      this.$router.push({path:"/good/return/edit?id="+id})
+    }
   },
 };
 </script>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -64,18 +64,16 @@
             type="primary"
             @click="saveGoodReturn"
             v-show="showOne"
-            >存</el-button
+            >保存</el-button
           >
           <el-button
             size="small"
             type="primary"
-            @click="saveGoodReturn"
+            @click=""
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="updatePurchaseOrder"
-            >审核</el-button
-          >
+          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</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> -->
@@ -850,7 +848,7 @@ export default {
       var id = this.$route.query.id;
       this.$router.push({ path: "/purchase/order/print?&id=" + id });
     },
-    saveGoodReturnOrder(){
+    saveGoodReturn(){
       var warehouse_out_id = this.$route.query.id
       this.$refs["tableForm"].validate((valid)=>{
         if(valid){
@@ -871,6 +869,8 @@ export default {
             stockIn:this.recordInfo.tableList,
             return_marke:this.return_remark,
            }
+           console.log("2323323232",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

src/xt_pages/supply/components/editGoodOrder.vue

@@ -429,10 +429,12 @@
       </div>
       <!-- <Computed></Computed> -->
     </div>
+    <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
   </div>
 </template>
 
 <script>
+import popup from "./Popup"
 import Computed from "../../components/Computed/index_1.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
@@ -447,11 +449,13 @@ import {
   UpdateSupplyWahouseingInfo,
   getSupplyWarehouseOutById,
 } from "@/api/supply";
+
 export default {
   name: "addPurchaseOrder",
   components: {
     BreadCrumb,
     Computed,
+    popup,
   },
   data() {
     return {
@@ -459,6 +463,11 @@ export default {
         { path: false, name: "采购单" },
         { path: "/supply/good/order/query", name: "编辑采购单" },
       ],
+      content_2:"退库单",
+      content:"采购单",
+      content_1:"已有以下关联数据,不能反审核",
+      type:2,
+      orderList:[],
       showOne: true,
       showTwo: false,
       showThree: false,
@@ -901,27 +910,16 @@ 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_price =
-          this.recordInfo.tableList[i].supply_total_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_total_price =  this.recordInfo.tableList[i].supply_total_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;
           }
         }
       }
@@ -960,6 +958,7 @@ export default {
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
+          this.is_check = 1
           this.showOne = false;
           this.showTwo = true;
           this.showThree = true;
@@ -1185,8 +1184,9 @@ export default {
           if (msg == 2) {
             var cancelList = response.data.data.cancelList
             console.log("cancelLIST2332322332232323",cancelList)
-            this.$message.error("该单有自动出库或生成了退货单,反审核失败!");
-            return 
+            this.orderList = cancelList
+            this.$refs.Popup.dialogVisible = true
+            return
           }
 
           var purcaseOrder = response.data.data.purcaseOrder;
@@ -1198,9 +1198,7 @@ export default {
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({
-              path: "/good/order/add?id=" + id + "&ids=" + ids,
-            });
+            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
           }
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
@@ -1216,8 +1214,7 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (goodOrder[i].is_source == 1) {
                 if (goodOrder[i].supply_unit == drugList[j].max_unit) {
-                  goodOrder[i].count =
-                    goodOrder[i].count * drugList[j].min_number;
+                  goodOrder[i].count = goodOrder[i].count * drugList[j].min_number;
                 }
               }
             }

src/xt_pages/supply/components/editGoodReturn.vue

@@ -60,9 +60,7 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</el-button>
-          <el-button size="small" type="primary" @click="updatePurchaseOrder"
-            >审核</el-button
-          >
+          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</el-button>
         </div>
       </div>
 

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -358,7 +358,7 @@
     <el-button @click="dialogVisible = false">取 消</el-button>
   </span>
   </el-dialog> -->
-  <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList"></popup>
+  <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
   </div>
 </template>
 
@@ -386,6 +386,7 @@ export default {
       content_2:"购货单",
       content:"购货订单",
       content_1:"已有以下关联数据,不能反审核",
+      type:1,
       Reviewed: false,
       crumbs: [
         { path: false, name: "采购订单" },
@@ -442,6 +443,7 @@ export default {
       showThree: false,
       orderList: [],
       return_remark: "",
+      
     };
   },
   methods: {
@@ -984,6 +986,7 @@ export default {
           //如果长度大于0,有购货单不能反审核
           if (list.length > 0) {
             this.$refs.Popup.dialogVisible = true
+            return 
           }
           if (list.length == 0) {
             this.getReturnOrder()