From ffe58e0cf73fa61d8b05de09645c5d8d89007ce5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 16 六月 2026 15:20:52 +0800
Subject: [PATCH] 君歌 1.部署修改
---
src/views/productionManagement/productionProcess/index.vue | 229 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 67 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index ae1732f..56f4381 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -44,7 +44,7 @@
<div class="card-body">
<!-- <div class="process-name">{{ process.name }}</div> -->
<div class="process-desc">{{ process.remark || '鏆傛棤鎻忚堪' }}</div>
- <div class="process-device">鍏宠仈璁惧: {{ deviceOptions.find(item => item.id === Number(process.deviceLedgerId))?.deviceName|| '鏈叧鑱�' }}</div>
+ <div class="process-device">鍏宠仈璁惧: {{ (deviceOptions.find(item => item.id === Number(process.deviceLedgerId))?.deviceName) || '鏈叧鑱�' }}</div>
</div>
<div class="card-footer">
<div class="status-tag">
@@ -52,14 +52,13 @@
:type="process.isQuality ? 'warning' : 'info'">
{{ process.isQuality ? '璐ㄦ' : '闈炶川妫�' }}
</el-tag>
- <el-tag v-if="process.type !== null && process.type !== undefined"
- size="small"
- :type="process.type == 1 ? 'primary' : 'success'"
- style="margin-left: 8px">
- {{ process.type == 0 ? '璁℃椂' : '璁′欢' }}
+ <el-tag size="small"
+ style="margin-left: 8px"
+ :type="process.isProduction ? 'warning' : 'info'">
+ {{ process.isProduction ? '鐢熶骇' : '涓嶇敓浜�' }}
</el-tag>
</div>
- <span class="param-count">宸ヨ祫瀹氶: 楼{{ process.salaryQuota || 0 }}</span>
+ <span class="param-count">璁″垝宸ユ椂: {{ process.salaryQuota || 0 }}灏忔椂</span>
</div>
</div>
</div>
@@ -96,39 +95,76 @@
</div>
</div>
<!-- 宸ュ簭鏂板/缂栬緫瀵硅瘽妗� -->
- <el-dialog v-model="processDialogVisible"
- :title="isProcessEdit ? '缂栬緫宸ュ簭' : '鏂板宸ュ簭'"
- width="500px">
+ <FormDialog v-model="processDialogVisible"
+ :title="isProcessEdit ? '缂栬緫閮ㄤ欢' : '鏂板閮ㄤ欢'"
+ width="600"
+ @confirm="handleProcessSubmit"
+ @cancel="processDialogVisible = false">
<el-form :model="processForm"
:rules="processRules"
ref="processFormRef"
- label-width="100px">
- <el-form-item label="宸ュ簭缂栫爜"
- prop="no">
- <el-input v-model="processForm.no"
- placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
- </el-form-item>
- <el-form-item label="宸ュ簭鍚嶇О"
+ label-width="120px">
+ <el-form-item label="閮ㄤ欢鍚嶇О"
prop="name">
<el-input v-model="processForm.name"
- placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
+ placeholder="璇疯緭鍏ラ儴浠跺悕绉�" />
</el-form-item>
- <el-form-item label="宸ヨ祫瀹氶"
+ <el-form-item label="閮ㄤ欢缂栧彿"
+ prop="no">
+ <el-input v-model="processForm.no"
+ placeholder="璇疯緭鍏ラ儴浠剁紪鍙�" />
+ </el-form-item>
+ <el-form-item label="閮ㄤ欢绫诲瀷"
+ prop="processType">
+ <el-select v-model="processForm.processType"
+ placeholder="璇烽�夋嫨閮ㄤ欢绫诲瀷"
+ style="width: 100%">
+ <el-option v-for="item in processTypeOptions"
+ :key="item"
+ :label="item"
+ :value="item" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁″垝宸ユ椂(灏忔椂)"
prop="salaryQuota">
<el-input v-model="processForm.salaryQuota"
type="number"
- :step="0.001" />
+ :step="0.5"
+ placeholder="璇疯緭鍏ヨ鍒掑伐鏃�" />
+ </el-form-item>
+ <el-form-item label="璁″垝浜哄憳"
+ prop="planPerson">
+ <el-select v-model="processForm.planPerson"
+ placeholder="璇烽�夋嫨璁″垝浜哄憳"
+ clearable
+ filterable
+ style="width: 100%">
+ <el-option v-for="item in employeeOptions"
+ :key="item.id"
+ :label="item.staffName"
+ :value="item.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁″垝鎵ц浜哄憳"
+ prop="executor">
+ <el-select v-model="processForm.executor"
+ placeholder="璇烽�夋嫨璁″垝鎵ц浜哄憳"
+ clearable
+ filterable
+ style="width: 100%">
+ <el-option v-for="item in employeeOptions"
+ :key="item.id"
+ :label="item.staffName"
+ :value="item.id" />
+ </el-select>
</el-form-item>
<el-form-item label="鏄惁璐ㄦ"
prop="isQuality">
<el-switch v-model="processForm.isQuality" />
</el-form-item>
- <el-form-item label="璁¤垂绫诲瀷"
- prop="type">
- <el-radio-group v-model="processForm.type">
- <el-radio :label="0">璁℃椂</el-radio>
- <el-radio :label="1">璁′欢</el-radio>
- </el-radio-group>
+ <el-form-item label="鏄惁鐢熶骇"
+ prop="isProduction">
+ <el-switch v-model="processForm.isProduction" />
</el-form-item>
<el-form-item label="鍏宠仈璁惧"
prop="deviceLedgerId">
@@ -151,18 +187,11 @@
placeholder="璇疯緭鍏ュ伐搴忔弿杩�" />
</el-form-item>
</el-form>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="processDialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary"
- @click="handleProcessSubmit">纭畾</el-button>
- </span>
- </template>
- </el-dialog>
+ </FormDialog>
<!-- 閫夋嫨鍙傛暟瀵硅瘽妗� -->
- <el-dialog v-model="paramDialogVisible"
- title="閫夋嫨鍙傛暟"
- width="1000px">
+ <FormDialog v-model="paramDialogVisible"
+ title="閫夋嫨鍙傛暟"
+ width="1000px">
<div class="param-select-container">
<!-- 宸︿晶鍙傛暟鍒楄〃 -->
<div class="param-list-area">
@@ -234,6 +263,7 @@
</el-form-item>
<el-form-item label="鏍囧噯鍊�">
<el-input v-model="selectedParam.standardValue"
+ @input="val => onStandardValueInput(val, selectedParam)"
placeholder="璇疯緭鍏ラ粯璁ゅ��" />
</el-form-item>
</el-form>
@@ -243,13 +273,13 @@
</div>
<template #footer>
<span class="dialog-footer">
- <el-button @click="paramDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
:disabled="!selectedParam"
@click="handleParamSubmit">纭畾</el-button>
+ <el-button @click="paramDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
- </el-dialog>
+ </FormDialog>
<!-- 缂栬緫鍙傛暟瀵硅瘽妗� -->
<el-dialog v-model="editParamDialogVisible"
title="缂栬緫鍙傛暟"
@@ -264,14 +294,15 @@
<el-form-item label="鏍囧噯鍊�"
prop="standardValue">
<el-input v-model="editParamForm.standardValue"
+ @input="val => onStandardValueInput(val, editParamForm)"
placeholder="璇疯緭鍏ユ爣鍑嗗��" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="editParamDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
@click="handleEditParamSubmit">纭畾</el-button>
+ <el-button @click="editParamDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
</el-dialog>
@@ -279,7 +310,7 @@
</template>
<script setup>
- import { ref, reactive, onMounted } from "vue";
+ import { ref, reactive, computed, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import { Plus, Edit, Delete, Search } from "@element-plus/icons-vue";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
@@ -297,6 +328,18 @@
} from "@/api/productionManagement/productionProcess.js";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
import { getBaseParamList } from "@/api/basicData/parameterMaintenance.js";
+ import { staffOnJobListPage } from "@/api/personnelManagement/staffOnJob.js";
+ import FormDialog from "@/components/Dialog/FormDialog.vue";
+
+ // 閮ㄤ欢绫诲瀷涓嬫媺閫夐」锛堝啓姝伙級
+ const processTypeOptions = [
+ "鏈哄姞宸�",
+ "鍒澘鍐疯姱鍒朵綔",
+ "绠¤矾缁勫",
+ "缃愪綋杩炴帴鍙婅皟璇�",
+ "娴嬭瘯鎵撳帇",
+ "鍏朵粬",
+ ];
// 宸ュ簭鍒楄〃鏁版嵁
const processValueList = ref([]);
@@ -304,12 +347,26 @@
const processLoading = ref(false);
const deviceOptions = ref([]);
- // 鍙傛暟鍒楄〃鏁版嵁
- const paramList = ref([]);
+ // 宸ュ簭宸查�夊弬鏁拌〃鏍煎垎椤碉紙鎺ュ彛涓�娆¤繑鍥炲叏閲忥級
+ const paramPage2 = ref({
+ current: 1,
+ size: 10,
+ total: 0,
+ });
+ const paramListRaw = ref([]);
+ const paramList = computed(() => {
+ const all = paramListRaw.value;
+ const { current, size } = paramPage2.value;
+ const start = (current - 1) * size;
+ return all.slice(start, start + size);
+ });
const paramLoading = ref(false);
// 鏁版嵁瀛楀吀
const dictTypes = ref([]);
+
+ // 鍛樺伐鍒楄〃锛堣鍒掍汉鍛樸�佽鍒掓墽琛屼汉鍛樹笅鎷夌敤锛�
+ const employeeOptions = ref([]);
// 宸ュ簭瀵硅瘽妗�
const processDialogVisible = ref(false);
@@ -321,21 +378,22 @@
name: "",
salaryQuota: null,
isQuality: false,
+ isProduction: false,
remark: "",
deviceLedgerId: null,
- type: 0,
+ processType: "",
+ planPerson: null,
+ executor: null,
});
const processRules = {
- no: [{ required: true, message: "璇疯緭鍏ュ伐搴忕紪鐮�", trigger: "blur" }],
- name: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
+ no: [{ required: true, message: "璇疯緭鍏ラ儴浠剁紪鐮�", trigger: "blur" }],
+ name: [{ required: true, message: "璇疯緭鍏ラ儴浠跺悕绉�", trigger: "blur" }],
salaryQuota: [
{
required: false,
- message: "璇疯緭鍏ュ伐璧勫畾棰�",
- trigger: "blur",
validator: (rule, value, callback) => {
- if (isNaN(value) || value < 0) {
- callback(new Error("宸ヨ祫瀹氶蹇呴』鏄潪璐熸暟瀛�"));
+ if (value !== null && value !== undefined && value !== "" && (isNaN(value) || Number(value) < 0)) {
+ callback(new Error("璁″垝宸ユ椂蹇呴』鏄潪璐熸暟瀛�"));
} else {
callback();
}
@@ -345,7 +403,7 @@
deviceLedgerId: [
{ required: false, message: "璇烽�夋嫨璁惧", trigger: "change" },
],
- type: [{ required: false, message: "璇烽�夋嫨璁¤垂绫诲瀷", trigger: "change" }],
+ processType: [{ required: true, message: "璇烽�夋嫨閮ㄤ欢绫诲瀷", trigger: "change" }],
};
// 鍙傛暟瀵硅瘽妗�
@@ -371,7 +429,18 @@
technologyParamId: null,
paramName: "",
standardValue: null,
+ paramType: null,
});
+
+ const onStandardValueInput = (val, target) => {
+ const data = target.value || target;
+ const type = data.paramType;
+ if (type === 1) {
+ // 鏁板�兼牸寮忥細涓嶈兘杈撳叆涓枃鎴栬嫳鏂囧瓧绗�
+ data.standardValue = val.replace(/[a-zA-Z\u4e00-\u9fa5]/g, "");
+ }
+ };
+
const editParamRules = {
standardValue: [
{
@@ -382,6 +451,12 @@
if (value === null || value === undefined || value === "") {
callback(new Error("璇疯緭鍏ユ爣鍑嗗��"));
} else {
+ const type = editParamForm.paramType;
+ if (type === 1 && value) {
+ if (/[a-zA-Z\u4e00-\u9fa5]/.test(value)) {
+ return callback(new Error("鏁板�兼牸寮忎笉鑳藉寘鍚腑鑻辨枃瀛楃"));
+ }
+ }
callback();
}
},
@@ -475,21 +550,21 @@
}
};
- const paramPage2 = ref({
- current: 1,
- size: 10,
- total: 0,
- });
-
// 鑾峰彇鍙傛暟鍒楄〃
const getParamList = processId => {
paramLoading.value = true;
- console.log(paramPage2.value, "paramPage2.value");
getProcessParamList({ technologyOperationId: processId })
.then(res => {
- console.log(res, "res");
- paramList.value = res.data || [];
- paramPage2.value.total = 0;
+ const list = res.data || [];
+ paramListRaw.value = Array.isArray(list) ? list : [];
+ paramPage2.value.total = paramListRaw.value.length;
+ const maxPage = Math.max(
+ 1,
+ Math.ceil(paramPage2.value.total / paramPage2.value.size) || 1
+ );
+ if (paramPage2.value.current > maxPage) {
+ paramPage2.value.current = maxPage;
+ }
})
.catch(() => {
ElMessage.error("鑾峰彇鍙傛暟鍒楄〃澶辫触");
@@ -502,6 +577,7 @@
// 閫夋嫨宸ュ簭
const selectProcess = process => {
selectedProcess.value = process;
+ paramPage2.value.current = 1;
getParamList(process.id);
};
@@ -513,9 +589,12 @@
processForm.name = "";
processForm.salaryQuota = null;
processForm.isQuality = false;
+ processForm.isProduction = false;
processForm.remark = "";
processForm.deviceLedgerId = null;
- processForm.type = 0;
+ processForm.processType = "";
+ processForm.planPerson = null;
+ processForm.executor = null;
processDialogVisible.value = true;
};
@@ -526,9 +605,15 @@
processForm.name = process.name;
processForm.salaryQuota = process.salaryQuota;
processForm.isQuality = !!process.isQuality;
+ processForm.isProduction = !!process.isProduction;
processForm.remark = process.remark || "";
- processForm.deviceLedgerId = Number(process.deviceLedgerId);
- processForm.type = process.type;
+ // 濡傛灉璁惧 ID 涓� 0 鎴栬�呭湪璁惧鍒楄〃涓壘涓嶅埌锛屽垯鍥炴樉涓虹┖锛坣ull锛�
+ const deviceId = Number(process.deviceLedgerId);
+ const hasDevice = deviceOptions.value.some(item => item.id === deviceId);
+ processForm.deviceLedgerId = deviceId && hasDevice ? deviceId : null;
+ processForm.processType = process.processType || "";
+ processForm.planPerson = process.planPerson || null;
+ processForm.executor = process.executor || null;
processDialogVisible.value = true;
};
@@ -544,7 +629,8 @@
getProcessList();
if (selectedProcess.value?.id === process.id) {
selectedProcess.value = null;
- paramList.value = [];
+ paramListRaw.value = [];
+ paramPage2.value.total = 0;
}
})
.catch(() => {
@@ -692,6 +778,7 @@
editParamForm.technologyParamId = row.technologyParamId;
editParamForm.paramName = row.paramName;
editParamForm.standardValue = row.standardValue;
+ editParamForm.paramType = row.paramType;
editParamDialogVisible.value = true;
};
@@ -732,10 +819,8 @@
};
const handleParamPagination = obj => {
- console.log(obj, "obj");
paramPage2.value.current = obj.page;
paramPage2.value.size = obj.limit;
- getParamList(selectedProcess.value.id);
};
// 鑾峰彇鏁版嵁瀛楀吀
@@ -745,10 +830,20 @@
});
};
+ const loadEmployees = async () => {
+ try {
+ const res = await staffOnJobListPage({ current: -1, size: -1, staffState: 1 });
+ employeeOptions.value = res.data?.records || [];
+ } catch (error) {
+ console.error("鍔犺浇鍛樺伐鍒楄〃澶辫触", error);
+ }
+ };
+
onMounted(() => {
loadDeviceName();
getProcessList();
getDictTypes();
+ loadEmployees();
});
</script>
--
Gitblit v1.9.3