From 1022826db3084755348fa4169fe0d703ad3bb443 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 30 三月 2026 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/workOrder/components/ProductionRecordForm.vue | 148 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 131 insertions(+), 17 deletions(-)
diff --git a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
index a7c1cc9..2af0633 100644
--- a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
+++ b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
@@ -1,22 +1,31 @@
<script setup lang="ts">
-import {computed, reactive, ref, watch} from "vue";
+import {computed, reactive, ref, watch, withDefaults} from "vue";
defineOptions({
name: "ProductionRecordForm"
});
-const props = defineProps({
- list: {
- type: Array,
- default() {
- return [];
- }
- },
- labelWidth: {
- type: Number,
- default: 120
+type DeviceOption = {
+ id: string | number;
+ deviceName: string;
+ deviceCode?: string | number | null;
+ rpm?: string | number | null;
+};
+
+const props = withDefaults(
+ defineProps<{
+ list: any[];
+ labelWidth: number;
+ deviceOptions: DeviceOption[];
+ selectedDeviceId: string | number | null;
+ }>(),
+ {
+ list: () => [],
+ labelWidth: 120,
+ deviceOptions: () => [],
+ selectedDeviceId: null,
}
-});
+);
const formRef = ref();
const formData = reactive({
@@ -32,6 +41,76 @@
const getType = (item: any) => item.type || "鏂囨湰鏍煎紡";
+const machineSelectItem = computed(() => {
+ return formData.list.find(item => getType(item) === '鏈哄彴閫夋嫨') || null;
+});
+
+const selectedDevice = computed(() => {
+ const machineValue = machineSelectItem.value?.value;
+ if (machineValue === null || machineValue === undefined || machineValue === '') return null;
+ return props.deviceOptions.find(device => String(device.id) === String(machineValue)) || null;
+});
+
+const AUTO_DEVICE_CODE_ID = "__auto_deviceCode__";
+const AUTO_RPM_ID = "__auto_rpm__";
+
+let isSyncingAutoFields = false;
+
+const syncAutoDeviceFields = () => {
+ if (isSyncingAutoFields) return;
+ isSyncingAutoFields = true;
+
+ try {
+ const machineIndex = formData.list.findIndex(item => getType(item) === "鏈哄彴閫夋嫨");
+ if (machineIndex === -1) return;
+
+ const removeById = (id: string) => {
+ const idx = formData.list.findIndex(x => x?.id === id);
+ if (idx !== -1) formData.list.splice(idx, 1);
+ };
+
+ removeById(AUTO_DEVICE_CODE_ID);
+ removeById(AUTO_RPM_ID);
+
+ const dev = selectedDevice.value as any;
+ let insertPos = machineIndex + 1;
+
+ const hasCode =
+ dev &&
+ dev.deviceCode !== null &&
+ dev.deviceCode !== undefined &&
+ String(dev.deviceCode) !== "";
+
+ const hasRpm = dev && dev.rpm !== null && dev.rpm !== undefined;
+
+ if (hasCode) {
+ formData.list.splice(insertPos, 0, {
+ id: AUTO_DEVICE_CODE_ID,
+ parameterItem: "璁惧缂栧彿",
+ value: dev.deviceCode,
+ // 鍙灞曠ず锛氶伩鍏嶅奖鍝嶅悗绔弬鏁扮粨鏋勶紙submitData 浼氳繃婊わ級
+ readonly: true,
+ isRequired: "0",
+ __autoExtra: true,
+ });
+ insertPos++;
+ }
+
+ if (hasRpm) {
+ formData.list.splice(insertPos, 0, {
+ id: AUTO_RPM_ID,
+ parameterItem: "杞暟",
+ value: dev.rpm,
+ readonly: true,
+ isRequired: "0",
+ __autoExtra: true,
+ });
+ }
+ } finally {
+ isSyncingAutoFields = false;
+ }
+};
+
const rules = computed(() => {
const result: Record<string, any[]> = {};
formData.list.forEach((item, index) => {
@@ -43,10 +122,15 @@
});
const initData = () => {
- formData.list = props.list || [];
+ // 閲嶈锛氫笉瑕佺洿鎺ュ鐢� props.list 鐨勫紩鐢紝鍚﹀垯鍚庣画 splice formData.list 浼氳Е鍙� props watch锛屽鑷撮�掑綊鏇存柊
+ formData.list = (props.list || []).map(item => ({ ...item }));
formData.list.forEach(item => {
if (item.value === undefined) {
item.value = null;
+ }
+ // 濡傛灉鍙傛暟涓瓨鍦ㄢ�滄満鍙伴�夋嫨鈥濓紝鍒欎娇鐢ㄧ埗缁勪欢浼犲叆鐨勯粯璁ゆ満鍙板洖濉�
+ if (getType(item) === '鏈哄彴閫夋嫨' && (item.value === null || item.value === undefined || item.value === '')) {
+ item.value = props.selectedDeviceId ?? item.value;
}
});
};
@@ -55,7 +139,8 @@
const valid = await formRef.value.validate().catch(() => false)
if (valid) {
- return formData.list
+ // 鑷姩鎻掑叆鐨勫彧璇诲瓧娈典笉鍙備笌鎻愪氦锛岄伩鍏嶅悗绔弬鏁扮粨鏋勫彉鍖�
+ return formData.list.filter(item => !item.__autoExtra)
} else {
return null
}
@@ -65,8 +150,18 @@
() => props.list,
() => {
initData();
+ // 鍒濆鍖栧悗鍐嶅悓姝ヨ嚜鍔ㄦ彃鍏ュ瓧娈�
+ syncAutoDeviceFields();
},
{immediate: true, deep: true}
+);
+
+watch(
+ () => selectedDevice.value,
+ () => {
+ syncAutoDeviceFields();
+ },
+ { immediate: true }
);
defineExpose({
@@ -76,9 +171,11 @@
<template>
<el-form ref="formRef" :model="formData" :rules="rules" :label-width="`${labelWidth}px`">
+ <el-row :gutter="30">
+ <el-col :span="12" v-for="(item, index) in formData.list"
+ :key="item.id">
<el-form-item
- v-for="(item, index) in formData.list"
- :key="item.id"
+
:label="fieldLabel(item)"
:prop="`list.${index}.value`"
>
@@ -117,12 +214,29 @@
<el-option label="鏄�" value="鏄�"/>
<el-option label="鍚�" value="鍚�"/>
</el-select>
+ <el-select
+ v-else-if="getType(item) === '鏈哄彴閫夋嫨'"
+ v-model="item.value"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="device in props.deviceOptions"
+ :key="device.id"
+ :label="device.deviceName"
+ :value="device.id"
+ />
+ </el-select>
<el-input
v-else
v-model="item.value"
placeholder="璇疯緭鍏�"
- clearable
+ :disabled="item.readonly"
+ :clearable="!item.readonly"
/>
</el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</template>
\ No newline at end of file
--
Gitblit v1.9.3