1

src/components/Materialman/SpotQuery.vue

@@ -331,7 +331,7 @@ export default {
       this.$router.push({
         path: "/materielexpire" ,
         query: {
-          SuppliesNum:row.SuppliesId,
+          SuppliesNum:row.SuppliesNum,
           WarehouseId:row.WarehouseId,
           ExpiresDay:this.msg.ExpiresDay
         }

src/components/assetsman/materielexpire.vue

@@ -52,7 +52,7 @@
                  :data="tableData">
         <vxe-table-column field="SuppliesNum" title="物料编码">
           <template  v-slot="{ row }">
-            <span >{{row.SuppliesNum}}</span>
+            <span @click="getCheckDes(row)" style="text-decoration: underline;cursor: pointer;">{{row.SuppliesNum}}</span>
           </template>
         </vxe-table-column>
         <vxe-table-column field="SuppliesName" title="耗材名称"  width='300'>
@@ -65,8 +65,9 @@
         <vxe-table-column field="UnitPrice" 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="ExpirationDate" title="到期时间"></vxe-table-column>
+
 
         <vxe-table-column field="Number" title="是否已过期">
           <template  v-slot="{ row }">
@@ -85,14 +86,20 @@
         :total="total">
       </el-pagination>
     </div>
+    <el-dialog title="物料详情" top="0" :visible.sync="CheckDetailState" width="1150px">
+      <wlDetails ref="mychild"></wlDetails>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+  import wlDetails from "@/components/global/wlDetails.vue";
 
   export default {
     name: 'materielexpire',
-
+    components: {
+      wlDetails
+    },
     data(){
       return{
         CheckDetailState:false,

src/components/assetsman/outboundOperate.vue

@@ -50,9 +50,10 @@
           <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 field="ExpirationDate" title="有效期"></vxe-table-column>
+
           <vxe-table-column title="操作">
             <template v-slot="{ row, rowIndex }">
               <img @click="delBound(row,rowIndex)" style="width:24px;height:24px"