From 16636dbae439d3d9b7f2ad0f48dfe1c592ec84c1 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 14 Dec 2023 17:49:54 +0800
Subject: [PATCH] =?UTF-8?q?13134=20=E4=B8=BB=E7=AE=A1=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/train/training_record/index.vue | 25 +------
 src/views/train/training_record/users.vue | 81 +----------------------
 static/config.js                          |  5 +-
 3 files changed, 5 insertions(+), 106 deletions(-)

diff --git a/src/views/train/training_record/index.vue b/src/views/train/training_record/index.vue
index f15b794..3ba567b 100644
--- a/src/views/train/training_record/index.vue
+++ b/src/views/train/training_record/index.vue
@@ -7,19 +7,6 @@
             <el-input v-model="XGF_NAME" placeholder="相关方名称"/>
           </el-form-item>
         </el-col>
-        <!--        <el-col :span="6">-->
-        <!--          <el-form-item label="审核通过时间">-->
-        <!--            <el-date-picker-->
-        <!--              v-model="dates"-->
-        <!--              type="daterange"-->
-        <!--              range-separator="至"-->
-        <!--              start-placeholder="开始日期"-->
-        <!--              end-placeholder="结束日期"-->
-        <!--              value-format="yyyy-MM-dd"-->
-        <!--              style="width: 100%;"-->
-        <!--            />-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
         <el-col :span="3">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -38,7 +25,7 @@
       <el-table-column prop="CREATTIME" width="150" label="申请时间" />
       <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部" width="150" />
       <el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" width="150" />
-      <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" width="150" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" width="150" />
       <el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" width="150" />
       <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" width="150" />
       <el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" width="150" />
@@ -47,16 +34,6 @@
           {{ new Date(row.CREATTIME).getFullYear() }}
         </template>
       </el-table-column>
-      <!--      <el-table-column prop="AUDIT_STATUS" label="审核状态" width="150">-->
-      <!--        <template slot-scope="{row}">-->
-      <!--          <span v-if="row.AUDIT_STATUS === 0">股份公司待审核</span>-->
-      <!--          <span v-if="row.AUDIT_STATUS === 1">分公司待审核</span>-->
-      <!--          <span v-if="row.AUDIT_STATUS === 2">培训中</span>-->
-      <!--          <span v-if="row.AUDIT_STATUS === 3">培训完成</span>-->
-      <!--          <span v-if="row.AUDIT_STATUS === -1">股份公司审核未通过</span>-->
-      <!--          <span v-if="row.AUDIT_STATUS === -2">分公司审核未通过</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
       <el-table-column label="申请通过人数" width="120">
         <template slot-scope="{row}">
           <span v-if="row.PASS_COUNT">{{ row.PASS_COUNT }}</span>
diff --git a/src/views/train/training_record/users.vue b/src/views/train/training_record/users.vue
index ab868db..07f9d61 100644
--- a/src/views/train/training_record/users.vue
+++ b/src/views/train/training_record/users.vue
@@ -9,12 +9,6 @@
       width="60%">
       <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
         <h1>申请信息</h1>
-        <!--        <span v-if="pd.AUDIT_STATUS === 0">股份公司待审核</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 1">分公司待审核</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 2">培训中</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 3">培训完成</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === -1">股份公司审核未通过</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === -2">分公司审核未通过</span>-->
       </div>
       <table class="table-ui" style="margin-bottom: 20px;">
         <tr>
@@ -55,15 +49,6 @@
           <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
         </tr>
 
-        <!--        <tr>-->
-        <!--          <th>委托审核单位</th>-->
-        <!--          <td>{{ pd.TRAIN_CORP_DEPT_NAME }}</td>-->
-        <!--          <th>审核人</th>-->
-        <!--          <td>{{ pd.TRAIN_CORP_LEADER_NAME }}</td>-->
-        <!--          <th>验证时间</th>-->
-        <!--          <td>{{ pd.VERIFY_TIME }}</td>-->
-        <!--        </tr>-->
-
         <tr v-if="pd.CORP_AUDIT_DESCR">
           <th>分公司意见</th>
           <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
@@ -85,18 +70,10 @@
             <el-tag v-else type="success">待审核</el-tag>
           </template>
         </el-table-column>
-        <!--        <el-table-column prop="STATUS" label="培训状态" >-->
-        <!--          <template slot-scope="{row}">-->
-        <!--            <span v-if="row.STATUS === 0">未培训</span>-->
-        <!--            <span v-if="row.STATUS === 1">培训中</span>-->
-        <!--            <span v-if="row.STATUS === 2">已培训</span>-->
-        <!--            <span v-if="row.STATUS === -1">培训未通过</span>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="操作" align="center" width="220">
           <template slot-scope="{row}">
             <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
-            <el-button v-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="primary" icon="el-icon-edit" size="mini" @click="handleCardShow(row.TRAINUSERS_ID)">电子工牌</el-button>
+            <el-button v-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1 && row.AUDIT_STATUS === 3" type="primary" icon="el-icon-edit" size="mini" @click="handleCardShow(row.TRAINUSERS_ID)">电子工牌</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -263,53 +240,7 @@
             </span>
           </td>
         </tr>
-        <!--        <tr>-->
-        <!--          <th>是否按期缴纳工伤保险</th>-->
-        <!--          <td :colspan="userDetailForm.IS_INJURIES_PAY === '1' ? '':5">{{ formatLabel(userDetailForm.IS_INJURIES_PAY) }}</td>-->
-        <!--          <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险有效期</th>-->
-        <!--          <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">{{ userDetailForm.IS_INJURIES_PAY_TIME }}</td>-->
-        <!--          <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险凭证</th>-->
-        <!--          <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">-->
-        <!--            <span>-->
-        <!--              <viewer>-->
-        <!--                <img-->
-        <!--                  v-for="item in gongshangbaoxianFile"-->
-        <!--                  :src="config.fileUrl + item.FILEPATH"-->
-        <!--                  :key="item.IMGFILES_ID"-->
-        <!--                  width="40"-->
-        <!--                  height="40"-->
-        <!--                  style="object-fit: cover;">-->
-        <!--              </viewer>-->
-        <!--            </span>-->
-        <!--          </td>-->
-        <!--        </tr>-->
-        <!--        <tr>-->
-        <!--          <th>是否缴纳商业保险</th>-->
-        <!--          <td :colspan="userDetailForm.ISPAY === '1' ? '' : 5">-->
-        <!--            {{ formatLabel(userDetailForm.ISPAY) }}-->
-        <!--          </td>-->
-        <!--          <th v-if="userDetailForm.ISPAY === '1'">商业保险附件</th>-->
-        <!--          <td v-if="userDetailForm.ISPAY === '1'">-->
-        <!--            <span>-->
-        <!--              <viewer>-->
-        <!--                <img-->
-        <!--                  v-for="item in insuranceFileList"-->
-        <!--                  :src="config.fileUrl + item.FILEPATH"-->
-        <!--                  :key="item.IMGFILES_ID"-->
-        <!--                  width="40"-->
-        <!--                  height="40"-->
-        <!--                  style="object-fit: cover;">-->
-        <!--              </viewer>-->
-        <!--            </span>-->
-        <!--          </td>-->
-        <!--          <th v-if="userDetailForm.ISPAY === '1'">商业保险单号</th>-->
-        <!--          <td v-if="userDetailForm.ISPAY === '1'">{{ userDetailForm.ISPAY_NUMBER }}</td>-->
-        <!--        </tr>-->
         <tr>
-          <!--            <th>安全告知培训是否合格</th>-->
-          <!--            <td>{{ formatLabel(userDetailForm.IS_SAFETY_TELL) }}</td>-->
-          <!--            <th>安全告知培训合格日期</th>-->
-          <!--            <td>{{ userDetailForm.IS_SAFETY_TIME }}</td>-->
           <th>是否缴纳保险</th>
           <td >{{ formatLabel(userDetailForm.IS_BF) }}</td>
           <th>是否特殊工种</th>
@@ -317,13 +248,6 @@
           <th>是否流动人员</th>
           <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
         </tr>
-
-
-        <!--        <tr>-->
-
-        <!--          <th>流动范围</th>-->
-        <!--          <td colspan="3">{{ userDetailForm.TRAIN_AREA }}</td>-->
-        <!--        </tr>-->
         <tr v-if="message != ''">
           <th>打回人</th>
           <td>{{ operator }}</td>
@@ -354,9 +278,6 @@
           <td>{{ item.REVIEW_TIME }}</td>
           <th>有效期</th>
           <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-
-          <!--          &lt;!&ndash;          <td v-if="!userEntryForm.TRAIN_AREA">暂无</td>&ndash;&gt;-->
-          <!--          &lt;!&ndash;          <td v-else style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>&ndash;&gt;-->
         </tr>
       </table>
       <div slot="footer" class="dialog-footer">
diff --git a/static/config.js b/static/config.js
index 893aca5..486543a 100644
--- a/static/config.js
+++ b/static/config.js
@@ -2,7 +2,7 @@ const config = {
   weburl: 'http://192.168.0.45:8082/', // 前台地址
   httpurl: 'http://192.168.151.56:8092/', // 后台地址
   qyurl: 'http://192.168.0.45:8080/', // 企业前台
-  fileUrl: 'http://192.168.192.201:8991/file/',// 附件服务器地址
+  fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
   weburlWaiwang: 'https://skqhdg.porthebei.com:9004/', // 附件服务器地址,
   httpurlWaiwang: 'https://skqhdg.porthebei.com:9004/qa-prevention-gwj/', // 附件服务器地址,
@@ -11,5 +11,6 @@ const config = {
   httpurlNaiwang: 'http://192.168.192.201:8992//qa-prevention-gwj/', // 附件服务器地址,
   perRealTimeLocUrl: '192.168.210.32:8084/netty/test.io',
   cfdfileUrl: 'http://60.2.209.238:8991/file',
-  xfgUrl: 'https://skqhdg.porthebei.com:9006/static/qrcode/views/xgf_hgz/index.html'
+  xfgUrl: 'https://skqhdg.porthebei.com:9006/static/qrcode/views/xgf_hgz/index.html',
+  messageUrl: 'http://192.168.151.56:8082/static/qrcode/views/xgf_hgz/index.html'
 }