From 6a79d8beebcf7245d0ee725b20f96876806563ee Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 31 May 2025 21:27:12 +0800
Subject: [PATCH] =?UTF-8?q?2025-05-31=20Master=20part=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E4=B8=BB=E9=A1=B5=E9=9D=A2=E3=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/partCatalogInformation.vue   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue
index f802015..af84cb8 100644
--- a/src/views/modules/part/partCatalogInformation.vue
+++ b/src/views/modules/part/partCatalogInformation.vue
@@ -126,17 +126,12 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="净重">
-          <el-input-number :controls="false" :step="0" v-model="modalData.weightNet" style="width: 120px"></el-input-number>
-        </el-form-item>
-        <el-form-item label="净重单位" style="margin-left: -10px">
-          <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 330px" :use-default-value="false" dict-type="part_uom_for_weight_net"></dict-data-select>
+        <!-- 2025-05-31 Master part增加字段（新增、编辑、主页面、接口同步调整） -->
+        <el-form-item>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(109)"><a herf="#">物料分组</a></span>
+          <el-input v-model="modalData.partMainGroup" @blur="groupIdBlur(109)" style="width: 120px"></el-input>
+          <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>
         </el-form-item>
-<!--        <el-form-item>-->
-<!--          <span style="cursor: pointer" slot="label" @click="getBaseList(109)"><a herf="#">物料分组</a></span>-->
-<!--          <el-input v-model="modalData.partMainGroup" @blur="groupIdBlur(109)" style="width: 120px"></el-input>-->
-<!--          <el-input v-model="modalData.groupName" disabled style="width: 330px"></el-input>-->
-<!--        </el-form-item>-->
         <el-form-item label="批量规则">
           <el-select v-model="modalData.lotQuantityRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
             <el-option label="One Lot Per Production Order" value="One Lot Per Production Order"></el-option>
@@ -145,11 +140,11 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="体积">
-          <el-input-number :controls="false" :step="0" v-model="modalData.volumeNet" style="width: 120px"></el-input-number>
+        <el-form-item label="净重">
+          <el-input-number :controls="false" :step="0" v-model="modalData.weightNet" style="width: 120px"></el-input-number>
         </el-form-item>
-        <el-form-item label="体积单位" style="margin-left: -10px">
-          <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 330px" dict-type="part_uom_for_volume_net"></dict-data-select>
+        <el-form-item label="净重单位" style="margin-left: -10px">
+          <dict-data-select v-if="modalFlag" v-model="modalData.uomForWeightNet" style="width: 330px" :use-default-value="false" dict-type="part_uom_for_weight_net"></dict-data-select>
         </el-form-item>
         <el-form-item label="子批次规则">
           <el-select v-model="modalData.subLotRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
@@ -159,8 +154,13 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="组件批次规则" style="margin-left: 468px">
+        <el-form-item label="体积">
+          <el-input-number :controls="false" :step="0" v-model="modalData.volumeNet" style="width: 120px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="体积单位" style="margin-left: -10px">
+          <dict-data-select v-if="modalFlag" v-model="modalData.uomForVolumeNet" style="width: 330px" dict-type="part_uom_for_volume_net"></dict-data-select>
+        </el-form-item>
+        <el-form-item label="组件批次规则">
           <el-select v-model="modalData.componentLotRule" :disabled="modalData.lotTrackingCode === 'Not Lot Tracking'" style="width: 230px">
             <el-option label="Many Lots Allowed" value="Many Lots Allowed"></el-option>
             <el-option label="One Lot Allowed" value="One Lot Allowed"></el-option>