diff --git a/src/views/modules/fanuc/currency.vue b/src/views/modules/fanuc/currency.vue
index c6cb2ca..ba3d6a7 100644
--- a/src/views/modules/fanuc/currency.vue
+++ b/src/views/modules/fanuc/currency.vue
@@ -10,17 +10,17 @@
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号:'">
+      <el-form-item :label="'工厂编号'">
         <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
       </el-form-item>
 
-      <el-form-item :label="'货币:'">
+      <el-form-item :label="'货币'">
         <el-input v-model="searchData.currency" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'货币描述:'">
+      <el-form-item :label="'货币描述'">
         <el-input v-model="searchData.currencyDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="状态:">
+      <el-form-item label="状态">
         <el-select v-model="searchData.active" placeholder="请选择">
           <el-option label="全部" value=" "></el-option>
           <el-option label="启用" value="Y"></el-option>
@@ -99,89 +99,95 @@
 
 
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card">
-      <el-tab-pane label="汇率" name="detail">
-        <el-row>
-          <el-col span="11">
-            <el-col>
-              <span>货币参考</span>
+      <el-tab-pane label="汇率" name="detail" >
+          <el-row style="display: flex">
+            <el-card style="width: 50%">
+            <el-col >
+              <el-col>
+                <span>参考货币</span>
+              </el-col>
+              <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
+              <el-table
+                :data="dataList1"
+                @row-click="changeData2"
+                :height="height"
+                border
+                style="width: 100%; ">
+                <el-table-column
+                  v-for="(item,index) in columnList1" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed==''?false:item.fixed"
+                  :min-width="item.columnWidth"
+                  :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>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  header-align="center"
+                  align="center"
+                  width="160"
+                  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>
+                  </template>
+                </el-table-column>
+
+              </el-table>
             </el-col>
-            <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
-            <el-table
-              :data="dataList1"
-              @row-click="changeData2"
-              :height="height"
-              border
-              style="width: 100%; ">
-              <el-table-column
-                v-for="(item,index) in columnList1" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed==''?false:item.fixed"
-                :min-width="item.columnWidth"
-                :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>
-                </template>
-              </el-table-column>
-              <el-table-column
-                fixed="right"
-                header-align="center"
-                align="center"
-                width="160"
-                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>
-                </template>
-              </el-table-column>
-
-            </el-table>
-          </el-col>
-          <el-col style="margin-left: 35px" span="11">
-            <el-col>
-              <span>货币汇率</span>
+        </el-card>
+            <el-card style="width: 50%">
+            <el-col style="margin-left: 20px">
+              <el-col>
+                <span>货币汇率</span>
+              </el-col>
+              <el-button v-if="!authSave" type="primary" @click="addModal2()">新增</el-button>
+              <el-table
+                :data="dataList2"
+                :height="height"
+                border
+                style="width: 100%; ">
+                <el-table-column
+                  v-for="(item,index) in columnList2" :key="index"
+                  :sortable="item.columnSortable"
+                  :prop="item.columnProp"
+                  :header-align="item.headerAlign"
+                  :show-overflow-tooltip="item.showOverflowTooltip"
+                  :align="item.align"
+                  :fixed="item.fixed==''?false:item.fixed"
+                  :min-width="item.columnWidth"
+                  :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>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  header-align="center"
+                  align="center"
+                  width="160"
+                  label="操作">
+                  <template slot-scope="scope">
+                    <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>
+                    <a type="text" size="small" @click="deleteModal2(scope.row)">删除</a>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-col>
-            <el-button v-if="!authSave" type="primary" @click="addModal2()">新增</el-button>
-            <el-table
-              :data="dataList2"
-              :height="height"
-              border
-              style="width: 100%; ">
-              <el-table-column
-                v-for="(item,index) in columnList2" :key="index"
-                :sortable="item.columnSortable"
-                :prop="item.columnProp"
-                :header-align="item.headerAlign"
-                :show-overflow-tooltip="item.showOverflowTooltip"
-                :align="item.align"
-                :fixed="item.fixed==''?false:item.fixed"
-                :min-width="item.columnWidth"
-                :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>
-                </template>
-              </el-table-column>
-              <el-table-column
-                fixed="right"
-                header-align="center"
-                align="center"
-                width="160"
-                label="操作">
-                <template slot-scope="scope">
-                  <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>
-                  <a type="text" size="small" @click="deleteModal2(scope.row)">删除</a>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-        </el-row>
+            </el-card>
+          </el-row>
+
+
       </el-tab-pane>
     </el-tabs>
 
@@ -198,11 +204,13 @@
         <el-form-item label="货币:" prop="currency" :rules="rules.currency">
           <el-input v-model="modalData.currency" :disabled="modalDisableFlag" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="货币描述:" prop="currencyDesc">
+
+        <el-form-item label="货币描述:" @change="" prop="currencyDesc">
           <el-input v-model="modalData.currencyDesc" style="width: 221px"></el-input>
         </el-form-item>
+
         <el-form-item label="状态:" prop="active">
-          <el-select v-model="modalData.active" placeholder="请选择" style="width: 221px">
+          <el-select v-model="modalData.active"  placeholder="请选择" style="width: 221px">
             <el-option label="启用" value="Y"></el-option>
             <el-option label="禁用" value="N"></el-option>
           </el-select>
@@ -232,16 +240,18 @@
         <el-form-item label="货币:" prop="currency">
           <el-input  v-model="modalData1.currency" style="width: 221px"></el-input>
         </el-form-item>
+
         <el-form-item label="货币描述:" prop="currencyDesc" >
-          <el-input  v-model="modalData1.currencyDesc" style="width: 221px"></el-input>
+          <el-input  v-model="modalData1.currencyDesc"  style="width: 221px"></el-input>
         </el-form-item>
 
+
         <el-form-item :label="'最近汇率日期：'" >
           <el-date-picker
             style="width: 221px"
             v-model="modalData1.createDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -253,20 +263,20 @@
     </el-dialog>
 
     <!-- 货币汇率新增和修改  -->
-    <el-dialog title="货币汇率" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="500px">
+    <el-dialog title="货币汇率" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="300px">
       <el-form :inline="true" label-position="top" :model="modalData2" :rules="rules"
                style="margin-left: 7px;margin-top: -5px;">
 
-        <el-form-item label="汇率:" prop="exchangeRate" >
-          <el-input v-model="modalData2.exchangeRate" style="width: 221px" ></el-input>
+        <el-form-item label="汇率:" prop="exchangeRate"  >
+          <el-input class="inlineNumber numInput" v-model="modalData2.exchangeRate" style="width: 200px" ></el-input>
         </el-form-item>
 
         <el-form-item :label="'启用日期：'" >
           <el-date-picker
-            style="width: 221px"
+            style="width: 200px"
             v-model="modalData2.activationDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -614,7 +624,7 @@ export default {
           columnWidth: 110,
           columnProp: 'exchangeRate',
           headerAlign: 'center',
-          align: 'center',
+          align: 'right',
           columnLabel: '汇率',
           columnHidden: false,
           columnImage: false,
@@ -753,12 +763,18 @@ export default {
     })
   },
 
-  //编码自动转化成大写
+
+
+  //货币自动转化成大写
   watch: {
     modalData: {
       deep: true,
       handler: function (newV, oldV) {
-        // this.modalData.currency = this.modalData.currency.toUpperCase()
+        this.modalData.currency = this.modalData.currency.toUpperCase()
+        this.$nextTick(() => {
+          this.modalData1.currency = this.modalData1.currency.toUpperCase();
+        });
+
       }
     }
   },
@@ -772,6 +788,17 @@ export default {
 
   methods: {
 
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      // const hours = date.getHours().toString().padStart(2, '0');
+      // const minutes = date.getMinutes().toString().padStart(2, '0');
+      // const seconds = date.getSeconds().toString().padStart(2, '0');
+      // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      return `${year}-${month}-${day}`;
+    },
+
     // 查询获取数据列表
     getDataList () {
       this.searchData.limit = this.pageSize
@@ -855,10 +882,11 @@ export default {
       this.modalData = {
         flag: '2',
         id: row.id,
+        site: this.$store.state.user.site,
         currency: row.currency,
         currencyDesc: row.currencyDesc,
         active: row.active,
-        baseCurrencyFlag: row.baseCurrencyFlag,
+        baseCurrencyFlag: row.baseCurrencyFlag === 'Y',
         createDate: row.createDate,
         createBy: row.createBy,
         updateDate: row.updateDate,
@@ -977,6 +1005,8 @@ export default {
         deleteRefCurrency(row).then(({data}) => {
           if (data && data.code === 0) {
             this.changeData()
+            this.refreshCurrentTabTable ()
+            this.changeData (row)
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1003,6 +1033,7 @@ export default {
         addRefCurrency(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable ()
             this.modalFlag1 = false
             this.$message({
               message: '操作成功',
@@ -1021,6 +1052,7 @@ export default {
         updateRefCurrency(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable ()
             this.modalFlag1 = false
             this.$message({
               message: '操作成功',
@@ -1045,12 +1077,13 @@ export default {
         flag: '1',
         id: '',
         currency: this.currentRow2.currency,
-        activationDate: '',
+        activationDate: this.formatDate(new Date()),
         exchangeRate: '',
         createDate: '',
         createBy: '',
         updateDate: '',
         updateBy: '',
+        currencyRateRefcurrencyId: this.currentRow2.id,
       }
       this.modalDisableFlag2 = false
       this.modalFlag2 = true
@@ -1077,6 +1110,8 @@ export default {
         addExchangeCurrency(this.modalData2).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable()
+            this.refreshCurrentTabTable2()
             this.modalFlag2 = false
             this.$message({
               message: '操作成功',
@@ -1095,6 +1130,7 @@ export default {
         updateExchangeCurrency(this.modalData2).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2()
             this.modalFlag2 = false
             this.$message({
               message: '操作成功',
@@ -1121,6 +1157,7 @@ export default {
         deleteExchangeCurrency(row).then(({data}) => {
           if (data && data.code === 0) {
             this.changeData2()
+            this.refreshCurrentTabTable2()
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1288,6 +1325,22 @@ export default {
       this.authUpdate = !updateFlag
       this.authDelete = !deleteFlag
     },
+
   }
 }
 </script>
+
+<style scoped>
+.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;
+}
+</style>
diff --git a/src/views/modules/fanuc/fanuc.vue b/src/views/modules/fanuc/fanuc.vue
index 3f63024..889f470 100644
--- a/src/views/modules/fanuc/fanuc.vue
+++ b/src/views/modules/fanuc/fanuc.vue
@@ -10,23 +10,23 @@
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号:'">
+      <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-form-item :label="'BU'">
         <el-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心编码:'">
+      <el-form-item :label="'加工中心编码'">
         <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心名称:'">
+      <el-form-item :label="'加工中心名称'">
         <el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="状态:">
+      <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-option label="停用" value="N"></el-option>
         </el-select>
       </el-form-item>
 
@@ -55,6 +55,7 @@
       :height="height"
       :data="dataList"
       @row-click="changeData"
+
       border
       style="width: 100%;">
       <el-table-column
@@ -79,7 +80,7 @@
         width="160"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
+          <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>
 <!--          <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>-->
         </template>
       </el-table-column>
@@ -97,28 +98,60 @@
 
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
       <el-tab-pane label="详情" name="detail">
-        <el-table
-          :data="dataList1"
-          :height="height"
-          border
-          style="width: 100%; ">
-          <el-table-column
-            v-for="(item,index) in columnList1" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :min-width="item.columnWidth"
-            :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>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-form :inline="true" label-position="top" :model="dataList1">
+        <el-row style="margin-top: 15px">
+          <el-form-item :label="'加工中心编码'">
+            <el-input v-model="dataList1.workshopId" clearable style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'加工中心名称'">
+            <el-input v-model="dataList1.workCenterDesc" 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-row>
+
+        <el-row style="margin-top: 15px">
+          <el-form-item :label="'加工中心类型'">
+            <el-input v-model="dataList1.workCenterType" clearable style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'加工中心组编码'">
+            <el-input v-model="dataList1.prolineNo" clearable style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'平均产能'">
+            <el-input v-model="dataList1.averageCapacity" clearable style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'产能类型'">
+            <el-input v-model="dataList1.capacityType" clearable style="width: 300px"></el-input>
+          </el-form-item>
+        </el-row>
+
+        <el-row style="margin-top: 15px">
+          <el-form-item :label="'备注'">
+            <el-input v-model="dataList1.remark" clearable style="width: 1235px"></el-input>
+          </el-form-item>
+        </el-row>
+
+        <el-row style="margin-top: 15px">
+          <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>
+
+
+       </el-form>
       </el-tab-pane>
 
       <el-tab-pane label="成本" name="cost">
@@ -165,34 +198,28 @@
     <el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" 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-item>
-
         <el-form-item label="加工中心编码:" prop="workCenterNo" >
           <el-input v-model="modalData1.workCenterNo" :disabled="!isNew" style="width: 221px"></el-input>
         </el-form-item>
-        <el-form-item label="项目号:" prop="itemNo" >
-          <el-input type="number" v-model="modalData1.itemNo" style="width: 221px"></el-input>
-        </el-form-item>
+
         <el-form-item label="单位成本:" prop="unitCost" :rules="rules.unitCost" >
-          <el-input type="number" v-model="modalData1.unitCost"  style="width: 221px"></el-input>
+          <el-input  v-model="modalData1.unitCost" class="inlineNumber numInput" @input="validateInput"  style="width: 221px;text-align:end"></el-input>
         </el-form-item>
 
         <el-form-item label="单位制造费用成本:" prop="overheadCost" :rules="rules.overheadCost">
-          <el-input type="number" v-model="modalData1.overheadCost"  style="width: 221px"></el-input>
+          <el-input  v-model="modalData1.overheadCost" class="inlineNumber numInput" @input="validateInput"  style="width: 221px"></el-input>
         </el-form-item>
 
         <el-form-item label="单位人工成本:" prop="laborCost" :rules="rules.laborCost">
-          <el-input type="number" v-model="modalData1.laborCost"  style="width: 221px"></el-input>
+          <el-input  v-model="modalData1.laborCost" class="inlineNumber numInput" @input="validateInput"  style="width: 221px"></el-input>
         </el-form-item>
 
-        <el-form-item :label="'启用日期：'" >
+        <el-form-item :label="'启用日期：'" :rules="rules.beginDate">
           <el-date-picker
             style="width: 221px"
             v-model="modalData1.beginDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -201,18 +228,12 @@
           <el-date-picker
             style="width: 221px"
             v-model="modalData1.endDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
 
-<!--        <el-form-item label="启用日期:" prop="beginDate" >-->
-<!--          <el-date-picker  v-model="modalData1.beginDate"  style="width: 221px"></el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="结束日期:" prop="endDate" >-->
-<!--          <el-date-picker  v-model="modalData1.endDate"  style="width: 221px"></el-date-picker>-->
-<!--        </el-form-item>-->
 
         <el-form-item label="备注:" prop="remake" >
           <el-input v-model="modalData.remake" style="width: 221px"></el-input>
@@ -224,7 +245,34 @@
       </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="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
 
+        <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>
+
+        <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>
+        <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">
+        <el-button type="primary" @click="saveData1()">保存</el-button>
+        <el-button type="primary" @click="modalFlag1 = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
 
 
   </div>
@@ -233,22 +281,24 @@
 <script>
 import {
   findAll, // 检验方法查询
-  updateFanuc, // 检验方法修
+  updateFanuc, // 检验方法修改
   findFanuc,//查询(传的list)
   appendByCost,//成本新增
-  queryByCost, //成本插叙
+  queryByCost, //成本查询
   amendByCost,//成本修改
   deleteByCost,//删除成本
 } from "@/api/fanucGroup/fanuc.js"
 import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
+
 export default {
   data () {
     return {
-      activeName:'detail',
-      currentRow:'',
-      headerData:'',
-      currentRow2:'',
-      headerData2:'',
+      activeName: 'detail',
+      currentRow: '',
+      headerData: '',
+      currentRow2: '',
+      isNew: false,
+      headerData2: '',
       // 是否收藏
       favorite: false,
       // 导出 start
@@ -290,11 +340,13 @@ export default {
       totalPage: 0,
       height: 200,
       dataList: [],
-      dataList1:[],
-      dataList2:[],
+      dataList1: [],
+      dataList2: [],
       dataListLoading: false,
       modalFlag: false,
       modalDisableFlag: false,
+      modalFlag1: false,
+      modalDisableFlag1: false,
       modalData: {
         site: this.$store.state.user.site,
         bu: '',
@@ -321,7 +373,7 @@ export default {
         delflag: '',
         version: ''
       },
-      modalData1:{
+      modalData1: {
         site: this.$store.state.user.site,
         workCenterNo: '',
         itemNo: '',
@@ -329,9 +381,10 @@ export default {
         overheadCost: '',
         laborCost: '',
         umId: '',
-        beginDate: '',
+        beginDate: this.formatDate(new Date()),
         endDate: '',
         remark: '',
+        serialNo: '',
       },
       // 标头展示
       columnList: [
@@ -466,12 +519,12 @@ export default {
           functionId: 501002,
           serialNumber: '501002TableCreatedDate',
           tableId: "501002Table",
-          tableName: "创建时间",
+          tableName: "录入时间",
           columnWidth: 130,
           columnProp: 'createdDate',
           headerAlign: 'center',
           align: "center",
-          columnLabel: '创建时间',
+          columnLabel: '录入时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -484,12 +537,12 @@ export default {
           functionId: 501002,
           serialNumber: '501002TableCreatedBy',
           tableId: "501002Table",
-          tableName: "创建人",
+          tableName: "录入人",
           columnWidth: 130,
           columnProp: 'createdBy',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '创建人',
+          columnLabel: '录入人',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -502,12 +555,12 @@ export default {
           functionId: 501002,
           serialNumber: '501002TableUpdateDate',
           tableId: "501002Table",
-          tableName: "修改时间",
+          tableName: "最近修改时间",
           columnWidth: 130,
-          columnProp: 'updateDate',
+          columnProp: 'updatedDate',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '修改时间',
+          columnLabel: '最近修改时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -520,12 +573,12 @@ export default {
           functionId: 501002,
           serialNumber: '501002TableUpdateBy',
           tableId: "501002Table",
-          tableName: "修改时间",
+          tableName: "最近修改人",
           columnWidth: 130,
           columnProp: 'updateBy',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '修改时间',
+          columnLabel: '最近修改人',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -753,34 +806,34 @@ export default {
         },
       ],
       columnList2: [
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 501002,
+        //   serialNumber: '501002TableSite',
+        //   tableId: "501002Table",
+        //   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: 501002,
-          serialNumber: '501002TableSite',
-          tableId: "501002Table",
-          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: 501002,
-          serialNumber: '501002TableId',
+          serialNumber: '501002TableItemNo',
           tableId: "501002Table",
           tableName: "序号",
           columnWidth: 130,
-          columnProp: 'id',
+          columnProp: 'itemNo',
           headerAlign: 'center',
-          align: "left",
+          align: "right",
           columnLabel: '序号',
           columnHidden: false,
           columnImage: false,
@@ -798,7 +851,7 @@ export default {
           columnWidth: 130,
           columnProp: 'unitCost',
           headerAlign: 'center',
-          align: "center",
+          align: "right",
           columnLabel: '单位成本',
           columnHidden: false,
           columnImage: false,
@@ -816,7 +869,7 @@ export default {
           columnWidth: 130,
           columnProp: 'overheadCost',
           headerAlign: 'center',
-          align: "center",
+          align: "right",
           columnLabel: '单位制造费用成本',
           columnHidden: false,
           columnImage: false,
@@ -834,7 +887,7 @@ export default {
           columnWidth: 130,
           columnProp: 'laborCost',
           headerAlign: 'center',
-          align: "center",
+          align: "right",
           columnLabel: '单位人工成本',
           columnHidden: false,
           columnImage: false,
@@ -940,6 +993,13 @@ export default {
             message: ' ',
             trigger: ['blur', 'change']
           }
+        ],
+        beginDate: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change']
+          }
         ]
       },
       options: [],
@@ -954,7 +1014,7 @@ export default {
 
   mounted () {
     this.$nextTick(() => {
-      this.height = (window.innerHeight- 260) / 2
+      this.height = (window.innerHeight - 260) / 2
     })
   },
 
@@ -976,6 +1036,22 @@ export default {
   },
 
   methods: {
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      // const hours = date.getHours().toString().padStart(2, '0');
+      // const minutes = date.getMinutes().toString().padStart(2, '0');
+      // const seconds = date.getSeconds().toString().padStart(2, '0');
+      // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      return `${year}-${month}-${day}`;
+    },
+
+
+    validateInput () {
+      // 只保留数字
+      this.inputValue = this.inputValue.replace(/\D/g, '');
+    },
     // 获取用户的bu
     getSiteAndBuByUserName () {
       let tempData = {
@@ -1018,37 +1094,37 @@ export default {
 
     tabClick (tab, event) {
       // 刷新列表数据
-      if (this.activeName == 'detail'){
+      if (this.activeName == 'detail') {
         this.refreshCurrentTabTable()
-      }else if (this.activeName == 'cost'){
+      } else if (this.activeName == 'cost') {
         this.refreshCurrentTabTable2()
       }
     },
 
-    changeData(row){
+    changeData (row) {
       this.currentRow = JSON.parse(JSON.stringify(row));
-      this.headerData=row;
+      this.headerData = row;
 
-      if (this.activeName == 'detail'){
+      if (this.activeName == 'detail') {
         this.refreshCurrentTabTable()
-      }else if (this.activeName == 'cost'){
+      } else if (this.activeName == 'cost') {
         this.refreshCurrentTabTable2()
       }
     },
-    refreshCurrentTabTable(){
+    refreshCurrentTabTable () {
 
       findFanuc(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
         if (data && data.code == 0) {
-          this.dataList1 = data.rows
+          this.dataList1 = data.rows[0]
+          console.log("1111111:" + this.dataList1.workshopId)
         } else {
           this.dataList1 = [];
         }
       });
     },
 
-
-    refreshCurrentTabTable2(){
+    refreshCurrentTabTable2 () {
 
       queryByCost(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
@@ -1071,7 +1147,7 @@ export default {
         overheadCost: '',
         laborCost: '',
         umId: '',
-        beginDate: '',
+        beginDate: this.formatDate(new Date()),
         endDate: '',
         remark: '',
 
@@ -1086,7 +1162,7 @@ export default {
         flag: '2',
         site: this.$store.state.user.site,
         workCenterNo: this.currentRow.workCenterNo,
-        id:row.id,
+        id: row.id,
         itemNo: row.itemNo,
         unitCost: row.unitCost,
         overheadCost: row.overheadCost,
@@ -1110,6 +1186,7 @@ export default {
         deleteByCost(row).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2 ()
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1130,13 +1207,22 @@ export default {
     // 新增/修改方法
     saveData () {
       if (this.modalData1.flag === '1') { // 新增
-        if (this.modalData1.workCenterNo ==null || this.modalData1.workCenterNo === ''){
+        if (this.modalData1.workCenterNo == null || this.modalData1.workCenterNo === '') {
           this.$message.warning('请选择一条加工中心数据！')
           return
         }
+        if (this.modalData1.beginDate == null || this.modalData1.beginDate === '') {
+          this.$message.warning('请选择启用日期！')
+          return
+        }
+        if (this.modalData1.unitCost == null || this.modalData1.unitCost <0) {
+          this.$message.warning('单位成本不能小于0！')
+          return
+        }
         appendByCost(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2()
             this.modalFlag = false
             this.$message({
               message: '操作成功',
@@ -1155,12 +1241,14 @@ export default {
         amendByCost(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2()
             this.modalFlag = false
             this.$message({
               message: '操作成功',
               type: 'success',
               duration: 1500,
               onClose: () => {
+
               }
             })
           } else {
@@ -1171,6 +1259,63 @@ export default {
         })
       }
     },
+    //加工中心
+    updateModal1 (row) {
+      this.modalData = {
+        flag: '2',
+        site: this.$store.state.user.site,
+        id: row.id,
+        bu: row.bu,
+        buNo: row.buNo,
+        workshopId: row.buNo,
+        workCenterNo: row.workCenterNo,
+        workCenterDesc: row.workCenterDesc,
+        workCenterTypeDb: row.workCenterTypeDb,
+        workCenterType: row.workCenterType,
+        updateBy: this.$store.state.user.name,
+        updateDate: row.updateDate,
+        averageCapacity: row.averageCapacity,
+        efficiency: row.efficiency,
+        utilization: row.utilization,
+        capacityTypeDb: row.capacityTypeDb,
+        capacityType: row.capacityType,
+        umid: row.umid,
+        active: row.active,
+        prolineNo: row.prolineNo,
+        needSetupFlag: row.needSetupFlag,
+        createdBy: this.$store.state.user.name,
+        createdDate: row.createDate,
+        remark: row.remark,
+        delflag: row.delflag,
+        version: row.version
+      }
+      this.modalDisableFlag1 = true
+      this.modalFlag1 = true
+    },
+    saveData1 () {
+      if (this.modalData.flag === '2') { // 修改
+        updateFanuc(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.refreshCurrentTabTable2()
+            this.modalFlag1 = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+
 
     // 查询检验类型
     inspectionTypeSearch () {
@@ -1325,3 +1470,18 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.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;
+}
+</style>
diff --git a/src/views/modules/fanuc/fanucGroup.vue b/src/views/modules/fanuc/fanucGroup.vue
index 7f8765e..c7ad9e2 100644
--- a/src/views/modules/fanuc/fanucGroup.vue
+++ b/src/views/modules/fanuc/fanucGroup.vue
@@ -10,13 +10,13 @@
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号:'">
+      <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-form-item :label="'BU'">
         <el-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="状态:">
+      <el-form-item label="状态">
         <el-select v-model="searchData.status" placeholder="请选择">
           <el-option label="全部" value=""></el-option>
           <el-option label="启用" value="Y"></el-option>
@@ -24,6 +24,12 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item :label="'组编码'">
+        <el-input v-model="searchData.prodLineNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'组名称'">
+        <el-input v-model="searchData.prodLineDesc" clearable style="width: 120px"></el-input>
+      </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>
@@ -89,25 +95,24 @@
     </el-pagination>
 
     <!-- 新增和修改 -->
-    <el-dialog title="加工中心组" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
+    <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: 221px" :disabled="!isNew"></el-input>
+          <el-input v-model="modalData.site" style="width: 150px" :disabled="!isNew"></el-input>
         </el-form-item>
 <!--        <el-form-item label="BU:" prop="buNo" >-->
 <!--          <el-input v-model="modalData.buNo" style="width: 221px" :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: 221px">
+          <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: left;width: 100px">{{ i.sitename }}</span>
-              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
+              <span style="float: left; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
                 {{ i.buDesc }}
               </span>
             </el-option>
@@ -115,17 +120,17 @@
         </el-form-item>
 
         <el-form-item label="组编码:" prop="prodLineNo" :rules="rules.prodLineNo">
-          <el-input v-model="modalData.prodLineNo" :disabled="modalDisableFlag"  style="width: 221px"></el-input>
+          <el-input v-model="modalData.prodLineNo" :disabled="modalDisableFlag"  style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="组名称:" prop="prodLineDesc" :rules="rules.prodLineDesc">
-          <el-input v-model="modalData.prodLineDesc" style="width: 221px"></el-input>
+          <el-input v-model="modalData.prodLineDesc" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="备注:" prop="remake" >
-          <el-input v-model="modalData.remake" style="width: 221px"></el-input>
+          <el-input v-model="modalData.remake" style="width: 150px"></el-input>
         </el-form-item>
 
         <el-form-item label="状态:">
-          <el-select v-model="modalData.status" placeholder="请选择" style="width: 221px">
+          <el-select v-model="modalData.status" placeholder="请选择" style="width: 150px">
             <el-option label="启用" value="Y"></el-option>
             <el-option label="禁用" value="N"></el-option>
           </el-select>
@@ -458,11 +463,11 @@ export default {
 
   created () {
     //页面在加载的时候就调用查询方法
-    this.getDataList()
     // 获取用户的 site 和 bu
     this.getSiteAndBuByUserName()
   },
 
+
   methods: {
     // 获取用户的bu
     getSiteAndBuByUserName () {
@@ -473,6 +478,7 @@ export default {
         if (data.code === 0) {
           this.userBuList = data.rows
         }
+        this.getDataList()
       })
     },
 
diff --git a/src/views/modules/fanuc/labor.vue b/src/views/modules/fanuc/labor.vue
index 7b769af..a32368e 100644
--- a/src/views/modules/fanuc/labor.vue
+++ b/src/views/modules/fanuc/labor.vue
@@ -10,23 +10,23 @@
 
     <!-- 条件查询 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'工厂编号:'">
+      <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-form-item :label="'BU'">
         <el-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'人工等级编码:'">
+      <el-form-item :label="'人工等级编码'">
         <el-input v-model="searchData.classNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'人工等级名称:'">
+      <el-form-item :label="'人工等级名称'">
         <el-input v-model="searchData.classDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="状态:">
+      <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-option label="停用" value="N"></el-option>
         </el-select>
       </el-form-item>
 
@@ -99,30 +99,51 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+    <el-tabs style="font-size: 12px;min-height: 300px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
       <el-tab-pane label="详情" name="detail">
-        <el-table
-          :data="dataList1"
-          :height="height"
-          border
-          style="width: 100%; ">
-          <el-table-column
-            v-for="(item,index) in columnList1" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :min-width="item.columnWidth"
-            :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>
-            </template>
-          </el-table-column>
-        </el-table>
+        <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-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>
+
+          <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>
+
+
+        </el-form>
       </el-tab-pane>
 
       <el-tab-pane label="成本" name="cost">
@@ -163,21 +184,20 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog title="人工等级" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
+    <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: 221px" :disabled="!isNew"></el-input>
+          <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: 221px">
+          <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: left;width: 100px">{{ i.sitename }}</span>
               <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
                 {{ i.buDesc }}
               </span>
@@ -186,20 +206,20 @@
         </el-form-item>
 
         <el-form-item label="人工等级编码:" prop="classNo" >
-          <el-input v-model="modalData.classNo" :disabled="modalDisableFlag" style="width: 221px"></el-input>
+          <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: 221px"></el-input>
+          <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: 221px">
+          <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: 221px"></el-input>
+          <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">
@@ -219,30 +239,24 @@
           <el-input v-model="modalData1.site" style="width: 221px" :disabled="!isNew"></el-input>
         </el-form-item>
 
-<!--        <el-form-item label="加工中心编码:" prop="workCenterNo" >-->
-<!--          <el-input v-model="modalData1.workCenterNo" :disabled="!isNew" style="width: 221px"></el-input>-->
+<!--        <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="itemNo" >
-          <el-input type="number" v-model="modalData1.itemNo" style="width: 221px"></el-input>
-        </el-form-item>
-        <el-form-item label="单位成本:" prop="unitCost" :rules="rules.unitCost" >
-          <el-input type="number" v-model="modalData1.unitCost"  style="width: 221px"></el-input>
-        </el-form-item>
 
         <el-form-item label="单位制造费用成本:" prop="overheadCost" :rules="rules.overheadCost">
-          <el-input type="number" v-model="modalData1.overheadCost"  style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="modalData1.overheadCost" @input="validateInput" style="width: 221px"></el-input>
         </el-form-item>
 
         <el-form-item label="单位人工成本:" prop="laborCost" :rules="rules.laborCost">
-          <el-input type="number" v-model="modalData1.laborCost"  style="width: 221px"></el-input>
+          <el-input class="inlineNumber numInput" v-model="modalData1.laborCost" @input="validateInput" style="width: 221px"></el-input>
         </el-form-item>
 
         <el-form-item :label="'启用日期：'" >
           <el-date-picker
             style="width: 221px"
             v-model="modalData1.beginDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -251,19 +265,12 @@
           <el-date-picker
             style="width: 221px"
             v-model="modalData1.endDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
 
-<!--        <el-form-item label="启用日期:" prop="beginDate" >-->
-<!--          <el-date-picker  v-model="modalData1.beginDate"  style="width: 221px"></el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="结束日期:" prop="endDate" >-->
-<!--          <el-date-picker  v-model="modalData1.endDate"  style="width: 221px"></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-item>
@@ -716,34 +723,34 @@ export default {
         },
       ],
       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: '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: '501003TableId',
+          serialNumber: '501003TableSerialNo',
           tableId: "501003Table",
           tableName: "序号",
           columnWidth: 130,
-          columnProp: 'id',
+          columnProp: 'serialNo',
           headerAlign: 'center',
-          align: "left",
+          align: "right",
           columnLabel: '序号',
           columnHidden: false,
           columnImage: false,
@@ -752,24 +759,24 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 501003,
-          serialNumber: '501003TableUnitCost',
-          tableId: "501003Table",
-          tableName: "单位成本",
-          columnWidth: 130,
-          columnProp: 'unitCost',
-          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: '501003TableUnitCost',
+        //   tableId: "501003Table",
+        //   tableName: "单位成本",
+        //   columnWidth: 130,
+        //   columnProp: 'unitCost',
+        //   headerAlign: 'center',
+        //   align: "right",
+        //   columnLabel: '单位成本',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 501003,
@@ -779,7 +786,7 @@ export default {
           columnWidth: 130,
           columnProp: 'overheadCost',
           headerAlign: 'center',
-          align: "center",
+          align: "right",
           columnLabel: '单位制造费用成本',
           columnHidden: false,
           columnImage: false,
@@ -797,7 +804,7 @@ export default {
           columnWidth: 130,
           columnProp: 'laborCost',
           headerAlign: 'center',
-          align: "center",
+          align: "right",
           columnLabel: '单位人工成本',
           columnHidden: false,
           columnImage: false,
@@ -939,6 +946,23 @@ export default {
   },
 
   methods: {
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      // const hours = date.getHours().toString().padStart(2, '0');
+      // const minutes = date.getMinutes().toString().padStart(2, '0');
+      // const seconds = date.getSeconds().toString().padStart(2, '0');
+      // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      return `${year}-${month}-${day}`;
+    },
+
+
+    validateInput () {
+      // 只保留数字
+      this.inputValue = this.inputValue.replace(/\D/g, '');
+    },
+
     // 获取用户的bu
     getSiteAndBuByUserName () {
       let tempData = {
@@ -1001,7 +1025,7 @@ export default {
       findByLabor(this.currentRow).then(({data}) => {
         //区分请求成功和失败的状况
         if (data && data.code == 0) {
-          this.dataList1 = data.rows
+          this.dataList1 = data.rows[0]
         } else {
           this.dataList1 = [];
         }
@@ -1143,10 +1167,9 @@ export default {
         overheadCost: '',
         laborCost: '',
         umId: '',
-        beginDate: '',
+        beginDate: this.formatDate(new Date()),
         endDate: '',
         remark: '',
-
       }
       this.modalDisableFlag1 = false
       this.modalFlag1 = true
@@ -1181,7 +1204,8 @@ export default {
       }).then(() => {
         deleteByCost(row).then(({data}) => {
           if (data && data.code === 0) {
-            this.changeData()
+            // this.changeData()
+            this.refreshCurrentTabTable2()
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1209,6 +1233,7 @@ export default {
         appendByCost(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2()
             this.modalFlag1 = false
             this.$message({
               message: '操作成功',
@@ -1227,6 +1252,7 @@ export default {
         amendByCost(this.modalData1).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
+            this.refreshCurrentTabTable2()
             this.modalFlag1 = false
             this.$message({
               message: '操作成功',
@@ -1397,3 +1423,18 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.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;
+}
+</style>