1

src/components/Materialman/SpotQuery.vue

@@ -17,9 +17,9 @@
         </div>
         <div class="padContent">
             <ul v-show="morequery" class="queryul">
-                <li>          
+                <li>
                     <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库" @change="msg.pageIndex=1,getList()">
-                        <el-option 
+                        <el-option
                         v-for="item in getWareHouseList"
                         :key="item.Id"
                         :label="item.Name"
@@ -27,10 +27,10 @@
                         </el-option>
                     </el-select>
                 </li>
-                
-                <li>              
+
+                <li>
                     <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料" @change="msg.pageIndex=1,getList()">
-                        <el-option 
+                        <el-option
                         v-for="item in wulaioList"
                         :key="item.Id"
                         :label="item.Name"
@@ -38,23 +38,33 @@
                         </el-option>
                     </el-select>
                 </li>
+              <li>
+                <el-select size="small" filterable clearable v-model="msg.ExpiresDay" placeholder="过期天数" @change="msg.pageIndex=1,getList()">
+                  <el-option
+                    v-for="item in daylist"
+                    :key="item.Id"
+                    :label="item.Name"
+                    :value="item.Id">
+                  </el-option>
+                </el-select>
+              </li>
             </ul>
             <vxe-table stripe style="margin-top:15px" :loading="loading"
             :data="tableData">
             <vxe-table-column field="SuppliesNum" title="耗材编码">
                 <template  v-slot="{ row }">
                     <span class="underline" @click="getCheckDes(row)">{{row.SuppliesNum}}</span>
-                </template> 
+                </template>
             </vxe-table-column>
             <vxe-table-column field="SuppliesName" title="耗材名称"  width='300'>
                 <template  v-slot="{ row }">
                     <span class="underline" @click="getCheckDes(row)">{{row.SuppliesName}}</span>
-                </template> 
+                </template>
             </vxe-table-column>
             <vxe-table-column field="SuppliesName" title="规格" width='200'>
                 <template  v-slot="{ row }">
                     <span v-for="(x,y) in row.GoodsSpecificationList" :key="y">{{x}}{{y+1==row.GoodsSpecificationList.length?'':'，'}}</span>
-                </template> 
+                </template>
             </vxe-table-column>
             <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
             <vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column>
@@ -70,6 +80,11 @@
                     <span v-else>{{row.Number}}</span>
                 </template>
             </vxe-table-column>
+              <vxe-table-column field="Number" title="到期数量">
+                <template  v-slot="{ row }">
+                  <span class="underline" >{{row.RecentExpiresNum}}</span>
+                </template>
+              </vxe-table-column>
             <vxe-table-column field="address" title="操作">
                 <template  v-slot="{ row }">
                     <el-tooltip class="item" effect="dark" content="日志" placement="top">
@@ -87,7 +102,7 @@
                 :total="total">
             </el-pagination>
         </div>
-        
+
 
 
         <!-- 操作日志 -->
@@ -171,7 +186,19 @@ export default {
             pageSize:15,
             WarehouseId:'',
             SuppliesId:'',
+            ExpiresDay:90,
         },
+        daylist:[
+          {Id:10,Name:'过期天数10天'},
+          {Id:20,Name:'过期天数20天'},
+          {Id:30,Name:'过期天数30天'},
+          {Id:40,Name:'过期天数40天'},
+          {Id:50,Name:'过期天数50天'},
+          {Id:60,Name:'过期天数60天'},
+          {Id:70,Name:'过期天数70天'},
+          {Id:80,Name:'过期天数80天'},
+          {Id:90,Name:'过期天数90天'},
+        ],
         addMsg:{
             Id:0,
             Name:'',
@@ -180,7 +207,7 @@ export default {
         },
         dialogtitle:'新增',
         dialogState:false,
-      
+
         getWareHouseList:[],
         wuliaomsg:{
             pageIndex:1,
@@ -255,7 +282,7 @@ export default {
         `${name}报表.xls`
         );
     },
-    // 仓库列表  
+    // 仓库列表
     getWareHouse(){
         this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
             res => {
@@ -299,10 +326,10 @@ export default {
             null
         );
     },
-    
+
 
   },
-  
+
 }
 </script>
 

src/components/assetsman/outboundOperate.vue

@@ -50,6 +50,7 @@
           <vxe-table-column field="Units" title="单位"></vxe-table-column>
 
           <vxe-table-column field="StockInNum" title="入库单号"></vxe-table-column>
+          <vxe-table-column field="ExpirationDate" title="有效期"></vxe-table-column>
           <vxe-table-column field="StockInDate" title="入库时间"></vxe-table-column>
           <vxe-table-column field="UnitPrice" title="价格"></vxe-table-column>
           <vxe-table-column title="操作">
@@ -212,6 +213,20 @@
               if(myData){
                 var scanMsg = {};
                 var data2 = JSON.parse(JSON.stringify(this.tableData));
+                // 2021-4-1加的
+                  let goon = true
+                if(myData.ValidityId>0 && this.scanData.length>0){
+                  this.scanData.map(x=>{
+                    if(x.ValidityId == myData.ValidityId){
+                      this.Error("该商品重复扫码");
+                      goon = false
+                      return
+                    }
+                  })
+                }
+                if(goon == false){//如果有相同的id 就不执行下面的内容
+                  return
+                }
                 this.orderNum=0;
                 let isUpdate=false
                 for (let i = 0; i < data2.length; i++) {
@@ -230,6 +245,7 @@
                       scanMsg.SpecificationSort = x.NewSpecificationSort;
                       scanMsg.GoodsId = x.NewGoodsId;
                       scanMsg.GoodsName = x.NewGoodsName;
+                      scanMsg.ValidityId = myData.ValidityId;
 
                       scanMsg.StockInId = myData.StockInId;
                       this.sureMsg.WarehouseOutGoodsDetailList.push(scanMsg);
@@ -237,7 +253,6 @@
                     }
                   }
                 }
-                console.log(this.orderNum>0 && !isUpdate)
                 if(this.orderNum>0 && !isUpdate){
                   this.Error("超过了出库数量");
                 }

src/router/config.js

@@ -166,6 +166,12 @@ export default {
                     name: 'disposalDetails',
                     component: resolve => require(['@/components/assetsman/disposalDetails'], resolve),
                 },
+                  // 物料到期查询
+                 {
+                    path: '/materielexpire',
+                    name: 'materielexpire',
+                    component: resolve => require(['@/components/assetsman/materielexpire'], resolve),
+                },
 
                 // 资产折旧报表
                 {