11月14日 库存扣减更新

src/api/supply.js

 
 export function saveGoodReturnOrder(data, warehouse_out_id, start_time, rate_of_concession, discount_amount, arrearage, payment, supplier_id) {
   return request({
-    url: '/api/supply/savegoodreturnOrder?warehouse_out_id=' + warehouse_out_id + '&start_time=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrearage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id,
+    url: '/api/supply/savegoodreturnOrder?warehouse_out_id=' + warehouse_out_id + '&start_time=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrerage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id,
     method: 'post',
     data: data
   })

src/views/layout/Layout.vue

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

src/xt_pages/data/components/consumables.vue

               register_number:"",
               is_user:"2",
               number:"",
+              is_warehouse:"1",
             },
             isVisibility: false,
           }
             this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
            
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
+
+            this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
             
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 45)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 45">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 45)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.template_id != 45'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                             </el-form-item>
 
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.org_id == 9987'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 45">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 ||  this.$store.getters.xt_user.template_info.template_id == 45">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

src/xt_pages/stock/Dialog/goodInfoDailog.vue

             
             <el-form-item label="是否零用:">
 
-              <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+              <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择" @change="changeUse">
                   <el-option
                           v-for="(item,index) in userList"
                           :key="index"
                   </el-option>
               </el-select>
              </el-form-item>
-
+           
+            <el-form-item label="是否自动出库:" v-if="form.is_user == 1">
+              <el-select v-model="form.is_warehouse" style="width:160px" filterable placeholder="请选择">
+                  <el-option
+                          v-for="(item,index) in userList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+             </el-form-item>
+ 
+          
             <el-form-item label="批准文号:" >
               <el-input v-model="form.number" style="width:180px"></el-input>
             </el-form-item>
 
+   
+
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
           register_number:"",
           is_user:"2",
           number:"",
+          is_warehouse:"1",
         },
 
         rules: {
         form["register_number"] = this.form.register_number
         form["is_user"] = this.form.is_user
         form["number"] = this.form.number
-
+        form["is_warehouse"] = this.form.is_warehouse
         return form
       }, changeSelected: function(val) {
         console.log(val)
         }
       },
      changeDefaultCountUnit(val){
-       console.log("val2222",val)
+      
        this.form.default_count_unit = ''
         this.form.default_count_unit = val
+      },
+      changeUse(val){
+        console.log("val2222",val)
+        if(val == 1){
+         this.form.is_user = val
+        }
       }
     },
     watch: {

src/xt_pages/supply/components/addGoodOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+     
     },
 
     calculate: function (val) {

src/xt_pages/supply/components/addGoodReturn.vue

             </template>
           </el-table-column>
 
+          <el-table-column label="批号" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.supply_batch_number"
+                style="width: 150px"
+                :disabled="true"
+                placeholder="批号"
+              ></el-input>
+               <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>单位<span style="color: red">*</span></span>
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count > 0){
+       return total_count;
+      }else{
+        return ""
+      }
+      
     },
     calculate: function (val) {
       if (isNaN(val)) {
           var drugList = response.data.data.drugList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
+            if(orderInfo[i].is_source == 1){
+              for(let j=0;j<orderInfo[i].drug_warehouse_info.length;j++){
+                 if(orderInfo[i].drug_warehouse_info[j].max_unit == orderInfo[i].drug.max_unit){
+                    orderInfo[i].drug_warehouse_info[j].stock_max_number =  orderInfo[i].drug_warehouse_info[j].stock_max_number * orderInfo[i].drug.min_number
+                 }
+              }
+              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)
+            }
+            if(orderInfo[i].is_source == 2){
+               orderInfo[i].supply_total = this.getTotalStockCount(orderInfo[i].good_warehouse_info)
+            }
             orderInfo[i].id = orderInfo[i].id;
-            orderInfo[i].supply_count = orderInfo[i].count;
+            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;
      }
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-        this.loading = false
-        this.showThree = false
-        this.disabled = true
-        this.is_check = 1
+      
         var msg = response.data.data.msg
-        this.Reviewed = true
-        this.$message.success("审核成功!")
+        if(msg == 1){
+          this.loading = false
+          this.showThree = false
+          this.disabled = true
+          this.is_check = 1
+          this.Reviewed = true
+          this.$message.success("审核成功!")
+        }
+
+         if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var str = good_name +"*" + specification_name +"库存不足,审核失败!"
+            this.$message.error(str)
+
+          }
+          if(msg == 3){
+              var drug_name =  response.data.data.drug_name
+              var dose = response.data.data.dose
+              var dose_unit = response.data.data.dose_unit
+              var min_number = response.data.data.min_number
+              var min_unit =  response.data.data.min_unit
+              var max_unit =  response.data.data.max_unit
+              var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+              this.$message.error(str + "库存不足,审核失败!")
+          }
+       
        }
      })
     },

src/xt_pages/supply/components/editGoodOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+         return total_count;
+      }else{
+        return ""
+      }
+      
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/components/editGoodReturn.vue

             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
+            :disabled ="disabled"
           >
             <el-option
               v-for="item in supplyList"
             </template>
           </el-table-column>
 
+         <el-table-column label="批号" align="center" width="200px">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.supply_batch_number"
+                style="width: 150px"
+                :disabled="true"
+                placeholder="批号"
+              ></el-input>
+               <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="单位" align="center" width="120px">
             <template slot="header" slot-scope="scope">
               <span>单位<span style="color: red">*</span></span>
       </el-form>
       <div style="margin-top: 10px">
         <el-input
+         :disabled ="disabled"
           type="textarea"
           :rows="2"
           placeholder="备注信息"
             v-model="rate_of_concession"
             @input="addressChange"
             placeholder="请输入优惠率"
+            :disabled ="disabled"
           ></el-input
           >%</span
         >
             v-model="discount_amount"
             @input="count_discount"
             placeholder="请输入优惠金额"
+            :disabled ="disabled"
           ></el-input
         ></span>
 
             v-model="payment"
             @input="count_payment"
             placeholder="请输入本次退款"
+            :disabled ="disabled"
           ></el-input
         ></span>
 
             v-model="arrearage"
             @input="count_arrearage"
             placeholder="请输入本次欠款"
+            :disabled ="disabled"
           ></el-input
         ></span>
       </div>
       var min_str = "";
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number);
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
       if (total < min_number) {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {
           this.discount_amount = out.discount_amount;
           this.payment = out.payment;
           this.arrearage = out.arrearage;
+          this.return_remark = out.return_remark
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.orderCancelDetail;
           if (out.is_check == 1) {
             this.disabled = true;
+            this.Reviewed = true
           }
           console.log("退库单详情", orderInfo);
           var drugList = response.data.data.drugList;

src/xt_pages/supply/components/editPurchaseOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count >0){
+        return total_count;
+      }else{
+        return ""
+      }
+     
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/goodOrderQuery.vue

                 var msg = response.data.data.msg
                 this.tableList.splice(index, 1);
                 this.$message.success("删除成功")
+                this.getlist()
             } else {
                 this.$message.error("删除失败")
             }

src/xt_pages/supply/goodreturn.vue

           <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)}}</span> 
          </template>
        </el-table-column>
-        <!-- <el-table-column label="已退款" align="center" width="200">
+        <el-table-column label="已退款" align="center" width="200">
          <template slot-scope="scope">
-         
+           <span v-if="scope.row.payment > 0">{{scope.row.payment}}</span> 
          </template>
-       </el-table-column> -->
+       </el-table-column>
        <el-table-column label="数量" align="center" width="200">
          <template slot-scope="scope">
            {{getCount(scope.row.cancelOrder)}}
        var buy_price = 0
        if(arr!=undefined && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            buy_price += (arr[i].count * arr[i].price)
+            buy_price += (arr[i].supply_count * arr[i].price)
           }
        }
 
        var buy_price = 0
        if(arr!=undefined && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            buy_price += (parseInt(arr[i].count) * arr[i].price)
+            buy_price += (parseInt(arr[i].supply_count) * arr[i].price)
           }
        }
-        console.log("discount233232232323",discount_amount)
        return (buy_price-discount_amount).toFixed(2)
      },
      getAllCount(arr){
        var count = ""
         if(arr!=undefined && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            count += arr[i].count
+            count += arr[i].supply_count
           }
        }
        return count
             if (response.data.state == 1) {
                 var msg = response.data.data.msg
                 this.tableList.splice(index, 1);
+                this.getlist()
                 this.$message.success("删除成功")
             } else {
                 this.$message.error("删除失败")
        }) 
      },
      getCount(val){
+       console.log("val323223322323",val)
        var total = 0
-       for(let i=0;i<val.length;i++){
-         total += val[i].count
-       }
-       if(total >0){
-         return total
-       }else{
-         return ""
+       if(val!=undefined){
+          for(let i=0;i<val.length;i++){
+          total += val[i].supply_count
+        }
+        if(total >0){
+          return total
+        }else{
+          return ""
+        }
        }
-      
      }
   },
   created() {
     var nowYear = now.getFullYear(); //当前年 
     //本月的开始时间
     var monthStartDate = new Date(nowYear, nowMonth, 1); 
-    this.start_time = monthStartDate
+    this.start_time = this.getTimes(monthStartDate) 
     this.end_time = this.getTimes(new Date());
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()

src/xt_pages/supply/purchaseOrderQuery.vue

             if (response.data.state == 1) {
               var msg = response.data.data.msg;
               this.tableList.splice(index, 1);
+              this.getlist()
               this.$message.success("删除成功");
             } else {
               this.$message.error("删除失败");