瀏覽代碼

11月14日 库存扣减更新

XMLWAN 3 年之前
父節點
當前提交
867f6caedd

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

49
     </div>
49
     </div>
50
     <div>
50
     <div>
51
         <el-button size="small" type="primary" @click="saveGoodOrder" v-show="showOne">保存</el-button>
51
         <el-button size="small" type="primary" @click="saveGoodOrder" v-show="showOne">保存</el-button>
52
-         <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">修改</el-button>
52
+         <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">保存</el-button>
53
         <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
53
         <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
54
 
54
 
55
        
55
        
790
            updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
790
            updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
791
            if(response.data.state == 1){
791
            if(response.data.state == 1){
792
              this.loading = false
792
              this.loading = false
793
-             this.$message.success("修改成功!")
793
+             this.$message.success("保存成功!")
794
              
794
              
795
            }
795
            }
796
          })
796
          })

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

60
         </div>
60
         </div>
61
         <div>
61
         <div>
62
           <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showOne">保存</el-button>
62
           <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showOne">保存</el-button>
63
-          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">修改</el-button>
63
+          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">保存</el-button>
64
           <el-button size="small" type="primary" @click="updatePurchaseOrder"
64
           <el-button size="small" type="primary" @click="updatePurchaseOrder"
65
             >审核</el-button
65
             >审核</el-button
66
           >
66
           >
683
             if (response.data.state == 1) {
683
             if (response.data.state == 1) {
684
               this.loading = false;
684
               this.loading = false;
685
               var warehousingInfo = response.data.data.warehousingInfo;
685
               var warehousingInfo = response.data.data.warehousingInfo;
686
-              this.$message.success("修改成功!");
686
+              this.$message.success("保存成功!");
687
             }
687
             }
688
           });
688
           });
689
         }
689
         }

+ 24 - 26
src/xt_pages/supply/components/addPurchaseOrder.vue 查看文件

82
             type="primary"
82
             type="primary"
83
             @click="updatePurchaseOrder"
83
             @click="updatePurchaseOrder"
84
             v-show="showOne"
84
             v-show="showOne"
85
-            >修改</el-button
85
+            >保存</el-button
86
           >
86
           >
87
         </div>
87
         </div>
88
       </div>
88
       </div>
669
               this.loading = false;
669
               this.loading = false;
670
               this.$message.success("保存成功!");
670
               this.$message.success("保存成功!");
671
               var warehouseInfo = response.data.data.warehouseInfo;
671
               var warehouseInfo = response.data.data.warehouseInfo;
672
+              if(warehouseInfo.is_check == 1){
673
+                this.Reviewed = true
674
+              }
672
               this.number = warehouseInfo.number;
675
               this.number = warehouseInfo.number;
673
               this.id = warehouseInfo.id;
676
               this.id = warehouseInfo.id;
674
               this.recordInfo.tableList = [];
677
               this.recordInfo.tableList = [];
704
               }
707
               }
705
               console.log("orderINFO23323232", orderInfo);
708
               console.log("orderINFO23323232", orderInfo);
706
               this.recordInfo.tableList = orderInfo;
709
               this.recordInfo.tableList = orderInfo;
707
-              // for(let i=0;i<orderInfo.length;i++){
708
-              //    orderInfo[i].name = ""
709
-              //    orderInfo[i].supply_name = ""
710
-              //    orderInfo[i].supply_specification_name = ""
711
-              //   if(orderInfo[i].is_source == 1){
712
-              //     for(let j=0;j<this.drugList.length;j++){
713
-              //        if(orderInfo[i].project_id == this.drugList[j].id){
714
-              //           orderInfo[i].name = this.drugList[j].drug_name
715
-              //        }
716
-              //     }
717
-              //   }
718
-              //   if(orderInfo[i].is_source == 2){
719
-              //     for(let y=0;y<this.goodList.length;y++){
720
-              //        if(orderInfo[i].project_id = this.goodList[y].id){
721
-              //           orderInfo[i].name = this.goodList[y].good_name
722
-              //        }
723
-              //     }
724
-              //   }
725
-              // }
710
+              for(let i=0;i<orderInfo.length;i++){
711
+                 orderInfo[i].name = ""
712
+                 orderInfo[i].supply_name = ""
713
+                 orderInfo[i].supply_specification_name = ""
714
+                if(orderInfo[i].is_source == 1){
715
+                  for(let j=0;j<this.drugList.length;j++){
716
+                     if(orderInfo[i].project_id == this.drugList[j].id){
717
+                        orderInfo[i].name = this.drugList[j].drug_name
718
+                     }
719
+                  }
720
+                }
721
+                if(orderInfo[i].is_source == 2){
722
+                  for(let y=0;y<this.goodList.length;y++){
723
+                     if(orderInfo[i].project_id = this.goodList[y].id){
724
+                        orderInfo[i].name = this.goodList[y].good_name
725
+                     }
726
+                  }
727
+                }
728
+              }
726
               this.showTwo = false;
729
               this.showTwo = false;
727
               this.showOne = true;
730
               this.showOne = true;
728
             }
731
             }
831
             if (response.data.state == 1) {
834
             if (response.data.state == 1) {
832
               this.loading = false;
835
               this.loading = false;
833
               var warehousingInfo = response.data.data.warehousingInfo;
836
               var warehousingInfo = response.data.data.warehousingInfo;
834
-              this.$message.success("修改成功!");
837
+              this.$message.success("保存成功!");
835
             }
838
             }
836
           });
839
           });
837
         }
840
         }
845
           this.recordInfo.tableList[i].supply_count;
848
           this.recordInfo.tableList[i].supply_count;
846
       }
849
       }
847
       this.total_price = total_price;
850
       this.total_price = total_price;
848
-      //   var discount_amount = 0
849
-      //   if(this.rate_of_concession >0){
850
-      //      discount_amount = (this.rate_of_concession/100*total_price)
851
-      //   }
852
-      //  this.discount_amount = discount_amount.toFixed(2)
853
       return total_price.toFixed(2);
851
       return total_price.toFixed(2);
854
     },
852
     },
855
     checkPurchaseOrder(id, index) {
853
     checkPurchaseOrder(id, index) {

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

47
 
47
 
48
     </div>
48
     </div>
49
     <div>
49
     <div>
50
-        <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
50
+        <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
51
         <el-button size="small" type="primary"  @click="toClick" v-show="showThree">生成采购退货单</el-button>
51
         <el-button size="small" type="primary"  @click="toClick" v-show="showThree">生成采购退货单</el-button>
52
         <el-button size="small" type="primary"  v-show="showOne">审核</el-button>
52
         <el-button size="small" type="primary"  v-show="showOne">审核</el-button>
53
         <el-button size="small" type="primary"  v-show="showTwo">反审核</el-button>
53
         <el-button size="small" type="primary"  v-show="showTwo">反审核</el-button>
698
            updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
698
            updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
699
            if(response.data.state == 1){
699
            if(response.data.state == 1){
700
              this.loading = false
700
              this.loading = false
701
-             this.$message.success("修改成功!")
701
+             this.$message.success("保存成功!")
702
              
702
              
703
            }
703
            }
704
          })
704
          })

+ 15 - 2
src/xt_pages/supply/components/editPurchaseOrder.vue 查看文件

51
     </div>
51
     </div>
52
     <div>
52
     <div>
53
         <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成采购单</el-button>
53
         <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成采购单</el-button>
54
-        <el-button size="small" type="primary" @click="updatePurchaseOrder">修改</el-button>
54
+        <el-button size="small" type="primary" @click="updatePurchaseOrder">保存</el-button>
55
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
55
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
56
         <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder" v-show="showTwo">审核</el-button>
56
         <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder" v-show="showTwo">审核</el-button>
57
         <el-button size="small" type="primary" v-if="is_check == 1" @click="checkReturnOrder" v-show="showThree">反审核</el-button>
57
         <el-button size="small" type="primary" v-if="is_check == 1" @click="checkReturnOrder" v-show="showThree">反审核</el-button>
197
         </template>
197
         </template>
198
     </el-table-column>
198
     </el-table-column>
199
   </el-table>
199
   </el-table>
200
+
201
+   <!-- 审核水印 -->
202
+  <img src="@/assets/purchase/Reviewed.png" alt="正在加载..." class="reviewImg" v-show="Reviewed == true" />
200
 </el-form>
203
 </el-form>
201
    <div style="margin-top:10px">
204
    <div style="margin-top:10px">
202
       合计:{{getAllPrice()}} 元
205
       合计:{{getAllPrice()}} 元
237
 },
240
 },
238
 data() {
241
 data() {
239
 return {
242
 return {
243
+    Reviewed:false,
240
     crumbs: [
244
     crumbs: [
241
        { path: false, name: "采购订单" },
245
        { path: false, name: "采购订单" },
242
        { path: "/supply/query", name: "编辑采购订单" }
246
        { path: "/supply/query", name: "编辑采购订单" }
552
            if(response.data.state == 1){
556
            if(response.data.state == 1){
553
             this.loading = false
557
             this.loading = false
554
              var warehousingInfo =  response.data.data.warehousingInfo
558
              var warehousingInfo =  response.data.data.warehousingInfo
555
-             this.$message.success("修改成功!")
559
+             this.$message.success("保存成功!")
556
            }
560
            }
557
         })
561
         })
558
       } 
562
       } 
594
     getPurchaseOrderDetail(id).then(response=>{
598
     getPurchaseOrderDetail(id).then(response=>{
595
       if(response.data.state == 1){
599
       if(response.data.state == 1){
596
         var info = response.data.data.info
600
         var info = response.data.data.info
601
+        if(info.is_check == 1){
602
+          this.Reviewed = true
603
+        }
597
         this.is_check = info.is_check
604
         this.is_check = info.is_check
598
         this.number = info.number
605
         this.number = info.number
599
         this.id = info.id
606
         this.id = info.id
885
   bottom: 20px;
892
   bottom: 20px;
886
   height: 100%;
893
   height: 100%;
887
 }
894
 }
895
+.reviewImg{
896
+  position: fixed;
897
+  left: 50%;
898
+  transform: translateX(-50%);
899
+  top: 30%;
900
+}
888
 </style>
901
 </style>

+ 1 - 1
src/xt_pages/supply/purchaseOrderQuery.vue 查看文件

361
     this.end_time = this.getTimes(new Date())
361
     this.end_time = this.getTimes(new Date())
362
     this.org_id =  this.$store.getters.xt_user.org_id
362
     this.org_id =  this.$store.getters.xt_user.org_id
363
     this.getAllSupply()
363
     this.getAllSupply()
364
-    // this.getlist()
364
+    this.getlist()
365
   },
365
   },
366
  
366
  
367
 };
367
 };

+ 13 - 13
src/xt_permission.js 查看文件

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))