From f71efb0f29f57d08574e61b624ac0f4314485e4d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Sep 2024 21:24:54 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-24=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/api/fanucGroup/labor.js       |   5 -
 src/views/modules/fanuc/labor.vue | 870 ++++++++++++------------------
 2 files changed, 338 insertions(+), 537 deletions(-)

diff --git a/src/api/fanucGroup/labor.js b/src/api/fanucGroup/labor.js
index 3cdf5ec..b3f0010 100644
--- a/src/api/fanucGroup/labor.js
+++ b/src/api/fanucGroup/labor.js
@@ -1,7 +1,5 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
-
-
 //查询
 export const findAll= data => createAPI(`/labor/queryAll`,'post',data)
 //新增
@@ -10,11 +8,8 @@ export const insertByLabor= data => createAPI(`/labor/append`,'post',data)
 export const updateLabor= data => createAPI(`/labor/amend`,'post',data)
 //删除
 export const deleteLabor= data => createAPI(`/labor/delete`,'post',data)
-
-
 //查询(获取单个数据)
 export const findByLabor= data => createAPI(`/labor/queryById`,'post',data)
-
 //成本新增
 export const appendByLaborClass= data => createAPI(`/LaborClass/append`,'post',data)
 //成本查询(绑定加工中心)
diff --git a/src/views/modules/fanuc/labor.vue b/src/views/modules/fanuc/labor.vue
index c4fc4dd..90c3899 100644
--- a/src/views/modules/fanuc/labor.vue
+++ b/src/views/modules/fanuc/labor.vue
@@ -1,64 +1,63 @@
 <template>
   <div class="mod-config">
-
-<!--    &lt;!&ndash; 收藏 &ndash;&gt;-->
-<!--    <div>-->
-<!--      <span @click="favoriteFunction()">-->
-<!--        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-<!--      </span>-->
-<!--    </div>-->
+    <div>
+        <span @click="favoriteFunction()">
+         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+        </span>
+    </div>
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号'">
-        <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'BU'">
-        <el-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
+        <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 100px">
+          <el-option
+            v-for = "i in buList"
+            :key = "i.buNo"
+            :label = "i.buDesc"
+            :value = "i.buNo">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'人工等级编码'">
         <el-input v-model="searchData.classNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'人工等级名称'">
-        <el-input v-model="searchData.classDesc" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.classDesc" clearable style="width: 200px"></el-input>
       </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="searchData.active" placeholder="请选择">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="启用" value="Y"></el-option>
-          <el-option label="停用" value="N"></el-option>
+      <el-form-item label="是否在用">
+        <el-select v-model="searchData.active" clearable placeholder="请选择" style="width: 100px">
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
         <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
-<!--        <download-excel-->
-<!--          :fields="fields()"-->
-<!--          :data="exportData"-->
-<!--          type="xls"-->
-<!--          :name="exportName"-->
-<!--          :header="exportHeader"-->
-<!--          :footer="exportFooter"-->
-<!--          :fetch="createExportData"-->
-<!--          :before-generate="startDownload"-->
-<!--          :before-finish="finishDownload"-->
-<!--          worksheet="导出信息"-->
-<!--          class="el-button el-button&#45;&#45;primary el-button&#45;&#45;medium">-->
-<!--          {{ "导出" }}-->
-<!--        </download-excel>-->
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
       </el-form-item>
 
 
     </el-form>
 
-
-
     <!-- 展示列表 -->
     <el-table
       :height="height"
       :data="dataList"
-      @row-click="changeData"
+      ref="laborClassTable"
+      @row-click="laborClassClickRow"
       border
       style="width: 100%;">
       <el-table-column
@@ -69,7 +68,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">
           <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
@@ -80,7 +79,7 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="160"
+        width="100"
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
@@ -99,60 +98,121 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-tabs style="font-size: 12px;min-height: 300px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+    <el-dialog title="人工等级" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="450px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
+        <el-form-item label="BU" prop="bu" :rules="rules.bu">
+          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 75px">
+            <el-option
+              v-for = "i in userBuList"
+              :key = "i.buNo"
+              :label = "i.buDesc"
+              :value = "i.buNo">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否在用" prop="active">
+          <el-select v-model="modalData.active" placeholder="请选择" style="width: 70px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
+        <el-form-item label="人工等级编码" prop="classNo">
+          <el-input v-model="modalData.classNo" :disabled="modalDisableFlag" style="width: 158px"></el-input>
+        </el-form-item>
+        <el-form-item label="人工等级名称" prop="classDesc">
+          <el-input  v-model="modalData.classDesc" style="width: 246px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
+        <el-form-item label="备注" style="height: 80px">
+          <el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none' show-word-limit style="width: 418px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <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 :inline="true" label-position="top" :model="dataList1">
-          <el-row style="margin-top: 30px">
-            <el-form-item :label="'人工等级编码'">
-              <el-input v-model="dataList1.classNo" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'人工等级名称'">
-              <el-input v-model="dataList1.classDesc" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'BU'">
-              <el-input v-model="dataList1.buNo" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'工厂编码'">
-              <el-input v-model="dataList1.site" clearable style="width: 300px"></el-input>
-            </el-form-item>
+        <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">
+              <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">
+              <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">
+              <div class="grid-content bg-purple">
+                <el-form-item :label="'是否在用'">
+                  <el-input v-model="dataList1.activeDesc" readonly></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
-
-
-          <el-row style="margin-top: 30px">
-            <el-form-item :label="'备注'">
-              <el-input v-model="dataList1.remark" clearable style="width: 925px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'状态'">
-              <el-input v-model="dataList1.active" clearable style="width: 300px"></el-input>
-            </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <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">
+              <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">
+              <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">
+              <div class="grid-content bg-purple">
+                <el-form-item :label="'修改时间'">
+                  <el-input v-model="dataList1.updatedDate" readonly></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
-
-          <el-row style="margin-top: 30px">
-            <el-form-item :label="'录入人'">
-              <el-input v-model="dataList1.createdBy" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'录入时间'">
-              <el-input v-model="dataList1.createdDate" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'最近修改人'">
-              <el-input v-model="dataList1.updateBy" clearable style="width: 300px"></el-input>
-            </el-form-item>
-            <el-form-item :label="'最近修改时间'">
-              <el-input v-model="dataList1.updateDate" clearable style="width: 300px"></el-input>
-            </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <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>
+                </el-form-item>
+              </div>
+            </el-col>
           </el-row>
-
-
         </el-form>
       </el-tab-pane>
 
       <el-tab-pane label="成本" name="cost">
-        <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
+        <div style="margin-left: 5px;margin-top: 5px">
+          <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
+        </div>
         <el-table
           :data="dataList2"
-          :height="height"
+          :height="secondHeight - 54"
           border
-          style="width: 100%; ">
+          style="width: 100%;margin-top: 5px">
           <el-table-column
             v-for="(item,index) in columnList2" :key="index"
             :sortable="item.columnSortable"
@@ -165,114 +225,56 @@
             :label="item.columnLabel">
             <template slot-scope="scope">
               <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>
           </el-table-column>
           <el-table-column
-            fixed="right"
             header-align="center"
             align="center"
-            width="160"
+            width="100"
             label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>
-                        <a type="text" size="small" @click="deleteModal1(scope.row)">删除</a>
+              <a type="text" size="small" @click="deleteModal1(scope.row)">删除</a>
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog title="人工等级" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="400px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="工厂编码:" prop="site" :rules="rules.site">
-          <el-input v-model="modalData.site" style="width: 150px" :disabled="!isNew"></el-input>
-        </el-form-item>
-
-        <el-form-item label="BU" prop="bu" :rules="rules.bu">
-          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 150px">
-            <el-option
-              v-for = "i in userBuList"
-              :key = "i.buNo"
-              :label = "i.sitename"
-              :value = "i.buNo">
-              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
-                {{ i.buDesc }}
-              </span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="人工等级编码:" prop="classNo" >
-          <el-input v-model="modalData.classNo" :disabled="modalDisableFlag" style="width: 150px"></el-input>
-        </el-form-item>
-        <el-form-item label="人工等级名称:" prop="classDesc" >
-          <el-input  v-model="modalData.classDesc" style="width: 150px"></el-input>
-        </el-form-item>
-        <el-form-item label="状态:" prop="active">
-          <el-select v-model="modalData.active" placeholder="请选择" style="width: 150px">
-            <el-option label="启用" value="Y"></el-option>
-            <el-option label="禁用" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="备注:" prop="remake" >
-          <el-input  v-model="modalData.remake"  style="width: 150px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="saveData()">保存</el-button>
-        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-      </el-footer>
-
-    </el-dialog>
-
-
-
     <!-- 成本新增和修改  -->
     <el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
-      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-
-        <el-form-item label="工厂编码:" prop="site" :rules="rules.site">
-          <el-input v-model="modalData1.site" style="width: 221px" :disabled="!isNew"></el-input>
+      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules1" style="margin-top: -5px;">
+        <el-form-item label="单位制造费用成本:" prop="overheadCost">
+          <el-input-number :controls="false" :step="0" min="0" v-model="modalData1.overheadCost" style="width: 225px"></el-input-number>
         </el-form-item>
-
-<!--        <el-form-item label="单位成本:" prop="unitCost" :rules="rules.unitCost" >-->
-<!--          <el-input  v-model="modalData1.unitCost" @input="validateInput" style="width: 221px"></el-input>-->
-<!--        </el-form-item>-->
-
-        <el-form-item label="单位制造费用成本:" prop="overheadCost" :rules="rules.overheadCost">
-          <el-input class="inlineNumber numInput" v-model="modalData1.overheadCost" @input="validateInput" style="width: 221px"></el-input>
-        </el-form-item>
-
-        <el-form-item label="单位人工成本:" prop="unitCost" :rules="rules.laborCost">
-          <el-input class="inlineNumber numInput" v-model="modalData1.unitCost" @input="validateInput" style="width: 221px"></el-input>
+        <el-form-item label="单位人工成本:" prop="unitCost">
+          <el-input-number :controls="false" :step="0" min="0" v-model="modalData1.unitCost" style="width: 225px"></el-input-number>
         </el-form-item>
-
-        <el-form-item :label="'启用日期：'" >
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules1">
+        <el-form-item :label="'启用日期'" prop="beginDate">
           <el-date-picker
-            style="width: 221px"
+            style="width: 225px"
             v-model="modalData1.beginDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item :label="'结束日期：'" >
+        <el-form-item :label="'结束日期'" >
           <el-date-picker
-            style="width: 221px"
+            style="width: 225px"
             v-model="modalData1.endDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="备注:" prop="remake" >
-          <el-input v-model="modalData.remake" style="width: 221px"></el-input>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
+        <el-form-item label="备注" style="height: 80px">
+          <el-input type="textarea" v-model="modalData1.remark" :rows="3" resize='none' show-word-limit style="width: 467px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -290,20 +292,19 @@ import {
   updateLabor,//修改人工等级
   deleteLabor,//删除人工等级
   findByLabor,//查询(获取单个详情数据)
-
   appendByLaborClass,//成本新增
   queryByLaborClass, //成本查询
   amendByLaborClass,//成本修改
   deleteByLaborClass,//删除成本
 } from "@/api/fanucGroup/labor.js"
-import {getSiteAndBuByUserName //获取bu
-} from "@/api/eam/eam.js"
+import {getSiteAndBuByUserName, getSiteAndBuByUserName2} from "@/api/qc/qc.js"
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
+import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
 export default {
   data () {
     return {
       activeName:'detail',
       currentRow:'',
-      headerData:'',
       currentRow2:'',
       headerData2:'',
       // 是否收藏
@@ -314,21 +315,15 @@ export default {
       exportHeader: ["检验方法"],
       exportFooter: [],
       exportList: [],
+      buList: [],
       // 导出 end
       searchData: {
-        site: this.$store.state.user.site,
-        id: '',
-        bu: '',
+        site: '',
         buNo: '',
+        userName: this.$store.state.user.name,
         classNo: '',
         classDesc: '',
         active: '',
-        createdDate: '',
-        createdBy: this.$store.state.user.name,
-        updatedDate: '',
-        updatedBy: this.$store.state.user.name,
-        levelCost: '',
-        remark: '',
         page: 1,
         limit: 10,
       },
@@ -336,8 +331,20 @@ export default {
       pageSize: 20,
       totalPage: 0,
       height: 200,
+      secondHeight: 200,
       dataList: [],
-      dataList1:[],
+      dataList1: {
+        site: '',
+        buNo: '',
+        classNo: '',
+        classDesc: '',
+        active: '',
+        createdDate: '',
+        createdBy: '',
+        updatedDate: '',
+        updatedBy: '',
+        remark: '',
+      },
       dataList2:[],
       dataListLoading: false,
       modalFlag: false,
@@ -345,22 +352,21 @@ export default {
       modalDisableFlag: false,
       modalDisableFlag1: false,
       modalData: {
-        site: this.$store.state.user.site,
+        site: '',
         id: '',
         bu: '',
         buNo: '',
         classNo: '',
         classDesc: '',
-        active: 'Y',
+        active: '',
         createdDate: '',
         createdBy: '',
         updatedDate: '',
         updatedBy: '',
-        levelCost: '',
         remark: '',
       },
       modalData1:{
-        site: this.$store.state.user.site,
+        site: '',
         classNo: '',
         itemNo: '',
         unitCost: '',
@@ -373,34 +379,16 @@ export default {
       },
       // 标头展示
       columnList: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableSite',
-          tableId: "501003Table",
-          tableName: "工厂编码",
-          columnWidth: 160,
-          columnProp: 'site',
-          headerAlign: 'center',
-          align: "center",
-          columnLabel: '工厂编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
           serialNumber: '501003TableBuNo',
           tableId: "501003Table",
-          tableName: "BU",
-          columnWidth: 160,
+          tableName: "人工等级",
+          columnWidth: 100,
           columnProp: 'buNo',
           headerAlign: 'center',
-          align: "left",
+          align: "center",
           columnLabel: 'Bu',
           columnHidden: false,
           columnImage: false,
@@ -414,8 +402,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableClassNo',
           tableId: "501003Table",
-          tableName: "人工等级编码",
-          columnWidth: 160,
+          tableName: "人工等级",
+          columnWidth: 120,
           columnProp: 'classNo',
           headerAlign: 'center',
           align: "left",
@@ -432,8 +420,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableClassDesc',
           tableId: "501003Table",
-          tableName: "人工等级名称",
-          columnWidth: 160,
+          tableName: "人工等级",
+          columnWidth: 200,
           columnProp: 'classDesc',
           headerAlign: 'center',
           align: "left",
@@ -450,12 +438,12 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableActive',
           tableId: "501003Table",
-          tableName: "状态",
-          columnWidth: 160,
-          columnProp: 'active',
+          tableName: "人工等级",
+          columnWidth: 100,
+          columnProp: 'activeDesc',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '状态',
+          columnLabel: '是否在用',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -466,160 +454,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
-          serialNumber: '501003TableCreatedDate',
-          tableId: "501003Table",
-          tableName: "录入时间",
-          columnWidth: 160,
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: "center",
-          columnLabel: '录入时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableCreatedBy',
-          tableId: "501003Table",
-          tableName: "录入人",
-          columnWidth: 160,
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: '录入人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableUpdatedDate',
-          tableId: "501003Table",
-          tableName: "修改时间",
-          columnWidth: 160,
-          columnProp: 'updatedDate',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: '修改时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableUpdatedBy',
-          tableId: "501003Table",
-          tableName: "修改人",
-          columnWidth: 160,
-          columnProp: 'updatedBy',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: '修改人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-      ],
-      columnList1: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableSite',
-          tableId: "501003Table",
-          tableName: "工厂编码",
-          columnWidth: 160,
-          columnProp: 'site',
-          headerAlign: 'center',
-          align: "center",
-          columnLabel: '工厂编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableBuNo',
-          tableId: "501003Table",
-          tableName: "BU",
-          columnWidth: 160,
-          columnProp: 'buNo',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: 'Bu',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableClassNo',
-          tableId: "501003Table",
-          tableName: "人工等级编码",
-          columnWidth: 160,
-          columnProp: 'classNo',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: '人工等级编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableClassDesc',
+          serialNumber: '501003TableRemark',
           tableId: "501003Table",
-          tableName: "人工等级名称",
-          columnWidth: 160,
-          columnProp: 'classDesc',
+          tableName: "人工等级",
+          columnWidth: 200,
+          columnProp: 'remark',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '人工等级名称',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableActive',
-          tableId: "501003Table",
-          tableName: "状态",
-          columnWidth: 160,
-          columnProp: 'active',
-          headerAlign: 'center',
-          align: "center",
-          columnLabel: '状态',
+          columnLabel: '备注',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -632,12 +474,12 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableCreatedDate',
           tableId: "501003Table",
-          tableName: "录入时间",
+          tableName: "人工等级",
           columnWidth: 160,
           columnProp: 'createdDate',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '录入时间',
+          columnLabel: '创建时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -650,12 +492,12 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableCreatedBy',
           tableId: "501003Table",
-          tableName: "录入人",
-          columnWidth: 160,
+          tableName: "人工等级",
+          columnWidth: 100,
           columnProp: 'createdBy',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '录入人',
+          columnLabel: '创建人',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -666,13 +508,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
-          serialNumber: '501003TableUpdateDate',
+          serialNumber: '501003TableUpdatedDate',
           tableId: "501003Table",
-          tableName: "修改时间",
-          columnWidth: 150,
+          tableName: "人工等级",
+          columnWidth: 160,
           columnProp: 'updatedDate',
           headerAlign: 'center',
-          align: "left",
+          align: "center",
           columnLabel: '修改时间',
           columnHidden: false,
           columnImage: false,
@@ -684,10 +526,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
-          serialNumber: '501003TableUpdateBy',
+          serialNumber: '501003TableUpdatedBy',
           tableId: "501003Table",
-          tableName: "修改人",
-          columnWidth: 150,
+          tableName: "人工等级",
+          columnWidth: 100,
           columnProp: 'updatedBy',
           headerAlign: 'center',
           align: "left",
@@ -699,51 +541,15 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableRemake',
-          tableId: "501003Table",
-          tableName: "备注",
-          columnWidth: 150,
-          columnProp: 'remake',
-          headerAlign: 'center',
-          align: "left",
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
       ],
       columnList2: [
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 501003,
-        //   serialNumber: '501003TableSite',
-        //   tableId: "501003Table",
-        //   tableName: "工厂编码",
-        //   columnWidth: 130,
-        //   columnProp: 'site',
-        //   headerAlign: 'center',
-        //   align: "center",
-        //   columnLabel: '工厂编码',
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: false,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: '',
-        // },
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
           serialNumber: '501003TableItemNo',
           tableId: "501003Table",
-          tableName: "序号",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 100,
           columnProp: 'itemNo',
           headerAlign: 'center',
           align: "right",
@@ -760,8 +566,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableUnitCost',
           tableId: "501003Table",
-          tableName: "单位人工成本",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 100,
           columnProp: 'unitCost',
           headerAlign: 'center',
           align: "right",
@@ -778,8 +584,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableOverheadCost',
           tableId: "501003Table",
-          tableName: "单位制造费用成本",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 100,
           columnProp: 'overheadCost',
           headerAlign: 'center',
           align: "right",
@@ -796,8 +602,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableBeginDate',
           tableId: "501003Table",
-          tableName: "启用日期",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 150,
           columnProp: 'beginDate',
           headerAlign: 'center',
           align: "center",
@@ -814,8 +620,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableEndDate',
           tableId: "501003Table",
-          tableName: "结束日期",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 150,
           columnProp: 'endDate',
           headerAlign: 'center',
           align: "center",
@@ -832,8 +638,8 @@ export default {
           functionId: 501003,
           serialNumber: '501003TableRemark',
           tableId: "501003Table",
-          tableName: "备注",
-          columnWidth: 130,
+          tableName: "成本",
+          columnWidth: 200,
           columnProp: 'remark',
           headerAlign: 'center',
           align: "left",
@@ -854,14 +660,16 @@ export default {
             trigger: ['blur', 'change']
           }
         ],
-        site: [
+        bu: [
           {
             required: true,
             message: ' ',
             trigger: ['blur', 'change']
           }
         ],
-        bu: [
+      },
+      rules1: {
+        overheadCost: [
           {
             required: true,
             message: ' ',
@@ -875,13 +683,13 @@ export default {
             trigger: ['blur', 'change']
           }
         ],
-        overheadCost: [
+        beginDate: [
           {
             required: true,
             message: ' ',
             trigger: ['blur', 'change']
           }
-        ],
+        ]
       },
       options: [],
       userBuList: [],
@@ -895,7 +703,9 @@ export default {
 
   mounted () {
     this.$nextTick(() => {
-      this.height = (window.innerHeight- 260) / 2
+      this.height = window.innerHeight / 2 - 30
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 175
     })
   },
 
@@ -914,9 +724,35 @@ export default {
     this.getDataList()
     // 获取用户的 site 和 bu
     this.getSiteAndBuByUserName()
+    // 获取用户的 site 和 bu
+    this.getSiteAndBuByUserName2()
   },
 
   methods: {
+    // 获取用户的bu
+    getSiteAndBuByUserName2 () {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName2(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.buList = data.rows
+        }
+      })
+    },
+
+    // 获取用户的bu
+    getSiteAndBuByUserName () {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+
     formatDate(date) {
       const year = date.getFullYear();
       const month = (date.getMonth() + 1).toString().padStart(2, '0');
@@ -934,18 +770,6 @@ export default {
       this.inputValue = this.inputValue.replace(/\D/g, '');
     },
 
-    // 获取用户的bu
-    getSiteAndBuByUserName () {
-      let tempData = {
-        username: this.$store.state.user.name,
-      }
-      getSiteAndBuByUserName(tempData).then(({data}) => {
-        if (data.code === 0) {
-          this.userBuList = data.rows
-        }
-      })
-    },
-
     // 查询获取数据列表
     getDataList () {
       this.searchData.limit = this.pageSize
@@ -956,6 +780,14 @@ export default {
           this.pageIndex = data.page.currPage
           this.pageSize = data.page.pageSize
           this.totalPage = data.page.totalCount
+          // 判断是否全部存在数据
+          if (this.dataList.length > 0) {
+            // 设置选中行
+            this.$refs.laborClassTable.setCurrentRow(this.dataList[0])
+            this.laborClassClickRow(this.dataList[0])
+          } else {
+            this.currentRow = {}
+          }
         }
       })
     },
@@ -972,44 +804,39 @@ export default {
       this.pageIndex = val
       this.getDataList()
     },
-//页签二插查询
 
+    //页签二插查询
     tabClick (tab, event) {
       // 刷新列表数据
-      if (this.activeName == 'detail'){
-        this.refreshCurrentTabTable()
-      }else if (this.activeName == 'cost'){
+      if (this.activeName === 'cost') {
         this.refreshCurrentTabTable2()
       }
     },
 
-    changeData(row){
-      this.currentRow = JSON.parse(JSON.stringify(row));
-      this.headerData=row;
-      if (this.activeName == 'detail'){
-        this.refreshCurrentTabTable()
-      }else if (this.activeName == 'cost'){
-        this.refreshCurrentTabTable2()
-      }
-    },
-    refreshCurrentTabTable(){
-      findByLabor(this.currentRow).then(({data}) => {
-        //区分请求成功和失败的状况
-        if (data && data.code == 0) {
-          this.dataList1 = data.rows[0]
-        } else {
-          this.dataList1 = [];
-        }
-      });
+    laborClassClickRow (row) {
+      this.currentRow = JSON.parse(JSON.stringify(row))
+      this.dataList1 = this.currentRow
+      this.refreshCurrentTabTable2()
     },
 
+    // refreshCurrentTabTable () {
+    //   findByLabor(this.currentRow).then(({data}) => {
+    //     //区分请求成功和失败的状况
+    //     if (data && data.code === 0) {
+    //       this.dataList1 = data.rows[0]
+    //     } else {
+    //       this.dataList1 = [];
+    //     }
+    //   });
+    // },
+
     refreshCurrentTabTable2(){
       queryByLaborClass(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
-        if (data && data.code == 0) {
+        if (data && data.code === 0) {
           this.dataList2 = data.rows
         } else {
-          this.dataList2 = [];
+          this.dataList2 = []
         }
       });
     },
@@ -1018,18 +845,17 @@ export default {
     addModal () {
       this.modalData = {
         flag: '1',
-        site: this.$store.state.user.site,
-        bu: '',
-        buNo: this.userBuList[0].buNo,
+        site: '',
+        buNo: '',
+        bu: this.userBuList[0].buNo,
         classNo: '',
         classDesc: '',
         active: 'Y',
         createdDate: '',
-        createdBy: '',
+        createdBy: this.$store.state.user.name,
         updatedDate: '',
         updatedBy: '',
-        levelCost: '',
-        remake:'',
+        remark: '',
       }
       this.modalDisableFlag = false
       this.modalFlag = true
@@ -1040,23 +866,35 @@ export default {
       this.modalData = {
         flag: '2',
         id: row.id,
-        site: this.$store.state.user.site,
-        bu:  row.site + '_' + row.buNo,
+        bu: row.site + '_' + row.buNo,
+        site: row.site,
         buNo: row.buNo,
         classNo: row.classNo,
         classDesc: row.classDesc,
         active: row.active,
         createdDate: row.createdDate,
-        createdBy: this.$store.state.user.name,
-        updatedDate: row.updatedDate,
+        createdBy: row.createdBy,
+        updatedDate: '',
         updatedBy: this.$store.state.user.name,
-        levelCost: row.levelCost,
-        remake:row.remake,
+        remark: row.remark,
       }
       this.modalDisableFlag = true
       this.modalFlag = true
     },
+
     saveData () {
+      if (this.modalData.bu === '' || this.modalData.bu == null) {
+        this.$message.warning('请选择BU！')
+        return
+      }
+      if (this.modalData.classNo === '' || this.modalData.classNo == null) {
+        this.$message.warning('请填写人工等级编码！')
+        return
+      }
+      if (this.modalData.classDesc === '' || this.modalData.classDesc == null) {
+        this.$message.warning('请填写人工等级名称！')
+        return
+      }
       if (this.modalData.flag === '1') { // 新增
         insertByLabor(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1118,19 +956,16 @@ export default {
             })
           }
         })
-      }).catch(() => {
       })
     },
 
-
-
-
     //成本
     // 新增按钮
     addModal1 () {
       this.modalData1 = {
         flag1: '1',
-        site: this.$store.state.user.site,
+        site: this.currentRow.site,
+        buNo: this.currentRow.buNo,
         classNo: this.currentRow.classNo,
         itemNo: '',
         unitCost: '',
@@ -1148,7 +983,8 @@ export default {
     updateModal1 (row) {
       this.modalData1 = {
         flag1: '2',
-        site: this.$store.state.user.site,
+        site: this.currentRow.site,
+        buNo: this.currentRow.buNo,
         classNo: this.currentRow.classNo,
         itemNo: row.itemNo,
         unitCost: row.unitCost,
@@ -1162,17 +998,17 @@ export default {
       this.modalFlag1 = true
     },
 
-    // 删除方法
-    deleteModal1 (row) {
-      this.$confirm(`是否删除此数据?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteByLaborClass(row).then(({data}) => {
+    // 新增/修改方法
+    saveData1 () {
+      if (this.modalData1.beginDate === '' || this.modalData1.beginDate == null) {
+        this.$message.warning('请选择启动日期！')
+        return
+      }
+      if (this.modalData1.flag1 === '1') { // 新增
+        appendByLaborClass(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
-            this.changeData()
             this.refreshCurrentTabTable2()
+            this.modalFlag1 = false
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1186,20 +1022,9 @@ export default {
             })
           }
         })
-      }).catch(() => {
-      })
-    },
-
-    // 新增/修改方法
-    saveData1 () {
-      if (this.modalData1.flag1 === '1') { // 新增
-        if (this.modalData1.classNo ==null || this.modalData1.classNo === ''){
-          this.$message.warning('请选择一条人工等级数据！')
-          return
-        }
-        appendByLaborClass(this.modalData1).then(({data}) => {
+      } else { // 修改
+        amendByLaborClass(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
-            this.getDataList()
             this.refreshCurrentTabTable2()
             this.modalFlag1 = false
             this.$message({
@@ -1215,12 +1040,19 @@ export default {
             })
           }
         })
-      } else { // 修改
-        amendByLaborClass(this.modalData1).then(({data}) => {
+      }
+    },
+
+    // 删除方法
+    deleteModal1 (row) {
+      this.$confirm(`是否删除此数据?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteByLaborClass(row).then(({data}) => {
           if (data && data.code === 0) {
-            this.getDataList()
             this.refreshCurrentTabTable2()
-            this.modalFlag1 = false
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1234,18 +1066,7 @@ export default {
             })
           }
         })
-      }
-    },
-
-    // 查询检验类型
-    inspectionTypeSearch () {
-      let tempData = {
-        site: this.$store.state.user.site
-      }
-      inspectionTypeSearch(tempData).then(({data}) => {
-        if (data.code === 0) {
-          this.options = data.rows
-        }
+      }).catch(() => {
       })
     },
 
@@ -1289,7 +1110,7 @@ export default {
       this.searchData.limit = -1
       this.searchData.page = 1
       await findAll(this.searchData).then(({data}) => {
-        this.exportList = data.rows
+        this.exportList = data.page.list
       })
       return this.exportList
     },
@@ -1325,20 +1146,10 @@ export default {
       }
       await getTableUserListLanguage(queryTableUser).then(({data}) => {
         if (data.rows.length > 0) {
-          //this.columnList1 = []
           switch (columnId) {
             case 1:
               this.columnList = data.rows
               break;
-            // case 2:
-            //   this.columnDetailList = data.rows
-            //   break;
-            // case 3:
-            //   this.columnList2 = data.rows
-            //   break;
-            // case 4:
-            //   this.columnList3 = data.rows
-            //   break;
           }
         } else {
           this.getColumnList(tableId, columnId)
@@ -1354,20 +1165,11 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length == 0) {
+        if (!data.rows.length === 0) {
           switch (columnId) {
             case 1:
               this.columnList = data.rows
               break;
-            // case 2:
-            //   this.columnDetailList = data.rows
-            //   break;
-            // case 3:
-            //   this.columnList2 = data.rows
-            //   break;
-            // case 4:
-            //   this.columnList3 = data.rows
-            //   break;
           }
         } else {
           // this.showDefault = true.
@@ -1392,6 +1194,10 @@ export default {
 </script>
 
 <style scoped>
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+  height: 459px;
+}
 .numInput /deep/ .el-input__inner{
   text-align: right;
 }