From 024755b1c4c09b7c50fe12d224a82982b180bd7e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 31 Oct 2024 17:49:12 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-31=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/changeManagement/changeRecord.vue | 32 ++++++++++++++-----
 .../changeManagement/changeRequest.vue        |  5 +--
 src/views/modules/part/bomManagement.vue      | 14 ++++----
 .../projectInfo/com_project_info_part.vue     |  2 +-
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index 9131555..50533e4 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -611,8 +611,8 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <div v-if="item.columnProp === 'codeNo'">
-                <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toMenu(scope.row.codeNo)"> {{ scope.row[item.columnProp] }}</el-link>
+              <div v-if="item.columnProp === 'oriCodeNo'">
+                <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toMenu(scope.row)"> {{ scope.row[item.columnProp] }}</el-link>
                 <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
               </div>
               <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
@@ -1660,7 +1660,7 @@
             columnWidth: 180
           },
           {
-            columnProp: 'codeNo',
+            columnProp: 'oriCodeNo',
             headerAlign: 'center',
             align: 'center',
             columnLabel: '技术参数卡',
@@ -1777,10 +1777,10 @@
           {
             userId: this.$store.state.user.name,
             functionId: 108002,
-            serialNumber: '108002Table2CodeNo',
+            serialNumber: '108002Table2OriCodeNo',
             tableId: '108002Table2',
             tableName: '变更单基本信息表',
-            columnProp: 'codeNo',
+            columnProp: 'oriCodeNo',
             headerAlign: 'center',
             align: 'center',
             columnLabel: '技术参数卡编码',
@@ -1788,7 +1788,23 @@
             columnImage: false,
             status: true,
             fixed: '',
-            columnWidth: 100
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 108002,
+            serialNumber: '108002Table2RevNo',
+            tableId: '108002Table2',
+            tableName: '变更单基本信息表',
+            columnProp: 'revNo',
+            headerAlign: 'center',
+            align: 'right',
+            columnLabel: '版本号',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 60
           },
         ],
         fileColumnList: [
@@ -4138,11 +4154,11 @@
         this.modalData.faiOperatorName = ''
       },
 
-      toMenu (codeNo) {
+      toMenu (row) {
         if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') {
           this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
         } else {
-          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:codeNo},})
+          this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:row.codeNo},})
         }
       },
 
diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue
index f06ab8a..c2c26e7 100644
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@@ -32,7 +32,7 @@
         <el-input v-model="searchData.projectDesc" clearable style="width: 150px"/>
       </el-form-item>
       <el-form-item label="技术参数卡编码">
-        <el-input v-model="searchData.codeNo" clearable style="width: 120px"/>
+        <el-input v-model="searchData.oriCodeNo" clearable style="width: 120px"/>
       </el-form-item>
       <el-form-item label=" ">
         <el-button plain type="primary" @click="getDataList">查询</el-button>
@@ -954,6 +954,7 @@
           projectId: '',
           projectDesc: '',
           codeNo: '',
+          oriCodeNo: '',
           buNo: '',
           page: 1,
           limit: 10
@@ -1237,7 +1238,7 @@
             serialNumber: '108001Table1CodeNo',
             tableId: '108001Table1',
             tableName: '技术参数卡',
-            columnProp: 'codeNo',
+            columnProp: 'oriCodeNo',
             headerAlign: 'center',
             align: 'center',
             columnLabel: '技术参数卡',
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 8ad7fbd..9adc92d 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -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: 144px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-model="componentData.qtyPerAssembly" 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: 80px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-model="componentData.componentScrap" 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>
@@ -1667,7 +1667,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 110
         },
         {
           userId: this.$store.state.user.name,
@@ -1685,7 +1685,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 110
         },
         {
           userId: this.$store.state.user.name,
@@ -1921,7 +1921,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 110
         },
         {
           userId: this.$store.state.user.name,
@@ -1939,7 +1939,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 110
         },
         {
           userId: this.$store.state.user.name,
@@ -2341,7 +2341,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
-          columnWidth: 60
+          columnWidth: 110
         },
         {
           columnProp: 'printUnit',
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 1c03680..bd04c83 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -1651,7 +1651,7 @@
               inventoryPartCostLevel: 'Cost Per Part',
               invoiceConsideration: 'Ignore Invoice Price',
               zeroCostFlag: 'Zero Cost Forbidden',
-              planningMethod: '',
+              planningMethod: 'A',
               planningMethodDesc: '',
               safetyStock: 0,
               minOrderQty: 0,