518合并代码

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -235,7 +235,11 @@
             {{getHouseName(scope.row.storehouse_id)}}
           </template>
         </el-table-column>
-
+         <!-- <el-table-column label="剩余库存" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+              {{scope.row.stock_count}}
+            </template>
+          </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
@@ -252,9 +256,9 @@
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="拆零零售价" align="center">
+          <!-- <el-table-column label="进货价" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
-              {{scope.row.retail_price}}
+              {{scope.row.last_price}}
             </template>
           </el-table-column> -->
           <el-table-column label="总价" align="center">
@@ -1010,7 +1014,6 @@ export default {
          }
          if(is_sys == 0 || is_sys == 12){
             var flowlist = response.data.data.flowlist
-            console.log("flowlist233232232323233223",flowlist)
             this.drugFlowList = []
             for(let i=0;i<flowlist.length;i++){
               if(flowlist[i].count_unit == flowlist[i].max_unit){
@@ -1022,7 +1025,6 @@ export default {
               }
             }
             this.drugFlowList = flowlist
-            console.log("this.drugFlowList32323232322323323232322323我的",flowlist)
 
          }
 

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -117,6 +117,28 @@
               </el-form-item>
             </template>
           </el-table-column>
+
+
+          <!-- <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余库存</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :rules="tableRules.stock_count"
+                style="padding-top: 20px"
+              >
+                <div>
+                  <el-input
+                    :disabled="true"
+                    style="width:120px"
+                    placeholder="剩余库存"
+                    v-model="scope.row.stock_count"
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
           
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
@@ -130,13 +152,14 @@
               >
                 <div style="display:flex;">
                   <el-input
+                    @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px" @change="changeUnit(scope.row)">
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px" @change="changeUnit(scope.row,scope.$index)">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
@@ -164,6 +187,26 @@
             </template>
           </el-table-column>
 
+           <!-- <el-table-column width="120" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>进货价</span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item
+                :rules="tableRules.last_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                 :disabled="true"
+                  placeholder="进货价"
+                  type="number"
+                  v-model="scope.row.last_price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
+
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货价<span style="color: red">*</span></span>
@@ -454,6 +497,11 @@ export default {
       tempObj["dealer"] = ""
       tempObj['manufacturer'] = ''
       tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
+      tempObj["last_price"] = ""
+      tempObj["stock_count"] = ""
+      tempObj["total_count"] = 0
+      tempObj["max_unit_fisrt"] = 0
+      tempObj["min_unit_fisrt"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -590,13 +638,14 @@ export default {
 
             }
 
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString()
+
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
        
-          console.log("parasm2233223233232233232",params)
-        
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -696,7 +745,9 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+       
         var arr = []
+
          for(let i=0;i<this.recordInfo.recordData.length;i++){
             arr.push(this.recordInfo.recordData[i].drug_id)
          }
@@ -707,6 +758,18 @@ export default {
             return
          }
          this.getDrugBatchNumber(val.id)
+        
+        var str_count = ""
+        var total_count = 0
+        for(let i=0;i<val.drug_warehouse_info.length;i++){
+           if(val.max_unit == val.drug_warehouse_info[i].max_unit){
+             val.drug_warehouse_info[i].stock_max_number = val.drug_warehouse_info[i].stock_max_number * val.min_number
+           }
+        }
+       
+       str_count =  this.getWarehoseInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+       total_count = this.getWarehoseInfoTwo(val.drug_warehouse_info)
+     
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].drug_id = val.id
@@ -721,6 +784,11 @@ export default {
             this.recordInfo.recordData[i].number = val.number
             this.recordInfo.recordData[i].unit = val.max_unit
             this.recordInfo.recordData[i].retail_price = val.retail_price
+            this.recordInfo.recordData[i].last_price = val.last_price
+            this.recordInfo.recordData[i].stock_count = str_count
+            this.recordInfo.recordData[i].total_count = total_count
+            this.recordInfo.recordData[i].max_unit_fisrt = val.max_unit
+            this.recordInfo.recordData[i].min_unit_fisrt = val.min_unit
             if(val.retail_price == 0){
               this.recordInfo.recordData[i].price = ""
             }else{
@@ -754,8 +822,9 @@ export default {
            }
         })
       },
-      changeUnit(val){
-       
+      changeUnit(val,index){
+        console.log("vla33232233232323232",val)
+
         this.getDrugBatchNumber(val.drug_id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.recordInfo.recordData[i].drug_id == val.drug_id){
@@ -773,7 +842,32 @@ export default {
             }
           }
         }
-        console.log('23323223333233232',this.recordInfo.recordData)
+
+        var count_total = 0
+        if(val.max_unit == val.max_unit_fisrt){
+          count_total = val.count * val.min_number
+        }
+
+        if(val.max_unit == val.min_unit_fisrt){
+          count_total = val.count 
+        }
+        if(count_total > val.total_count){
+          this.$message.error("出库数量不能大于剩余库存")
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            if(index == i){
+                this.recordInfo.recordData[i].count = ""
+            }
+          }
+        }else{
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            if(index == i){
+                this.recordInfo.recordData[i].count = val.count
+            }
+          } 
+        }
+     
+
+       
       },
       changeBatchNumber(val){
        
@@ -788,7 +882,71 @@ export default {
               }
             }
         }
+      },
+
+     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
+    getWarehoseInfoTwo(arr){
+      var total = 0;
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      return total
+    },
+    getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
+     
+      var count_total = 0
+      if(max_unit == max_unit_fisrt){
+        count_total = count * min_number
+      }
+
+      if(max_unit == min_unit_fisrt){
+        count_total = count 
+      }
+
+      if(count_total > total_count){
+        this.$message.error("出库数量不能大于剩余库存")
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(index == i){
+              this.recordInfo.recordData[i].count = ""
+           }
+        }
+      }else{
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(index == i){
+              this.recordInfo.recordData[i].count = count
+           }
+        } 
       }
+     console.log("count_toal23233232",count_total)
+    }
   },
   created() {
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
@@ -821,6 +979,11 @@ export default {
     tempObj["count"] = ""
     tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
     tempObj["retail_price"] = 0;
+    tempObj["last_price"] = ""
+    tempObj["stock_count"] = ""
+    tempObj["total_count"] = 0
+    tempObj["max_unit_fisrt"] = 0
+    tempObj["min_unit_fisrt"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -126,6 +126,27 @@
                   </el-form-item>
               </template>
           </el-table-column> -->
+<!--          
+         <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余库存</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :rules="tableRules.stock_count"
+                style="padding-top: 20px"
+              >
+                <div>
+                  <el-input
+                    :disabled="true"
+                    style="width:120px"
+                    placeholder="剩余库存"
+                    v-model="scope.row.stock_count"
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
            <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -138,12 +159,14 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                    oninput="value=value.replace(/\D|^0/g,'')"
                    style="width:100px"
                    :disabled="drug_show"
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
+
                   ></el-input>
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
                     <el-option
@@ -170,6 +193,26 @@
                </el-select>
             </template>
           </el-table-column>
+        
+          <!-- <el-table-column width="120" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>进货价</span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item
+                :rules="tableRules.last_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                 :disabled="true"
+                  placeholder="进货价"
+                  type="number"
+                  v-model="scope.row.last_price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货价<span style="color: red">*</span></span>
@@ -486,15 +529,22 @@
         tempObj['drug_id'] = 0
         tempObj['retail_price'] = ''
         tempObj['count'] = ''
+        tempObj['max_unit'] = ''
+        tempObj['min_unit'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
         tempObj['batch_number'] = ''
         tempObj['number'] = ''
-        tempObj['count_unit'] = ""
+        tempObj['count_unit'] = ''
         tempObj['dealer'] = ""
         tempObj['manufacturer'] = ""
         tempObj['warehouse_info_id'] = 0
         tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
+        tempObj["last_price"] = ""
+        tempObj["stock_count"] = ""
+        tempObj["total_count"] = 0
+        tempObj["max_unit_fisrt"] = 0
+        tempObj["min_unit_fisrt"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if(parseInt(this.$route.query.is_sys) == 12){
@@ -645,6 +695,8 @@
                   }
 
                }
+               this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+               this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString()
             }
             const loading = this.$loading({
               lock: true,
@@ -720,6 +772,8 @@
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+
+            
               if(response.data.data.list[i].dealer == "0" || response.data.data.list[i].dealer == 0){
                   response.data.data.list[i].dealer = ""
               }else{
@@ -728,6 +782,9 @@
 
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
+
+              response.data.data.list[i].stock_count = response.data.data.list[i].stock_count
+              response.data.data.list[i].last_price = response.data.data.list[i].last_price
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
              for(let j=0;j<this.recordInfo.recordData.length;j++){
@@ -819,6 +876,16 @@
             return
          }
          this.getDrugBatchNumber(val.id)
+          var str_count = ""
+          var total_count = 0
+          for(let i=0;i<val.drug_warehouse_info.length;i++){
+            if(val.max_unit == val.drug_warehouse_info[i].max_unit){
+              val.drug_warehouse_info[i].stock_max_number = val.drug_warehouse_info[i].stock_max_number * val.min_number
+            }
+          }
+        
+        str_count =  this.getWarehoseInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        total_count = this.getWarehoseInfoTwo(val.drug_warehouse_info)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -830,6 +897,12 @@
              this.recordInfo.recordData[i].number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
              this.recordInfo.recordData[i].min_unit = val.min_unit
+             this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].stock_count = str_count
+             this.recordInfo.recordData[i].total_count = total_count
+             this.recordInfo.recordData[i].max_unit_fisrt = val.max_unit
+             this.recordInfo.recordData[i].min_unit_fisrt = val.min_unit
+             this.recordInfo.recordData[i].count_unit = val.max_unit
              if(val.dealer == 0){
                this.recordInfo.recordData[i].dealer = ""
              }else{
@@ -849,14 +922,77 @@
           var params = {
             id:id
           }
-        getDrugBatchNumber(params).then(response=>{
+     getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
 
              this.numberList = list
            }
         })
+      },
+    getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
       }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
+    getWarehoseInfoTwo(arr){
+      var total = 0;
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      return total
+    },
+    getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
+     
+      var count_total = 0
+      if(max_unit == max_unit_fisrt){
+        count_total = count * min_number
+      }
+
+      if(max_unit == min_unit_fisrt){
+        count_total = count 
+      }
+
+      if(count_total > total_count){
+        this.$message.error("出库数量不能大于剩余库存")
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(index == i){
+              this.recordInfo.recordData[i].count = ""
+           }
+        }
+      }else{
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(index == i){
+              this.recordInfo.recordData[i].count = count
+           }
+        } 
+      }
+     console.log("count_toal23233232",count_total)
+    }
     },
     created() {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type')

src/xt_pages/stock/stockModifyPrice.vue

@@ -666,12 +666,9 @@ export default {
          var params= {
            tableData:this.tableData,
          }
-      
-      console.log("parasm222",params)
       saveAdjustPrice(params).then(response=>{
         if(response.data.state == 1){
           var msg =  response.data.data.msg
-          console.log("msg",msg)
           this.$message.success("保存成功!")
           this.dialogVisible = false
           this.tableData = []

src/xt_pages/stock/stockOutOrder.vue

@@ -229,6 +229,11 @@
               {{getHouseName(scope.row.storehouse_id)}}
             </template>
           </el-table-column>
+          <!-- <el-table-column label="剩余库存" align="center" v-if="is_sys== 0">
+            <template slot-scope="scope">
+              <span>{{scope.row.stock_count}}</span>
+            </template>
+          </el-table-column> -->
          
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
@@ -241,6 +246,11 @@
              {{getXuserName(scope.row.admin_user_id)}}
             </template>
           </el-table-column>
+          <!-- <el-table-column label="进货价" align="center" v-if="is_sys== 0">
+            <template slot-scope="scope">
+              <span>{{scope.row.buy_price}}</span>
+            </template>
+          </el-table-column> -->
           <el-table-column label="出货价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price >0">{{ scope.row.price}}</span> 
@@ -926,7 +936,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+       
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -1073,7 +1083,7 @@ export default {
       for(let i=0;i<selection.length;i++){
         ids.push(selection[i].id)
       }
-      console.log("ids",ids)
+
       this.exportList = []
       this.order_id = ids.join(",")
       this.warehouse_out_time = selection[0].warehouse_out_time
@@ -1082,7 +1092,7 @@ export default {
 
     },
     batchDelete() {
-      console.log("this.selectedTableData",this.selectedTableData)
+     
       
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
@@ -1160,7 +1170,7 @@ export default {
             if(response.data.state == 1){
               this.tableShow = true
               var list = response.data.data.list          
-              console.log("info2232323",list)
+             
               this.tableList = []
               for(let i=0;i<list.length;i++){
                 // if(list[i].dealer == 0){
@@ -1245,9 +1255,7 @@ export default {
               is_total: 1,
               total: total,
             })
-            // this.type_name = this.userList[0].type.type_name
-            // this.specification_name = this.userList[0].info.specification_name
-            console.log("详情数据区",this.userList)
+        
             this.editdialogVisibleThree = true
           }
         })
@@ -1294,9 +1302,9 @@ export default {
         GetOutStockTotalCount(params).then(response=>{
            if(response.data.state == 1){
               var stockCount = response.data.data.stockCount
-              console.log("出库数量2323",stockCount)
+             
               this.stockCount = stockCount
-              // this.dialogVisible = true
+            
            }
         })
       },
@@ -1328,7 +1336,7 @@ export default {
         const params = {
           'id': order_id
         }
-        console.log("触发了222222",order_id)
+
         getWarehouseOutInfo(params).then(response => {
          if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1535,7 +1543,7 @@ export default {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
-            console.log("$arr3333333333",array)
+
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -1583,9 +1591,9 @@ export default {
               var arrList =  this.unique(list)
               var info = response.data.data.info
               this.infoList = info
-              console.log("info列表22222222",info)
+             
               var stockflowlist = response.data.data.stockFlowList
-              console.log("stockflowlist",stockflowlist)
+ 
               this.stockFlowList = stockflowlist
              
 
@@ -1599,8 +1607,6 @@ export default {
                 is_total: 1,
                 total: total,
               })
-
-              console.log("详情数据区",this.userList)
               if(val.is_sys == 1){
                 this.editdialogVisibleThree = true
               }
@@ -1619,7 +1625,7 @@ export default {
             arr.push(...this.userList[i].warehouseOutInfo)
           }
         }
-        console.log("arr",arr)
+      
         if(arr.length > 0){
           for(let i=0;i<arr.length;i++){
               ids.push(arr[i].number)
@@ -1641,12 +1647,12 @@ export default {
            "start_time":this.start_time,
            "end_time":this.end_time,
          }
-        console.log('parasm22',params)
+       
        getOutExportList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
             var outCount = response.data.data.outCount
-            console.log("outCount",outCount)
+        
             for(let i=0;i<list.length;i++){
                list[i].unit = list[i].specification_name +"/" + list[i].packing_unit
                list[i].total_price = (list[i].total_count * list[i].price).toFixed(2)
@@ -1668,7 +1674,7 @@ export default {
                  }
               } 
             }
-            console.log("导出list222222",list)
+           
             this.exportList = list
           }
         })
@@ -1679,7 +1685,7 @@ export default {
          return
         }
         import('@/vendor/Export2Excel').then(excel => {
-          console.log("23232323",this.exportList)
+         
         for(let i=0;i<this.exportList.length;i++){
           this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
           for(let j=0;j<this.goodType.length;j++){
@@ -1700,7 +1706,7 @@ export default {
        
         const tHeader = ['耗材名称', '耗材类型', '规格&单位','出库数量','出货价','总价','生产厂商','经销商','生产日期','有效期','备注']
         const filterVal = ['good_name', 'good_type_id', 'unit','count','price','total_price','manufacturer','dealer','product_date','expiry_date','remark']
-        console.log("table",this.exportList)
+    
        
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -122,12 +122,30 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <el-input v-model="scope.row.name"></el-input>
+                <el-input v-model="scope.row.name" placeholder="规格&单位"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           
-      
+          <!-- <el-table-column  width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余库存</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :rules="tableRules.count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  :disabled="true"
+                  placeholder="剩余库存"
+                  type="number"
+                  v-model="scope.row.stock_count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+       -->
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -140,6 +158,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                  @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"
                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入出库数量"
                   type="number"
@@ -161,6 +180,26 @@
                </el-select>
             </template>   
           </el-table-column>
+<!-- 
+          <el-table-column  width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>进货价</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.buy_price'"
+                :rules="tableRules.buy_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  :disabled="true"
+                  placeholder="进货价"
+                  type="number"
+                  v-model="scope.row.buy_price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
 
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -474,6 +513,8 @@ export default {
       tempObj["license_number"] = ""
       tempObj["warehouse_info_id"] = 0
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
+      tempObj["buy_price"]= ""
+      tempObj["stock_count"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -600,6 +641,10 @@ export default {
             }
            
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+
+             this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString()
+
+             this.recordInfo.recordData[i].buy_price = this.recordInfo.recordData[i].buy_price.toString()
           }
        
           for(let i=0;i<this.recordInfo.recordData.length;i++){
@@ -631,7 +676,8 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-        
+         
+         
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -721,8 +767,10 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-       console.log("val232323",val)
+       
         var arr = []
+       
+       
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
         }
@@ -735,15 +783,22 @@ export default {
         }
         //获取当前耗材的批号
         this.getStockBatchNumber(val.id)
+        var total_count = 0
+        for(let i=0;i<val.xt_warehouse_info.length;i++){
+           total_count += val.xt_warehouse_info[i].stock_count
+        }
+
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
+           
             this.recordInfo.recordData[i].good_type_id = val.id
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-          
+            this.recordInfo.recordData[i].buy_price = val.buy_price
+            this.recordInfo.recordData[i].stock_count = total_count
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{
@@ -786,6 +841,26 @@ export default {
        }  
     
     },
+    getSupplyCount(count,sum_count,index){
+    
+      if(sum_count < count){
+        this.$message.error("出库数量不能大于剩余库存")
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(index == i){
+            this.recordInfo.recordData[i].count = ""
+          }
+          return
+        }
+      }else{
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(index == i){
+            this.recordInfo.recordData[i].count = count
+          }
+          return
+        }
+      }
+ 
+    }
     
   },
   created() {
@@ -813,6 +888,8 @@ export default {
     tempObj["license_number"] = ""
     tempObj["warehouse_info_id"] = 0
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
+    tempObj["buy_price"]= ""
+    tempObj["stock_count"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
   

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -126,6 +126,26 @@
             </template>
           </el-table-column> -->
 
+          <!-- <el-table-column  width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>进货价</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.buy_price'"
+                :rules="tableRules.buy_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  :disabled="true"
+                  placeholder="进货价"
+                  type="number"
+                  v-model="scope.row.buy_price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
+
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
@@ -141,6 +161,25 @@
             </template>
           </el-table-column>
 
+          <!-- <el-table-column  width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余库存</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :rules="tableRules.count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  :disabled="true"
+                  placeholder="剩余库存"
+                  type="number"
+                  v-model="scope.row.stock_count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
+
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -148,7 +187,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"></el-input>
+                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"  @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -451,6 +490,8 @@
         tempObj['dealer'] = ""
         tempObj['manufacturer'] = ""
         tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
+        tempObj["buy_price"]= ""
+        tempObj["stock_count"] = ""
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {
@@ -591,6 +632,9 @@
                 this.recordInfo.recordData[i].product_date = ""
               }
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+              
+              this.recordInfo.recordData[i].buy_price = this.recordInfo.recordData[i].buy_price.toString()
+              this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString()
 
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -726,6 +770,10 @@
           return
         }
         this.getStockBatchNumber(val.id)
+        var total_count = 0
+        for(let i=0;i<val.xt_warehouse_info.length;i++){
+           total_count += val.xt_warehouse_info[i].stock_count
+        }
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_type_id = val.id
@@ -736,6 +784,8 @@
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].license_number = ""
             this.recordInfo.recordData[i].warehouse_info_id = 0
+            this.recordInfo.recordData[i].buy_price = val.buy_price
+            this.recordInfo.recordData[i].stock_count = total_count
             if(val.packing_price == 0){
                this.recordInfo.recordData[i].price = ""
             }else{
@@ -774,6 +824,7 @@
           this.manufacturerList = manufacturerList
           this.goodType = response.data.data.goodType
           this.doctorList = response.data.data.doctorlist
+         
           for (let i = 0; i < response.data.data.list.length; i++) {
 
             response.data.data.list[i].price = response.data.data.list[i].price.toString()
@@ -784,7 +835,8 @@
             response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
             response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
             response.data.data.list[i].remark = response.data.data.list[i].remark
-
+            response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
+            response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
             if(response.data.data.list[i].dealer == 0){
                response.data.data.list[i].dealer = ""
             }
@@ -822,6 +874,24 @@
          }
        }
 
+     },
+     getSupplyCount(count,sum_count,index){
+      if(sum_count < count){
+        this.$message.error("出库数量不能大于剩余库存")
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(index == i){
+            this.recordInfo.recordData[i].count = ""
+          }
+          return
+        }
+      }else{
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(index == i){
+            this.recordInfo.recordData[i].count = count
+          }
+          return
+        }
+      }
      }
     },
     created() {

src/xt_pages/user/patients.vue

@@ -1341,14 +1341,14 @@
         this.getList()
       },
       getList() {
-        console.log("parasm2222",this.listQuery)
+       
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
             this.tableData = response.data.data.patients
-            console.log('病人是', this.tableData)
+           
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total