11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -49,7 +49,7 @@
     </div>
     <div>
         <el-button size="small" type="primary" @click="saveGoodOrder" v-show="showOne">保存</el-button>
-         <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">修改</el-button>
+         <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">保存</el-button>
         <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
 
        
@@ -790,7 +790,7 @@ getTimes(time) {
            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=>{
            if(response.data.state == 1){
              this.loading = false
-             this.$message.success("修改成功!")
+             this.$message.success("保存成功!")
              
            }
          })

src/xt_pages/supply/components/addGoodReturn.vue

@@ -60,7 +60,7 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showOne">保存</el-button>
-          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">修改</el-button>
+          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">保存</el-button>
           <el-button size="small" type="primary" @click="updatePurchaseOrder"
             >审核</el-button
           >
@@ -683,7 +683,7 @@ export default {
             if (response.data.state == 1) {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
-              this.$message.success("修改成功!");
+              this.$message.success("保存成功!");
             }
           });
         }

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -82,7 +82,7 @@
             type="primary"
             @click="updatePurchaseOrder"
             v-show="showOne"
-            >修改</el-button
+            >保存</el-button
           >
         </div>
       </div>
@@ -669,6 +669,9 @@ export default {
               this.loading = false;
               this.$message.success("保存成功!");
               var warehouseInfo = response.data.data.warehouseInfo;
+              if(warehouseInfo.is_check == 1){
+                this.Reviewed = true
+              }
               this.number = warehouseInfo.number;
               this.id = warehouseInfo.id;
               this.recordInfo.tableList = [];
@@ -704,25 +707,25 @@ export default {
               }
               console.log("orderINFO23323232", orderInfo);
               this.recordInfo.tableList = orderInfo;
-              // for(let i=0;i<orderInfo.length;i++){
-              //    orderInfo[i].name = ""
-              //    orderInfo[i].supply_name = ""
-              //    orderInfo[i].supply_specification_name = ""
-              //   if(orderInfo[i].is_source == 1){
-              //     for(let j=0;j<this.drugList.length;j++){
-              //        if(orderInfo[i].project_id == this.drugList[j].id){
-              //           orderInfo[i].name = this.drugList[j].drug_name
-              //        }
-              //     }
-              //   }
-              //   if(orderInfo[i].is_source == 2){
-              //     for(let y=0;y<this.goodList.length;y++){
-              //        if(orderInfo[i].project_id = this.goodList[y].id){
-              //           orderInfo[i].name = this.goodList[y].good_name
-              //        }
-              //     }
-              //   }
-              // }
+              for(let i=0;i<orderInfo.length;i++){
+                 orderInfo[i].name = ""
+                 orderInfo[i].supply_name = ""
+                 orderInfo[i].supply_specification_name = ""
+                if(orderInfo[i].is_source == 1){
+                  for(let j=0;j<this.drugList.length;j++){
+                     if(orderInfo[i].project_id == this.drugList[j].id){
+                        orderInfo[i].name = this.drugList[j].drug_name
+                     }
+                  }
+                }
+                if(orderInfo[i].is_source == 2){
+                  for(let y=0;y<this.goodList.length;y++){
+                     if(orderInfo[i].project_id = this.goodList[y].id){
+                        orderInfo[i].name = this.goodList[y].good_name
+                     }
+                  }
+                }
+              }
               this.showTwo = false;
               this.showOne = true;
             }
@@ -831,7 +834,7 @@ export default {
             if (response.data.state == 1) {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
-              this.$message.success("修改成功!");
+              this.$message.success("保存成功!");
             }
           });
         }
@@ -845,11 +848,6 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      //   var discount_amount = 0
-      //   if(this.rate_of_concession >0){
-      //      discount_amount = (this.rate_of_concession/100*total_price)
-      //   }
-      //  this.discount_amount = discount_amount.toFixed(2)
       return total_price.toFixed(2);
     },
     checkPurchaseOrder(id, index) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -47,7 +47,7 @@
 
     </div>
     <div>
-        <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
+        <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
         <el-button size="small" type="primary"  @click="toClick" v-show="showThree">生成采购退货单</el-button>
         <el-button size="small" type="primary"  v-show="showOne">审核</el-button>
         <el-button size="small" type="primary"  v-show="showTwo">反审核</el-button>
@@ -698,7 +698,7 @@ getTimes(time) {
            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=>{
            if(response.data.state == 1){
              this.loading = false
-             this.$message.success("修改成功!")
+             this.$message.success("保存成功!")
              
            }
          })

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -51,7 +51,7 @@
     </div>
     <div>
         <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成采购单</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" v-show="showTwo">审核</el-button>
         <el-button size="small" type="primary" v-if="is_check == 1" @click="checkReturnOrder" v-show="showThree">反审核</el-button>
@@ -197,6 +197,9 @@
         </template>
     </el-table-column>
   </el-table>
+
+   <!-- 审核水印 -->
+  <img src="@/assets/purchase/Reviewed.png" alt="正在加载..." class="reviewImg" v-show="Reviewed == true" />
 </el-form>
    <div style="margin-top:10px">
       合计:{{getAllPrice()}} 元
@@ -237,6 +240,7 @@ BreadCrumb
 },
 data() {
 return {
+    Reviewed:false,
     crumbs: [
        { path: false, name: "采购订单" },
        { path: "/supply/query", name: "编辑采购订单" }
@@ -552,7 +556,7 @@ getTimes(time) {
            if(response.data.state == 1){
             this.loading = false
              var warehousingInfo =  response.data.data.warehousingInfo
-             this.$message.success("修改成功!")
+             this.$message.success("保存成功!")
            }
         })
       } 
@@ -594,6 +598,9 @@ getTimes(time) {
     getPurchaseOrderDetail(id).then(response=>{
       if(response.data.state == 1){
         var info = response.data.data.info
+        if(info.is_check == 1){
+          this.Reviewed = true
+        }
         this.is_check = info.is_check
         this.number = info.number
         this.id = info.id
@@ -885,4 +892,10 @@ background-color: #d0d3da;
   bottom: 20px;
   height: 100%;
 }
+.reviewImg{
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
 </style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -361,7 +361,7 @@ export default {
     this.end_time = this.getTimes(new Date())
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()
-    // this.getlist()
+    this.getlist()
   },
  
 };

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))