From c54ee7364bdd8c5b121f99f337e8f8d1721a6af3 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 14 Nov 2024 11:34:29 +0800
Subject: [PATCH] 2024-11-14

---
 src/views/modules/part/bomManagement.vue     | 44 +++++++++++++++-----
 src/views/modules/part/routingManagement.vue |  6 +--
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 2eb7be5..88a18ee 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -3,7 +3,7 @@
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 90px">
           <el-option
             v-for = "i in buList"
             :key = "i.buNo"
@@ -16,7 +16,7 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.partDesc" clearable style="width: 300px"></el-input>
       </el-form-item>
       <el-form-item :label="'制造类型'">
         <el-select v-model="searchData.bomType" clearable style="width: 120px">
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'BOM版本号'">
-        <el-input v-model="searchData.engChgLevel" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.engChgLevel" clearable style="width: 90px"></el-input>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" @click="getDataList">查询</el-button>
@@ -169,6 +169,9 @@
         <el-form-item :label="'净重'">
           <el-input-number :controls="false" :step="0" v-model="modalData.netWeight" style="width: 90px"></el-input-number>
         </el-form-item>
+        <el-form-item :label="'损耗率%'">
+          <el-input-number :controls="false" :step="0" disabled v-model="modalData.shrinkageFactor" style="width: 100px"></el-input-number>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary" @click="saveBomHeader" style="margin-top: 23px;width: 100px">保存</el-button>
           <el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyBomRevision" style="margin-top: 23px;width: 100px">Copy</el-button>
@@ -1125,7 +1128,8 @@ export default {
         updateBy: '',
         printUnit: '',
         printUnitName: '',
-        yieldRate: ''
+        yieldRate: '',
+        shrinkageFactor: ''
       },
       detailData: {
         site: this.$store.state.user.site,
@@ -1567,7 +1571,18 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100
-        }
+        },
+        {
+          columnProp: 'yieldRate',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '良品率',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
       ],
       componentPartColumnList: [
         {
@@ -2312,7 +2327,8 @@ export default {
         createBy: this.$store.state.user.name,
         printUnit: '',
         printUnitName: '',
-        yieldRate: ''
+        yieldRate: '',
+        shrinkageFactor: ''
       }
       this.detailData = {
         site: '',
@@ -2361,7 +2377,8 @@ export default {
         printUnit: row.printUnit,
         printUnitName: row.printUnitName,
         alternativeNo: row.alternativeNo,
-        yieldRate: row.yieldRate
+        yieldRate: row.yieldRate,
+        shrinkageFactor: new Decimal(100).sub(new Decimal(row.yieldRate)).toNumber()
       }
       this.subDetailTable = 'bom_sub_detail'
       // 查bom明细
@@ -2504,7 +2521,7 @@ export default {
         qtyPerAssembly: 0,
         componentScrap: 0,
         issueType: 'Reserve And Backflush',
-        shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber(),
+        shrinkageFactor: this.modalData.shrinkageFactor,
         lineItemNo: '',
         operationId: '',
         operationNo: '',
@@ -2552,7 +2569,7 @@ export default {
           this.batchComponentPartList = []
         }
       })
-      this.batchComponentPartData.shrinkageFactor = new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber()
+      this.batchComponentPartData.shrinkageFactor = this.modalData.shrinkageFactor
       this.choosePartList = []
     },
 
@@ -2566,7 +2583,7 @@ export default {
         bomType: this.detailData.bomType,
         alternativeNo: this.detailData.alternativeNo,
         createBy: this.$store.state.user.name,
-        shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber()
+        shrinkageFactor: this.modalData.shrinkageFactor
       }
       //打开组件 去做新增业务
       this.$nextTick(() => {
@@ -2851,6 +2868,7 @@ export default {
               this.modalData.partDesc = data.page.list[0].partDesc
               this.modalData.printUnit = data.page.list[0].printUnit
               this.modalData.printUnitName = data.page.list[0].printUnitName
+              this.modalData.shrinkageFactor = new Decimal(100).sub(new Decimal(data.page.list[0].yieldRate)).toNumber()
               // 获取物料的routing版本号
               getBomEngChgLevel(this.modalData).then(({data}) => {
                 if (data && data.code === 0) {
@@ -2864,6 +2882,7 @@ export default {
               this.modalData.printUnit = ''
               this.modalData.printUnitName = ''
               this.modalData.engChgLevel = ''
+              this.modalData.shrinkageFactor = ''
             }
           }
         })
@@ -2872,6 +2891,7 @@ export default {
         this.modalData.printUnit = ''
         this.modalData.printUnitName = ''
         this.modalData.engChgLevel = ''
+        this.modalData.shrinkageFactor = ''
       }
     },
 
@@ -2898,6 +2918,7 @@ export default {
       this.modalData.partDesc = row.partDesc
       this.modalData.printUnit = row.printUnit
       this.modalData.printUnitName = row.printUnitName
+      this.modalData.shrinkageFactor = new Decimal(100).sub(new Decimal(row.yieldRate)).toNumber()
       // 获取物料的routing版本号
       getBomEngChgLevel(this.modalData).then(({data}) => {
         if (data && data.code === 0) {
@@ -3421,7 +3442,8 @@ export default {
             engRevision: data.rows.modalData.engRevision,
             typeFlag: data.rows.modalData.typeFlag,
             netWeight: data.rows.modalData.netWeight,
-            yieldRate: data.rows.modalData.yieldRate
+            yieldRate: data.rows.modalData.yieldRate,
+            shrinkageFactor: new Decimal(100).sub(new Decimal(data.rows.modalData.yieldRate)).toNumber()
           }
           this.detailDataList = data.rows.detailDataList
           this.detailData = data.rows.detailData
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 7c99c6d..abe6517 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -3,7 +3,7 @@
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 90px">
           <el-option
             v-for = "i in buList"
             :key = "i.buNo"
@@ -16,7 +16,7 @@
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.partDesc" clearable style="width: 300px"></el-input>
       </el-form-item>
       <el-form-item :label="'工艺类型'">
         <el-select v-model="searchData.routingType" clearable style="width: 120px">
@@ -26,7 +26,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'Routing版本号'">
-        <el-input v-model="searchData.routingRevision" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.routingRevision" clearable style="width: 90px"></el-input>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" @click="getDataList">查询</el-button>