11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -17,10 +17,10 @@
           <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>

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

@@ -42,6 +42,7 @@
                 </div>
             </div>
             <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
         </div>
     </div>
 

src/xt_pages/hospitalStation/template/printThree.vue

@@ -70,7 +70,8 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt="">
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
@@ -116,7 +117,8 @@ export default {
         orgname:"",
         diagnoses:[],
         pageArr:[],
-        faber:{}
+        faber:{},
+        org_id:0,
       }
     },
    methods:{
@@ -421,6 +423,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
+      this.org_id = this.$store.getters.xt_user.org.id
 
    },
    watch:{

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -70,7 +70,8 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt="">
+          <span v-if="org_id == 10138"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span> 
+          <span v-if="org_id == 10278"><img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt=""></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
@@ -116,7 +117,8 @@ export default {
         orgname:"",
         diagnoses:[],
         pageArr:[],
-        faber:{}
+        faber:{},
+        org_id:0,
       }
     },
    methods:{
@@ -434,6 +436,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
+      this.org_id = this.$store.getters.xt_user.org.id
 
    },
    watch:{

src/xt_pages/supply/components/addGoodReturn.vue

@@ -824,15 +824,16 @@ export default {
                  }
               }
               orderInfo[i].supply_total = this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
-              orderInfo[i].count =this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
+             // orderInfo[i].count =this.getWarehoseInfo(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number)
             }
             if(orderInfo[i].is_source == 2){
                orderInfo[i].supply_total = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
-               orderInfo[i].count = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
+
+              // orderInfo[i].count = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
             }
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
-           
+            orderInfo[i].count = orderInfo[i].count
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -847,6 +848,7 @@ export default {
             orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
             orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
             orderInfo[i].deposit_rate = ""
+           
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1375,6 +1375,7 @@ export default {
             this.Reviewed = false
             this.showOne = true
             this.showTwo = false
+            this.showThree = false
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -562,6 +562,7 @@ export default {
             drugList[i].type = 1;
             drugList[i].supply_price = drugList[i].last_price;
             drugList[i].name = drugList[i].drug_name;
+            drugList[i].count = ""
             drugList[i].unitList = [
               { id: 1, name: "" },
               { id: 2, name: "" },
@@ -614,7 +615,9 @@ export default {
               { id: 1, name: "" },
               { id: 2, name: "" },
             ];
+
             goodList[i].supply_unit = goodList[i].packing_unit;
+            goodList[i].count = ""
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
@@ -919,7 +922,6 @@ export default {
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
             orderInfo[i].count = orderInfo[i].count;
-
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -1021,7 +1023,9 @@ export default {
             if (response.data.state == 1) {
               var msg = response.data.msg;
               this.loading = false;
+              this.getGoodReturnDetail()
               this.$message.success("保存成功!");
+
             }
           });
         }
@@ -1112,6 +1116,7 @@ export default {
     tempObj["order_number"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
+
     //获取购货单列表
     this.getGoodReturnDetail();
     this.start_time = this.getTimes(new Date());

src/xt_pages/supply/goodreturn.vue

@@ -156,6 +156,9 @@
           <template slot-scope="scope">
             <!-- <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span> -->
+           <span v-if="scope.row.payment == 0">未退款</span>
+           <span v-if="scope.row.payment > 0 && scope.row.payment< getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">部分退款</span>
+           <span v-if="scope.row.payment == getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">全部退款</span>
           </template>
         </el-table-column>
 

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -107,7 +107,6 @@
               <tr class="color" v-for="(item,index) in scope.row.orderOut" :key="index">
                  <td style="border-right:none;">{{item.good_number}}</td>
               </tr>
-
             </div>
           </template>
         </el-table-column>
@@ -126,9 +125,14 @@
         </el-table-column>
         <el-table-column label="订单状态" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_warehouse == 1">全部入库</span>
+            <!-- <span v-if="scope.row.is_warehouse == 1">全部入库</span>
             <span v-if="scope.row.is_warehouse == 2">未入库</span>
-            <span v-if="scope.row.is_warehouse == 3">部分入库</span>
+            <span v-if="scope.row.is_warehouse == 3">部分入库</span> -->
+            <span v-if="scope.row.orderOut!= undefined && scope.row.orderOut.length == 0">未入库</span> 
+            <span v-if="scope.row.orderOut!= undefined && scope.row.orderOut.length > 0">
+            <span v-if="getStatus(scope.row.orderOut) >= getAllCount(scope.row.orderInfo) ">全部入库</span> 
+            <span v-if="getStatus(scope.row.orderOut) < getAllCount(scope.row.orderInfo) ">部分入库</span> 
+            </span> 
           </template>
         </el-table-column>
 
@@ -288,9 +292,11 @@ export default {
       getAllPurchaseOrderList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
+          console.log("list2323322332323232232323",list)
           this.tableList = list;
           var total = response.data.data.total;
           this.total = total;
+         
         }
       });
     },
@@ -376,6 +382,33 @@ export default {
       this.Color_txt = false;
       console.log(this.Color_txt, "false");
     },
+    getStatus(val){
+      console.log("val23322332",val)
+      var arr =[]
+      var newArr =[]
+      var total = 0
+      if(val!=undefined && val.length >0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].is_check == 1){
+             arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+          for(let j=0;j<arr[i].order.length;j++){
+            newArr.push(arr[i].order[j])
+          }
+        }
+      }
+      if(newArr.length >0){
+        for(let i=0;i<newArr.length;i++){
+          total +=newArr[i].count
+        }
+      }
+      
+      return total
+    }
   },
   created() {
     var now = new Date(); //当前日期