2024-08-16 ifs接口更新2

src/views/modules/part/bomManagement.vue

@@ -168,7 +168,7 @@
               <el-button v-if="modalData.flag === '2'" type="primary" @click="copyBomAlternative">Copy</el-button>
               <el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
               <el-button v-if="detailData.status === 'Buildable'" type="primary" @click="updateStatusToObsolete">Retire</el-button>
-              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialBom">转正式BOM</el-button>
+              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialBom" :loading="toBecomeOfficialLoading">转正式BOM</el-button>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
@@ -899,6 +899,7 @@ export default {
       saveHeaderLoading: false,
       saveDetailLoading: false,
       saveAllLoading: false,
+      toBecomeOfficialLoading: false,
       // 初始页签
       detailTable: 'bom_detail',
       subDetailTable: 'bom_sub_detail',
@@ -3878,6 +3879,7 @@ export default {
 
     // 临时Bom转为正式Bom
     toBecomeOfficialBom () {
+      this.toBecomeOfficialLoading = true
       toBecomeOfficialBom(this.detailData).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()
@@ -3893,6 +3895,9 @@ export default {
             confirmButtonText: '确定'
           })
         }
+        this.toBecomeOfficialLoading = false
+      }).catch(()=>{
+        this.toBecomeOfficialLoading = false
       })
     },
 

src/views/modules/part/partCatalogInformation.vue

@@ -447,7 +447,7 @@
         deep: true,
         handler: function (newV, oldV) {
           this.modalData.partNo = this.modalData.partNo.toUpperCase()
-          this.modalData.umId = this.modalData.umId.toUpperCase()
+          //this.modalData.umId = this.modalData.umId.toUpperCase()
           this.modalData.codeNo = this.modalData.codeNo.toUpperCase()
         }
       },

src/views/modules/part/partInformation.vue

@@ -116,7 +116,7 @@
 
     <!-- 物料新增/编辑模态框 -->
     <el-dialog :title="modalData.title" top="10vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1000px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;" v-loading="toBecomeOfficialLoading" element-loading-text="拼命加载中">
         <el-form-item label="物料编码" prop="partNo" :rules="rules.partNo">
           <el-input v-model="modalData.partNo" style="width: 128px" @blur="queryMasterField"></el-input>
         </el-form-item>
@@ -571,9 +571,9 @@
         </el-container>
       </el-form>
       <el-footer style="height:35px;margin-top: 20px;text-align:center">
-        <el-button v-if="modalData.flag === '3'" type="primary" @click="saveData">同步</el-button>
+        <el-button v-if="modalData.flag === '3'" type="primary" @click="saveData" :loading="toBecomeOfficialLoading">同步</el-button>
         <el-button v-else type="primary" @click="saveData">保存</el-button>
-        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+        <el-button type="primary" @click="modalFlag = false" :loading="toBecomeOfficialLoading">关闭</el-button>
       </el-footer>
     </el-dialog>
 
@@ -1440,7 +1440,7 @@
           this.modalData.productGroupId4 = this.modalData.productGroupId4.toUpperCase()
           this.modalData.hazardCode = this.modalData.hazardCode.toUpperCase()
           this.modalData.productGroupId3 = this.modalData.productGroupId3.toUpperCase()
-          this.modalData.umId = this.modalData.umId.toUpperCase()
+          //this.modalData.umId = this.modalData.umId.toUpperCase()
           this.modalData.groupId = this.modalData.groupId.toUpperCase()
           this.modalData.productGroupId1 = this.modalData.productGroupId1.toUpperCase()
           this.modalData.familyId = this.modalData.familyId.toUpperCase()
@@ -1518,6 +1518,7 @@
         },
         // 其它
         loading: false,
+        toBecomeOfficialLoading: false,
         // 初始页签
         activeTable: 'part_item',
         inventoryPartTable: 'General',
@@ -4552,6 +4553,7 @@
             this.$message.warning('IFS物料编码不能等于PLM物料编码！')
             return
           }
+          this.toBecomeOfficialLoading = true
           this.modalData.bomAlternativeList = this.bomAlternativeSelections
           this.modalData.routingAlternativeList = this.routingAlternativeSelections
           partInformationToOfficial(this.modalData).then(({data}) => {
@@ -4569,6 +4571,9 @@
                 confirmButtonText: '确定'
               })
             }
+            this.toBecomeOfficialLoading = false
+          }).catch(()=>{
+            this.toBecomeOfficialLoading = false
           })
         } else {
           partInformationEdit(this.modalData).then(({data}) => {

src/views/modules/part/routingManagement.vue

@@ -158,7 +158,7 @@
               <el-button v-if="modalData.flag === '2'" type="primary" @click="copyRoutingAlternative">Copy</el-button>
               <el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
               <el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button>
-              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting">转正式Routing</el-button>
+              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting" :loading="toBecomeOfficialLoading">转正式Routing</el-button>
             </el-form-item>
           </el-form>
           <el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
@@ -436,12 +436,9 @@
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'产出单位'" prop="runTimeCode" :rules="componentRules.runTimeCode">
           <el-select v-model="componentData.runTimeCode" clearable style="width: 221px">
-            <el-option label="单位/小时" value="A"></el-option>
-            <el-option label="小时/单位" value="B"></el-option>
-            <el-option label="小时" value="C"></el-option>
-<!--            <el-option label="单位/小时" value="Units/Hour"></el-option>-->
-<!--            <el-option label="小时/单位" value="Hours/Unit"></el-option>-->
-<!--            <el-option label="小时" value="Hours"></el-option>-->
+            <el-option label="单位/小时" value="Units/Hour"></el-option>
+            <el-option label="小时/单位" value="Hours/Unit"></el-option>
+            <el-option label="小时" value="Hours"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="laborClassNo" :rules="componentRules.laborClassNo">
@@ -927,6 +924,7 @@ export default {
       saveHeaderLoading: false,
       saveDetailLoading: false,
       saveAllLoading: false,
+      toBecomeOfficialLoading: false,
       // 初始页签
       detailTable: 'routing_detail',
       subDetailTable: 'routing_sub_detail',
@@ -3804,6 +3802,7 @@ export default {
 
     // 临时Routing转为正式Routing
     toBecomeOfficialRouting () {
+      this.toBecomeOfficialLoading = true
       toBecomeOfficialRouting(this.detailData).then(({data}) => {
         if (data && data.code === 0) {
           this.getDataList()
@@ -3819,6 +3818,9 @@ export default {
             confirmButtonText: '确定'
           })
         }
+        this.toBecomeOfficialLoading = false
+      }).catch(()=>{
+        this.toBecomeOfficialLoading = false
       })
     },