From 758aa7ce0b70bf8bde616c5332e6af2eb205f199 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:55:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/productionOrder/New.vue | 49 ++++++++++-
src/views/productionManagement/productionReporting/index.vue | 5 -
src/views/productionManagement/workOrder/index.vue | 126 ++++++++++++++++++++++++++++---
src/views/productionManagement/productionOrder/index.vue | 20 ++--
4 files changed, 164 insertions(+), 36 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 4a9bb60..59c04bd 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -24,17 +24,29 @@
</el-form-item>
<el-form-item
+ label="鎵瑰彿"
+ prop="batchNo"
+ :rules="[
+ {
+ required: true,
+ }
+ ]"
+ >
+ <el-input v-model="formState.batchNo"/>
+ </el-form-item>
+
+ <el-form-item
label="瑙勬牸"
prop="productModelName"
>
- <el-input v-model="formState.productModelName" disabled />
+ <el-input v-model="formState.productModelName" disabled/>
</el-form-item>
<el-form-item
label="鍗曚綅"
prop="unit"
>
- <el-input v-model="formState.unit" disabled />
+ <el-input v-model="formState.unit" disabled/>
</el-form-item>
<el-form-item label="宸ヨ壓璺嚎">
@@ -45,7 +57,7 @@
<el-option v-for="item in routeOptions"
:key="item.id"
:label="`${item.processRouteCode || ''}`"
- :value="item.id" />
+ :value="item.id"/>
</el-select>
</el-form-item>
@@ -53,7 +65,21 @@
label="棰勮鐢熶骇鏁伴噺"
prop="quantity"
>
- <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%" />
+ <el-input-number v-model="formState.quantity" :step="1" :min="1" style="width: 100%"/>
+ </el-form-item>
+
+ <el-form-item
+ label="棰勮鏃ョ▼锛堝ぉ锛�"
+ prop="expectedSchedule"
+ >
+ <el-input-number v-model="formState.expectedSchedule" :step="0.01" :min="0" style="width: 100%" />
+ </el-form-item>
+
+ <el-form-item
+ label="鍒堕�犵彮缁�"
+ prop="manufacturingTeam"
+ >
+ <el-input v-model="formState.manufacturingTeam" disabled />
</el-form-item>
</el-form>
@@ -101,7 +127,10 @@
productName: "",
productModelName: "",
unit: "",
+ batchNo: "",
quantity: 0,
+ expectedSchedule: undefined,
+ manufacturingTeam: undefined,
});
const isShow = computed({
@@ -115,7 +144,7 @@
const showProductSelectDialog = ref(false);
-let { proxy } = getCurrentInstance()
+let {proxy} = getCurrentInstance()
const closeModal = () => {
// 閲嶇疆琛ㄥ崟鏁版嵁
@@ -126,6 +155,7 @@
productName: "",
productModelName: "",
quantity: '',
+ batchNo: "",
};
isShow.value = false;
};
@@ -136,11 +166,16 @@
const product = products[0];
formState.value.productId = product.productId;
formState.value.productName = product.productName;
+ const productNameArr = product.productName.split('-');
+ if (productNameArr.length === 3 && productNameArr[0] && productNameArr[1] !== '') {
+ formState.value.manufacturingTeam = productNameArr[1].charAt(0) + '绫昏溅闂�';
+ }
+
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
showProductSelectDialog.value = false;
- fetchRouteOptions( product.id);
+ fetchRouteOptions(product.id);
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
}
@@ -152,7 +187,7 @@
formState.value.routeId = undefined;
routeOptions.value = []
bindRouteLoading.value = true;
- listProcessRoute({ productModelId: productModelId }).then(res => {
+ listProcessRoute({productModelId: productModelId}).then(res => {
routeOptions.value = res.data || [];
}).finally(() => {
bindRouteLoading.value = false;
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index bc699fd..1f4c3f0 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -125,16 +125,6 @@
width: '120px',
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
- },
- {
label: "浜у搧鍚嶇О",
prop: "productCategory",
width: '120px',
@@ -184,6 +174,16 @@
width: 120,
},
{
+ label: "棰勮鏃ョ▼锛堝ぉ锛�",
+ prop: "expectedSchedule",
+ width: 120,
+ },
+ {
+ label: "鍒堕�犵彮缁�",
+ prop: "manufacturingTeam",
+ width: 120,
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 0b42dae..af06fe5 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -173,11 +173,6 @@
width: 120,
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: 120,
- },
- {
label: "浜у搧鍚嶇О",
prop: "productName",
width: 120,
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index d8fbab9..0e950d1 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -176,6 +176,16 @@
readonly
style="width: 300px" />
</el-form-item>
+ <el-form-item label="鎶曞叆鎬婚噺(kg)"
+ prop="totalInvestment">
+ <el-input v-model.number="reportForm.totalInvestment"
+ type="number"
+ min="1"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ユ姇鍏ユ�婚噺"
+ @input="handleTotalInvestmentInput" />
+ </el-form-item>
<el-form-item label="鏈鐢熶骇鏁伴噺"
prop="quantity">
<el-input v-model.number="reportForm.quantity"
@@ -195,6 +205,15 @@
style="width: 300px"
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
+ </el-form-item>
+ <el-form-item label="妫�鍝佹暟閲�"
+ prop="inspectedQuantity">
+ <el-input-number v-model.number="reportForm.inspectedQuantity"
+ :min="0"
+ :step="1"
+ style="width: 300px"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ鍝佹暟閲�"/>
</el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
@@ -270,6 +289,10 @@
{
label: "宸ュ簭鍚嶇О",
prop: "processName",
+ },
+ {
+ label: "鎶曞叆鎬婚噺(kg)",
+ prop: "totalInvestment",
},
{
label: "棰勮鐢熶骇鏁伴噺",
@@ -358,8 +381,10 @@
const userOptions = ref([]);
const reportForm = reactive({
planQuantity: 0,
+ totalInvestment: 0,
quantity: null,
scrapQty: null,
+ inspectedQuantity: null,
userName: "",
workOrderId: "",
reportWork: "",
@@ -368,6 +393,26 @@
productMainId: null,
});
+ // 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
+ const validateTotalInvestment = (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ姇鍏ユ�婚噺"));
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num) || !Number.isInteger(num) || num < 1) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬绛変簬1"));
+ return;
+ }
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ if (num < Number(reportForm.quantity)) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬鏈鐢熶骇鏁伴噺"));
+ return;
+ }
+ }
+ callback();
+ };
+
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
const validateQuantity = (rule, value, callback) => {
if (value === null || value === undefined || value === "") {
@@ -375,10 +420,15 @@
return;
}
const num = Number(value);
- // 鏁存暟涓斿ぇ浜庣瓑浜�1
if (isNaN(num) || !Number.isInteger(num) || num < 1) {
callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
return;
+ }
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ if (num > Number(reportForm.totalInvestment)) {
+ callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』灏忎簬鎶曞叆鎬婚噺"));
+ return;
+ }
}
callback();
};
@@ -400,37 +450,87 @@
// 楠岃瘉瑙勫垯
const reportFormRules = {
+ totalInvestment: [{ required: true, validator: validateTotalInvestment, trigger: "blur" }],
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
};
- // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
- const handleQuantityInput = value => {
+ // 澶勭悊鎶曞叆鎬婚噺杈撳叆
+ const handleTotalInvestmentInput = value => {
if (value === "" || value === null || value === undefined) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
const num = Number(value);
if (isNaN(num)) {
return;
}
- // 濡傛灉灏忎簬1锛屾竻闄�
if (num < 1) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁板彇鏁存暟閮ㄥ垎
if (!Number.isInteger(num)) {
const intValue = Math.floor(num);
- // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
+ if (intValue < 1) {
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ reportForm.totalInvestment = intValue;
+ } else {
+ reportForm.totalInvestment = num;
+ }
+ // 濡傛灉 quantity 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
+ };
+
+ // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
+ const handleQuantityInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 1) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ const intValue = Math.floor(num);
if (intValue < 1) {
reportForm.quantity = null;
+ reportForm.scrapQty = null;
return;
}
reportForm.quantity = intValue;
- return;
+ } else {
+ reportForm.quantity = num;
}
- reportForm.quantity = num;
+ // 濡傛灉 totalInvestment 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
};
// 澶勭悊鎶ュ簾鏁伴噺
@@ -440,21 +540,17 @@
return;
}
const num = Number(value);
- // 濡傛灉鏄疦aN锛屼繚鎸佸師鍊�
if (isNaN(num)) {
return;
}
- // 濡傛灉鏄礋鏁帮紝娓呴櫎杈撳叆
if (num < 0) {
reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁帮紝鍙栨暣鏁伴儴鍒�
if (!Number.isInteger(num)) {
reportForm.scrapQty = Math.floor(num);
return;
}
- // 鏈夋晥鐨勯潪璐熸暣鏁帮紙鍖呮嫭0锛�
reportForm.scrapQty = num;
};
const currentReportRowData = ref(null);
@@ -597,12 +693,14 @@
const showReportDialog = row => {
currentReportRowData.value = row;
reportForm.planQuantity = row.planQuantity;
+ reportForm.totalInvestment = row.totalInvestment;
reportForm.quantity =
row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
+ reportForm.inspectedQuantity = row.inspectedQuantity;
reportForm.scrapQty =
row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
nextTick(() => {
--
Gitblit v1.9.3