fix: 修复产线能力查询参数错误及调整分页默认值

修复产线能力查询时lineId参数传递错误的问题，增加参数校验
调整分页组件默认的pageSizes选项，增加10的选项
修改物料线圈查询状态参数为0
优化线圈吞吐记录展示方式，改为行点击触发
移除用餐记录中不必要的部门字典依赖

klp-ui/src/components/HomeModules/StatisticGroup.vue

@@ -100,7 +100,7 @@ export default {
         // 顺序请求：前一个请求完成后，再执行下一个
         const productRes = await listProduct({ pageSize: 10, pageNum: 1 });
         const rawMaterialRes = await listRawMaterial({ pageSize: 10, pageNum: 1 });
-        const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1, status: 1 });
+        const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1, status: 0 });
         const equipmentRes = await listEquipmentManagement({ pageSize: 1, pageNum: 1, status: 'in_service' });
         const orderRes = await listOrder({ pageSize: 1, pageNum: 1 });
         const customerRes = await listCustomer({ pageSize: 1, pageNum: 1 });

klp-ui/src/components/Pagination/index.vue

@@ -37,7 +37,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [15, 20, 30, 50]
+        return [10, 15, 20, 30, 50]
       }
     },
     // 移动端页码按钮的数量端默认值5

klp-ui/src/views/aps/lineCapability/index.vue

@@ -236,7 +236,8 @@ export default {
     },
     onLineRowClick(row) {
       this.queryParams.lineId = row.lineId
-      this.handleQuery()
+      console.log(row);
+      // this.handleQuery()
     },
     getList() {
       this.loading = true
@@ -264,8 +265,14 @@ export default {
         this.open = true
         return
       }
+      console.log(row);
+      const lineId = row.lineId ?? this.queryParams.lineId
+      if (!lineId) {
+        this.$modal.msgError('请选择产线')
+        return
+      }
       this.loading = true
-      getLineCapability(row.capabilityId).then(res => {
+      getLineCapability(lineId).then(res => {
         const d = res.data || {}
         this.form = {
           ...this.form,

klp-ui/src/views/wms/coil/panels/base.vue

@@ -77,7 +77,7 @@
     </el-row>
 
     <KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true"
-      :floatLayerConfig="floatLayerConfig">
+      :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
         <template slot-scope="scope">
@@ -249,8 +249,8 @@
             @click="handleAbnormal(scope.row)">查看异常</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
             v-if="showControl">修正</el-button>
-          <el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
+          <!-- <el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
-            v-if="showWareLog">吞吐记录</el-button>
+            v-if="showWareLog">吞吐记录</el-button> -->
           <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-if="showControl">删除</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
@@ -387,9 +387,9 @@
     </el-dialog>
 
     <!-- 吞吐记录 -->
-    <el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body>
+    <!-- <el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body> -->
-      <log-table :coil-id="currentCoilId"></log-table>
+    <log-table v-if="showWareLog && currentCoilId" :coil-id="currentCoilId"></log-table>
-    </el-dialog>
+    <!-- </el-dialog> -->
   </div>
 </template>
 
@@ -721,6 +721,12 @@ export default {
     this.getUserList();
   },
   methods: {
+    // 处理行点击事件
+    handleRowClick(row) {
+      this.currentCoilId = row.coilId;
+      this.logOpen = true;
+    },
+    // 获取用户列表
     getUserList() {
       listUser({ pageNum: 1, pageSize: 1000 }).then(res => {
         this.userList = res.rows || [];

klp-ui/src/views/wms/hrm/records/meal.vue

@@ -31,7 +31,6 @@
         />
       </el-form-item>
       <el-form-item label="部门名称" prop="deptName">
-        <!-- <DictSelect dictType="hrm_department" v-model="queryParams.deptName" placeholder="请选择部门名称"></DictSelect> -->
         <el-select v-model="queryParams.deptName" placeholder="请选择部门名称">
           <el-option
             v-for="dict in deptOptions"
@@ -98,11 +97,7 @@
           <dict-tag :options="dict.type.hrm_meal_type" :value="scope.row.mealType"/>
         </template>
       </el-table-column>
-      <el-table-column label="部门名称" align="center" prop="deptName">
+      <el-table-column label="部门名称" align="center" prop="deptName"></el-table-column>
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.hrm_department" :value="scope.row.deptName"/>
-        </template>
-      </el-table-column>
       <el-table-column label="用餐总人数" align="center" prop="totalPeople" />
       <el-table-column label="堂食人数" align="center" prop="dineInPeople">
         <template slot-scope="scope">
@@ -172,7 +167,6 @@
               :value="dict.deptName"
             ></el-option>
           </el-select>
-          <!-- <DictSelect dictType="hrm_department" v-model="form.deptName" placeholder="请选择部门名称"></DictSelect> -->
         </el-form-item>
         <el-form-item label="堂食成员" prop="dineInPeopleList">
           <employee-selector v-model="form.dineInPeopleList" :key-field="'name'" :multiple="true" placeholder="请选择堂食成员" @change="handleDineInPeopleChange" :disabled-names="form.takeoutPeopleList || ''" />
@@ -208,7 +202,7 @@ import { listDept } from "@/api/wms/dept"
 
 export default {
   name: "MealReport",
-  dicts: ['hrm_meal_type', 'hrm_department'],
+  dicts: ['hrm_meal_type'],
   components: { DictSelect, EmployeeSelector },
   data() {
     // 用餐日期默认选中今天
@@ -241,7 +235,24 @@ export default {
         status: undefined,
         deadlineTime: '12:00:00' // 新增：截至时间默认12点
       },
-      form: {},
+      form: {
+        reportId: undefined,
+        reportDate: nowTime,
+        mealType: undefined,
+        deptName: undefined,
+        totalPeople: undefined,
+        dineInPeopleList: '',
+        dineInPeople: 0,
+        takeoutPeopleList: '',
+        takeoutPeople: 0,
+        reportUserName: undefined,
+        status: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        remark: undefined
+      },
       // 替换原有统计变量，新增6个有效/无效统计项
       validDineIn: 0,    // 有效堂食人数
       validTakeout: 0,   // 有效打包人数
@@ -372,8 +383,10 @@ export default {
         mealType: undefined,
         deptName: undefined,
         totalPeople: undefined,
-        dineInPeople: undefined,
+        dineInPeopleList: '',
-        takeoutPeople: undefined,
+        dineInPeople: 0,
+        takeoutPeopleList: '',
+        takeoutPeople: 0,
         reportUserName: undefined,
         status: undefined,
         createBy: undefined,