优化工序库的出入库记录页面布局

Signed-off-by: AiNoeLiYa <jzbcxy@gmail.com>

src/api/processLibrary/InventoryRecord.js

 import request from '@/utils/request'
 
 export function listLog(queryParams) {
+  console.log('this is date:', queryParams.dateRange)
   return request({
     url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
     method: 'get',

src/components/Table/BaseTable/index.vue

 <template>
-  <div>
+  <div style="padding:5px 10px">
     <div class="mb12 font-small-bold">{{ allTableArguments.listName }}</div>
-    <div class="tableList" style="height:600px;">
+    <div class="tableList" style=" height:600px;">
       <el-scrollbar style="height: 100%;">
         <el-table
           v-loading="allTableArguments.loading"
@@ -11,46 +11,6 @@
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
-          <!--          <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />-->
-          <!--          <el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.processName || '-' }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column label="生产车间" prop="workshop">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.workshop || '-' }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column label="操作人" prop="createBy" width="210px">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.createBy || '-' }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            label="操作"-->
-          <!--            class-name="small-padding fixed-width"-->
-          <!--            width="180px"-->
-          <!--          >-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <div class="processListBtns">-->
-          <!--                <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">-->
-          <!--                  详情-->
-          <!--                </el-button>-->
-          <!--                <el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">-->
-          <!--                  修改-->
-          <!--                </el-button>-->
-          <!--                <el-button :type="typeParent" :size="size" @click="handleDelete(scope.row)">-->
-          <!--                  删除-->
-          <!--                </el-button>-->
-          <!--              </div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
 
           <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
 
@@ -100,14 +60,14 @@
               <!-- 操作按钮 -->
               <span v-if="column.isOperation" class="processListBtns">
                 <span v-for="(operations, index) in column.operation" :key="index">
-                  <el-button v-if="operations.isShow(row,$index)" :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="operations.buttonClick(row,$index)">{{ operations.label }}</el-button>
+                  <el-button v-if=" operations.clickType === '1' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDetail">{{ operations.label }}</el-button>
+                  <el-button v-else-if=" operations.clickType === '2' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleUpdate">{{ operations.label }}</el-button>
+                  <el-button v-else-if=" operations.clickType === '3' " :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="handleDelete">{{ operations.label }}</el-button>
                 </span>
               </span>
             </template>
           </el-table-column>
-
         </el-table>
-
       </el-scrollbar>
       <div />
     </div>
@@ -171,7 +131,7 @@ export default {
 /* TODO: 这里是控制内容列表的样式 */
 .processListBtns {
   .el-button {
-    margin: 0 7px;
+    margin: 0 12px;
   }
 }
 

src/views/system/user/index.vue

@@ -184,8 +184,8 @@
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.rows"
           @pagination="getList"
         />
       </el-col>
@@ -529,8 +529,8 @@ export default {
       },
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         username: undefined,
         email: undefined,
         phone: undefined,