From 8976b5da5084878e069decc660cf5ee83a02646e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 8 Apr 2024 17:11:02 +0800
Subject: [PATCH] plm BM

---
 .../com_technical-add-or-update.vue           | 34 +++++++++++++++----
 .../com_bm_bom.vue                            |  4 +--
 .../com_bm_routing.vue                        | 12 +++----
 .../technicalSpecificationDetail.vue          | 18 +++++-----
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 8a895b4..e7f3dba 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -132,7 +132,7 @@
             prop="proofingNo"
             header-align="center"
             align="left"
-            min-width="40"
+            min-width="120"
             style="font-size: 20px"
             label="打样单">
           </el-table-column>
@@ -140,24 +140,46 @@
             prop="projectId"
             header-align="center"
             align="left"
-            min-width="40"
+            min-width="120"
             style="font-size: 20px"
             label="项目号">
           </el-table-column>
+          <el-table-column
+            prop="projectName"
+            header-align="center"
+            align="left"
+            min-width="120"
+            style="font-size: 20px"
+            label="项目名称">
+          </el-table-column>
           <el-table-column
             prop="testPartNo"
             header-align="center"
             align="left"
-            min-width="50"
+            min-width="120"
             label="测试料号">
           </el-table-column>
           <el-table-column
             prop="partDesc"
             header-align="center"
             align="left"
-            min-width="80"
+            min-width="120"
             label="物料名称">
           </el-table-column>
+          <el-table-column
+            prop="customerDesc"
+            header-align="center"
+            align="left"
+            min-width="120"
+            label="直接客户">
+          </el-table-column>
+          <el-table-column
+            prop="finalCustomerDesc"
+            header-align="center"
+            align="left"
+            min-width="120"
+            label="最终客户">
+          </el-table-column>
         </el-table>
       </el-form>
     </el-dialog>
@@ -184,7 +206,7 @@
     },
     data () {
       return {
-        jumpFlag:false,
+        jumpFlag:true,
         tagNo:'',
         tagNo1:'',
         visible: false,
@@ -320,7 +342,7 @@
         }
       },
       init (id) {
-        this.jumpFlag=false
+        this.jumpFlag=true
         this.dataForm.id = id || 0
         if(this.dataForm.id!=0){
           let inData={
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index d491c72..650c159 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -270,7 +270,7 @@
             serialNumber: '104002Table2PrintUnitName',
             tableId: '104002Table2',
             tableName: 'BOM子物料表',
-            columnProp: 'printUnitName',
+            columnProp: 'printUnit',
             headerAlign: 'center',
             align: 'center',
             columnLabel: '单位',
@@ -288,7 +288,7 @@
             serialNumber: '104002Table2IssueType',
             tableId: '104002Table2',
             tableName: 'BOM子物料表',
-            columnProp: 'issueTypeName',
+            columnProp: 'issueType',
             headerAlign: 'center',
             align: 'center',
             columnLabel: '生产属性',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 74cc62b..a74a650 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -593,7 +593,7 @@
             columnProp: 'machRunFactor',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '机器运行速度',
+            columnLabel: '机器单位产出',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -611,7 +611,7 @@
             columnProp: 'machSetupTime',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '机器调机时长',
+            columnLabel: '机器调机时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -629,7 +629,7 @@
             columnProp: 'runTimeCode',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '时长单位',
+            columnLabel: '产出单位',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -647,7 +647,7 @@
             columnProp: 'laborRunFactor',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '人工生产速度',
+            columnLabel: '人工单位产出',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -665,7 +665,7 @@
             columnProp: 'laborSetupTime',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '人工调机时长',
+            columnLabel: '人工调机时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -791,7 +791,7 @@
             columnProp: 'setupLaborClassDesc',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '调机时人员等级',
+            columnLabel: '调机过程中人员等级',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 73846b0..9b52403 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -19,21 +19,24 @@
         <el-tab-pane label="工艺信息"  name="routing" v-if="getPageIf('routing')">
           <routing ref="routing"></routing>
         </el-tab-pane>
+        <el-tab-pane label="图稿信息"  name="drawing" v-if="getPageIf('drawing')">
+          <drawing ref="drawing"></drawing>
+        </el-tab-pane>
+        <el-tab-pane label="FAI"  name="fai" v-if="getPageIf('fai')">
+          <fai ref="fai"></fai>
+        </el-tab-pane>
+        <el-tab-pane label="品质文件"  name="qualityDocument" v-if="getPageIf('qualityDocument')">
+          <qualityDocument ref="qualityDocument"></qualityDocument>
+        </el-tab-pane>
         <el-tab-pane label="TP工程师填写信息"  name="tpInfo" v-if="getPageIf('tpInfo')">
           <tpInfo ref="tpInfo"></tpInfo>
         </el-tab-pane>
         <el-tab-pane label="产品技术要求"  name="technicalRequirement" v-if="getPageIf('technicalRequirement')">
           <technicalRequirement ref="technicalRequirement"></technicalRequirement>
-        </el-tab-pane>
-        <el-tab-pane label="图稿信息"  name="drawing" v-if="getPageIf('drawing')">
-          <drawing ref="drawing"></drawing>
         </el-tab-pane>
           <el-tab-pane label="PE确认信息"  name="PEConfirm" v-if="getPageIf('PEConfirm')">
           <PEConfirm ref="PEConfirm"></PEConfirm>
         </el-tab-pane>
-        <el-tab-pane label="品质文件"  name="qualityDocument" v-if="getPageIf('qualityDocument')">
-          <qualityDocument ref="qualityDocument"></qualityDocument>
-        </el-tab-pane>
         <el-tab-pane label="文档控制"  name="documentControl" v-if="getPageIf('documentControl')">
           <documentControl ref="documentControl"></documentControl>
         </el-tab-pane>
@@ -44,9 +47,6 @@
         <el-tab-pane label="报价专员确认信息"  name="queteConfirm" v-if="getPageIf('queteConfirm')">
           <queteConfirm ref="queteConfirm"></queteConfirm>
         </el-tab-pane>
-        <el-tab-pane label="FAI"  name="fai" v-if="getPageIf('fai')">
-          <fai ref="fai"></fai>
-        </el-tab-pane>
         <el-tab-pane label="CQE确认"  name="cqeComfirm" v-if="getPageIf('cqeComfirm')">
           <cqeComfirm ref="cqeComfirm"></cqeComfirm>
         </el-tab-pane>