瀏覽代碼

11月14日 库存扣减更新

XMLWAN 3 年之前
父節點
當前提交
e3632bc3e8
共有 3 個文件被更改,包括 16 次插入8 次删除
  1. 3 3
      src/views/layout/Layout.vue
  2. 9 2
      src/xt_pages/supply/components/editGoodOrder.vue
  3. 4 3
      src/xt_pages/supply/goodreturn.vue

+ 3 - 3
src/views/layout/Layout.vue 查看文件

17
           <p>透析管理</p>
17
           <p>透析管理</p>
18
         </div>
18
         </div>
19
 
19
 
20
-        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
21
-          <i class="iconfont icon-kccx navIcon"></i>
22
-          <p>采购管理</p>
20
+         <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
21
+           <i class="iconfont icon-kccx navIcon"></i>
22
+           <p>采购管理</p>
23
         </div>
23
         </div>
24
         
24
         
25
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
25
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">

+ 9 - 2
src/xt_pages/supply/components/editGoodOrder.vue 查看文件

1351
     },
1351
     },
1352
     //反审核
1352
     //反审核
1353
     MofyGoodOrder() {
1353
     MofyGoodOrder() {
1354
-      var id = this.$route.query.id;
1355
-      var warehousing_id = this.$route.query.warehousing_id;
1354
+      var id = parseInt(this.$route.query.id);
1355
+      var warehousing_id = parseInt(this.$route.query.warehousing_id);
1356
       var params = {
1356
       var params = {
1357
         id: id,
1357
         id: id,
1358
         warehousing_id: warehousing_id,
1358
         warehousing_id: warehousing_id,
1359
       };
1359
       };
1360
+      console.log("return2332232333",params)
1361
+    
1360
       MofyGoodOrder(params).then((response) => {
1362
       MofyGoodOrder(params).then((response) => {
1361
         if (response.data.state == 1) {
1363
         if (response.data.state == 1) {
1362
           var msg = response.data.data.msg;
1364
           var msg = response.data.data.msg;
1375
             return;
1377
             return;
1376
           }
1378
           }
1377
 
1379
 
1380
+          if (msg == 3) {
1381
+            this.$message.error("已有出库数据,反审核失败!")
1382
+            return;
1383
+          }
1384
+
1378
           var purcaseOrder = response.data.data.purcaseOrder;
1385
           var purcaseOrder = response.data.data.purcaseOrder;
1379
           console.log("采购订单", purcaseOrder);
1386
           console.log("采购订单", purcaseOrder);
1380
           var goodOrder = response.data.data.goodOrder;
1387
           var goodOrder = response.data.data.goodOrder;

+ 4 - 3
src/xt_pages/supply/goodreturn.vue 查看文件

204
       multipleSelection: [],
204
       multipleSelection: [],
205
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
205
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
206
       start_time: "",
206
       start_time: "",
207
-      end_time:new Date(),
207
+      end_time:"",
208
       page: 1,
208
       page: 1,
209
       limit: 10,
209
       limit: 10,
210
       goodType: [],
210
       goodType: [],
267
      getlist(){
267
      getlist(){
268
         var params = {
268
         var params = {
269
           check_id:this.check_id,
269
           check_id:this.check_id,
270
-          start_time:this.getTimes(this.start_time),
271
-          end_time:this.getTimes(this.end_time),
270
+          start_time:this.start_time,
271
+          end_time:this.end_time,
272
           keyword:this.keywords,
272
           keyword:this.keywords,
273
           page:this.page,
273
           page:this.page,
274
           limit:this.limit,
274
           limit:this.limit,
382
     //本月的开始时间
382
     //本月的开始时间
383
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
383
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
384
     this.start_time = monthStartDate
384
     this.start_time = monthStartDate
385
+    this.end_time = this.getTimes(new Date());
385
     this.org_id =  this.$store.getters.xt_user.org_id
386
     this.org_id =  this.$store.getters.xt_user.org_id
386
     this.getAllSupply()
387
     this.getAllSupply()
387
     this.getlist()
388
     this.getlist()