Browse Source

fix: 修复保存提交问题

jiaxing.liao 1 day ago
parent
commit
9192ef71d5

+ 78 - 53
src/pages/excel/ConfigDrawerProduction.vue

@@ -4,6 +4,7 @@
     title="制造BOM详情配置"
     title="制造BOM详情配置"
     size="600"
     size="600"
     v-loading="loading"
     v-loading="loading"
+    @close="handleSubmit"
   >
   >
     <el-form
     <el-form
       ref="form"
       ref="form"
@@ -315,9 +316,9 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
-        <!-- 制造设备类(组) -->
+        <!-- 制造设备类 -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="制造设备类(组)" prop="manufature_equip">
+          <el-form-item label="制造设备类" prop="manufature_equip">
             <el-input
             <el-input
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.manufature_equip"
               v-model="formData.manufature_equip"
@@ -325,9 +326,39 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
-        <!-- 模具/工装治具 -->
+        <!-- 制造设备名称 -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="模具/工装治具" prop="moldtooling_fixture">
+          <el-form-item label="制造设备类别" prop="manufacture_var2">
+            <el-input
+              placeholder="请输入"
+              v-model="formData.manufacture_var2"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- 制造设备编号 -->
+        <el-col :span="12">
+          <el-form-item label="制造设备编号" prop="manufacture_var3">
+            <el-input
+              placeholder="请输入"
+              v-model="formData.manufacture_var3"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- 模具编号 -->
+        <el-col :span="12">
+          <el-form-item label="模具编号" prop="manufacture_var4">
+            <el-input
+              placeholder="请输入"
+              v-model="formData.manufacture_var4"
+            />
+          </el-form-item>
+        </el-col>
+
+        <!-- 治具尺寸 -->
+        <el-col :span="12">
+          <el-form-item label="治具尺寸" prop="moldtooling_fixture">
             <el-input
             <el-input
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.moldtooling_fixture"
               v-model="formData.moldtooling_fixture"
@@ -348,6 +379,16 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
+        <!-- 制造周期(M) -->
+        <el-col :span="12">
+          <el-form-item label="制造周期(M)" prop="manufacture_var5">
+            <el-input
+              placeholder="请输入"
+              v-model="formData.manufacture_var5"
+            />
+          </el-form-item>
+        </el-col>
+
         <!-- 制造周期(S) -->
         <!-- 制造周期(S) -->
         <el-col :span="12">
         <el-col :span="12">
           <el-form-item label="制造周期(S)" prop="production_cycle">
           <el-form-item label="制造周期(S)" prop="production_cycle">
@@ -357,7 +398,7 @@
 
 
         <!-- 持台人数 -->
         <!-- 持台人数 -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="持台人数" prop="holding_number">
+          <el-form-item label="持台人数(人)" prop="holding_number">
             <el-input-number
             <el-input-number
               :step="1"
               :step="1"
               :precision="0"
               :precision="0"
@@ -398,7 +439,7 @@
 
 
         <!-- snp -->
         <!-- snp -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="SNP" prop="snp">
+          <el-form-item label="SNP(pcs)" prop="snp">
             <el-input-number
             <el-input-number
               :step="1"
               :step="1"
               :precision="0"
               :precision="0"
@@ -532,42 +573,6 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <!-- 备用字段2 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段2" name="manufacture_var2">
-            <el-input
-              placeholder="请输入"
-              v-model="formData.manufacture_var2"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段3 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段3" name="manufacture_var3">
-            <el-input
-              placeholder="请输入"
-              v-model="formData.manufacture_var3"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段4 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段4" name="manufacture_var4">
-            <el-input
-              placeholder="请输入"
-              v-model="formData.manufacture_var4"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段5 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段5" name="manufacture_var5">
-            <el-input
-              placeholder="请输入"
-              v-model="formData.manufacture_var5"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
@@ -625,11 +630,11 @@ const keyMap = {
   nonperform_rate: "不良率%",
   nonperform_rate: "不良率%",
   manufacture_area: "制造区域",
   manufacture_area: "制造区域",
   manufacture_report: "制造单元",
   manufacture_report: "制造单元",
-  manufature_equip: "制造设备类(组)",
-  moldtooling_fixture: "模具/工装治具",
+  manufature_equip: "制造设备类",
+  moldtooling_fixture: "治具尺寸",
   cavities: "模腔数/取数(pcs)",
   cavities: "模腔数/取数(pcs)",
   production_cycle: "制造周期(S)",
   production_cycle: "制造周期(S)",
-  holding_number: "持台人数",
+  holding_number: "持台人数(人)",
   single_piece: "单件节拍(S)",
   single_piece: "单件节拍(S)",
   package_type: "外包类型",
   package_type: "外包类型",
   innerpackage_type: "内包类型",
   innerpackage_type: "内包类型",
@@ -647,10 +652,10 @@ const keyMap = {
   engin_var4: "备用字段4",
   engin_var4: "备用字段4",
   engin_var5: "备用字段5",
   engin_var5: "备用字段5",
   manufacture_var1: "备用字段1",
   manufacture_var1: "备用字段1",
-  manufacture_var2: "备用字段2",
-  manufacture_var3: "备用字段3",
-  manufacture_var4: "备用字段4",
-  manufacture_var5: "备用字段5",
+  manufacture_var2: "制造设备名称",
+  manufacture_var3: "制造设备编号",
+  manufacture_var4: "模具编号",
+  manufacture_var5: "制造周期(M)",
 };
 };
 
 
 const options = [
 const options = [
@@ -675,13 +680,29 @@ const partAttributeOptions = computed(() => {
 
 
 // 制造单元
 // 制造单元
 const manufatureUnitOptions = [
 const manufatureUnitOptions = [
-  "丝网印刷",
+  "丝网印刷1st",
+  "丝网印刷2nd",
+  "丝网印刷3rd",
+  "丝网印刷4th",
+  "丝网印刷5th",
+  "丝网印刷6th",
+  "丝网印刷7th",
   "连续机吸塑",
   "连续机吸塑",
   "单片机吸塑",
   "单片机吸塑",
   "成型",
   "成型",
-  "机器人产线喷涂",
-  "往复机产线喷涂",
-  "手工喷涂",
+  "机器人产线喷涂1sT",
+  "机器人产线喷涂2nd",
+  "机器人产线喷涂3rd",
+  "往复机产线喷涂1sT",
+  "往复机产线喷涂2nd",
+  "往复机产线喷涂3rd",
+  "手工喷涂1st",
+  "手工喷涂2nd",
+  "手工喷涂3rd",
+  "手工喷涂4th",
+  "手工喷涂5th",
+  "手工喷涂6th",
+  "手工喷涂7th",
   "热压",
   "热压",
   "CNC",
   "CNC",
   "PUR",
   "PUR",
@@ -717,6 +738,7 @@ const processOptions = [
   "手工喷涂",
   "手工喷涂",
   "丝网印刷",
   "丝网印刷",
   "吸塑",
   "吸塑",
+  "UV",
   "PUR",
   "PUR",
   "产线装配",
   "产线装配",
   "焊接",
   "焊接",
@@ -941,6 +963,9 @@ const handleSubmit = async () => {
     // 编辑数据
     // 编辑数据
     bom_det: formData.value.bom_det,
     bom_det: formData.value.bom_det,
   };
   };
+  if(originFormData.value?.is_add) {
+    result.is_add = true;
+  }
   // 不需要这两个字段
   // 不需要这两个字段
   delete result.part_name;
   delete result.part_name;
   delete result.part_type;
   delete result.part_type;

+ 25 - 44
src/pages/excel/ConfigDrawerProject.vue

@@ -4,6 +4,7 @@
     title="工程BOM详情配置"
     title="工程BOM详情配置"
     size="600"
     size="600"
     v-loading="loading"
     v-loading="loading"
+    @close="handleSubmit"
   >
   >
     <el-form
     <el-form
       ref="form"
       ref="form"
@@ -424,46 +425,6 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <!-- 备用字段2 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段2" name="manufacture_var2">
-            <el-input
-              disabled
-              placeholder="请输入"
-              v-model="formData.manufacture_var2"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段3 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段3" name="manufacture_var3">
-            <el-input
-              disabled
-              placeholder="请输入"
-              v-model="formData.manufacture_var3"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段4 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段4" name="manufacture_var4">
-            <el-input
-              disabled
-              placeholder="请输入"
-              v-model="formData.manufacture_var4"
-            />
-          </el-form-item>
-        </el-col>
-        <!-- 备用字段5 -->
-        <el-col :span="12">
-          <el-form-item label="制造BOM备用字段5" name="manufacture_var5">
-            <el-input
-              disabled
-              placeholder="请输入"
-              v-model="formData.manufacture_var5"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
@@ -573,13 +534,29 @@ const partAttributeOptions = computed(() => {
 
 
 // 制造单元
 // 制造单元
 const manufatureUnitOptions = [
 const manufatureUnitOptions = [
-  "丝网印刷",
+  "丝网印刷1st",
+  "丝网印刷2nd",
+  "丝网印刷3rd",
+  "丝网印刷4th",
+  "丝网印刷5th",
+  "丝网印刷6th",
+  "丝网印刷7th",
   "连续机吸塑",
   "连续机吸塑",
   "单片机吸塑",
   "单片机吸塑",
   "成型",
   "成型",
-  "机器人产线喷涂",
-  "往复机产线喷涂",
-  "手工喷涂",
+  "机器人产线喷涂1sT",
+  "机器人产线喷涂2nd",
+  "机器人产线喷涂3rd",
+  "往复机产线喷涂1sT",
+  "往复机产线喷涂2nd",
+  "往复机产线喷涂3rd",
+  "手工喷涂1st",
+  "手工喷涂2nd",
+  "手工喷涂3rd",
+  "手工喷涂4th",
+  "手工喷涂5th",
+  "手工喷涂6th",
+  "手工喷涂7th",
   "热压",
   "热压",
   "CNC",
   "CNC",
   "PUR",
   "PUR",
@@ -615,6 +592,7 @@ const processOptions = [
   "手工喷涂",
   "手工喷涂",
   "丝网印刷",
   "丝网印刷",
   "吸塑",
   "吸塑",
+  "UV",
   "PUR",
   "PUR",
   "产线装配",
   "产线装配",
   "焊接",
   "焊接",
@@ -839,6 +817,9 @@ const handleSubmit = async () => {
     // 编辑数据
     // 编辑数据
     bom_det: formData.value.bom_det,
     bom_det: formData.value.bom_det,
   };
   };
+  if(originFormData.value?.is_add) {
+    result.is_add = true;
+  }
   // 不需要这两个字段
   // 不需要这两个字段
   delete result.part_name;
   delete result.part_name;
   delete result.part_type;
   delete result.part_type;

+ 1 - 0
src/pages/excel/MindmapModal.vue

@@ -400,6 +400,7 @@ const handleSave = () => {
     //   hasAddData = true;
     //   hasAddData = true;
     // }
     // }
   });
   });
+  console.log("node:", data);
 
 
   if (!valid) {
   if (!valid) {
     ElMessage.error("请检查数据是否填写完整!");
     ElMessage.error("请检查数据是否填写完整!");

File diff suppressed because it is too large
+ 1 - 1
stats.html