2024-11-01

优化

src/views/modules/part/bomManagement.vue

@@ -502,7 +502,7 @@
     </el-dialog>
 
     <!-- 子明细新增模态框 -->
-    <el-dialog title="新增子物料" :close-on-click-modal="false" top="25vh" v-drag :visible.sync="componentSaveModal" width="800px">
+    <el-dialog title="子物料" :close-on-click-modal="false" top="25vh" v-drag :visible.sync="componentSaveModal" width="800px">
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'序号'" prop="lineSequence" :rules="componentRules.lineSequence">
           <el-input-number :controls="false" :step="0" v-model="componentData.lineSequence" style="width: 49px"></el-input-number>
@@ -527,10 +527,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'单位用量'" prop="qtyPerAssembly" :rules="componentRules.qtyPerAssembly">
-          <el-input-number :controls="false" :step="0" v-model="componentData.qtyPerAssembly" style="width: 112px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-model="componentData.qtyPerAssembly" @input="validateInput" style="width: 112px"></el-input-number>
         </el-form-item>
         <el-form-item :label="'调机量'" prop="componentScrap" :rules="componentRules.componentScrap">
-          <el-input-number :controls="false" :step="0" v-model="componentData.componentScrap" style="width: 112px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-model="componentData.componentScrap" @input="validateInput" style="width: 112px"></el-input-number>
         </el-form-item>
         <el-form-item :label="'损耗率%'" prop="shrinkageFactor" :rules="componentRules.shrinkageFactor">
           <el-input-number :controls="false" :step="0" min="0" max="100" v-model="componentData.shrinkageFactor" style="width: 80px"></el-input-number>
@@ -844,7 +844,7 @@
             <el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="BOM版本号">
-            <el-input v-model="copyAlternativeData.engChgLevel" disabled style="width: 85px"></el-input>
+            <el-input v-model="copyAlternativeData.engChgLevel" style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">
             <el-select v-model="copyAlternativeData.bomType" style="width: 185px">
@@ -2605,6 +2605,16 @@ export default {
   },
   // js
   methods: {
+    validateInput (value) {
+      // 使用正则表达式检查是否为科学计数法
+      if (/e/i.test(value.toString())) {
+        // 如果是科学计数法，则恢复到之前的值
+        this.$nextTick(() => {
+          this.componentData.componentScrap = ''
+        })
+      }
+    },
+
     // === 报价查询 ===
     handleQueryBomByQuote(){
       let params = {
@@ -4007,6 +4017,7 @@ export default {
         this.saveHeaderLoading = false
       })
     },
+
     /**
      * 复制bom的模态框
      */
@@ -4015,7 +4026,7 @@ export default {
         site: this.modalData.site,
         partNo: this.modalData.partNo,
         partDesc: this.modalData.partDesc,
-        engChgLevel: this.modalData.engChgLevel + 1,
+        engChgLevel: '',
         bomType: this.modalData.bomType,
         effPhaseInDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
         effPhaseOutDate: '',
@@ -4023,6 +4034,12 @@ export default {
         createBy: this.$store.state.user.name,
         officialFlag: 'N'
       }
+      // 获取物料的bom版本号
+      getBomEngChgLevel(this.copyBomData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.copyBomData.engChgLevel = data.engChgLevel
+        }
+      })
       this.copyPartData = {
         type: '1',
         site: this.$store.state.user.site,

src/views/modules/part/routingManagement.vue

@@ -678,7 +678,7 @@
             <el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="Routing版本号">
-            <el-input v-model="copyAlternativeData.routingRevision" disabled style="width: 85px"></el-input>
+            <el-input v-model="copyAlternativeData.routingRevision" style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="工艺类型">
             <el-select v-model="copyAlternativeData.routingType" style="width: 185px">
@@ -2727,7 +2727,6 @@ export default {
       })
     },
 
-
     // ======== 页签切换相关方法 ========
     /**
      * 明细页签选择替换
@@ -3721,7 +3720,7 @@ export default {
         site: this.modalData.site,
         partNo: this.modalData.partNo,
         partDesc: this.modalData.partDesc,
-        routingRevision: this.modalData.routingRevision + 1,
+        routingRevision: '',
         routingType: this.modalData.routingType,
         phaseInDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
         phaseOutDate: '',
@@ -3729,6 +3728,12 @@ export default {
         createBy: this.$store.state.user.name,
         officialFlag: 'N'
       }
+      // 获取物料的routing版本号
+      getRottingRevision(this.copyRoutingData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.copyRoutingData.routingRevision = data.routingRevision
+        }
+      })
       this.copyPartData = {
         type: '1',
         site: this.$store.state.user.site,

src/views/modules/project/projectInfo/com_project_info_part.vue

@@ -191,7 +191,7 @@
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
-              <el-form-item prop="codeNo" :rules="rules.codeNo">
+              <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(20)"><a herf="#">属性模板</a></span>
                 <el-input v-model="modalData.codeNo" @blur="codeNoBlur(20)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
@@ -1947,10 +1947,10 @@
           this.$message.warning('请选择计量单位！')
           return
         }
-        if (this.modalData.codeNo === '' || this.modalData.codeNo == null) {
-          this.$message.warning('请选择属性模板！')
-          return
-        }
+        // if (this.modalData.codeNo === '' || this.modalData.codeNo == null) {
+        //   this.$message.warning('请选择属性模板！')
+        //   return
+        // }
         if (this.modalData.buNo === '' || this.modalData.buNo == null) {
           this.$message.warning('请选择BU！')
           return