代码提交

src/api/incomeInoutWmsLog.js

@@ -14,7 +14,7 @@ import Qs from 'qs'
 // 1. 查询入库记录列表
 export function listIncomeInoutWmsLog(query) {
   return request({
-    url: '/incomeinoutwmslog/list',
+    url: '/incomeinoutwmslog/queryIncomeInoutWmsLogByPagination',
     method: 'get',
     params: query
   })

src/views/template/ConfirmationMaterials.vue

@@ -118,7 +118,9 @@
         </el-table-column>
         <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.whId || '-' }}
+            <span v-if="scope.row.whId === '001'">仓库1</span>
+            <span v-else-if="scope.row.whId === '002'">仓库2</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">

src/views/template/outcomeWmsApply.vue

@@ -125,7 +125,9 @@
         </el-table-column>
         <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.whId || '-' }}
+            <span v-if="scope.row.whId === '001'">仓库1</span>
+            <span v-else-if="scope.row.whId === '002'">仓库2</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">