From 80f27f1672467e91ff3d4fd7f30a817f6f11d5c0 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 22:55:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev
---
src/views/mainPlan/plateProcessStat/index.vue | 231 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 166 insertions(+), 65 deletions(-)
diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue
index 9ca9b9f..1c9d002 100644
--- a/src/views/mainPlan/plateProcessStat/index.vue
+++ b/src/views/mainPlan/plateProcessStat/index.vue
@@ -1,70 +1,61 @@
<template>
<div class="app-container">
- <el-row :gutter="20"> <el-col>
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
- <el-row :gutter="20">
- <el-col :span="6">
-
- <el-form-item label="鎺掑簭" prop="num">
- <el-input
- v-model="queryParams.workOrderNo"
- placeholder="璇疯緭鍏ラ挘閲戣鍒掑伐鍗曞彿"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item> </el-col>
- <el-col :span="24" style="text-align: right;">
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </el-col> </el-row>
+ <el-row :gutter="20">
+ <el-col>
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="宸ュ崟鍙�" prop="num">
+ <el-input
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ラ挘閲戣鍒掑伐鍗曞彿"
+ clearable
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['aps_plate_process_stat:aps_plate_process_stat:edit']"
- >鏇存柊缁熻琛�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['aps_plate_process_stat:aps_plate_process_stat:export']"
+ type="warning"
+ plain
+ icon="Download"
+ @click="handleExport"
+ v-hasPermi="['apsPlateProcessStat:export']"
>瀵煎嚭</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="Edit"
+ @click="handleUpdate"
+ v-hasPermi="['apsPlateProcessStat:edit']"
+ >鏇存柊</el-button>
+ </el-col>
+
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="aps_plate_process_statList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo" />
- <el-table-column label="宸ュ簭鍚嶇О" align="center" prop="processName" />
- <el-table-column label="鎺掑簭" align="center" prop="num" />
- <el-table-column label="宸ュ簭鍙�" align="center" prop="routeProcessNumber" />
- <el-table-column label="褰撳墠宸ュ簭鍙�" align="center" prop="currentProcessNumber" />
- <el-table-column label="鐢熶骇鏁伴噺" align="center" prop="productionQuantity" />
- <el-table-column label="鏍囧噯宸ユ椂" align="center" prop="standardTime" />
- <el-table-column label="宸ュ簭鎬诲伐鏃�" align="center" prop="processTotalTime" />
- <el-table-column label="璁″垝瀹屾垚鏃�" align="center" prop="processPlanEndDay" />
- <el-table-column label="璁＄畻瀹屾垚鏃�" align="center" prop="computePlanEndDay" />
- <el-table-column label="璁捐宸ユ椂" align="center" prop="designTimes" />
- <el-table-column label="鎵规鍙�" align="center" prop="batchNumber" />
- </el-table>
-
-
-
+ <HxlhTable
+ style="width: 100%"
+ :columns="columns"
+ :data="aps_plate_process_statList"
+ :loading="loading"
+ :height="height"
+ >
+ </HxlhTable>
<!-- 娣诲姞鎴栦慨鏀归挘閲戠粺璁″璇濇 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="aps_plate_process_statRef" :model="form" :rules="rules" label-width="80px">
@@ -96,18 +87,22 @@
<script setup name="Aps_plate_process_stat">
import { listPlateStat,updateStat } from "@/api/mainPlan/plateProcessStat";
-
+import HxlhTable from "@/components/HxlhTable/index.vue";
+import { getToken } from "@/utils/auth";
+import { ref } from "vue";
+import {ElMessage} from "element-plus";
const { proxy } = getCurrentInstance();
const aps_plate_process_statList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
-const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
+const height = ref(document.documentElement.clientHeight - 220 + "px;")
+
const data = reactive({
form: {},
@@ -133,11 +128,81 @@
const { queryParams, form, rules } = toRefs(data);
+
+// 琛ㄦ牸閰嶇疆
+const columns = ref([
+/* { type: 'seq', title: '搴忓彿', width: 60 },*/
+ {
+ title: '宸ュ崟鍙�',
+ field: 'workOrderNo',
+ width: 150,
+ } ,
+ {
+ title: '宸ュ簭鍚嶇О',
+ field: 'processName',
+ },
+ {
+ title: '宸ュ簭鍙�',
+ field: 'routeProcessNumberTxt',
+ width: 100,
+ },
+ {
+ title: '褰撳墠宸ュ簭鍙�',
+ field: 'currentProcessNumberTxt',
+ width: 100,
+ },
+ {
+ title: '鐢熶骇鏁伴噺',
+ field: 'productionQuantity',
+ width: 80,
+ },
+ {
+ title: '鏍囧噯宸ユ椂',
+ field: 'standardTime',
+ width: 80,
+ },
+ {
+ title: '宸ュ簭鎬诲伐鏃�',
+ field: 'processTotalTime',
+ width: 80,
+
+ },
+ {
+ title: '璁″垝寮�宸ユ棩',
+ field: 'processPlanStartDaytxt',
+ width: 140,
+ type:'html'
+ },
+ {
+ title: '璁″垝瀹屽伐鏃�',
+ field: 'processPlanEndDaytxt',
+ width: 140,
+ type:'html'
+ },
+ {
+ title: '璁㈠崟瀹屽伐鏃�',
+ field: 'orderPlanEndDay',
+ width: 120,
+ format: 'YYYY-MM-DD'
+ }
+]);
+
+
+
/** 鏌ヨ閽ｉ噾缁熻鍒楄〃 */
function getList() {
loading.value = true;
listPlateStat(queryParams.value).then(response => {
- aps_plate_process_statList.value = response.rows;
+ const listValue = response.rows;
+ listValue.forEach(listItem => {
+ listItem[`processPlanStartDaytxt`]= listItem.warning? `<font color="red">${listItem.processPlanStartDay}</font>` :listItem.processPlanStartDay;
+ listItem[`processPlanEndDaytxt`]= listItem.warning? `<font color="red">${listItem.processPlanEndDay}</font>` :listItem.processPlanEndDay;
+ listItem[`routeProcessNumberTxt`]= listItem.routeProcessNumber.toString().padStart(3, '0');
+ listItem[`currentProcessNumberTxt`]= listItem.currentProcessNumber.toString().padStart(3, '0');
+
+
+ });
+ aps_plate_process_statList.value =listValue
total.value = response.total;
loading.value = false;
});
@@ -179,6 +244,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
+ queryParams.value.workOrderNo ='';
proxy.resetForm("queryRef");
handleQuery();
}
@@ -200,11 +266,13 @@
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
reset();
- const _id = row.id || ids.value
- getAps_plate_process_stat(_id).then(response => {
+ updateStat().then(response => {
form.value = response.data;
- open.value = true;
- title.value = "淇敼閽ｉ噾缁熻";
+ ElMessage({
+ message: '鏁版嵁鏇存柊鎴愬姛',
+ type: 'success',
+ })
+ getList();
});
}
@@ -242,10 +310,43 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
function handleExport() {
- proxy.download('aps_plate_process_stat/aps_plate_process_stat/export', {
+ proxy.download('/aps/plateProcessStat/export', {
...queryParams.value
}, `aps_plate_process_stat_${new Date().getTime()}.xlsx`)
}
-
+const headerCellClassName = ({ column }) => {
+ if (column.field === 'name') {
+ return 'col-blue'
+ }
+ return null
+}
+const rowClassName = ({ rowIndex }) => {
+ if ([2, 3, 5].includes(rowIndex)) {
+ return 'row-green'
+ }
+ return null
+}
+const cellClassName = ({ row, column }) => {
+ if (column.field === 'processPlanStartDay'||column.field === 'processPlanEndDay') {
+ if (row.warning) {
+ return 'col-orange'
+ }
+ }
+ return null
+}
getList();
</script>
+<style lang="scss" scoped>
+::v-deep(.mytable-style.vxe-table .vxe-body--row.row-green) {
+ background-color: #187;
+ color: #fff;
+}
+::v-deep(.mytable-style.vxe-table .vxe-header--column.col-blue) {
+ background-color: #2db7f5;
+ color: #fff;
+}
+::v-deep(.mytable-style.vxe-table .vxe-body--column.col-red) {
+ background-color: red;
+ color: #fff;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3