From 0f1530b6049426e68db2bd41e018651a563a827d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 25 Sep 2024 13:05:34 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-25=20RFQ=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/fanuc/labor.vue            | 26 ++---
 src/views/modules/part/bomManagement.vue     | 38 ++------
 src/views/modules/part/routingManagement.vue | 99 ++++++++++++++------
 3 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/src/views/modules/fanuc/labor.vue b/src/views/modules/fanuc/labor.vue
index 90c3899..00dff1f 100644
--- a/src/views/modules/fanuc/labor.vue
+++ b/src/views/modules/fanuc/labor.vue
@@ -139,22 +139,22 @@
     <el-tabs v-model="activeName" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
       <el-tab-pane label="详情" name="detail">
         <el-form label-position="top" :model="dataList1" style="margin-left: 10px;margin-top: 5px;margin-right: 10px">
-          <el-row :gutter="20">
-            <el-col :span="6">
+          <el-row :gutter="10">
+            <el-col :span="4">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'人工等级编码'">
                   <el-input v-model="dataList1.classNo" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="14">
+            <el-col :span="10">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'人工等级名称'">
                   <el-input v-model="dataList1.classDesc" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="2">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'是否在用'">
                   <el-input v-model="dataList1.activeDesc" readonly></el-input>
@@ -162,29 +162,29 @@
               </div>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="6">
+          <el-row :gutter="10">
+            <el-col :span="4">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'创建人'">
                   <el-input v-model="dataList1.createdBy" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'创建时间'">
                   <el-input v-model="dataList1.createdDate" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'修改人'">
                   <el-input v-model="dataList1.updatedBy" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <div class="grid-content bg-purple">
                 <el-form-item :label="'修改时间'">
                   <el-input v-model="dataList1.updatedDate" readonly></el-input>
@@ -192,8 +192,8 @@
               </div>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="24">
+          <el-row :gutter="10">
+            <el-col :span="16">
               <div class="grid-content bg-purple">
                 <el-form-item label="备注" style="height: 80px">
                   <el-input type="textarea" v-model="dataList1.remark" readonly :rows="3" resize='none' show-word-limit></el-input>
@@ -386,10 +386,10 @@ export default {
           tableId: "501003Table",
           tableName: "人工等级",
           columnWidth: 100,
-          columnProp: 'buNo',
+          columnProp: 'buDesc',
           headerAlign: 'center',
           align: "center",
-          columnLabel: 'Bu',
+          columnLabel: 'BU',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 4b2f9c1..bb016dc 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -592,7 +592,7 @@
             <el-input v-model="copyBomData.site" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="BOM版本号">
-            <el-input v-model="copyBomData.engChgLevel" style="width: 85px"></el-input>
+            <el-input v-model="copyBomData.engChgLevel" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">
             <el-select v-model="copyBomData.bomType" @change="copyBomTypeChange" style="width: 185px">
@@ -1278,15 +1278,15 @@ export default {
           columnWidth: 300
         },
         {
-          columnProp: 'familyName',
+          columnProp: 'spec',
           headerAlign: "center",
           align: "center",
-          columnLabel: '物料分类',
+          columnLabel: '规格型号',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 300
         },
         {
           columnProp: 'printUnit',
@@ -1299,17 +1299,6 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          columnProp: 'spec',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '规格型号',
-          columnHidden: false,
-          columnImage: false,
-          status: true,
-          fixed: '',
-          columnWidth: 300
-        },
         {
           columnProp: 'partType',
           headerAlign: "center",
@@ -1346,15 +1335,15 @@ export default {
           columnWidth: 300
         },
         {
-          columnProp: 'familyName',
+          columnProp: 'spec',
           headerAlign: "center",
-          align: "center",
-          columnLabel: '物料分类',
+          align: "left",
+          columnLabel: '规格型号',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 300
         },
         {
           columnProp: 'printUnit',
@@ -1367,17 +1356,6 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          columnProp: 'spec',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: '规格型号',
-          columnHidden: false,
-          columnImage: false,
-          status: true,
-          fixed: '',
-          columnWidth: 300
-        },
         {
           columnProp: 'partType',
           headerAlign: "center",
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index db1a719..e77f027 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -19,7 +19,11 @@
         <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'工艺类型'">
-        <el-input v-model="searchData.routingType" clearable style="width: 120px"></el-input>
+        <el-select v-model="searchData.routingType" clearable style="width: 120px">
+          <el-option label="Manufacturing" value="Manufacturing"></el-option>
+          <el-option label="Repair" value="Repair"></el-option>
+          <el-option label="Prototype" value="Prototype"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'Routing版本号'">
         <el-input v-model="searchData.routingRevision" clearable style="width: 120px"></el-input>
@@ -349,7 +353,10 @@
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item prop="workCenterNo">
           <span style="cursor: pointer" slot="label" @click="getBaseList(216)"><a herf="#">加工中心编码</a></span>
-          <el-input v-model="componentData.workCenterNo" @blur="workCenterBlur(216)" style="width: 221px"></el-input>
+          <el-input v-model="componentData.workCenterNo" @blur="workCenterBlur(216)" style="width: 103px"></el-input>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-input v-model="componentData.workCenterType" disabled style="width: 103px"></el-input>
         </el-form-item>
         <el-form-item :label="'加工中心名称'">
           <el-input v-model="componentData.workCenterDesc" disabled style="width: 221px"></el-input>
@@ -499,7 +506,7 @@
             <el-input v-model="copyRoutingData.site" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="Routing版本号">
-            <el-input v-model="copyRoutingData.routingRevision" style="width: 85px"></el-input>
+            <el-input v-model="copyRoutingData.routingRevision" disabled style="width: 85px"></el-input>
           </el-form-item>
           <el-form-item label="工艺类型">
             <el-select v-model="copyRoutingData.routingType" @change="copyRoutingTypeChange" style="width: 185px">
@@ -871,6 +878,7 @@ export default {
         machineNo: '',
         workCenterNo: '',
         workCenterDesc: '',
+        workCenterType: '',
         laborClassNo: '',
         laborClassDesc: '',
         setupLaborClassNo: '',
@@ -1136,26 +1144,29 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 120
         },
         {
           columnProp: 'partDesc',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 300
         },
         {
-          columnProp: 'familyName',
+          columnProp: 'spec',
           headerAlign: "center",
-          align: "center",
-          columnLabel: '物料分类',
+          align: "left",
+          columnLabel: '规格型号',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 300
         },
         {
           columnProp: 'printUnit',
@@ -1166,16 +1177,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
-        },
-        {
-          columnProp: 'spec',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '规格型号',
-          columnHidden: false,
-          columnImage: false,
-          status: true,
-          fixed: '',
+          columnWidth: 100
         },
         {
           columnProp: 'partType',
@@ -1186,6 +1188,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 150
         }
       ],
       componentOperationColumnList: [
@@ -1449,6 +1452,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '104003Table2WorkCenterNo',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'workCenterNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '加工中心编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
@@ -1457,8 +1478,26 @@ export default {
           tableName: 'Routing工序表',
           columnProp: 'workCenterDesc',
           headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '601003Table2WorkCenterType',
+          tableId: '601003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'workCenterType',
+          headerAlign: 'center',
           align: 'center',
-          columnLabel: '加工中心',
+          columnLabel: '加工中心类型',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1570,6 +1609,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 120
         },
         {
           columnProp: 'partDesc',
@@ -1580,16 +1620,18 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 300
         },
         {
-          columnProp: 'familyName',
+          columnProp: 'spec',
           headerAlign: "center",
           align: "center",
-          columnLabel: '物料分类',
+          columnLabel: '规格型号',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 300
         },
         {
           columnProp: 'printUnit',
@@ -1600,16 +1642,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
-        },
-        {
-          columnProp: 'spec',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '规格型号',
-          columnHidden: false,
-          columnImage: false,
-          status: true,
-          fixed: '',
+          columnWidth: 100
         },
         {
           columnProp: 'partType',
@@ -1620,6 +1653,7 @@ export default {
           columnImage: false,
           status: true,
           fixed: '',
+          columnWidth: 150
         }
       ],
       standardOperationColumnList: [
@@ -2469,6 +2503,7 @@ export default {
         machineNo: '',
         workCenterNo: '',
         workCenterDesc: '',
+        workCenterType: '',
         laborClassNo: '',
         laborClassDesc: '',
         setupLaborClassNo: '',
@@ -2523,6 +2558,7 @@ export default {
         machineNo: row.machineNo,
         workCenterNo: row.workCenterNo,
         workCenterDesc: row.workCenterDesc,
+        workCenterType: row.workCenterType,
         laborClassNo: row.laborClassNo,
         laborClassDesc: row.laborClassDesc,
         setupLaborClassNo: row.setupLaborClassNo,
@@ -3419,6 +3455,7 @@ export default {
       if (this.tagNo === 216) {
         this.componentData.workCenterNo = val.work_center_no
         this.componentData.workCenterDesc = val.work_center_desc
+        this.componentData.workCenterType = val.work_center_type
       }
     },
 
@@ -3460,12 +3497,14 @@ export default {
             if (data.baseListData.length > 0) {
               this.componentData.workCenterNo = data.baseListData[0].work_center_no
               this.componentData.workCenterDesc = data.baseListData[0].work_center_desc
+              this.componentData.workCenterType = data.baseListData[0].work_center_type
               return
             }
           }
         })
       }
       this.componentData.workCenterDesc = ''
+      this.componentData.workCenterType = ''
     },
 
     // 人员等级