Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/crm/components/CoilTable.vue

@@ -220,7 +220,6 @@ export default {
       this.labelRender.visible = true;
       this.labelRender.data = {
         ...row,
-        itemName: itemName,
         updateTime: row.updateTime?.split(' ')[0] || '',
       };
     },

klp-ui/src/views/wms/anneal/performance/report.vue

@@ -21,9 +21,12 @@
       <el-form-item label="当前钢卷号" prop="currentCoilNo">
         <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable />
       </el-form-item>
-      <el-form-item label="逻辑库区" prop="warehouseId">
+      <el-form-item label="出炉库区" prop="warehouseId">
         <WarehouseSelect v-model="queryParams.warehouseId" placeholder="请选择" clearable filterable />
       </el-form-item>
+      <el-form-item label="逻辑库区" prop="coilWarehouseId">
+        <WarehouseSelect v-model="queryParams.coilWarehouseId" placeholder="请选择" clearable filterable />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -56,6 +59,7 @@
           <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
         </template>
       </el-table-column>
+      <el-table-column label="出炉库区" prop="logicWarehouseName" align="center" />
       <el-table-column label="逻辑库区" prop="warehouseName" align="center" />
       <el-table-column label="入场钢卷号" prop="enterCoilNo" align="center" />
       <el-table-column label="当前钢卷号" prop="currentCoilNo" align="center" />
@@ -100,9 +104,12 @@ export default {
       queryParams: {
         startTime,
         endTime,
+        currentCoilNo: undefined,
         targetFurnaceId: undefined,
         planNo: undefined,
         enterCoilNo: undefined,
+        warehouseId: undefined,
+        coilWarehouseId: undefined,
       },
       summary: {},
       detailList: [],
@@ -142,7 +149,6 @@ export default {
             }
           }) || []
         }).flat();
-        console.log(this.detailList);
         this.loading = false;
       }).catch(() => {
         this.loading = false;

klp-ui/src/views/wms/hrm/attendance/sync.vue

@@ -86,7 +86,7 @@
       <el-table-column label="考勤编号" align="center" prop="sn" />
       <el-table-column label="打卡时间" align="center" prop="checktime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checktime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.checktime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="验证状态" align="center" prop="verify" />