From 702e6fa5b51cf448c2394416e1e0eacb6b747a3b Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 6 May 2024 15:42:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.js                      |   8 +-
 src/store/index.js                            |  26 +-
 .../allInfo/componentsModule/dataListData.vue | 194 +++--
 .../hadRead/componentsModule/dataListData.vue |  56 +-
 .../notRead/componentsModule/dataListData.vue |  56 +-
 .../projectFront/carManage/carManage.vue      |   1 +
 .../laborManage/personDetails.vue             |   2 +-
 .../personModule/administration.vue           |   1 +
 .../personModule/laborComponent.vue           |   1 +
 .../laborManage/personRegisterDetails.vue     | 665 +++++++++---------
 .../materialManage/materialEntryManage.vue    |   3 +-
 .../materialManage/materialExitManage.vue     |   3 +-
 12 files changed, 575 insertions(+), 441 deletions(-)

diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index 2f8dd2d4..ce6df518 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -38,10 +38,10 @@ import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 
 import 'quill/dist/quill.bubble.css'
-import VConsole from 'vconsole';
-if (process.env.NODE_ENV == 'development'){
-  new VConsole();
-}
+// import VConsole from 'vconsole';
+// if (process.env.NODE_ENV == 'development'){
+//   new VConsole();
+// }
 const hls = require('videojs-contrib-hls')
 Vue.use(hls)
 Vue.use(VueQuillEditor) // 注册富文本编辑器
diff --git a/src/store/index.js b/src/store/index.js
index 9860fd60..25362aac 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,24 +48,24 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
-    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    // BASEURL: baseUrl
-    //   ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
-    //   window.location.protocol +
-    //   "//" +
-    //   window.location.host +
-    //   "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    BASEURL: baseUrl
+      ? baseUrl
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    UPLOADURL:
+      window.location.protocol +
+      "//" +
+      window.location.host +
+      "/upload/image", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
     // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
-    // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
+    WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
     // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
index dc72dc27..dc916161 100644
--- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
@@ -18,7 +18,7 @@
           ref="searchForm"
           :model="searchForm"
           size="medium"
-          style="width: 100%;display: flex;align-items: center;"
+          style="width: 100%; display: flex; align-items: center"
         >
           <el-form-item label="标题内容" prop="title">
             <el-input
@@ -28,22 +28,14 @@
             />
           </el-form-item>
           <el-form-item label="应用" prop="app">
-              <!-- suffix-icon="el-icon-search" -->
-            <el-input
-              placeholder="请输入"
-              clearable
-              v-model="searchForm.app"
-            />
+            <!-- suffix-icon="el-icon-search" -->
+            <el-input placeholder="请输入" clearable v-model="searchForm.app" />
           </el-form-item>
           <el-form-item label="标签" prop="tag">
-            <el-input
-              placeholder="请输入"
-              clearable
-              v-model="searchForm.tag"
-            />
+            <el-input placeholder="请输入" clearable v-model="searchForm.tag" />
           </el-form-item>
           <!-- 时间 -->
-          <el-form-item label="接收时间" style="margin-right: auto;">
+          <el-form-item label="接收时间" style="margin-right: auto">
             <el-date-picker
               size="medium"
               v-model="timeRange"
@@ -56,24 +48,39 @@
             </el-date-picker>
           </el-form-item>
           <!-- 条件查询按钮 -->
-          <el-form-item style="margin-right: 0px;">
+          <el-form-item style="margin-right: 0px">
             <el-button type="primary" plain @click="searchList">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="info-operate">
         <span>消息列表</span>
-        <el-button type="primary" size="medium" @click="markReadFn">标为已读</el-button>
-        <el-button type="danger" plain size="medium" @click="deleteInfoFn">删除</el-button>
+        <el-button type="primary" size="medium" @click="markReadFn"
+          >标为已读</el-button
+        >
+        <el-button type="danger" plain size="medium" @click="deleteInfoFn"
+          >删除</el-button
+        >
       </div>
       <div class="table_wrap whiteBlock">
-        <el-table class="tables" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
+        <el-table
+          class="tables"
+          v-loading="loading"
+          :data="tableData"
+          @selection-change="handleSelectionChange"
+          @row-click="rowClickFn"
+        >
           <el-table-column type="selection" align="center" width="60" />
           <el-table-column label="标题内容" align="center" prop="title">
             <template slot-scope="scope">
-              <span :style="{color: scope.row.isRead == 1?'#BFBFBF':'#5181F7'}" style="cursor: pointer;" @click="infoDetailOpen(scope.row)">{{
-                scope.row.title
-              }}</span>
+              <span
+                :style="{
+                  color: scope.row.isRead == 1 ? '#BFBFBF' : '#5181F7',
+                }"
+                style="cursor: pointer"
+                @click="infoDetailOpen(scope.row)"
+                >{{ scope.row.title }}</span
+              >
             </template>
           </el-table-column>
           <el-table-column label="类别" align="center" prop="type">
@@ -81,11 +88,7 @@
               <span>{{ scope.row.type | typeText(searchBtnList) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="应用"
-            align="center"
-            prop="app"
-          />
+          <el-table-column label="应用" align="center" prop="app" />
           <el-table-column label="标签" align="center" prop="tag" />
           <el-table-column label="操作时间" align="center" prop="operateTime" />
         </el-table>
@@ -108,31 +111,42 @@
         <span>返回</span>
       </div>
       <div class="info-content-detail">
-        <div class="detail-title">{{rowObj.title}}</div>
+        <div class="detail-title">{{ rowObj.title }}</div>
         <div class="detail-sub-title">
-          <span>应用：{{rowObj.app}}</span>
-          <span>标签：{{rowObj.tag}}</span>
-          <span>接收时间：{{rowObj.operateTime}}</span>
+          <span>应用：{{ rowObj.app }}</span>
+          <span>标签：{{ rowObj.tag }}</span>
+          <span>接收时间：{{ rowObj.operateTime }}</span>
         </div>
-        <div class="detail-content">{{rowObj.content}}</div>
+        <div class="detail-content">{{ rowObj.content }}</div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { getInfoListApi, markInfoReadApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
+import {
+  getInfoListApi,
+  markInfoReadApi,
+  batchDeleteInfoApi,
+} from "@/assets/js/api/loginSign.js";
+import { getNoticeListApi } from "@/assets/js/api/company/project";
 export default {
   data() {
     return {
       infoDetailShow: false,
       checkIndex: 0,
+      // searchBtnList: [
+      //   { name: "全部类别", value: "" },
+      //   { name: "通知公告", value: 1 },
+      //   { name: "审批流程", value: 3 },
+      //   { name: "风险预警", value: 2 },
+      //   { name: "任务待办", value: 4 },
+      //   { name: "其他", value: 5 },
+      // ],
       searchBtnList: [
         { name: "全部类别", value: "" },
-        { name: "通知公告", value: 1 },
-        { name: "审批流程", value: 3 },
-        { name: "风险预警", value: 2 },
-        { name: "任务待办", value: 4 },
-        { name: "其他", value: 5 },
+        { name: "质量", value: 11 },
+        { name: "安全", value: 10 },
+        { name: "AI", value: 8 }
       ],
       devSn: "",
       // 遮罩层
@@ -151,7 +165,7 @@ export default {
       timeRange: [],
       tableData: [],
       multipleSelection: [],
-      rowObj: {}
+      rowObj: {},
     };
   },
   filters: {
@@ -165,19 +179,30 @@ export default {
     this.getList();
   },
   methods: {
+    // 表格行点击
+    rowClickFn(row,column,event){
+      console.log(row)
+      if(row.type == 11){ // 质量
+        this.$router.push("/project/quality/inspectionLedger");
+      } else if(row.type == 10){  // 安全
+        this.$router.push("/project/safeSame/inspectionLedger");
+      } else if(row.type == 8){ // AI
+        this.$router.push("/project/aiAnalysis/warningList");
+      }
+    },
     // 删除
-    deleteInfoFn(){
+    deleteInfoFn() {
       let selectedIds = [];
-      if(this.multipleSelection.length == 0){
+      if (this.multipleSelection.length == 0) {
         this.$message({
-                type: "error",
-                message: "请勾选表格项",
-              });
-              return;
+          type: "error",
+          message: "请勾选表格项",
+        });
+        return;
       } else {
-        this.multipleSelection.map(item => {
-          selectedIds.push(item.id)
-        })
+        this.multipleSelection.map((item) => {
+          selectedIds.push(item.id);
+        });
       }
       this.$confirm("此操作将删除信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -185,9 +210,12 @@ export default {
         type: "warning",
       })
         .then(() => {
-          batchDeleteInfoApi({ accountId: this.$store.state.userInfo.userId, ids: selectedIds.join(',') }).then((res) => {
+          batchDeleteInfoApi({
+            accountId: this.$store.state.userInfo.userId,
+            ids: selectedIds.join(","),
+          }).then((res) => {
             if (res.success) {
-              this.getList()
+              this.getList();
               this.$message({
                 type: "success",
                 message: "操作成功!",
@@ -208,18 +236,18 @@ export default {
         });
     },
     // 标为已读
-    markReadFn(){
+    markReadFn() {
       let selectedIds = [];
-      if(this.multipleSelection.length == 0){
+      if (this.multipleSelection.length == 0) {
         this.$message({
-                type: "error",
-                message: "请勾选表格项",
-              });
-              return;
+          type: "error",
+          message: "请勾选表格项",
+        });
+        return;
       } else {
-        this.multipleSelection.map(item => {
-          selectedIds.push(item.id)
-        })
+        this.multipleSelection.map((item) => {
+          selectedIds.push(item.id);
+        });
       }
       this.$confirm("此操作将标记已读, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -227,9 +255,12 @@ export default {
         type: "warning",
       })
         .then(() => {
-          markInfoReadApi({ accountId: this.$store.state.userInfo.userId, ids: selectedIds.join(',') }).then((res) => {
+          markInfoReadApi({
+            accountId: this.$store.state.userInfo.userId,
+            ids: selectedIds.join(","),
+          }).then((res) => {
             if (res.success) {
-              this.getList()
+              this.getList();
               this.$message({
                 type: "success",
                 message: "操作成功!",
@@ -251,7 +282,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
-      console.log(val,'测试测试')
+      console.log(val, "测试测试");
     },
     infoDetailOpen(item) {
       this.rowObj = item;
@@ -269,19 +300,38 @@ export default {
         pageNo: this.pageInfo.pageNo,
         pageSize: this.pageInfo.pageSize,
         type: this.searchBtnList[this.checkIndex].value,
-        ...this.searchForm
+        ...this.searchForm,
+      };
+      if (this.timeRange && this.timeRange.length > 0) {
+        requestData.operateTime_begin = this.timeRange[0];
+        requestData.operateTime_end = this.timeRange[1];
       }
-      if(this.timeRange && this.timeRange.length > 0){
-        requestData.operateTime_begin = this.timeRange[0]
-        requestData.operateTime_end = this.timeRange[1]
-      }
-      getInfoListApi(requestData).then((result) => {
-        if (result.success) {
-          this.tableData = result.result.records;
-          this.pageInfo.total = result.result.total;
+      getNoticeListApi(requestData).then((res) => {
+        if (res.success) {
+          this.tableData = res.result.records;
+          this.pageInfo.total = res.result.total;
         }
       });
     },
+    // getList() {
+    //   let requestData = {
+    //     accountId: this.$store.state.userInfo.userId,
+    //     pageNo: this.pageInfo.pageNo,
+    //     pageSize: this.pageInfo.pageSize,
+    //     type: this.searchBtnList[this.checkIndex].value,
+    //     ...this.searchForm
+    //   }
+    //   if(this.timeRange && this.timeRange.length > 0){
+    //     requestData.operateTime_begin = this.timeRange[0]
+    //     requestData.operateTime_end = this.timeRange[1]
+    //   }
+    //   getInfoListApi(requestData).then((result) => {
+    //     if (result.success) {
+    //       this.tableData = result.result.records;
+    //       this.pageInfo.total = result.result.total;
+    //     }
+    //   });
+    // },
     SizeChange(val) {
       this.pageInfo.pageSize = val;
       this.getList();
@@ -313,7 +363,7 @@ export default {
     handleCurrentChange(val) {
       this.pageNo2 = val;
       this.getPageList();
-    }
+    },
   },
 };
 </script>
@@ -406,8 +456,8 @@ export default {
     }
   }
 }
-.table_wrap{
-  .pagerBox{
+.table_wrap {
+  .pagerBox {
     margin-top: 30px;
   }
 }
diff --git a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
index 02fdff00..e7a4fb8b 100644
--- a/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/hadRead/componentsModule/dataListData.vue
@@ -120,18 +120,25 @@
 </template>
 <script>
 import { getInfoListApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
+import { getNoticeListApi } from "@/assets/js/api/company/project";
 export default {
   data() {
     return {
       infoDetailShow: false,
       checkIndex: 0,
+      // searchBtnList: [
+      //   { name: "全部类别", value: "" },
+      //   { name: "通知公告", value: 1 },
+      //   { name: "审批流程", value: 3 },
+      //   { name: "风险预警", value: 2 },
+      //   { name: "任务待办", value: 4 },
+      //   { name: "其他", value: 5 },
+      // ],
       searchBtnList: [
         { name: "全部类别", value: "" },
-        { name: "通知公告", value: 1 },
-        { name: "审批流程", value: 3 },
-        { name: "风险预警", value: 2 },
-        { name: "任务待办", value: 4 },
-        { name: "其他", value: 5 },
+        { name: "质量", value: 11 },
+        { name: "安全", value: 10 },
+        { name: "AI", value: 8 }
       ],
       devSn: "",
       // 遮罩层
@@ -227,19 +234,40 @@ export default {
         pageSize: this.pageInfo.pageSize,
         type: this.searchBtnList[this.checkIndex].value,
         isRead: 1,
-        ...this.searchForm
+        ...this.searchForm,
+      };
+      if (this.timeRange && this.timeRange.length > 0) {
+        requestData.operateTime_begin = this.timeRange[0];
+        requestData.operateTime_end = this.timeRange[1];
       }
-      if(this.timeRange && this.timeRange.length > 0){
-        requestData.operateTime_begin = this.timeRange[0]
-        requestData.operateTime_end = this.timeRange[1]
-      }
-      getInfoListApi(requestData).then((result) => {
-        if (result.success) {
-          this.tableData = result.result.records;
-          this.pageInfo.total = result.result.total;
+      getNoticeListApi(requestData).then((res) => {
+        if (res.success) {
+          this.tableData = res.result.records;
+          this.pageInfo.total = res.result.total;
         }
       });
     },
+    //查询列表
+    // getList() {
+    //   let requestData = {
+    //     accountId: this.$store.state.userInfo.userId,
+    //     pageNo: this.pageInfo.pageNo,
+    //     pageSize: this.pageInfo.pageSize,
+    //     type: this.searchBtnList[this.checkIndex].value,
+    //     isRead: 1,
+    //     ...this.searchForm
+    //   }
+    //   if(this.timeRange && this.timeRange.length > 0){
+    //     requestData.operateTime_begin = this.timeRange[0]
+    //     requestData.operateTime_end = this.timeRange[1]
+    //   }
+    //   getInfoListApi(requestData).then((result) => {
+    //     if (result.success) {
+    //       this.tableData = result.result.records;
+    //       this.pageInfo.total = result.result.total;
+    //     }
+    //   });
+    // },
     SizeChange(val) {
       this.pageInfo.pageSize = val;
       this.getList();
diff --git a/src/views/infoCenter/notRead/componentsModule/dataListData.vue b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
index 502c7d0f..97cddc2e 100644
--- a/src/views/infoCenter/notRead/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/notRead/componentsModule/dataListData.vue
@@ -121,18 +121,25 @@
 </template>
 <script>
 import { getInfoListApi, markInfoReadApi, batchDeleteInfoApi } from "@/assets/js/api/loginSign.js";
+import { getNoticeListApi } from "@/assets/js/api/company/project";
 export default {
   data() {
     return {
       infoDetailShow: false,
       checkIndex: 0,
+      // searchBtnList: [
+      //   { name: "全部类别", value: "" },
+      //   { name: "通知公告", value: 1 },
+      //   { name: "审批流程", value: 3 },
+      //   { name: "风险预警", value: 2 },
+      //   { name: "任务待办", value: 4 },
+      //   { name: "其他", value: 5 },
+      // ],
       searchBtnList: [
         { name: "全部类别", value: "" },
-        { name: "通知公告", value: 1 },
-        { name: "审批流程", value: 3 },
-        { name: "风险预警", value: 2 },
-        { name: "任务待办", value: 4 },
-        { name: "其他", value: 5 },
+        { name: "质量", value: 11 },
+        { name: "安全", value: 10 },
+        { name: "AI", value: 8 }
       ],
       devSn: "",
       // 遮罩层
@@ -270,19 +277,40 @@ export default {
         pageSize: this.pageInfo.pageSize,
         type: this.searchBtnList[this.checkIndex].value,
         isRead: 0,
-        ...this.searchForm
+        ...this.searchForm,
+      };
+      if (this.timeRange && this.timeRange.length > 0) {
+        requestData.operateTime_begin = this.timeRange[0];
+        requestData.operateTime_end = this.timeRange[1];
       }
-      if(this.timeRange && this.timeRange.length > 0){
-        requestData.operateTime_begin = this.timeRange[0]
-        requestData.operateTime_end = this.timeRange[1]
-      }
-      getInfoListApi(requestData).then((result) => {
-        if (result.success) {
-          this.tableData = result.result.records;
-          this.pageInfo.total = result.result.total;
+      getNoticeListApi(requestData).then((res) => {
+        if (res.success) {
+          this.tableData = res.result.records;
+          this.pageInfo.total = res.result.total;
         }
       });
     },
+    //查询列表
+    // getList() {
+    //   let requestData = {
+    //     accountId: this.$store.state.userInfo.userId,
+    //     pageNo: this.pageInfo.pageNo,
+    //     pageSize: this.pageInfo.pageSize,
+    //     type: this.searchBtnList[this.checkIndex].value,
+    //     isRead: 0,
+    //     ...this.searchForm
+    //   }
+    //   if(this.timeRange && this.timeRange.length > 0){
+    //     requestData.operateTime_begin = this.timeRange[0]
+    //     requestData.operateTime_end = this.timeRange[1]
+    //   }
+    //   getInfoListApi(requestData).then((result) => {
+    //     if (result.success) {
+    //       this.tableData = result.result.records;
+    //       this.pageInfo.total = result.result.total;
+    //     }
+    //   });
+    // },
     SizeChange(val) {
       this.pageInfo.pageSize = val;
       this.getList();
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 29b4f468..963df0bf 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -1137,6 +1137,7 @@ export default {
         id: id,
       });
       console.log(res);
+      this.getList();
     },
     getBlackWhiteBoole() {
       let clgl = {
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index ebd504c0..3bed22ca 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -1298,7 +1298,7 @@
                     <el-option
                       v-for="(item, index) in certificateTypeList"
                       :key="index"
-                      :value="item.id"
+                      :value="Number(item.id)"
                       :label="item.dictionaryName"
                     ></el-option>
                   </el-select>
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 7e3d2e7a..a838629d 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -3852,6 +3852,7 @@ export default {
         id: id,
       });
       console.log(res);
+      this.getTableData();
     },
   },
 };
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 73ef3a89..dd0550d1 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -4561,6 +4561,7 @@ export default {
         id: id,
       });
       console.log(res);
+      this.getTableData();
     },
   },
 };
diff --git a/src/views/projectFront/laborManage/personRegisterDetails.vue b/src/views/projectFront/laborManage/personRegisterDetails.vue
index c4458594..ce0ed03f 100644
--- a/src/views/projectFront/laborManage/personRegisterDetails.vue
+++ b/src/views/projectFront/laborManage/personRegisterDetails.vue
@@ -2,9 +2,9 @@
   <div class="personDetails whiteBlock">
     <div class="navigatTitle flex">
       <el-button type="primary" size="medium" @click="goBack">{{
-        $t('message.laborMange.lookTG')
+        $t("message.laborMange.lookTG")
       }}</el-button>
-      <div class="title">{{ $t('message.laborMange.crewInfoDetail') }}</div>
+      <div class="title">{{ $t("message.laborMange.crewInfoDetail") }}</div>
     </div>
     <div class="flex2 data_wrap">
       <vue-scroll
@@ -13,7 +13,7 @@
       >
         <div id="basic" class="table">
           <div class="pageTitle">
-            {{ $t('message.laborMange.essential') }}
+            {{ $t("message.laborMange.essential") }}
             <!-- <el-button
               type="text"
               class="margin_left"
@@ -61,7 +61,7 @@
                     accept=".jpg, .jpeg"
                   >
                     <el-button size="small" type="primary">{{
-                      $t('message.laborMange.updateOnsitePhotos')
+                      $t("message.laborMange.updateOnsitePhotos")
                     }}</el-button>
                   </el-upload>
                 </div>
@@ -90,8 +90,8 @@
                     accept=".jpg, .jpeg"
                   >
                     <el-button size="small" type="primary">{{
-                      $t('message.laborMange.update') +
-                      $t('message.laborMange.IdCardHead')
+                      $t("message.laborMange.update") +
+                      $t("message.laborMange.IdCardHead")
                     }}</el-button>
                   </el-upload>
                 </div>
@@ -107,22 +107,22 @@
                   ></el-input>
                 </div>
                 <div class="time">
-                  {{ $t('message.laborMange.recordDate') }}:
+                  {{ $t("message.laborMange.recordDate") }}:
                   {{ workerInfo.enterDate }}
-                  {{ $t('message.laborMange.anExitDate') }}:{{
+                  {{ $t("message.laborMange.anExitDate") }}:{{
                     workerInfo.exitDate
                   }}
                 </div>
                 <div class="team2" v-if="workerInfo.personType == 1">
-                  {{ $t('message.laborMange.team') }}：{{ workerInfo.teamName }}
+                  {{ $t("message.laborMange.team") }}：{{ workerInfo.teamName }}
                 </div>
                 <div class="team2" v-else>
-                  {{ $t('message.laborMange.section') }}：{{
+                  {{ $t("message.laborMange.section") }}：{{
                     workerInfo.departmentName
                   }}
                 </div>
                 <div class="number">
-                  {{ $t('message.laborMange.jobNumber') }}：
+                  {{ $t("message.laborMange.jobNumber") }}：
                   <el-input
                     size="small"
                     style="width: 180px; margin-top: 5px"
@@ -135,22 +135,22 @@
               <div class="info_wrap" v-else>
                 <div class="name">{{ workerInfo.workerName }}</div>
                 <div class="time">
-                  {{ $t('message.laborMange.recordDate') }}:
+                  {{ $t("message.laborMange.recordDate") }}:
                   {{ workerInfo.enterDate }}
-                  {{ $t('message.laborMange.anExitDate') }}:{{
+                  {{ $t("message.laborMange.anExitDate") }}:{{
                     workerInfo.exitDate
                   }}
                 </div>
                 <div class="team2" v-if="workerInfo.personType == 1">
-                  {{ $t('message.laborMange.team') }}：{{ workerInfo.teamName }}
+                  {{ $t("message.laborMange.team") }}：{{ workerInfo.teamName }}
                 </div>
                 <div class="team2" v-else>
-                  {{ $t('message.laborMange.section') }}：{{
+                  {{ $t("message.laborMange.section") }}：{{
                     workerInfo.departmentName
                   }}
                 </div>
                 <div class="number">
-                  {{ $t('message.laborMange.jobNumber') }}：{{
+                  {{ $t("message.laborMange.jobNumber") }}：{{
                     workerInfo.attendanceNumber
                   }}
                 </div>
@@ -160,7 +160,7 @@
           </div>
           <div id="details" class="table">
             <div class="pageTitle">
-              {{ $t('message.laborMange.detailMessage') }}
+              {{ $t("message.laborMange.detailMessage") }}
               <!-- <i class="el-icon-arrow-down" style="font-size: 18px"></i> -->
               <!-- <el-button
                 type="text"
@@ -245,7 +245,7 @@
                               name="files"
                             >
                               <el-button size="small" type="primary">{{
-                                $t('message.laborMange.update')
+                                $t("message.laborMange.update")
                               }}</el-button>
                             </el-upload>
                           </div>
@@ -277,7 +277,7 @@
                               name="files"
                             >
                               <el-button size="small" type="primary">{{
-                                $t('message.laborMange.update')
+                                $t("message.laborMange.update")
                               }}</el-button>
                             </el-upload>
                           </div>
@@ -297,16 +297,16 @@
                           v-model="workerInfo.sex"
                         >
                           <el-radio :label="1">{{
-                            $t('message.laborMange.man')
+                            $t("message.laborMange.man")
                           }}</el-radio>
                           <el-radio :label="2">{{
-                            $t('message.laborMange.female')
+                            $t("message.laborMange.female")
                           }}</el-radio>
                         </el-radio-group>
                         <span v-else>{{
                           workerInfo.sex == 1
-                            ? $t('message.laborMange.man')
-                            : $t('message.laborMange.female')
+                            ? $t("message.laborMange.man")
+                            : $t("message.laborMange.female")
                         }}</span>
                       </el-form-item>
                     </el-col>
@@ -429,10 +429,7 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="12">
-                      <el-form-item
-                        label="现住地址:"
-                        prop="nativePlace"
-                      >
+                      <el-form-item label="现住地址:" prop="nativePlace">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
@@ -443,40 +440,37 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item
-                        label="身份证有效期:"
-                        prop="nativePlace"
-                      >
+                      <el-form-item label="身份证有效期:" prop="nativePlace">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
                           v-model="workerInfo.nativePlace"
                           :placeholder="$t('message.laborMange.placeholder2')"
                         ></el-input>
-                        <span v-else>{{ workerInfo.longTerm == 1?'长期':workerInfo.idCardEndDate }}</span>
+                        <span v-else>{{
+                          workerInfo.longTerm == 1
+                            ? "长期"
+                            : workerInfo.idCardEndDate
+                        }}</span>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="12">
-                      <el-form-item
-                        label="企业:"
-                        prop="enterpriseName"
-                      >
+                      <el-form-item label="企业:" prop="enterpriseName">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
                           v-model="workerInfo.enterpriseName"
                           :placeholder="$t('message.laborMange.placeholder2')"
                         ></el-input>
-                        <span v-else>{{ workerInfo.enterpriseName || "" }}</span>
+                        <span v-else>{{
+                          workerInfo.enterpriseName || ""
+                        }}</span>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item
-                        label="班组:"
-                        prop="teamName"
-                      >
+                      <el-form-item label="班组:" prop="teamName">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
@@ -489,10 +483,7 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="12">
-                      <el-form-item
-                        label="手机号:"
-                        prop="phoneNumber"
-                      >
+                      <el-form-item label="手机号:" prop="phoneNumber">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
@@ -503,10 +494,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item
-                        label="进场日期:"
-                        prop="enterDate"
-                      >
+                      <el-form-item label="进场日期:" prop="enterDate">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
@@ -519,17 +507,22 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="12">
-                      <el-form-item
-                        label="人员类型:"
-                        prop="phoneNumber"
-                      >
+                      <el-form-item label="人员类型:" prop="phoneNumber">
                         <el-input
                           v-if="detailInfoStatus"
                           style="width: 80%"
                           v-model="workerInfo.personType"
                           :placeholder="$t('message.laborMange.placeholder2')"
                         ></el-input>
-                        <span v-else>{{ workerInfo.personType == 1?'劳务人员':workerInfo.personType == 2?'管理人员':workerInfo.personType == 3?'临时人员':'' }}</span>
+                        <span v-else>{{
+                          workerInfo.personType == 1
+                            ? "劳务人员"
+                            : workerInfo.personType == 2
+                            ? "管理人员"
+                            : workerInfo.personType == 3
+                            ? "临时人员"
+                            : ""
+                        }}</span>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1006,101 +999,96 @@
                    
                   </el-row> -->
                   <el-row :gutter="24" v-if="detailInfoStatus">
-                    <el-col :span="12"> 
-                      <el-form-item
-                      label=""
-                      prop="devType"
-                    >
-                    <el-radio-group v-model="workerInfo.devType" @input="devTypeChange">
-                      <el-radio :label="1">设备</el-radio>
-                      <el-radio :label="2">分组</el-radio>
-                    </el-radio-group>
-                    </el-form-item>
+                    <el-col :span="12">
+                      <el-form-item label="" prop="devType">
+                        <el-radio-group
+                          v-model="workerInfo.devType"
+                          @input="devTypeChange"
+                        >
+                          <el-radio :label="1">设备</el-radio>
+                          <el-radio :label="2">分组</el-radio>
+                        </el-radio-group>
+                      </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row :gutter="24" v-if="workerInfo.devType == 1">
-                    <el-col :span="12"> 
+                    <el-col :span="12">
                       <el-form-item
-                      :label="$t('message.laborMange.faceDevice') + ':'"
-                      prop="ufaceDevId"
-                    >
-                      <!-- <div v-if="detailInfoStatus"> -->
-                      <el-checkbox
-                        v-if="detailInfoStatus"
-                        :indeterminate="isIndeterminate2"
-                        v-model="checkAllFaceDev"
-                        @change="handleCheckAllChangeFace"
-                        >{{ $t('message.laborMange.checkAll') }}</el-checkbox
-                      >
-                      <el-checkbox-group
-                        key="ufaceDevId"
-                        v-if="detailInfoStatus"
-                        v-model="workerInfo.ufaceDevId"
-                        @change="ufaceDevIdChange"
+                        :label="$t('message.laborMange.faceDevice') + ':'"
+                        prop="ufaceDevId"
                       >
+                        <!-- <div v-if="detailInfoStatus"> -->
                         <el-checkbox
-                          v-for="(item, index) in ufaceDevAllList"
-                          :key="item.id"
-                          :label="item.id"
-                          :disabled="item.disabled"
+                          v-if="detailInfoStatus"
+                          :indeterminate="isIndeterminate2"
+                          v-model="checkAllFaceDev"
+                          @change="handleCheckAllChangeFace"
+                          >{{ $t("message.laborMange.checkAll") }}</el-checkbox
                         >
-                          {{ item.devName }}
-                        </el-checkbox>
-                      </el-checkbox-group>
-                      <!-- </div> -->
-                      <div v-else>
-                        <span
-                          v-for="(item, index) in ufaceDevNameList"
-                          :key="index"
+                        <el-checkbox-group
+                          key="ufaceDevId"
+                          v-if="detailInfoStatus"
+                          v-model="workerInfo.ufaceDevId"
+                          @change="ufaceDevIdChange"
                         >
-                          {{ item }}
-                        </span>
-                      </div>
-                    </el-form-item>
+                          <el-checkbox
+                            v-for="(item, index) in ufaceDevAllList"
+                            :key="item.id"
+                            :label="item.id"
+                            :disabled="item.disabled"
+                          >
+                            {{ item.devName }}
+                          </el-checkbox>
+                        </el-checkbox-group>
+                        <!-- </div> -->
+                        <div v-else>
+                          <span
+                            v-for="(item, index) in ufaceDevNameList"
+                            :key="index"
+                          >
+                            {{ item }}
+                          </span>
+                        </div>
+                      </el-form-item>
                     </el-col>
-                  
                   </el-row>
                   <el-row :gutter="24" v-if="workerInfo.devType == 2">
-                    <el-col :span="12"> 
-                      <el-form-item
-                      label="人脸分组:"
-                      prop="ufaceDevGroupId"
-                    >
-                      <!-- <div v-if="detailInfoStatus"> -->
-                      <el-checkbox
-                        v-if="detailInfoStatus"
-                        :indeterminate="isIndeterminate3"
-                        v-model="checkAllGroup"
-                        @change="handleCheckAllChangeGroup"
-                        >{{ $t('message.laborMange.checkAll') }}</el-checkbox
-                      >
-                      <el-checkbox-group
-                        key="ufaceDevGroupId"
-                        v-if="detailInfoStatus"
-                        v-model="workerInfo.ufaceDevGroupId"
-                        @change="uGroupIdChange"
-                      >
+                    <el-col :span="12">
+                      <el-form-item label="人脸分组:" prop="ufaceDevGroupId">
+                        <!-- <div v-if="detailInfoStatus"> -->
                         <el-checkbox
-                          v-for="(item, index) in uGroupAllList"
-                          :key="item.id"
-                          :label="item.id"
-                          :disabled="item.disabled"
+                          v-if="detailInfoStatus"
+                          :indeterminate="isIndeterminate3"
+                          v-model="checkAllGroup"
+                          @change="handleCheckAllChangeGroup"
+                          >{{ $t("message.laborMange.checkAll") }}</el-checkbox
                         >
-                          {{ item.name }}
-                        </el-checkbox>
-                      </el-checkbox-group>
-                      <!-- </div> -->
-                      <div v-else>
-                        <span
-                          v-for="(item, index) in uGroupNameList"
-                          :key="index"
+                        <el-checkbox-group
+                          key="ufaceDevGroupId"
+                          v-if="detailInfoStatus"
+                          v-model="workerInfo.ufaceDevGroupId"
+                          @change="uGroupIdChange"
                         >
-                          {{ item }}
-                        </span>
-                      </div>
-                    </el-form-item>
+                          <el-checkbox
+                            v-for="(item, index) in uGroupAllList"
+                            :key="item.id"
+                            :label="item.id"
+                            :disabled="item.disabled"
+                          >
+                            {{ item.name }}
+                          </el-checkbox>
+                        </el-checkbox-group>
+                        <!-- </div> -->
+                        <div v-else>
+                          <span
+                            v-for="(item, index) in uGroupNameList"
+                            :key="index"
+                          >
+                            {{ item }}
+                          </span>
+                        </div>
+                      </el-form-item>
                     </el-col>
-                  
                   </el-row>
                 </el-col>
               </el-row>
@@ -1108,7 +1096,7 @@
           </div>
           <div id="pact" class="table">
             <div class="pageTitle">
-              {{ $t('message.laborMange.contractInfo') }}
+              {{ $t("message.laborMange.contractInfo") }}
               <el-button
                 type="text"
                 @click="editPactInfo"
@@ -1116,8 +1104,8 @@
                 style="padding: 0"
                 >{{
                   pactInfoStatus
-                    ? $t('message.laborMange.save')
-                    : $t('message.laborMange.edit')
+                    ? $t("message.laborMange.save")
+                    : $t("message.laborMange.edit")
                 }}</el-button
               >
               <el-button
@@ -1126,7 +1114,7 @@
                 class="margin_left"
                 style="padding: 0"
                 v-if="pactInfoStatus"
-                >{{ $t('message.laborMange.cancel') }}</el-button
+                >{{ $t("message.laborMange.cancel") }}</el-button
               >
             </div>
             <el-table :data="contractList" style="width: 100%">
@@ -1141,16 +1129,16 @@
                     v-model="scope.row.signState"
                   >
                     <el-radio :label="0">{{
-                      $t('message.laborMange.notSigned')
+                      $t("message.laborMange.notSigned")
                     }}</el-radio>
                     <el-radio :label="1">{{
-                      $t('message.laborMange.signed')
+                      $t("message.laborMange.signed")
                     }}</el-radio>
                   </el-radio-group>
                   <span v-else>{{
                     scope.row.signState == 1
-                      ? $t('message.laborMange.signed')
-                      : $t('message.laborMange.notSigned')
+                      ? $t("message.laborMange.signed")
+                      : $t("message.laborMange.notSigned")
                   }}</span>
                 </template>
               </el-table-column>
@@ -1193,10 +1181,10 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.contractType == 1
-                      ? $t('message.laborMange.paperContract')
+                      ? $t("message.laborMange.paperContract")
                       : scope.row.contractType == 2
-                      ? $t('message.laborMange.electronicContract')
-                      : ''
+                      ? $t("message.laborMange.electronicContract")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1222,10 +1210,10 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.laborContractType == 1
-                      ? $t('message.laborMange.fixedTermContract')
+                      ? $t("message.laborMange.fixedTermContract")
                       : scope.row.laborContractType == 2
-                      ? $t('message.laborMange.certainAmountOfWork')
-                      : ''
+                      ? $t("message.laborMange.certainAmountOfWork")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1295,14 +1283,14 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.wagesVerificationType == 1
-                      ? $t('message.laborMange.perDiem')
+                      ? $t("message.laborMange.perDiem")
                       : scope.row.wagesVerificationType == 2
-                      ? $t('message.laborMange.byTheHour')
+                      ? $t("message.laborMange.byTheHour")
                       : scope.row.wagesVerificationType == 3
-                      ? $t('message.laborMange.perMensem')
+                      ? $t("message.laborMange.perMensem")
                       : scope.row.wagesVerificationType == 4
-                      ? $t('message.laborMange.byThePiece')
-                      : ''
+                      ? $t("message.laborMange.byThePiece")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1338,7 +1326,7 @@
                     :file-list="scope.row.fileList"
                   >
                     <el-button size="small" type="primary">{{
-                      $t('message.laborMange.clickOnTheUpload')
+                      $t("message.laborMange.clickOnTheUpload")
                     }}</el-button>
                   </el-upload>
                   <div
@@ -1367,13 +1355,13 @@
           </div>
           <div id="credentials" class="table">
             <div class="pageTitle">
-              {{ $t('message.laborMange.credentials') }}
+              {{ $t("message.laborMange.credentials") }}
               <el-button
                 type="text"
                 @click="addTableInfo(1)"
                 class="margin_left"
                 style="padding: 0"
-                >{{ $t('message.laborMange.add') }}</el-button
+                >{{ $t("message.laborMange.add") }}</el-button
               >
             </div>
             <el-table :data="certificateList" style="width: 100%">
@@ -1450,22 +1438,25 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.skillLevel == 1
-                      ? $t('message.laborMange.generalWorker')
+                      ? $t("message.laborMange.generalWorker")
                       : scope.row.skillLevel == 2
-                      ? $t('message.laborMange.primaryWorkers')
+                      ? $t("message.laborMange.primaryWorkers")
                       : scope.row.skillLevel == 3
-                      ? $t('message.laborMange.intermediateLabor')
+                      ? $t("message.laborMange.intermediateLabor")
                       : scope.row.skillLevel == 4
-                      ? $t('message.laborMange.seniorWorker')
+                      ? $t("message.laborMange.seniorWorker")
                       : scope.row.skillLevel == 5
-                      ? $t('message.laborMange.technician')
+                      ? $t("message.laborMange.technician")
                       : scope.row.skillLevel == 6
-                      ? $t('message.laborMange.seniorTechnician')
-                      : ''
+                      ? $t("message.laborMange.seniorTechnician")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="address" :label="$t('message.laborMange.dateOfIssue')">
+              <el-table-column
+                prop="address"
+                :label="$t('message.laborMange.dateOfIssue')"
+              >
                 <template slot-scope="scope">
                   <el-date-picker
                     v-if="scope.row.certificateState"
@@ -1549,7 +1540,7 @@
                     :file-list="scope.row.fileList"
                   >
                     <el-button size="small" type="primary">{{
-                      $t('message.laborMange.clickOnTheUpload')
+                      $t("message.laborMange.clickOnTheUpload")
                     }}</el-button>
                   </el-upload>
                   <div
@@ -1581,28 +1572,28 @@
                     type="text"
                     v-if="scope.row.certificateState"
                     @click="saveTableInfo(1, scope.$index)"
-                    >{{ $t('message.laborMange.save') }}</el-button
+                    >{{ $t("message.laborMange.save") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-else
                     @click="editTableInfo(1, scope.$index)"
-                    >{{ $t('message.laborMange.edit') }}</el-button
+                    >{{ $t("message.laborMange.edit") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-if="scope.row.certificateState"
                     @click="cancelEditTableInfo(1, scope.$index)"
-                    >{{ $t('message.laborMange.cancel') }}</el-button
+                    >{{ $t("message.laborMange.cancel") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-if="!scope.row.certificateState"
                     @click="deleteTableInfo(1, scope.$index)"
-                    >{{ $t('message.laborMange.delete') }}</el-button
+                    >{{ $t("message.laborMange.delete") }}</el-button
                   >
                 </template>
               </el-table-column>
@@ -1776,13 +1767,13 @@
           </div> -->
           <div id="insurance" class="table">
             <div class="pageTitle">
-              {{ $t('message.laborMange.insuranceInfo') }}
+              {{ $t("message.laborMange.insuranceInfo") }}
               <el-button
                 type="text"
                 @click="addTableInfo(3)"
                 class="margin_left"
                 style="padding: 0"
-                >{{ $t('message.laborMange.add') }}</el-button
+                >{{ $t("message.laborMange.add") }}</el-button
               >
             </div>
             <el-table :data="insuranceList" style="width: 100%">
@@ -1844,10 +1835,10 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.state == 1
-                      ? $t('message.laborMange.unpurchased')
+                      ? $t("message.laborMange.unpurchased")
                       : scope.row.state == 2
-                      ? $t('message.laborMange.haveBought')
-                      : ''
+                      ? $t("message.laborMange.haveBought")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1887,10 +1878,10 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.medicalInsurance == 1
-                      ? $t('message.laborMange.no')
+                      ? $t("message.laborMange.no")
                       : scope.row.medicalInsurance == 2
-                      ? $t('message.laborMange.yes')
-                      : ''
+                      ? $t("message.laborMange.yes")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1917,10 +1908,10 @@
                   </el-select>
                   <span v-else>{{
                     scope.row.endowmentInsurance == 1
-                      ? $t('message.laborMange.no')
+                      ? $t("message.laborMange.no")
                       : scope.row.endowmentInsurance == 2
-                      ? $t('message.laborMange.yes')
-                      : ''
+                      ? $t("message.laborMange.yes")
+                      : ""
                   }}</span>
                 </template>
               </el-table-column>
@@ -1947,7 +1938,7 @@
                     :file-list="scope.row.fileList"
                   >
                     <el-button size="small" type="primary">{{
-                      $t('message.laborMange.clickOnTheUpload')
+                      $t("message.laborMange.clickOnTheUpload")
                     }}</el-button>
                   </el-upload>
                   <div
@@ -1979,28 +1970,28 @@
                     type="text"
                     v-if="scope.row.insuranceState"
                     @click="saveTableInfo(3, scope.$index)"
-                    >{{ $t('message.laborMange.save') }}</el-button
+                    >{{ $t("message.laborMange.save") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-else
                     @click="editTableInfo(3, scope.$index)"
-                    >{{ $t('message.laborMange.edit') }}</el-button
+                    >{{ $t("message.laborMange.edit") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-if="scope.row.insuranceState"
                     @click="cancelEditTableInfo(3, scope.$index)"
-                    >{{ $t('message.laborMange.cancel') }}</el-button
+                    >{{ $t("message.laborMange.cancel") }}</el-button
                   >
                   <el-button
                     size="small"
                     type="text"
                     v-if="!scope.row.insuranceState"
                     @click="deleteTableInfo(3, scope.$index)"
-                    >{{ $t('message.laborMange.delete') }}</el-button
+                    >{{ $t("message.laborMange.delete") }}</el-button
                   >
                 </template>
               </el-table-column>
@@ -2212,25 +2203,25 @@
           :class="activeClass == 0 ? 'checkedClass' : ''"
           @click="getActiveClass(0)"
         >
-          {{ $t('message.laborMange.essential') }}
+          {{ $t("message.laborMange.essential") }}
         </div>
         <div
           :class="activeClass == 1 ? 'checkedClass' : ''"
           @click="getActiveClass(1)"
         >
-          {{ $t('message.laborMange.detailMessage') }}
+          {{ $t("message.laborMange.detailMessage") }}
         </div>
         <div
           :class="activeClass == 2 ? 'checkedClass' : ''"
           @click="getActiveClass(2)"
         >
-          {{ $t('message.laborMange.contractInfo') }}
+          {{ $t("message.laborMange.contractInfo") }}
         </div>
         <div
           :class="activeClass == 3 ? 'checkedClass' : ''"
           @click="getActiveClass(3)"
         >
-          {{ $t('message.laborMange.credentials') }}
+          {{ $t("message.laborMange.credentials") }}
         </div>
         <!-- 体检信息 -->
         <!-- <div
@@ -2243,7 +2234,7 @@
           :class="activeClass == 5 ? 'checkedClass' : ''"
           @click="getActiveClass(5)"
         >
-          {{ $t('message.laborMange.insuranceInfo') }}
+          {{ $t("message.laborMange.insuranceInfo") }}
         </div>
         <!-- 安全教育 -->
         <!-- <div
@@ -2275,7 +2266,7 @@
       :visible.sync="dialogVisible"
       width="767px"
     >
-    <div class="dialog_content" style="height: 400px">
+      <div class="dialog_content" style="height: 400px">
         <!-- <vue-scroll> -->
         <vueCropper
           ref="cropperEdit"
@@ -2294,14 +2285,14 @@
           @click="dialogVisible = false"
           icon="el-icon-circle-close"
           size="medium"
-          >{{ $t('message.personnelPosition.cancel') }}
+          >{{ $t("message.personnelPosition.cancel") }}
         </el-button>
         <el-button
           type="primary"
           icon="el-icon-circle-check"
           @click="saveMapUrlEditFn"
           size="medium"
-          >{{ $t('message.personnelPosition.determine') }}
+          >{{ $t("message.personnelPosition.determine") }}
         </el-button>
       </div>
       <!-- title="查看大图" -->
@@ -2342,14 +2333,14 @@
           @click="cropperDialog = false"
           icon="el-icon-circle-close"
           size="medium"
-          >{{ $t('message.personnelPosition.cancel') }}
+          >{{ $t("message.personnelPosition.cancel") }}
         </el-button>
         <el-button
           type="primary"
           icon="el-icon-circle-check"
           @click="saveMapUrlFn"
           size="medium"
-          >{{ $t('message.personnelPosition.determine') }}
+          >{{ $t("message.personnelPosition.determine") }}
         </el-button>
       </div>
     </el-dialog>
@@ -2363,8 +2354,8 @@
         <div class="form-label">
           <span>*</span
           >{{
-            $t('message.laborMange.pleaseChoose') +
-            $t('message.laborMange.picture')
+            $t("message.laborMange.pleaseChoose") +
+            $t("message.laborMange.picture")
           }}:
         </div>
         <el-radio-group class="radio-box" v-model="radio">
@@ -2390,10 +2381,10 @@
             icon="el-icon-circle-check"
             type="primary"
             @click="checkImg"
-            >{{ $t('message.laborMange.confirm') }}</el-button
+            >{{ $t("message.laborMange.confirm") }}</el-button
           >
           <el-button icon="el-icon-circle-close" @click="showImgList = false">{{
-            $t('message.laborMange.cancel')
+            $t("message.laborMange.cancel")
           }}</el-button>
         </div>
       </div>
@@ -2401,8 +2392,6 @@
   </div>
 </template>
 
-
-
 <script>
 import {
   getRegisterWorkerInfoData,
@@ -2427,7 +2416,7 @@ import {
   ufaceDevList,
   getGroupListApi,
   checkImgLibraryApi,
-  updateMemberDetailDataList
+  updateMemberDetailDataList,
 } from "@/assets/js/api/laborPerson.js";
 import { getProjectConfigListApi } from "@/assets/js/api/project.js";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
@@ -2529,8 +2518,8 @@ export default {
     });
   },
   methods: {
-    devTypeChange(e){
-      if(e == 1){
+    devTypeChange(e) {
+      if (e == 1) {
         this.getUfaceDevList();
       } else {
         this.getUGroupDevList();
@@ -2572,8 +2561,8 @@ export default {
     uGroupIdChange(val) {
       let checkedCount = val.length;
       let allCheckList = [];
-      console.log(val,"---------55");
-      console.log(this.workerInfo.ufaceDevGroupId,"---------55");
+      console.log(val, "---------55");
+      console.log(this.workerInfo.ufaceDevGroupId, "---------55");
       for (let i = 0; i < this.uGroupAllList.length; i++) {
         if (!this.uGroupAllList[i].disabled) {
           allCheckList.push(this.uGroupAllList[i]);
@@ -2602,7 +2591,7 @@ export default {
     ufaceDevIdChange(val) {
       let checkedCount = val.length;
       let allCheckList = [];
-      console.log(val,"---------55");
+      console.log(val, "---------55");
       for (let i = 0; i < this.ufaceDevAllList.length; i++) {
         if (!this.ufaceDevAllList[i].disabled) {
           allCheckList.push(this.ufaceDevAllList[i]);
@@ -2621,7 +2610,7 @@ export default {
         console.log(res);
         if (res.code == 200) {
           this.uGroupAllList = res.result;
-          console.log(this.uGroupAllList,777888999)
+          console.log(this.uGroupAllList, 777888999);
           if (this.$store.state.userInfo.accountType == 6) {
             this.uGroupAllList.forEach((item) => {
               item.disabled = true;
@@ -2648,9 +2637,7 @@ export default {
                   for (let j = 0; j < this.uGroupAllList.length; j++) {
                     console.log(this.uGroupAllList[j].id, id);
                     if (this.uGroupAllList[j].id == id) {
-                      this.uGroupNameList.push(
-                        this.uGroupAllList[j].devName
-                      );
+                      this.uGroupNameList.push(this.uGroupAllList[j].devName);
                       this.uGroupAllList[j].disabled = false;
                     }
                   }
@@ -2778,7 +2765,7 @@ export default {
           }
           this.uGroupNameList = [];
           if (data.workerInfo.ufaceDevGroupId) {
-            console.log(123456789)
+            console.log(123456789);
             let arr = [];
             if (data.workerInfo.ufaceDevGroupId) {
               arr = data.workerInfo.ufaceDevGroupId.split(",");
@@ -2802,16 +2789,18 @@ export default {
           // console.log(this.workerInfo.ufaceDevId, this.ufaceDevNameList)
           this.longTerm = this.workerInfo.longTerm == 1 ? true : false; //设置身份证有效期是否长期
           //获取合同照片
-          if(data.workerInfo.contractInfo){
-              data.workerInfo.contractInfo = JSON.parse(data.workerInfo.contractInfo)
-              let arr = data.workerInfo.contractInfo[0].imageUrl.split(",");
-              let fileList = [];
-              arr.forEach((item) => {
-                let valArr = item.split("*");
-                fileList.push({ name: valArr[0], url: valArr[1] });
-              });
-              data.workerInfo.contractInfo[0].fileList = fileList;
-              this.contractList = data.workerInfo.contractInfo; //合同信息
+          if (data.workerInfo.contractInfo) {
+            data.workerInfo.contractInfo = JSON.parse(
+              data.workerInfo.contractInfo
+            );
+            let arr = data.workerInfo.contractInfo[0].imageUrl.split(",");
+            let fileList = [];
+            arr.forEach((item) => {
+              let valArr = item.split("*");
+              fileList.push({ name: valArr[0], url: valArr[1] });
+            });
+            data.workerInfo.contractInfo[0].fileList = fileList;
+            this.contractList = data.workerInfo.contractInfo; //合同信息
           } else {
             this.contractList = []; //合同信息
           }
@@ -2831,7 +2820,9 @@ export default {
           // this.contractList = data.contractList; //合同信息
           //获取证书附件
           if (data.workerInfo.specialCertificateInfo) {
-            data.workerInfo.specialCertificateInfo = JSON.parse(data.workerInfo.specialCertificateInfo)
+            data.workerInfo.specialCertificateInfo = JSON.parse(
+              data.workerInfo.specialCertificateInfo
+            );
             data.workerInfo.specialCertificateInfo.forEach((item) => {
               item.certificateState = false; //设置可编辑状态
               if (item.photoUrl) {
@@ -2866,7 +2857,9 @@ export default {
 
           //获取保险列表
           if (data.workerInfo.insuranceInfo) {
-            data.workerInfo.insuranceInfo = JSON.parse(data.workerInfo.insuranceInfo)
+            data.workerInfo.insuranceInfo = JSON.parse(
+              data.workerInfo.insuranceInfo
+            );
             data.workerInfo.insuranceInfo.forEach((item) => {
               item.insuranceState = false; //设置可编辑状态
               if (item.photoUrl) {
@@ -3000,11 +2993,11 @@ export default {
         } else {
           data.accountType = 1;
         }
-        console.log(this.workerInfo.ufaceDevId,123456);
-        if(this.workerInfo.devType == 1){
+        console.log(this.workerInfo.ufaceDevId, 123456);
+        if (this.workerInfo.devType == 1) {
           data.ufaceDevId = this.workerInfo.ufaceDevId.join(",");
           data.ufaceDevGroupId = "";
-        } else if(this.workerInfo.devType == 2){
+        } else if (this.workerInfo.devType == 2) {
           data.ufaceDevGroupId = this.workerInfo.ufaceDevGroupId.join(",");
           data.ufaceDevId = "";
         }
@@ -3024,8 +3017,8 @@ export default {
             this.$message.error(res.message);
           }
         });
-      this.checkAllFaceDev = false;
-      this.checkAllGroup = false;
+        this.checkAllFaceDev = false;
+        this.checkAllGroup = false;
       } else {
         console.log("------------------3");
         console.log(this.workerInfo.ufaceDevId);
@@ -3058,7 +3051,7 @@ export default {
     },
     // 上传前
     handleBeforeUpload(file, type) {
-      console.log('上传前----', file);
+      console.log("上传前----", file);
       if (type == 1) {
         if (
           file.type != "image/jpeg" &&
@@ -3070,7 +3063,6 @@ export default {
           return false;
         }
       }
-
     },
     //上传成功
     handleSuccess(file, type, file2) {
@@ -3095,9 +3087,11 @@ export default {
       } else if (type == 3) {
         this.workerInfo.idCardDownPhotoUrl = file.data[0].imageUrl;
         this.discernId(file.data[0].imageUrl, 1);
-      }
-      else if (type == 4) {
-        let data = { name: file.data[0].fileInfo.originalFilename, url: file.data[0].imageUrl };
+      } else if (type == 4) {
+        let data = {
+          name: file.data[0].fileInfo.originalFilename,
+          url: file.data[0].imageUrl,
+        };
         if (
           this.contractList[0].fileList &&
           this.contractList[0].fileList.length > 0
@@ -3114,17 +3108,21 @@ export default {
         };
         this.certificateList[file.index].fileList = [data];
         this.certificateList[file.index].photoUrl =
-          file.file.data[0].fileInfo.originalFilename + "*" + file.file.data[0].imageUrl;
+          file.file.data[0].fileInfo.originalFilename +
+          "*" +
+          file.file.data[0].imageUrl;
       } else if (type == 6) {
         this.workerInfo.idCardBigPhotoUrl = file.data[0].imageUrl;
-      } else if(type == 7){
+      } else if (type == 7) {
         let data = {
           name: file.file.data[0].fileInfo.originalFilename,
           url: file.file.data[0].imageUrl,
         };
         this.insuranceList[file.index].fileList = [data];
         this.insuranceList[file.index].photoUrl =
-          file.file.data[0].fileInfo.originalFilename + "*" + file.file.data[0].imageUrl;
+          file.file.data[0].fileInfo.originalFilename +
+          "*" +
+          file.file.data[0].imageUrl;
       }
     },
     // 人员照片库比对
@@ -3190,9 +3188,9 @@ export default {
             //   }
             // }
             if (res.data.status == "SUCCESS") {
-              if(this.cropperEditTitle = "现场采集照裁剪"){
+              if ((this.cropperEditTitle = "现场采集照裁剪")) {
                 this.workerInfo.fieldAcquisitionUrl = res.data.data[0].imageUrl;
-              } else if(this.cropperEditTitle = "身份证头像裁剪"){
+              } else if ((this.cropperEditTitle = "身份证头像裁剪")) {
                 this.workerInfo.idCardBigPhotoUrl = res.data.data[0].imageUrl;
               }
               this.dialogVisible = false;
@@ -3270,8 +3268,8 @@ export default {
 
     //查看图片
     handlePreview(file, name, type) {
-      let itemUrl = file.url
-      let itemName = name.name
+      let itemUrl = file.url;
+      let itemName = name.name;
       let fileType = file.url.split(".")[1];
       if (
         fileType == "bmp" ||
@@ -3298,16 +3296,22 @@ export default {
       ) {
         // this.dialogImageUrl = this.fileUrl + file.url;
         this.cropperEditOption.img = this.fileUrl + file.url;
-        if(type == 1){
-          this.cropperEditTitle = "现场采集照裁剪"
-        } else if(type == 8){
-          this.cropperEditTitle = "身份证头像裁剪"
+        if (type == 1) {
+          this.cropperEditTitle = "现场采集照裁剪";
+        } else if (type == 8) {
+          this.cropperEditTitle = "身份证头像裁剪";
         }
-        if(this.basicInfoStatus){
+        if (this.basicInfoStatus) {
           this.dialogVisible = true;
         }
       } else if (name != {}) {
-        let url = this.$http.defaults.baseURL + 'xmgl/upload/getRenameFile?fileUrl=' + this.fileUrl + itemUrl + '&fileName=' + itemName
+        let url =
+          this.$http.defaults.baseURL +
+          "xmgl/upload/getRenameFile?fileUrl=" +
+          this.fileUrl +
+          itemUrl +
+          "&fileName=" +
+          itemName;
         window.location.href = url;
       }
     },
@@ -3333,7 +3337,7 @@ export default {
     //编辑合同信息
     editPactInfo() {
       if (this.pactInfoStatus) {
-        console.log('查看编辑时的数据---，', this.contractList[0]);
+        console.log("查看编辑时的数据---，", this.contractList[0]);
         //获取到上传的合同
         let fileArr = [];
         if (this.contractList[0].fileList.length > 0) {
@@ -3348,21 +3352,23 @@ export default {
         let requestData = {
           ...this.workerInfo,
           id: this.workerInfo.id,
-          contractInfo: JSON.stringify(this.contractList)
+          contractInfo: JSON.stringify(this.contractList),
+        };
+        if (requestData.specialCertificateInfo) {
+          requestData.specialCertificateInfo = JSON.stringify(
+            requestData.specialCertificateInfo
+          );
         }
-        if(requestData.specialCertificateInfo){
-          requestData.specialCertificateInfo = JSON.stringify(requestData.specialCertificateInfo)
+        if (requestData.insuranceInfo) {
+          requestData.insuranceInfo = JSON.stringify(requestData.insuranceInfo);
         }
-        if(requestData.insuranceInfo){
-          requestData.insuranceInfo = JSON.stringify(requestData.insuranceInfo)
-        }
-        updateMemberDetailDataList(requestData).then(res => {
-          if(res.code == 200){
+        updateMemberDetailDataList(requestData).then((res) => {
+          if (res.code == 200) {
             this.$message.success("操作成功");
             this.pactInfoStatus = false;
             this.getWorkerInfo();
           }
-        })
+        });
         //没有数据  调用新增接口
         // if (this.originalData.contractList.length == 0) {
         //   if (this.contractList[0].contractNumber == "") {
@@ -3439,12 +3445,13 @@ export default {
 
     //新增表格里的某一项数据-----公用
     addTableInfo(type) {
-      this.isNew = true
+      this.isNew = true;
       //type == 1 证书  2 体检报告 3 保险
       if (type == 1) {
         let data = {
           certificateNumber: "",
           certificateType: "",
+          certificateTypeName: "",
           effectTime: "",
           issueCompany: "",
           issueTime: "",
@@ -3491,7 +3498,7 @@ export default {
 
     //编辑表格里的某一项数据-----公用
     editTableInfo(type, index) {
-      this.isNew = false
+      this.isNew = false;
       //type == 1 证书   2 体检报告 3 保险
       if (type == 1) {
         this.getCertificateTypeList();
@@ -3507,11 +3514,11 @@ export default {
       //type == 1 证书   2 体检报告 3 保险  4 合同  5 基本信息  6 详细信息
       let data = JSON.parse(JSON.stringify(this.originalData));
       // console.log('取消',index,this.physicalsList)
-      console.log(data,111222)
+      console.log(data, 111222);
       if (type == 1) {
         //获取证书附件
         if (this.isNew == true) {
-          this.certificateList.splice(index, 1)
+          this.certificateList.splice(index, 1);
         } else {
           if (data.workerInfo.certificateList) {
             JSON.parse(data.workerInfo.certificateList).forEach((item) => {
@@ -3528,13 +3535,13 @@ export default {
         }
       } else if (type == 2) {
         if (this.isNew == true) {
-          this.physicalsList.splice(index, 1)
+          this.physicalsList.splice(index, 1);
         } else {
           this.physicalsList[index].physicalState = false;
         }
       } else if (type == 3) {
         if (this.isNew == true) {
-          this.insuranceList.splice(index, 1)
+          this.insuranceList.splice(index, 1);
         } else {
           if (data.workerInfo.insuranceList) {
             JSON.parse(data.workerInfo.insuranceList).forEach((item) => {
@@ -3579,83 +3586,101 @@ export default {
 
     //保存表格里的某一项数据-----公用
     saveTableInfo(type, index) {
-      console.log('查看编辑时的数据---，', this.contractList[0]);
+      console.log("查看编辑时的数据---，", this.contractList[0]);
       if (type == 1) {
-        let date1_s = this.certificateList[index].effectTime.replace(/\-/g, '/')
-        let date2_s = this.certificateList[index].issueTime.replace(/\-/g, '/')
-        let date1_unix = Date.parse(date1_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
-        let date2_unix = Date.parse(date2_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+        let date1_s = this.certificateList[index].effectTime.replace(
+          /\-/g,
+          "/"
+        );
+        let date2_s = this.certificateList[index].issueTime.replace(/\-/g, "/");
+        let date1_unix = Date.parse(date1_s); //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+        let date2_unix = Date.parse(date2_s); //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
         //新增
-        console.log('effectTime issueTime', this.certificateList[index].effectTime, this.certificateList[index].issueTime)
+        console.log(
+          "effectTime issueTime",
+          this.certificateList[index].effectTime,
+          this.certificateList[index].issueTime
+        );
         if (!this.certificateList[index].id) {
           if (date1_unix < date2_unix) {
-            this.$message.error('开始日期不能大于截止有效期');
+            this.$message.error("开始日期不能大于截止有效期");
             return;
           }
           if (this.certificateList[index].certificateType == "") {
             this.$message.error(
               this.$t("message.laborMange.pleaseChoose") +
-              this.$t("message.laborMange.certificateType")
+                this.$t("message.laborMange.certificateType")
             );
             return;
           }
+          let findItem = this.certificateTypeList.find(item => item.id == this.certificateList[index].certificateType);
+          if(findItem){
+            this.certificateList[index].certificateTypeName = findItem.dictionaryName
+          }
           let requestData = {
             ...this.workerInfo,
             id: this.workerInfo.id,
-            specialCertificateInfo: JSON.stringify(this.certificateList)
+            specialCertificateInfo: JSON.stringify(this.certificateList),
+          };
+          if (requestData.contractInfo) {
+            requestData.contractInfo = JSON.stringify(requestData.contractInfo);
           }
-          if(requestData.contractInfo){
-            requestData.contractInfo = JSON.stringify(requestData.contractInfo)
+          if (requestData.insuranceInfo) {
+            requestData.insuranceInfo = JSON.stringify(
+              requestData.insuranceInfo
+            );
           }
-          if(requestData.insuranceInfo){
-            requestData.insuranceInfo = JSON.stringify(requestData.insuranceInfo)
-          }
-          updateMemberDetailDataList(requestData).then(res => {
-            if(res.code == 200){
+          updateMemberDetailDataList(requestData).then((res) => {
+            if (res.code == 200) {
               this.$message.success("操作成功");
               this.certificateList[index].certificateState = false;
               this.getWorkerInfo();
             } else {
               this.$message.error(res.message);
             }
-          })
+          });
         } else {
           let requestData = {
             ...this.workerInfo,
             id: this.workerInfo.id,
-            specialCertificateInfo: JSON.stringify(this.certificateList)
+            specialCertificateInfo: JSON.stringify(this.certificateList),
+          };
+          if (requestData.contractInfo) {
+            requestData.contractInfo = JSON.stringify(requestData.contractInfo);
           }
-          if(requestData.contractInfo){
-            requestData.contractInfo = JSON.stringify(requestData.contractInfo)
+          if (requestData.insuranceInfo) {
+            requestData.insuranceInfo = JSON.stringify(
+              requestData.insuranceInfo
+            );
           }
-          if(requestData.insuranceInfo){
-            requestData.insuranceInfo = JSON.stringify(requestData.insuranceInfo)
-          }
-          updateMemberDetailDataList(requestData).then(res => {
-            if(res.code == 200){
+          updateMemberDetailDataList(requestData).then((res) => {
+            if (res.code == 200) {
               this.$message.success("操作成功");
               this.certificateList[index].certificateState = false;
               this.getWorkerInfo();
             } else {
               this.$message.error(res.message);
             }
-          })
+          });
         }
       } else if (type == 3) {
-        let date1_s = this.insuranceList[index].insuranceTime.replace(/\-/g, '/')
-        let date2_s = this.insuranceList[index].expireTime.replace(/\-/g, '/')
-        let date1_unix = Date.parse(date1_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
-        let date2_unix = Date.parse(date2_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
-        console.log('日期', date1_unix, date2_unix)
+        let date1_s = this.insuranceList[index].insuranceTime.replace(
+          /\-/g,
+          "/"
+        );
+        let date2_s = this.insuranceList[index].expireTime.replace(/\-/g, "/");
+        let date1_unix = Date.parse(date1_s); //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+        let date2_unix = Date.parse(date2_s); //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+        console.log("日期", date1_unix, date2_unix);
         if (date1_unix > date2_unix) {
-          this.$message.error('到期日期不能大于购买日期');
+          this.$message.error("到期日期不能大于购买日期");
           return;
         }
 
         if (this.insuranceList[index].state == "") {
           this.$message.error(
             this.$t("message.laborMange.pleaseChoose") +
-            this.$t("message.laborMange.insurancePurchaseStatus")
+              this.$t("message.laborMange.insurancePurchaseStatus")
           );
           return;
         }
@@ -3664,44 +3689,48 @@ export default {
           let requestData = {
             ...this.workerInfo,
             id: this.workerInfo.id,
-            insuranceInfo: JSON.stringify(this.insuranceList)
+            insuranceInfo: JSON.stringify(this.insuranceList),
+          };
+          if (requestData.contractInfo) {
+            requestData.contractInfo = JSON.stringify(requestData.contractInfo);
           }
-          if(requestData.contractInfo){
-            requestData.contractInfo = JSON.stringify(requestData.contractInfo)
+          if (requestData.specialCertificateInfo) {
+            requestData.specialCertificateInfo = JSON.stringify(
+              requestData.specialCertificateInfo
+            );
           }
-          if(requestData.specialCertificateInfo){
-            requestData.specialCertificateInfo = JSON.stringify(requestData.specialCertificateInfo)
-          }
-          updateMemberDetailDataList(requestData).then(res => {
-            if(res.code == 200){
+          updateMemberDetailDataList(requestData).then((res) => {
+            if (res.code == 200) {
               this.$message.success("操作成功");
               this.insuranceList[index].insuranceState = false;
               this.getWorkerInfo();
             } else {
               this.$message.error(res.message);
             }
-          })
+          });
         } else {
           let requestData = {
             ...this.workerInfo,
             id: this.workerInfo.id,
-            insuranceInfo: JSON.stringify(this.insuranceList)
+            insuranceInfo: JSON.stringify(this.insuranceList),
+          };
+          if (requestData.contractInfo) {
+            requestData.contractInfo = JSON.stringify(requestData.contractInfo);
           }
-          if(requestData.contractInfo){
-            requestData.contractInfo = JSON.stringify(requestData.contractInfo)
+          if (requestData.specialCertificateInfo) {
+            requestData.specialCertificateInfo = JSON.stringify(
+              requestData.specialCertificateInfo
+            );
           }
-          if(requestData.specialCertificateInfo){
-            requestData.specialCertificateInfo = JSON.stringify(requestData.specialCertificateInfo)
-          }
-          updateMemberDetailDataList(requestData).then(res => {
-            if(res.code == 200){
+          updateMemberDetailDataList(requestData).then((res) => {
+            if (res.code == 200) {
               this.$message.success("操作成功");
               this.insuranceList[index].insuranceState = false;
               this.getWorkerInfo();
             } else {
               this.$message.error(res.message);
             }
-          })
+          });
         }
       }
     },
@@ -3727,7 +3756,6 @@ export default {
     //         return;
     //       }
 
-
     //       addCertificateApi(this.certificateList[index]).then((res) => {
     //         if (res.code == 200) {
     //           this.certificateList[index].certificateState = false;
@@ -3959,7 +3987,7 @@ export default {
     },
 
     //处罚记录 切换
-    handleClick() { },
+    handleClick() {},
 
     //滚动事件
     handleScroll(e) {
@@ -3983,11 +4011,6 @@ export default {
 };
 </script>
 
-
-
-
-
-
 <style lang="less" scoped>
 .flex {
   display: flex;
diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue
index ada8d3eb..a8dc6f34 100644
--- a/src/views/projectFront/materialManage/materialEntryManage.vue
+++ b/src/views/projectFront/materialManage/materialEntryManage.vue
@@ -271,7 +271,8 @@ export default {
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         name: this.queryInfo.materialName,
-        enterpriseId: this.queryInfo.id
+        enterpriseId: this.queryInfo.id,
+        type: 1
       };
       if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
         data.entryTime_begin = this.queryInfo.timeRange[0];
diff --git a/src/views/projectFront/materialManage/materialExitManage.vue b/src/views/projectFront/materialManage/materialExitManage.vue
index ada8d3eb..1bd0e152 100644
--- a/src/views/projectFront/materialManage/materialExitManage.vue
+++ b/src/views/projectFront/materialManage/materialExitManage.vue
@@ -271,7 +271,8 @@ export default {
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         name: this.queryInfo.materialName,
-        enterpriseId: this.queryInfo.id
+        enterpriseId: this.queryInfo.id,
+        type: 2
       };
       if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
         data.entryTime_begin = this.queryInfo.timeRange[0];