From de83f5112fecda011bce0192dce152e66bb56f87 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 17:37:24 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_衡阳_鹏创电子
---
src/views/productionManagement/productionOrder/New.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index c9c478b..f6f13f9 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -31,6 +31,13 @@
</el-form-item>
<el-form-item
+ label="鏂欏彿"
+ prop="materialCode"
+ >
+ <el-input v-model="formState.materialCode" disabled />
+ </el-form-item>
+
+ <el-form-item
label="鍗曚綅"
prop="unit"
>
@@ -48,6 +55,33 @@
:value="item.id" />
</el-select>
</el-form-item>
+ <el-form-item
+ label="鐢熶骇鎵瑰彿"
+ prop="lotNo"
+ >
+ <el-input v-model="formState.lotNo" placeholder="璇疯緭鍏ョ敓浜ф壒鍙�" />
+ </el-form-item>
+
+ <el-form-item
+ label="浼樺厛绾�"
+ prop="priority"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨浼樺厛绾�',
+ trigger: 'change',
+ },
+ ]"
+ >
+ <el-select v-model="formState.priority" placeholder="璇烽�夋嫨浼樺厛绾�" style="width: 100%;" clearable>
+ <el-option
+ v-for="dict in priority_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item
label="闇�姹傛暟閲�"
@@ -55,6 +89,7 @@
>
<el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
</el-form-item>
+
</el-form>
<!-- 浜у搧閫夋嫨寮圭獥 -->
@@ -100,8 +135,11 @@
routeId: undefined,
productName: "",
productModelName: "",
+ materialCode: "",
unit: "",
+ priority: undefined,
quantity: 0,
+ lotNo: "",
});
const isShow = computed({
@@ -115,7 +153,12 @@
const showProductSelectDialog = ref(false);
-let { proxy } = getCurrentInstance()
+let { proxy } = getCurrentInstance();
+const { priority_type } = proxy.useDict("priority_type");
+
+if (priority_type.value && priority_type.value.length > 0) {
+ formState.value.priority = priority_type.value[2].value;
+}
const closeModal = () => {
// 閲嶇疆琛ㄥ崟鏁版嵁
@@ -125,7 +168,11 @@
routeId: undefined,
productName: "",
productModelName: "",
+ unit: "",
+ materialCode: "",
+ priority: priority_type.value && priority_type.value.length > 0 ? priority_type.value[2].value : undefined,
quantity: '',
+ lotNo: "",
};
isShow.value = false;
};
@@ -139,6 +186,7 @@
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.materialCode = product.materialCode || "";
showProductSelectDialog.value = false;
fetchRouteOptions( product.id);
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
--
Gitblit v1.9.3