From 3d2f7ed2a7199c967febcdd79ae38f6be469edce Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 25 Sep 2024 09:38:12 +0800
Subject: [PATCH 1/3] 1

---
 src/views/modules/common/Chooselist_eam.vue | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue
index 32958c2..8435da4 100644
--- a/src/views/modules/common/Chooselist_eam.vue
+++ b/src/views/modules/common/Chooselist_eam.vue
@@ -1,21 +1,33 @@
 <template>
-  <el-dialog :title="baseListData.description" :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
-    <el-form label-position="top" inline="inline" size="mini" label-width="120px">
+  <el-dialog class="yzzInput" :title="baseListData.description" :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
+    <el-form label-position="top" inline="inline" size="mini" >
+      <el-row :gutter="10">
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption1" v-if="baseListData.caption1 != '' && baseListData.caption1 != null">
         <el-input v-model="param1"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption2" v-if="baseListData.caption2 != '' && baseListData.caption2 != null">
         <el-input v-model="param2"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption3" v-if="baseListData.caption3 != '' && baseListData.caption3 != null">
         <el-input v-model="param3"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption4" v-if="baseListData.caption4 != '' && baseListData.caption4 != null">
         <el-input v-model="param4"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption5" v-if="baseListData.caption5 != '' && baseListData.caption5 != null">
         <el-input v-model="param5"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption6" v-if="baseListData.caption6 != '' && baseListData.caption6 != null ">
         <el-select v-model="param6" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -23,11 +35,18 @@
           <el-option label="不在用" value="N"></el-option>
         </el-select>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-form-item :label="baseListData.caption7" v-if="baseListData.caption7 != '' && baseListData.caption7 != null">
         <el-input v-model="param7"></el-input>
       </el-form-item>
+        </el-col>
+        <el-col :span="6" >
       <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
       </el-button>
+        </el-col>
+
+      </el-row>
     </el-form>
 
     <el-table

From 989785fddcacac088f8800535e1e1bd9474352f7 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 25 Sep 2024 10:43:42 +0800
Subject: [PATCH 2/3] 20240925

---
 src/views/modules/fanuc/currency.vue   |  67 ++----
 src/views/modules/fanuc/fanuc.vue      | 313 ++++++++++++-------------
 src/views/modules/fanuc/fanucGroup.vue |  38 +--
 3 files changed, 185 insertions(+), 233 deletions(-)

diff --git a/src/views/modules/fanuc/currency.vue b/src/views/modules/fanuc/currency.vue
index 755deae..c3e0ca0 100644
--- a/src/views/modules/fanuc/currency.vue
+++ b/src/views/modules/fanuc/currency.vue
@@ -7,7 +7,7 @@
             <el-form-item label="工厂编号">
               <el-select v-model="searchData.site" style="width: 100%">
                 <el-option label="全部" value=" "></el-option>
-                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
+                <el-option :label="site.siteid" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -73,11 +73,11 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="160"
+        min-width="120"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
-          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
+          <a type="text" @click="updateModal(scope.row)">修改</a>
+          <a type="text" @click="deleteModal(scope.row)">删除</a>
         </template>
       </el-table-column>
     </el-table>
@@ -191,7 +191,7 @@
           <el-col :span="10">
             <el-form-item label="工厂编码" prop="site">
               <el-select v-model="modalData.site" :disabled="modalDisableFlag" style="width: 100%">
-                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
+                <el-option :label="site.siteid" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,19 +230,10 @@
 
 
     <!-- 货币参考新增和修改  -->
-    <el-dialog title="货币参考" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
+    <el-dialog title="货币参考" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="300px">
       <el-form label-position="top" :model="modalData1" :rules="rules" >
         <el-row :gutter="10">
-          <el-col :span="10">
-            <el-form-item label="工厂编码" prop="site">
-              <el-select v-model="modalData1.site" disabled style="width: 100%">
-                <el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="参考货币" prop="currency">
               <template slot="label">
                 <a @click="handleClickCurrency">参考货币</a>
@@ -250,23 +241,11 @@
               <el-input v-model="modalData1.currency" @blur="handleBlurCurrency"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14">
+          <el-col :span="24">
             <el-form-item label="参考货币描述" prop="currencyDesc">
               <el-input v-model="modalData1.currencyDesc" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="最近汇率日期" >
-              <el-date-picker
-                style="width: 100%"
-                v-model="modalData1.createDate"
-                type="date"
-                disabled
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <el-footer style="height:30px;line-height:30px;text-align:center">
@@ -279,7 +258,7 @@
     <el-dialog title="货币汇率" top="20vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="200px">
       <el-form label-position="top" :model="modalData2" :rules="rules">
         <el-form-item label="汇率:" prop="exchangeRate">
-          <el-input-number v-model="modalData2.exchangeRate" style="width: 100%;" :controls="false" :step="0" :precision="4"></el-input-number>
+          <el-input-number v-model="modalData2.exchangeRate" style="width: 50%;" :controls="false" :step="0" :precision="4"></el-input-number>
         </el-form-item>
 
         <el-form-item label="启用日期" >
@@ -464,7 +443,7 @@ export default {
           serialNumber: '501004TableSite',
           tableId: '501004Table',
           tableName: '工厂编码',
-          columnWidth: 160,
+          columnWidth: 100,
           columnProp: 'site',
           headerAlign: 'center',
           align: 'center',
@@ -482,7 +461,7 @@ export default {
           serialNumber: '501004TableCurrency',
           tableId: '501004Table',
           tableName: '货币',
-          columnWidth: 160,
+          columnWidth: 120,
           columnProp: 'currency',
           headerAlign: 'center',
           align: 'left',
@@ -500,7 +479,7 @@ export default {
           serialNumber: '501004TableCurrencyDesc',
           tableId: '501004Table',
           tableName: '货币描述',
-          columnWidth: 160,
+          columnWidth: 180,
           columnProp: 'currencyDesc',
           headerAlign: 'center',
           align: 'left',
@@ -518,7 +497,7 @@ export default {
           serialNumber: '501004TableBaseCurrencyFlag',
           tableId: '501004Table',
           tableName: '本位币',
-          columnWidth: 160,
+          columnWidth: 120,
           columnProp: 'baseCurrencyFlag',
           headerAlign: 'center',
           align: 'center',
@@ -536,7 +515,7 @@ export default {
           serialNumber: '501004TableActive',
           tableId: '501004Table',
           tableName: '状态',
-          columnWidth: 160,
+          columnWidth: 100,
           columnProp: 'active',
           headerAlign: 'center',
           align: 'center',
@@ -593,7 +572,7 @@ export default {
           columnWidth: 160,
           columnProp: 'updateDate',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '修改时间',
           columnHidden: false,
           columnImage: false,
@@ -628,11 +607,11 @@ export default {
           serialNumber: '501004TableCurrency',
           tableId: '501004Table',
           tableName: '货币',
-          columnWidth: 160,
+          columnWidth: 100,
           columnProp: 'currency',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '货币',
+          columnLabel: '参考货币',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -650,7 +629,7 @@ export default {
           columnProp: 'currencyDesc',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '货币描述',
+          columnLabel: '参考货币描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -664,10 +643,10 @@ export default {
           serialNumber: '501004TableCreatDate',
           tableId: '501004Table',
           tableName: '最近汇率日期',
-          columnWidth: 160,
+          columnWidth: 120,
           columnProp: 'createDate',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '最近汇率日期',
           columnHidden: false,
           columnImage: false,
@@ -702,10 +681,10 @@ export default {
           serialNumber: '501004TableActivationDate',
           tableId: '501004Table',
           tableName: '启用日期',
-          columnWidth: 140,
+          columnWidth: 100,
           columnProp: 'activationDate',
           headerAlign: 'center',
-          align: 'left',
+          align: 'center',
           columnLabel: '启用日期',
           columnHidden: false,
           columnImage: false,
@@ -720,7 +699,7 @@ export default {
           serialNumber: '501004TableCreateDate',
           tableId: '501004Table',
           tableName: '录入时间',
-          columnWidth: 110,
+          columnWidth: 140,
           columnProp: 'createDate',
           headerAlign: 'center',
           align: 'center',
diff --git a/src/views/modules/fanuc/fanuc.vue b/src/views/modules/fanuc/fanuc.vue
index ecda596..ab17c97 100644
--- a/src/views/modules/fanuc/fanuc.vue
+++ b/src/views/modules/fanuc/fanuc.vue
@@ -41,7 +41,7 @@
 
     <!-- 展示列表 -->
     <el-table
-      height="35vh"
+      height="42vh"
       :data="dataList"
       @row-click="changeData"
       :row-style="rowStyle"
@@ -59,11 +59,12 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <template v-if="item.columnProp==='active'">
-            <span > {{ scope.row[item.columnProp] === 'Y'? '启用' : '停用' }}</span>
+            <span> {{ scope.row[item.columnProp] === 'Y' ? '启用' : '停用' }}</span>
           </template>
           <template v-else>
             <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
           </template>
         </template>
       </el-table-column>
@@ -79,101 +80,97 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-tabs style="height: 45vh" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+    <el-tabs style="height: 40vh" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
       <el-tab-pane label="详情" name="detail">
         <el-form label-position="top" :model="currentRow">
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item label="工厂编码">
-              <el-input v-model="currentRow.site" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="BU">
-              <el-input v-model="currentRow.buDesc" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item :label="'加工中心编码'">
-              <el-input v-model="currentRow.workshopId" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item :label="'加工中心名称'">
-              <el-input v-model="currentRow.workCenterDesc" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item :label="'加工中心类型'">
-              <el-input v-model="currentRow.workCenterType" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="机台数量">
-              <el-input v-model="currentRow.resourceCount" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item :label="'加工中心组编码'">
-              <el-input v-model="currentRow.prolineNo" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item :label="'平均产能'">
-              <el-input v-model="currentRow.averageCapacity" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item :label="'产能类型'">
-              <el-input v-model="currentRow.capacityType" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item :label="'录入时间'">
-              <el-input v-model="currentRow.createdDate" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item :label="'录入人'">
-              <el-input v-model="currentRow.createdBy" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="3">
-            <el-form-item :label="'最近修改时间'">
-              <el-input v-model="currentRow.updateDate" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item :label="'最近修改人'">
-              <el-input v-model="currentRow.updateBy" readonly></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item :label="'备注'" class="auto">
-              <el-input v-model="currentRow.remark"  :rows="3" type="textarea"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-       </el-form>
+          <el-row :gutter="10">
+            <el-col :span="3">
+              <el-form-item label="工厂编码">
+                <el-input v-model="currentRow.site" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="BU">
+                <el-input v-model="currentRow.buDesc" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'加工中心编码'">
+                <el-input v-model="currentRow.workshopId" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="'加工中心名称'">
+                <el-input v-model="currentRow.workCenterDesc" readonly></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="3">
+              <el-form-item :label="'加工中心类型'">
+                <el-input v-model="currentRow.workCenterType" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="机台数量">
+                <el-input v-model="currentRow.resourceCount" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'加工中心组编码'">
+                <el-input v-model="currentRow.prolineNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="3">
+              <el-form-item :label="'平均产能'">
+                <el-input v-model="currentRow.averageCapacity" class="numInput" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'产能类型'">
+                <el-input v-model="currentRow.capacityType" readonly></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="3">
+              <el-form-item :label="'录入时间'">
+                <el-input v-model="currentRow.createdDate" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'录入人'">
+                <el-input v-model="currentRow.createdBy" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'最近修改时间'">
+                <el-input v-model="currentRow.updatedDate" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="'最近修改人'">
+                <el-input v-model="currentRow.updateBy" readonly></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="15">
+              <el-form-item :label="'备注'" class="auto">
+                <el-input v-model="currentRow.remark" readonly resize='none' :rows="3" type="textarea"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </el-tab-pane>
 
       <el-tab-pane label="成本" name="cost">
         <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
         <el-table
           :data="dataList2"
-          :height="height"
+          height="33vh"
           border
           style="width: 100%; ">
           <el-table-column
@@ -209,7 +206,7 @@
       <el-tab-pane label="机台" name="resource">
         <el-table
           :data="dataList3"
-          :height="height + 25"
+          height="35vh"
           border
           style="width: 100%; ">
           <el-table-column
@@ -233,13 +230,12 @@
     </el-tabs>
 
 
-
     <!-- 新增和修改 -->
     <el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <el-form label-position="top" :model="modalData1" :rules="rules">
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="加工中心编码" prop="workCenterNo" >
+            <el-form-item label="加工中心编码" prop="workCenterNo">
               <el-input v-model="modalData1.workCenterNo" :disabled="!isNew"></el-input>
             </el-form-item>
           </el-col>
@@ -247,17 +243,20 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="单位成本" prop="unitCost">
-              <el-input-number v-model="modalData1.unitCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
+              <el-input-number v-model="modalData1.unitCost" style="width: 100%" :controls="false"
+                               :step="0"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位制造费用成本" prop="overheadCost">
-              <el-input-number v-model="modalData1.overheadCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
+              <el-input-number v-model="modalData1.overheadCost" style="width: 100%" :controls="false"
+                               :step="0"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位人工成本" prop="laborCost">
-              <el-input-number v-model="modalData1.laborCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
+              <el-input-number v-model="modalData1.laborCost" style="width: 100%" :controls="false"
+                               :step="0"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -272,7 +271,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="'结束日期'" >
+            <el-form-item :label="'结束日期'">
               <el-date-picker
                 style="width: 100%"
                 v-model="modalData1.endDate"
@@ -283,8 +282,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注" class="auto" >
-              <el-input v-model="modalData.remark"  :rows="3" type="textarea"></el-input>
+            <el-form-item label="备注" class="auto">
+              <el-input v-model="modalData.remark" :rows="3" type="textarea"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -297,25 +296,26 @@
 
     <!-- 修改 -->
     <el-dialog title="加工中心" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
+               style="margin-left: 7px;margin-top: -5px;">
 
-        <el-form-item label="加工中心编码:" prop="workCenterNo" >
+        <el-form-item label="加工中心编码:" prop="workCenterNo">
           <el-input v-model="modalData.workCenterNo" style="width: 221px"></el-input>
         </el-form-item>
 
-        <el-form-item label="加工中心名称:" prop="workCenterDesc"  >
-          <el-input  v-model="modalData.workCenterDesc"   style="width: 221px;text-align:end"></el-input>
+        <el-form-item label="加工中心名称:" prop="workCenterDesc">
+          <el-input v-model="modalData.workCenterDesc" style="width: 221px;text-align:end"></el-input>
         </el-form-item>
 
-        <el-form-item label="加工中心类型:" prop="workCenterType" >
-          <el-input  v-model="modalData.workCenterType"    style="width: 221px"></el-input>
+        <el-form-item label="加工中心类型:" prop="workCenterType">
+          <el-input v-model="modalData.workCenterType" style="width: 221px"></el-input>
         </el-form-item>
 
-        <el-form-item label="加工中心组编码:" prop="prolineNo" >
-          <el-input  v-model="modalData.prolineNo"    style="width: 221px"></el-input>
+        <el-form-item label="加工中心组编码:" prop="prolineNo">
+          <el-input v-model="modalData.prolineNo" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="状态:" prop="active" >
-          <el-input  v-model="modalData.active"    style="width: 221px"></el-input>
+        <el-form-item label="状态:" prop="active">
+          <el-input v-model="modalData.active" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -344,7 +344,7 @@ import BuSelect from "../../../components/selector/select/BuSelect.vue";
 
 export default {
   components: {BuSelect},
-  data () {
+  data() {
     return {
       activeName: 'detail',
       currentRow: {},
@@ -449,7 +449,7 @@ export default {
           serialNumber: '501002TableSite',
           tableId: "501002Table",
           tableName: "工厂编码",
-          columnWidth: 130,
+          columnWidth: 80,
           columnProp: 'site',
           headerAlign: 'center',
           align: "center",
@@ -471,7 +471,7 @@ export default {
           columnProp: 'buDesc',
           headerAlign: 'center',
           align: "left",
-          columnLabel: 'Bu',
+          columnLabel: 'BU',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -575,7 +575,7 @@ export default {
           serialNumber: '501002TableActive',
           tableId: "501002Table",
           tableName: "状态",
-          columnWidth: 130,
+          columnWidth: 80,
           columnProp: 'active',
           headerAlign: 'center',
           align: "center",
@@ -1097,7 +1097,7 @@ export default {
           status: true,
           fixed: '',
         },
-    ],
+      ],
       rules: {
         prodLineNo: [
           {
@@ -1159,7 +1159,7 @@ export default {
     }
   },
 
-  mounted () {
+  mounted() {
     this.$nextTick(() => {
       this.height = (window.innerHeight - 260) / 2
     })
@@ -1175,7 +1175,7 @@ export default {
     }
   },
 
-  created () {
+  created() {
     //页面在加载的时候就调用查询方法
     this.getDataList()
     // 获取用户的 site 和 bu
@@ -1195,12 +1195,12 @@ export default {
     },
 
 
-    validateInput () {
+    validateInput() {
       // 只保留数字
       this.inputValue = this.inputValue.replace(/\D/g, '');
     },
     // 获取用户的bu
-    getSiteAndBuByUserName () {
+    getSiteAndBuByUserName() {
       let tempData = {
         username: this.$store.state.user.name,
       }
@@ -1212,7 +1212,7 @@ export default {
     },
 
     // 查询获取数据列表
-    getDataList () {
+    getDataList() {
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
       findAll(this.searchData).then(({data}) => {
@@ -1222,28 +1222,28 @@ export default {
           this.pageSize = data.page.pageSize
           this.totalPage = data.page.totalCount
         }
-          if (this.dataList.length > 0) {
-            this.currentRow = this.dataList[0]
-            this.refreshCurrentTabTable()
-          }
+        if (this.dataList.length > 0) {
+          this.currentRow = this.dataList[0]
+          this.refreshCurrentTabTable()
+        }
       })
     },
 
     // 每页数
-    sizeChangeHandle (val) {
+    sizeChangeHandle(val) {
       this.pageSize = val
       this.pageIndex = 1
       this.getDataList()
     },
 
     // 当前页
-    currentChangeHandle (val) {
+    currentChangeHandle(val) {
       this.pageIndex = val
       this.getDataList()
     },
 //页签二插查询
 
-    tabClick (tab, event) {
+    tabClick(tab, event) {
       // 刷新列表数据
       if (this.activeName == 'detail') {
         this.refreshCurrentTabTable()
@@ -1254,7 +1254,7 @@ export default {
       }
     },
 
-    changeData (row) {
+    changeData(row) {
       this.currentRow = JSON.parse(JSON.stringify(row));
       // this.headerData = row;
 
@@ -1267,13 +1267,13 @@ export default {
       }
     },
 
-    rowStyle ({row}) {
+    rowStyle({row}) {
       if (this.currentRow.workCenterNo === row.workCenterNo) {
-        return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+        return {'background-color': '#E8F7F6', cursor: 'pointer'};
       }
     },
 
-    refreshCurrentTabTable () {
+    refreshCurrentTabTable() {
 
       findFanuc(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
@@ -1285,7 +1285,7 @@ export default {
       });
     },
 
-    refreshCurrentTabTable2 () {
+    refreshCurrentTabTable2() {
 
       queryByCost(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
@@ -1297,7 +1297,7 @@ export default {
       });
     },
 
-    refreshCurrentTabTable3 () {
+    refreshCurrentTabTable3() {
       queryResourceInfo(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
         if (data && data.code == 0) {
@@ -1309,7 +1309,7 @@ export default {
     },
 
     // 新增按钮
-    addModal () {
+    addModal() {
       this.modalData1 = {
         flag: '1',
         site: this.$store.state.user.site,
@@ -1329,7 +1329,7 @@ export default {
     },
 
     // 修改按钮
-    updateModal (row) {
+    updateModal(row) {
       this.modalData1 = {
         flag: '2',
         site: this.$store.state.user.site,
@@ -1349,7 +1349,7 @@ export default {
     },
 
     // 删除方法
-    deleteModal (row) {
+    deleteModal(row) {
       this.$confirm(`是否删除此数据?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1358,7 +1358,7 @@ export default {
         deleteByCost(row).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
-            this.refreshCurrentTabTable2 ()
+            this.refreshCurrentTabTable2()
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1377,7 +1377,7 @@ export default {
     },
 
     // 新增/修改方法
-    saveData () {
+    saveData() {
       if (this.modalData1.flag === '1') { // 新增
         if (this.modalData1.workCenterNo == null || this.modalData1.workCenterNo === '') {
           this.$message.warning('请选择一条加工中心数据！')
@@ -1387,7 +1387,7 @@ export default {
           this.$message.warning('请选择启用日期！')
           return
         }
-        if (this.modalData1.unitCost == null || this.modalData1.unitCost <0) {
+        if (this.modalData1.unitCost == null || this.modalData1.unitCost < 0) {
           this.$message.warning('单位成本不能小于0！')
           return
         }
@@ -1432,7 +1432,7 @@ export default {
       }
     },
     //加工中心
-    updateModal1 (row) {
+    updateModal1(row) {
       this.modalData = {
         flag: '2',
         site: this.$store.state.user.site,
@@ -1464,7 +1464,7 @@ export default {
       this.modalDisableFlag1 = true
       this.modalFlag1 = true
     },
-    saveData1 () {
+    saveData1() {
       if (this.modalData.flag === '2') { // 修改
         updateFanuc(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1490,7 +1490,7 @@ export default {
 
 
     // 查询检验类型
-    inspectionTypeSearch () {
+    inspectionTypeSearch() {
       let tempData = {
         site: this.$store.state.user.site
       }
@@ -1502,7 +1502,7 @@ export default {
     },
 
     // 校验用户是否收藏
-    favoriteIsOk () {
+    favoriteIsOk() {
       let userFavorite = {
         userId: this.$store.state.user.id,
         languageCode: this.$i18n.locale
@@ -1517,7 +1517,7 @@ export default {
     },
 
     // 收藏 OR 取消收藏
-    favoriteFunction () {
+    favoriteFunction() {
       let userFavorite = {
         userId: this.$store.state.user.id,
         functionId: this.$route.meta.menuId,
@@ -1537,7 +1537,7 @@ export default {
     },
 
     //导出excel
-    async createExportData () {
+    async createExportData() {
       this.searchData.limit = -1
       this.searchData.page = 1
       await findAll(this.searchData).then(({data}) => {
@@ -1546,13 +1546,13 @@ export default {
       return this.exportList
     },
 
-    startDownload () {
+    startDownload() {
     },
 
-    finishDownload () {
+    finishDownload() {
     },
 
-    fields () {
+    fields() {
       let json = "{"
       this.columnList.forEach((item, index) => {
         if (index == this.columnList.length - 1) {
@@ -1567,7 +1567,7 @@ export default {
     },
 
     // 动态列开始 获取 用户保存的 格式列
-    async getTableUserColumn (tableId, columnId) {
+    async getTableUserColumn(tableId, columnId) {
       let queryTableUser = {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
@@ -1599,7 +1599,7 @@ export default {
     },
 
     // 获取 tableDefault 列
-    async getColumnList (tableId, columnId) {
+    async getColumnList(tableId, columnId) {
       let queryTable = {
         functionId: this.$route.meta.menuId,
         tableId: tableId,
@@ -1628,7 +1628,7 @@ export default {
     },
 
     //获取按钮的权限数据
-    getButtonAuthData () {
+    getButtonAuthData() {
       let searchFlag = this.isAuth(this.menuId + ":search")
       let saveFlag = this.isAuth(this.menuId + ":save")
       let updateFlag = this.isAuth(this.menuId + ":update")
@@ -1644,20 +1644,11 @@ export default {
 </script>
 
 <style scoped>
-.numInput /deep/ .el-input__inner{
+.numInput /deep/ .el-input__inner {
   text-align: right;
-}
-/deep/  .inlineNumber input::-webkit-outer-spin-button,
-/deep/  .inlineNumber input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-
-}
-/deep/  .inlineNumber input[type="number"]{
-  -moz-appearance: textfield;
   padding-right: 5px !important;
 }
-
-.auto /deep/ .el-form-item__content{
+.auto /deep/ .el-form-item__content {
   height: auto;
   line-height: 1.5;
 }
diff --git a/src/views/modules/fanuc/fanucGroup.vue b/src/views/modules/fanuc/fanucGroup.vue
index a0c968c..ba33357 100644
--- a/src/views/modules/fanuc/fanucGroup.vue
+++ b/src/views/modules/fanuc/fanucGroup.vue
@@ -54,7 +54,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <template v-if="item.columnProp==='status'">
@@ -70,11 +70,11 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="160"
+        min-width="100"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
-          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
+          <a type="text" @click="updateModal(scope.row)">修改</a>
+          <a type="text" @click="deleteModal(scope.row)">删除</a>
         </template>
       </el-table-column>
     </el-table>
@@ -202,7 +202,7 @@ export default {
           serialNumber: '501001TableSite',
           tableId: "501001Table",
           tableName: "工厂编码",
-          columnWidth: 150,
+          columnWidth: 80,
           columnProp: 'site',
           headerAlign: 'center',
           align: "center",
@@ -220,7 +220,7 @@ export default {
           serialNumber: '501001TableBuDesc',
           tableId: "501001Table",
           tableName: "BU",
-          columnWidth: 150,
+          columnWidth: 120,
           columnProp: 'buDesc',
           headerAlign: 'center',
           align: "left",
@@ -238,7 +238,7 @@ export default {
           serialNumber: '501001TableProdLineNo',
           tableId: "501001Table",
           tableName: "组编码",
-          columnWidth: 150,
+          columnWidth: 120,
           columnProp: 'prodLineNo',
           headerAlign: 'center',
           align: "left",
@@ -268,24 +268,6 @@ export default {
           status: true,
           fixed: '',
         },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 501001,
-        //   serialNumber: '501001TableActive',
-        //   tableId: "501001Table",
-        //   tableName: "仓库类型",
-        //   columnWidth: 150,
-        //   columnProp: 'active',
-        //   headerAlign: 'center',
-        //   align: "center",
-        //   columnLabel: '仓库类型',
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: false,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: '',
-        // },
         {
           userId: this.$store.state.user.name,
           functionId: 501001,
@@ -331,7 +313,7 @@ export default {
           columnWidth: 140,
           columnProp: 'updateBy',
           headerAlign: 'center',
-          align: "center",
+          align: "left",
           columnLabel: '修改人',
           columnHidden: false,
           columnImage: false,
@@ -349,7 +331,7 @@ export default {
           columnWidth: 150,
           columnProp: 'updateDate',
           headerAlign: 'center',
-          align: "left",
+          align: "center",
           columnLabel: '修改时间',
           columnHidden: false,
           columnImage: false,
@@ -382,7 +364,7 @@ export default {
           serialNumber: '501001TableStatus',
           tableId: "501001Table",
           tableName: "状态",
-          columnWidth: 125,
+          columnWidth: 80,
           columnProp: 'status',
           headerAlign: 'center',
           align: "center",

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 3/3] =?UTF-8?q?2024-09-25=20RFQ=20=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=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 = ''
     },
 
     // 人员等级