From 9aced09ef31ab77663e6ee052785d87ca3c671ba Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 31 三月 2026 10:44:00 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/procurementManagement/procurementLedger/index.vue | 1 +
src/views/productionManagement/productionOrder/New.vue | 5 ++---
src/views/qualityManagement/finalInspection/components/formDia.vue | 19 +++++++++++++------
src/views/salesManagement/salesLedger/index.vue | 1 +
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index d69c73e..3ac30e6 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -86,6 +86,7 @@
prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿"
prop="specificationModel" />
+ <el-table-column label="UID鐮�" prop="uidNo" />
<el-table-column label="鍗曚綅"
prop="unit" />
<el-table-column label="鏁伴噺"
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 59c04bd..a72528e 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -166,9 +166,8 @@
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) + '绫昏溅闂�';
+ if (product.parentName === '涓�绫讳骇鍝�') {
+ formState.value.manufacturingTeam = product.parentName.charAt(0) + '绫昏溅闂�';
}
formState.value.productModelName = product.model;
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 332b3fd..38902e4 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -49,11 +49,6 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="UID鐮侊細" prop="uidNo">
- <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
- </el-form-item>
- </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -62,7 +57,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁伴噺锛�" prop="quantity">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�鍝佹暟閲忥細" prop="inspectedQuantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inspectedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎬绘暟閲忥細" prop="quantity">
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
</el-form-item>
</el-col>
@@ -186,6 +191,7 @@
testStandardId: "",
unit: "",
uidNo: "",
+ inspectedQuantity: "",
quantity: "",
checkCompany: "",
checkResult: "",
@@ -198,6 +204,7 @@
productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
testStandardId: [{required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ inspectedQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ca1530f..8475b25 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -47,6 +47,7 @@
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鎵瑰彿" prop="batchNo" />
+ <el-table-column label="UID鐮�" prop="uidNo" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="浜у搧鐘舵��"
width="100px"
--
Gitblit v1.9.3