新加页面

src/components/assetsman/materielexpire.vue

@@ -91,7 +91,7 @@
 <script>
 
   export default {
-    name: 'Supplierman',
+    name: 'materielexpire',
 
     data(){
       return{

src/components/assetsman/reWarehousing.vue

+<template>
+  <div class="reWarehousing">
+    <div class="routerTitle">
+      <span class="pageTitle">商品重新入库</span>
+      <span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
+                <span style="margin-right:5px">高级查询</span>
+                <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
+                <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
+            </span>
+      <span  @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
+      <!-- <span  @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
+      <!-- <span  @click="addSupplier" style="margin-left:20px" class="addSpan">
+          <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
+      新增</span> -->
+      <!--      <span  @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span>-->
+
+    </div>
+    <div class="padContent">
+      <ul v-show="morequery" class="queryul">
+        <li>
+          <el-input class="w200" size="small" v-model="msg.OrderId" placeholder="订单ID"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+        </li>
+        <li>
+          <el-input class="w200" size="small" v-model="msg.GoodsName" placeholder="商品名称"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+        </li>
+        <li>
+          <el-input class="w200" size="small" v-model="msg.OrderNo" placeholder="订单号"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+        </li>
+
+
+      </ul>
+      <vxe-table stripe style="margin-top:15px" :loading="loading"
+                 :data="tableData">
+        <vxe-table-column field="OrderId" title="订单id"></vxe-table-column>
+        <vxe-table-column field="OrderNo" title="订单号"></vxe-table-column>
+        <vxe-table-column field="GoodsName" title="商品名称"  width='300'></vxe-table-column>
+        <vxe-table-column field="Specification" title="规格" width='200'></vxe-table-column>
+        <vxe-table-column field="WarehouseName" title="仓库"></vxe-table-column>
+        <vxe-table-column field="CostMoney" title="成本价格"></vxe-table-column>
+        <vxe-table-column field="ProductCode" title="货号"></vxe-table-column>
+
+        <vxe-table-column field="Number" title="出库数量"></vxe-table-column>
+        <vxe-table-column field="StockOutDate" title="出库时间"></vxe-table-column>
+        <vxe-table-column field="InventoryNum" title="重新入库数量"></vxe-table-column>
+        <vxe-table-column field="StockInDate" title="重新入库时间"></vxe-table-column>
+        <vxe-table-column field="FinanceId" title="财务单据"></vxe-table-column>
+        <vxe-table-column field="StockInNum" title="重新入库单号"></vxe-table-column>
+
+
+
+      </vxe-table>
+      <el-pagination
+        @current-change="currentChange"
+        background
+        :page-size="msg.pageSize"
+        :current-page.sync="msg.pageIndex"
+        layout="prev, pager, next"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    name: 'reWarehousing',
+
+    data(){
+      return{
+        CheckDetailState:false,
+        caozuoState: false,
+        morequery:false,
+        currentPage:1,
+        tableData: [],
+        loading:false,
+        total:0,
+        dateList:[],
+        msg:{
+          pageIndex:1,
+          pageSize:15,
+          OrderId:'',
+          GoodsName:'',
+          OrderNo:'',
+
+        },
+        dialogState:false,
+        getWareHouseList:[],
+      }
+    },
+    mounted(){
+
+      // this.getWareHouse();
+
+      this.getList();
+    },
+    methods:{
+      getCheckDes(item){
+        let PropertyId=item.SuppliesId;
+        this.CheckDetailState=true;
+        setTimeout(()=>{
+          this.$refs.mychild.InitData(PropertyId);
+        },10)
+      },
+
+
+      Export(url,name){
+        let msg = JSON.parse(JSON.stringify(this.msg));
+        this.JavaGetLocalFile(
+          `/api/Supplies/${url}`,
+          msg,
+          `${name}报表.xls`
+        );
+      },
+      // 仓库列表
+      getWareHouse(){
+        this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
+          res => {
+            if (res.data.resultCode === 1) {
+              this.getWareHouseList=res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+
+      currentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      getList(){
+
+        this.loading=true;
+        let msg = JSON.parse(JSON.stringify(this.msg))
+        if(msg.OrderId==''){
+          msg.OrderId = 0
+        }else {
+          msg.OrderId = Number(msg.OrderId )
+        }
+
+        this.apiJavaPost("/api/WarehouseOut/GetGoodsOutDetailPageList",msg,
+          res => {
+            this.loading=false;
+            if (res.data.resultCode === 1) {
+              this.tableData=res.data.data.pageData;
+              this.total=res.data.data.count;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+
+
+    },
+
+  }
+</script>
+
+<style scoped>
+  .reWarehousing{
+    box-sizing: border-box;
+  }
+</style>

src/router/config.js

@@ -172,6 +172,12 @@ export default {
                     name: 'materielexpire',
                     component: resolve => require(['@/components/assetsman/materielexpire'], resolve),
                 },
+                // 商品重新入库
+                 {
+                    path: '/reWarehousing',
+                    name: 'reWarehousing',
+                    component: resolve => require(['@/components/assetsman/reWarehousing'], resolve),
+                },
 
                 // 资产折旧报表
                 {