进出库日志

src/views/consignmentManagement/inOutStockLog.vue

@@ -6,11 +6,13 @@
         <el-form-item label="型号" prop="goods_name">
           <el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
         </el-form-item>
-        <el-form-item label="类型" prop="status">
-          <el-select v-model="formParam.status" placeholder="全部" clearable multiple>
+        <el-form-item label="类型" prop="types">
+          <el-select v-model="formParam.types" placeholder="全部" clearable multiple collapse-tags>
             <el-option label="全部" value=""></el-option>
             <el-option label="寄售入库" value="1"></el-option>
             <el-option label="寄售退货入库" value="2"></el-option>
+            <el-option label="寄售出库" value="3"></el-option>
+            <el-option label="寄售召回出库" value="4"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -22,14 +24,15 @@
       <div class="data-box">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
-          <el-table-column prop="msg_type" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="msg_type" label="标准品牌" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="msg_type" label="单号" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="id" label="类型" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="id" label="仓库" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="id" label="D/C" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="id" label="供应商" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="create_time" label="入库时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="goods_name" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="brand_name" label="标准品牌" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="wms_sn" label="单号" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="type_val" label="类型" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="stock_num" label="数量" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="warehouse_name" label="仓库" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="date_code" label="D/C" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="supplier_name" label="供应商" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="log_time" label="出入库时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
         </el-table>
         <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
       </div>
@@ -56,8 +59,8 @@ export default {
       limit: 10,
       list: [],
       formParam: {
-        status: '',
-        date: ''
+        goods_name: '',
+        types: []
       }
     };
   },
@@ -66,12 +69,12 @@ export default {
   },
   methods: {
     getData() {
-      var params = Object.assign({}, this.formParam,
-          {page: this.page, limit: this.limit},
-          {start_time: this.formParam.date ? this.formParam.date[0] : ''},
-          {end_time: this.formParam.date ? this.formParam.date[1] : ''}
-      );
-      this.$http('GET', "/api/message/getMsgList", params).then(res => {
+      const params = {
+        ...this.formParam,
+        types: this.formParam.types?.join(',') || ''
+      };
+
+      this.$http('GET', "/api/consignmentWmsLog/getConsignmentWmsLogList", params).then(res => {
         if (res.code === 0) {
           this.list = res.data.list || [];
           this.total = Number(res.data.total) || 0;