11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -17,9 +17,9 @@
           <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 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,'库房管理')">

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1351,12 +1351,14 @@ export default {
     },
     //反审核
     MofyGoodOrder() {
-      var id = this.$route.query.id;
-      var warehousing_id = this.$route.query.warehousing_id;
+      var id = parseInt(this.$route.query.id);
+      var warehousing_id = parseInt(this.$route.query.warehousing_id);
       var params = {
         id: id,
         warehousing_id: warehousing_id,
       };
+      console.log("return2332232333",params)
+    
       MofyGoodOrder(params).then((response) => {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
@@ -1375,6 +1377,11 @@ export default {
             return;
           }
 
+          if (msg == 3) {
+            this.$message.error("已有出库数据,反审核失败!")
+            return;
+          }
+
           var purcaseOrder = response.data.data.purcaseOrder;
           console.log("采购订单", purcaseOrder);
           var goodOrder = response.data.data.goodOrder;

src/xt_pages/supply/goodreturn.vue

@@ -204,7 +204,7 @@ export default {
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time:new Date(),
+      end_time:"",
       page: 1,
       limit: 10,
       goodType: [],
@@ -267,8 +267,8 @@ export default {
      getlist(){
         var params = {
           check_id:this.check_id,
-          start_time:this.getTimes(this.start_time),
-          end_time:this.getTimes(this.end_time),
+          start_time:this.start_time,
+          end_time:this.end_time,
           keyword:this.keywords,
           page:this.page,
           limit:this.limit,
@@ -382,6 +382,7 @@ export default {
     //本月的开始时间
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
     this.start_time = monthStartDate
+    this.end_time = this.getTimes(new Date());
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()
     this.getlist()