From 2b6af35238aa3daba815449f808a22c29d77e0e2 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 18 Dec 2023 18:54:49 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E9=9D=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/toolMan/components/corpInfoEdit.vue   | 1342 ++++++++++++++++
 src/views/xgf/toolMan/components/edit.vue     | 1375 +++++++++++++++++
 src/views/xgf/toolMan/components/list.vue     |  188 +++
 src/views/xgf/toolMan/index.vue               |   36 +
 4 files changed, 2941 insertions(+)
 create mode 100644 src/views/xgf/toolMan/components/corpInfoEdit.vue
 create mode 100644 src/views/xgf/toolMan/components/edit.vue
 create mode 100644 src/views/xgf/toolMan/components/list.vue
 create mode 100644 src/views/xgf/toolMan/index.vue

diff --git a/src/views/xgf/toolMan/components/corpInfoEdit.vue b/src/views/xgf/toolMan/components/corpInfoEdit.vue
new file mode 100644
index 0000000..3c68210
--- /dev/null
+++ b/src/views/xgf/toolMan/components/corpInfoEdit.vue
@@ -0,0 +1,1342 @@
+<template>
+  <div class="reform-bg">
+    <div class="reform-warp">
+      <div class="reform-content">
+        <el-form ref="dataForm" :rules="rules" :model="dataForm" label-width="200px">
+          <div class="level-title">
+            <h1>1、相关方单位基础信息</h1>
+          </div>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="主管部门" prop="MAIN_DEPARTMENT">
+                <SelectTree
+                  ref="deptTree"
+                  :clearable="false"
+                  :options="treeData"
+                  :props="defaultProps"
+                  v-model="dataForm.MAIN_DEPARTMENT"
+                  :disable="true"
+                  placeholder="请选择主管部门"
+                  style="width: 300px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开户人" prop="CREATOR">
+                <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="单位名称" prop="RELEVANT_UNIT_NAME">
+            <el-input id="RELEVANT_UNIT_NAME" ref="RELEVANT_UNIT_NAME" v-model="dataForm.RELEVANT_UNIT_NAME" disabled dmaxlength="255" placeholder="这里输入单位名称..." title="单位名称"/>
+          </el-form-item>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="统一社会信用代码" prop="SOCIAL_CODE">
+                <el-input id="SOCIAL_CODE" ref="SOCIAL_CODE" v-model="dataForm.SOCIAL_CODE" maxlength="255" disabled placeholder="这里输入统一社会信用代码..." title="统一社会信用代码"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="属地" prop="POSSESSION">
+                <el-cascader
+                  id="POSSESSION"
+                  ref="POSSESSION"
+                  v-model="dataForm.POSSESSION"
+                  :options="areaList"
+                  :props="areaProps"
+                  placeholder="请选择属地"
+                  style="width: 100%"
+                  @change="cascaderChange"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="所属行业" disabled prop="INDUSTRY">
+                <el-select v-model="dataForm.INDUSTRY" disabled style="width: 100%">
+                  <el-option v-for="item in industryList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经济类型" prop="ECONOMIC_TYPE">
+                <el-select v-model="dataForm.ECONOMIC_TYPE" placeholder="请选择" style="width: 100%;" disabled>
+                  <el-option v-for="item in ecnomicTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="经度" prop="LONGITUDE">
+                <el-input v-model="dataForm.LONGITUDE" disabled placeholder="请输入内容" @focus="handleMap" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="LATITUDE">
+                <div style="display: flex">
+                  <el-input v-model="dataForm.LATITUDE" disabled placeholder="请输入内容" style="width: 100%" @focus="handleMap"/>
+                  <el-button style="margin-left:10px" @click="handleMap">
+                    <span class="svg-container">
+                      <svg-icon icon-class="international" />
+                    </span>
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="单位经营地址" prop="BUSINESS_ADDRESS">
+                <el-input id="BUSINESS_ADDRESS" ref="BUSINESS_ADDRESS" v-model="dataForm.BUSINESS_ADDRESS" maxlength="255" disabled placeholder="这里输入单位经营地址..." title="单位经营地址"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业规模" prop="CORP_SIZE">
+                <el-select v-model="dataForm.CORP_SIZE" style="width: 100%;" disabled>
+                  <el-option v-for="item in enterpriseSizeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="法人姓名" prop="LEGAL_PERSON">
+                <el-input id="LEGAL_PERSON" ref="LEGAL_PERSON" v-model="dataForm.LEGAL_PERSON" maxlength="20" disabled placeholder="这里输入法人姓名..." title="法人姓名"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="LEGAL_PERSON_TEL">
+                <el-input id="LEGAL_PERSON_TEL" ref="LEGAL_PERSON_TEL" v-model="dataForm.LEGAL_PERSON_TEL" maxlength="11" disabled placeholder="这里输入联系电话..." title="联系电话"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="主要负责人" prop="CONTACT_PERSON">
+                <el-input id="CONTACT_PERSON" ref="CONTACT_PERSON" v-model="dataForm.CONTACT_PERSON" maxlength="20" disabled placeholder="这里输入主要负责人..." title="主要负责人"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="主要负责人联系电话" prop="CONTACT_TEL">
+                <el-input id="CONTACT_TEL" ref="CONTACT_TEL" v-model="dataForm.CONTACT_TEL" maxlength="11" disabled placeholder="这里输入主要负责人联系电话..." title="主要负责人联系电话"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="成立日期" prop="ESTABLISHMENT_DATE">
+                <el-date-picker v-model="dataForm.ESTABLISHMENT_DATE" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" disabled placeholder="选择日期"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职工人数（人）" prop="EMPLOY_NUM">
+                <el-input id="EMPLOY_NUM" ref="EMPLOY_NUM" v-model="dataForm.EMPLOY_NUM" type="number" maxlength="11" disabled placeholder="这里输入职工人数..." title="职工人数"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="资产总额（万元）" prop="TOTAL_ASSETS">
+                <el-input id="TOTAL_ASSETS" ref="TOTAL_ASSETS" v-model="dataForm.TOTAL_ASSETS" type="number" maxlength="11" disabled placeholder="这里输入资产总额（万元）..." title="资产总额（万元）"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="注册资金" prop="REGISTERED_CAPITAL">
+                <el-input id="REGISTERED_CAPITAL" ref="REGISTERED_CAPITAL" v-model="dataForm.REGISTERED_CAPITAL" type="number" maxlength="11" disabled placeholder="这里输入注册资金..." title="注册资金"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="用工形式" disabled prop="EMPLOYMENT_FORM">
+                <el-select v-model="dataForm.EMPLOYMENT_FORM" style="width: 100%;" disabled>
+                  <el-option v-for="item in employmentTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="选取形式" disabled prop="SELECT_FORM">
+                <el-select v-model="dataForm.SELECT_FORM" style="width: 100%;" disabled>
+                  <el-option v-for="item in selectFormList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item :span="12" label="流动人员比例(%)" disabled prop="FLOATING_PERCENT">
+            <el-input id="FLOATING_PERCENT" ref="FLOATING_PERCENT" v-model="dataForm.FLOATING_PERCENT" maxlength="255" placeholder="这里输入流动人员比例..." disabled title="流动人员比例"/>
+          </el-form-item>
+          <div class="level-title">
+            <h1>2、单位资质信息</h1>
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleQualificationAdd">添加资质</el-button>-->
+          </div>
+          <el-table
+            v-loading="listLoading"
+            :data="qualificationList"
+            :header-cell-style="{
+              'font-weight': 'bold',
+              'color': '#000'
+            }"
+            tooltip-effect="dark"
+            border
+            fit
+            highlight-current-row
+          >
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="QUALIFICATION_NAME" label="资质正式名称" />
+            <el-table-column prop="" label="证书有限期">
+              <template slot-scope="{row}">
+                {{ row.START_DATE }} 至 {{ row.END_DATE }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="CERTIFICATE_NO" label="证书编号" />
+            <el-table-column label="操作" align="center" width="200">
+              <template slot-scope="{row}">
+                <el-button type="primary" icon="el-icon-view" size="mini" @click="handlePictureCardView(row)">预览</el-button>
+                <!-- <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleQualificationEdit(row.CORPQUALIFICATIONINFO_ID)">编辑</el-button>
+                <el-button type="danger" icon="el-icon-delete" size="mini" @click="delQualification(row.CORPQUALIFICATIONINFO_ID)">删除</el-button>-->
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+      <div class="ui-height" />
+      <div class="ui-foot">
+        <!--        <el-button :loading="buttonloading" type="warning" icon="el-icon-document" @click="confirm('1')">保存并提交审核</el-button>-->
+        <!--        <el-button :loading="buttonloading" type="primary" icon="el-icon-check" @click="confirm('0')">保存草稿</el-button>-->
+        <!-- <el-button type="primary" @click="handleSh">通过</el-button>
+        <el-button type="danger" @click="handleBtg">不通过</el-button>-->
+        <el-button plain type="info" @click="back">返 回</el-button>
+      </div>
+      <!-- 上级企业 -->
+      <el-dialog :visible.sync="dialogParentCorp" title="上级企业" width="1000px">
+        <CorpSelect v-if="dialogParentCorp" ref="corpSelect" :corpid="CORPINFO_ID" @assignCorpParent="assignCorpParent" />
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogParentCorp = false">取 消</el-button>
+          <el-button type="primary" @click="defineCorp">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 坐标选择 -->
+      <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+        <baidu-map
+          v-loading="loadingMap"
+          :zoom="zoom"
+          :scroll-wheel-zoom="true"
+          :style="{height: clientHeight+'px'}"
+          @click="getClickInfo"
+          @ready="handler">
+          <bm-view style="width: 100%; height:100%; flex: 1" />
+          <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
+            <div class="map-flex">
+
+              <div class="map-lable">关键词：</div>
+              <div style="flex:1;">
+                <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
+              </div>
+              <!--            <el-input v-model="addressKeyword" style="width: 200px" placeholder="请输入内容" />-->
+              <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
+            </div>
+          </bm-control>
+          <!--        <bm-local-search :keyword="addressKeyword" :auto-viewport="true"/>-->
+        </baidu-map>
+        <div slot="footer" class="dialog-footer">
+          <span>经度：</span>
+          <el-input v-model="LONGITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+          <span>纬度：</span>
+          <el-input v-model="LATITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+          <el-button @click="dialogFormMap = false">关 闭</el-button>
+          <!-- <el-button type="primary" @click="setPosition">确 定</el-button>-->
+        </div>
+      </el-dialog>
+
+      <!-- 图片上传预览 -->
+      <el-dialog :visible.sync="dialogVisible">
+        <img :src="dialogImageUrl" width="100%" alt="">
+      </el-dialog>
+      <!-- 单位资质信息 编辑 -->
+      <el-dialog :visible.sync="dialogQualificationEdit" :title="dialogQualificationType==='edit'?'修改单位资质信息':'新增单位资质信息'" width="600px">
+        <el-form ref="formQualification" :rules="rulesQualification" :model="formQualification" label-width="140px" style="width: 500px;">
+          <el-form-item label="资质正式名称" prop="QUALIFICATION_NAME">
+            <el-input id="QUALIFICATION_NAME" ref="QUALIFICATION_NAME" v-model="formQualification.QUALIFICATION_NAME" maxlength="255" placeholder="这里输入资质正式名称..." title="资质正式名称"/>
+          </el-form-item>
+          <el-form-item label="证书有限期" prop="date">
+            <el-date-picker
+              v-model="formQualification.date"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="handlePeriodChange"/>
+          </el-form-item>
+          <el-form-item label="证书编号" prop="CERTIFICATE_NO">
+            <el-input id="CERTIFICATE_NO" ref="CERTIFICATE_NO" v-model="formQualification.CERTIFICATE_NO" maxlength="255" placeholder="这里输入证书编号..." title="证书编号"/>
+          </el-form-item>
+          <el-form-item label="照片" prop="QUALIFICATION_PIC">
+            <el-upload ref="qualificationPicFileRef" :file-list="formQualification.QUALIFICATION_PIC" :multiple="false" :limit="1" :auto-upload="false" :on-change="qualificationPicFileChange" :on-remove="qualificationPicFileRemove" action="#" accept=".jpg,.jpeg,.png" list-type="picture-card">
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogQualificationEdit = false">取 消</el-button>
+          <el-button type="primary" @click="confirmQualification">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import SelectTree from '@/components/SelectTree'
+import { upload } from '@/utils/upload'
+export default {
+  components: { SelectTree },
+  data() {
+    /* var hasName = (rule, value, callback) => {
+      requestFN(
+        '/corpinfo/hasName',
+        {
+          RELEVANT_UNIT_NAME: value,
+          CORPINFO_ID: ''
+
+        }
+      ).then((data) => {
+        if (data.pd) {
+          if (data.pd.CORPINFO_ID === this.$parent.CORPINFO_ID) {
+            callback()
+          } else {
+            callback(new Error('单位名称重复'))
+          }
+        }
+        callback()
+      }).catch((e) => {
+        callback()
+      })
+    } */
+    /* var hasSocialCode = (rule, value, callback) => {
+      requestFN(
+        '/corpinfo/hasSocialCode',
+        {
+          SOCIAL_CODE: value,
+          CORPINFO_ID: ''
+
+        }
+      ).then((data) => {
+        if (data.pd) {
+          if (data.pd.CORPINFO_ID === this.$parent.CORPINFO_ID) {
+            callback()
+          } else {
+            callback(new Error('统一社会信用代码重复'))
+          }
+        }
+        callback()
+      }).catch((e) => {
+        callback()
+      })
+    } */
+    return {
+      dataForm: {
+        MAIN_DEPARTMENT: '',
+        RELEVANT_UNIT_NAME: '',
+        SOCIAL_CODE: '',
+        POSSESSION: '',
+        INDUSTRY: '',
+        ECONOMIC_TYPE: '',
+        LONGITUDE: '',
+        LATITUDE: '',
+        BUSINESS_ADDRESS: '',
+        CORP_SIZE: '',
+        LEGAL_PERSON: '',
+        LEGAL_PERSON_TEL: '',
+        CONTACT_PERSON: '',
+        CONTACT_TEL: '',
+        ESTABLISHMENT_DATE: '',
+        EMPLOY_NUM: '',
+        TOTAL_ASSETS: '',
+        REGISTERED_CAPITAL: '',
+        EMPLOYMENT_FORM: '',
+        SELECT_FORM: ''
+      },
+      employmentTypeList: [], // 用工形式数据
+      industryList: [],
+      selectFormList: [], // 选取形式数据
+      ecnomicTypeList: [], // 经济类型数据
+      enterpriseSizeList: [], // 企业规模数据
+      treeData: [], // 主管部门
+      config: config,
+      corpStateList: [], // 企业经营状态
+      hylxList: [], // 国民经济行业分类 (GB-T4754-2017)
+      /** 安全生产管理制度 Begin */
+      dialogQualificationEdit: false,
+      dialogQualificationType: 'add',
+      qualificationList: [],
+      formQualification: {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      },
+      rulesQualification: {
+        QUALIFICATION_NAME: [{ required: true, message: '资质正式名称不能为空', trigger: 'blur' }],
+        date: [
+          {
+            type: 'array',
+            required: true,
+            message: '请选择日期区间',
+            fields: {
+              // tpye类型试情况而定,所以如果返回的是date就改成date,如果返回的是string就改成string
+              0: { type: 'string', trigger: 'change', required: true, message: '请选择开始日期' },
+              1: { type: 'string', trigger: 'change', required: true, message: '请选择结束日期' }
+            },
+            trigger: 'blur'
+          }
+        ],
+        CERTIFICATE_NO: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+        QUALIFICATION_PIC: [
+          {
+            type: 'array',
+            required: true,
+            message: '请上传照片',
+            trigger: 'blur'
+          }
+        ]
+      },
+      /** 安全生产管理制度 End */
+      // 地图相关
+      // clientHeight: document.documentElement.clientHeight - 250,
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      loadingMap: true,
+      listLoading: false,
+      buttonloading: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      addressKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
+      dialogImageUrl: '',
+      dialogVisible: false,
+      provinceList: [],
+      cityList: [],
+      countyList: [],
+      scaleList: [],
+      areaList: [], // 属地
+      jjlxList: [],
+      corpFoTypeList: [],
+      trainDicList: [],
+      OLDFOURTYPE: '',
+      defaultProps: {
+        children: 'nodes',
+        label: 'name',
+        value: 'id'
+      },
+      // 上级企业选择
+      dialogParentCorp: false,
+      ECO_TYPE: '',
+      ecoArr: [],
+      ecoNameArr: [],
+      INDUSTRY: '',
+      // imgUrl: require('@/assets/images/map.png'),
+      rules: {
+        MAIN_DEPARTMENT: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        /* RELEVANT_UNIT_NAME: [
+          { required: true, message: '单位名字不能为空', trigger: 'blur' },
+          { validator: hasName, trigger: 'blur' }
+        ], */
+        /* SOCIAL_CODE: [
+          { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
+          { validator: hasSocialCode, trigger: 'blur' },
+          {
+            pattern: /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/,
+            message: '请输入正确的统一社会信用代码'
+          }
+        ], */
+        // POSSESSION: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
+        // INDUSTRY: [{ required: true, message: '国民经济行业分类 (GB-T4754-2017)不能为空', trigger: 'blur' }],
+        ECONOMIC_TYPE: [{ required: true, message: '请选择经济类型', trigger: 'blur' }],
+        LONGITUDE: [{ required: true, message: '请选择经度', trigger: 'blur' }],
+        LATITUDE: [{ required: true, message: '请选择纬度', trigger: 'blur' }],
+        BUSINESS_ADDRESS: [{ required: true, message: '单位经营地址不能为空', trigger: 'blur' }],
+        CORP_SIZE: [{ required: true, message: '企业规模不能为空', trigger: 'blur' }],
+        LEGAL_PERSON: [{ required: true, message: '法人姓名不能为空', trigger: 'blur' }],
+        LEGAL_PERSON_TEL: [
+          { required: true, message: '法人电话不能为空', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          }
+        ],
+        CONTACT_PERSON: [{ required: true, message: '主要负责人不能为空', trigger: 'blur' }],
+        CONTACT_TEL: [
+          { required: true, message: '主要负责人电话不能为空', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          }
+        ],
+        ESTABLISHMENT_DATE: [{ required: true, message: '请选择成立日期', trigger: 'blur' }],
+        EMPLOY_NUM: [
+          { required: true, message: '职工人数不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的职工人数', trigger: 'blur' }
+        ],
+        TOTAL_ASSETS: [
+          { required: true, message: '资产总额不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的资产总额', trigger: 'blur' }
+        ],
+        REGISTERED_CAPITAL: [
+          { required: true, message: '注册资金不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的注册资金', trigger: 'blur' }
+        ],
+        EMPLOYMENT_FORM: [{ required: true, message: '请选择用工形式', trigger: 'blur' }],
+        SELECT_FORM: [{ required: true, message: '请选择选取形式', trigger: 'blur' }]
+      },
+      propsCorpFoType: { value: 'id', id: 'id', label: 'label', children: 'children' },
+
+      ecoProps: {
+        lazy: true,
+        lazyLoad: this.lazyLoad,
+        value: 'id',
+        id: 'id',
+        label: 'label',
+        children: 'children'
+      },
+      industryProps: {
+        lazy: true,
+        lazyLoad: this.lazyLoad,
+        value: 'id',
+        id: 'id',
+        label: 'label',
+        children: 'children',
+        checkStrictly: false
+      },
+      areaProps: {
+        lazy: true,
+        lazyLoad: async(node, resolve) => {
+          const resData = await this.getAreaDict(
+            (node.data && node.data.DICTIONARIES_ID) || 'e725d2a91b8248f4b8f49889038df7de'
+          )
+          const { level } = node
+          resolve(
+            resData.map((item) => {
+              return {
+                DICTIONARIES_ID: item.DICTIONARIES_ID,
+                BIANMA: item.BIANMA,
+                NAME: item.NAME,
+                leaf: level >= 3
+              }
+            })
+          )
+        },
+        value: 'BIANMA',
+        id: 'DICTIONARIES_ID',
+        label: 'NAME',
+        children: 'children',
+        checkStrictly: true
+      },
+      // 主管部门
+      mainDepartment: '',
+      // 监管部门
+      regulatoryDepartment: ''
+    }
+  },
+  watch: {},
+  async created() {
+    const loading = this.$loading({
+      lock: true,
+      text: '读取中...',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
+    await this.getDict()
+    await this.getData()
+    loading.close()
+  },
+  mounted() {
+    // this.getNextTickData()
+    this.getQualificationList()
+    this.getTreeList()
+  },
+  methods: {
+    async getAreaDict(DICTIONARIES_ID) {
+      const { list } = await requestFN(
+        '/xgf/dictionaries/getAreaLevels',
+        {
+          DICTIONARIES_ID
+        }
+      )
+      return list
+    },
+    cascaderChange(e) {
+      // console.log('e', e)
+      const newVal = e[e.length - 1]
+      // console.log('选中', newVal[newVal.length - 1])
+      if (newVal === '1' || newVal === '2' || newVal === '3' || newVal === '4') {
+        this.$message({
+          message: '请选择正确的属地...',
+          type: 'error'
+        })
+        this.form.POSSESSION.pop()
+        // console.log('移除', this.corpStateForm.REGULATORY_DEPARTMENT_ARR)
+      }
+    },
+    getTreeList() {
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+    getData() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/relevantunits/getCorpInfoDetail',
+          {
+            CORPINFO_ID: this.$parent.CORPINFO_ID,
+            tm: new Date().getTime()
+          }
+        ).then((data) => {
+          this.dataForm = Object.assign(this.dataForm, data.pd)
+          this.dataForm.POSSESSION = []
+          if (data.pd.PROVINCE != '') this.dataForm.POSSESSION.push(data.pd.PROVINCE)
+          if (data.pd.CITY != '') this.dataForm.POSSESSION.push(data.pd.CITY)
+          if (data.pd.COUNTY != '') this.dataForm.POSSESSION.push(data.pd.COUNTY)
+          if (data.pd.VILLAGE != '') this.dataForm.POSSESSION.push(data.pd.VILLAGE)
+          this.qualificationList = data.qualification
+          const node = {}
+          node.id = this.dataForm.MAIN_DEPARTMENT
+          node.name = this.dataForm.mainDepartment
+          this.$refs.deptTree.clearHandle()
+          this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+            this.$refs.deptTree.handleNodeClick(node)
+          })
+
+          /* this.OLDFOURTYPE = data.pd.FOURTYPE
+          this.form = Object.assign(this.form, data.pd)
+          // 国民经济行业分类
+          if (data.pd.industryOption && data.pd.industryOption.length > 0) {
+            this.hylxList = data.pd.industryOption
+          } else {
+            this.getDictByDicId('f2598ba72e864eadabf0ca4b664d26b9').then(data => {
+              this.hylxList = data
+            })
+          }
+          // 主管部门监管部门
+          if (data.dep) {
+            this.mainDepartment = data.dep.MAIN_REGULATORY_DEPARTMENT_NAME
+            this.regulatoryDepartment = data.dep.REGULATORY_DEPARTMENT_NAME
+          }
+          console.log('this.form', this.form) */
+          resolve()
+        }).catch((e) => {
+          this.$message({
+            message: '操作失败',
+            type: 'error'
+          })
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getNextTickData() {
+      // this.$nextTick(() => {
+      //   this.$refs.ecoCascader.presentText = this.censusRegisterPlaceName
+      // })
+      if (this.form.CORP_OF_TYPE2 && this.form.CORP_OF_TYPE2 != '') {
+        const node = {}
+        node.id = this.form.CORP_OF_TYPE2
+        this.$nextTick(() => {
+          this.$refs.corpOfTypeRef.handleNodeClick(node)
+        })
+      } else if (this.form.CORP_OF_TYPE && this.form.CORP_OF_TYPE != '') {
+        const node = {}
+        node.id = this.form.CORP_OF_TYPE
+        this.$nextTick(() => {
+          this.$refs.corpOfTypeRef.handleNodeClick(node)
+        })
+      }
+      // const nodea = {}
+      // nodea.id = this.form.TRAINTYPE
+      // this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+      //   this.$refs.keyHyRef.handleNodeClick(nodea)
+      // })
+      this.$forceUpdate()
+    },
+    /** 上级企业选择 Begin */
+    handleSelectParentCorp() {
+      this.dialogParentCorp = true
+    },
+    defineCorp() {
+      this.$refs.corpSelect.defineCorp()
+    },
+    assignCorpParent(corp) {
+      this.form.CORP_PARENT = corp.CORPINFO_ID
+      this.form.CORP_PARENT_NAME = corp.CORP_NAME
+      this.form.CORP_GROUP = this.validStr(corp.CORP_GROUP) ? corp.CORP_GROUP : corp.CORPINFO_ID
+      this.form.CORP_GROUP_NAME = this.validStr(corp.CORP_GROUP_NAME) ? corp.CORP_GROUP_NAME : corp.CORP_NAME
+      this.form.CORP_PARENTS = (this.validStr(corp.CORP_PARENTS) ? corp.CORP_PARENTS : ',') + corp.CORPINFO_ID + ','
+      // console.log('this.form.CORP_PARENT', this.form.CORP_PARENT)
+      // console.log('this.form.CORP_PARENT_NAME', this.form.CORP_PARENT_NAME)
+      // console.log('this.form.CORP_GROUP', this.form.CORP_GROUP)
+      // console.log('this.form.CORP_GROUP_NAME', this.form.CORP_GROUP_NAME)
+      // console.log('this.form.CORP_PARENTS', this.form.CORP_PARENTS)
+      this.dialogParentCorp = false
+    },
+    /** 上级企业选择 End */
+    // 加载级联的方法
+    lazyLoad(nodeValue, resolve) {
+      if (nodeValue.data && (!nodeValue.children || nodeValue.children.length == 0)) {
+        this.getDictByDicId(nodeValue.data.id).then(data => {
+          resolve(data)
+        })
+      } else {
+        resolve(null)
+      }
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.dataForm.LATITUDE
+      this.LONGITUDE = this.dataForm.LONGITUDE
+    },
+    getClickInfo(e) {
+      this.LONGITUDE = e.point.lng
+      this.LATITUDE = e.point.lat
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.dataForm.LATITUDE = this.LATITUDE
+      this.dataForm.LONGITUDE = this.LONGITUDE
+    },
+    // 提交表单
+    confirm(type) {
+      // const _this = this
+      this.$refs.dataForm.validate(valid => {
+        if (valid) {
+          const loading = this.$loading({
+            lock: true,
+            text: '提交中...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          /* if (this.dataForm.POSSESSION && this.dataForm.POSSESSION.length > 0) {
+            this.dataForm.PROVINCE = this.dataForm.POSSESSION[0] || ''
+            this.dataForm.CITY = this.dataForm.POSSESSION[1] || ''
+            this.dataForm.COUNTY = this.dataForm.POSSESSION[2] || ''
+            this.dataForm.VILLAGE = this.dataForm.POSSESSION[3] || ''
+            this.dataForm.STREET = this.dataForm.POSSESSION[4] || ''
+            this.dataForm.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : ''
+          }
+          if (_this.dataForm.INDUSTRYALL && _this.dataForm.INDUSTRYALL.length > 0) {
+            _this.dataForm.CORP_TYPE = _this.dataForm.INDUSTRYALL[0] || ''
+            _this.dataForm.CORP_TYPE2 = _this.dataForm.INDUSTRYALL[1] || ''
+            _this.dataForm.CORP_TYPE3 = _this.dataForm.INDUSTRYALL[2] || ''
+            _this.dataForm.CORP_TYPE4 = _this.dataForm.INDUSTRYALL[3] || ''
+            _this.dataForm.CORP_TYPE_NAME = _this.$refs.industryCascader.getCheckedNodes()[0].pathLabels ? _this.$refs.industryCascader.getCheckedNodes()[0].pathLabels.join('/') : ''
+          } */
+
+          const formData = new FormData()
+          Object.keys(this.dataForm).map(key => {
+            formData.append(key, this.dataForm[key])
+          })
+          formData.append('saveType', type)
+          this.buttonloading = true
+          upload(
+            '/corpinfo/saveEdit',
+            formData
+          ).then((data) => {
+            loading.close()
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.buttonloading = false
+            // this.$parent.activeName = 'CorpView'
+          }).catch((e) => {
+            loading.close()
+            this.buttonloading = false
+            this.$message({
+              message: '操作失败',
+              type: 'error'
+            })
+          })
+        }
+      })
+    },
+    // back() {
+    //   this.$parent.activeName = 'CorpView'
+    // },
+
+    getTrainDicList() {
+      return new Promise(resolve => {
+        requestFN(
+          '/dictionaries/listAllDictToParId',
+          {
+            parentId: '052369aa22d242118236cde52d0c67ea'
+          }
+        ).then((data) => {
+          resolve()
+          this.trainDicList = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    getProvinceList() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'e725d2a91b8248f4b8f49889038df7de'
+        }
+      ).then((data) => {
+        this.provinceList = data.list
+        // this.provinceList = [{ DICTIONARIES_ID: 'acd05c42faf346db9a0d067402b97c10', BIANMA: '130000', NAME: '河北省' }]
+      }).catch((e) => {
+      })
+    },
+    async getCityList() {
+      var dictID = await this.getDictID(this.form.PROVINCE)
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: dictID
+        }
+      ).then((data) => {
+        this.cityList = data.list
+      }).catch((e) => {
+      })
+    },
+    async getCountyList() {
+      var dictID = await this.getDictID(this.form.CITY)
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: dictID
+        }
+      ).then((data) => {
+        this.countyList = data.list
+      }).catch((e) => {
+      })
+    },
+    getDictID(BIANMA) {
+      return new Promise((resolve) => {
+        requestFN(
+          '/dictionaries/findByBianma',
+          {
+            BIANMA: BIANMA
+          }
+        ).then((data) => {
+          resolve(data.DICTIONARIES_ID)
+        }).catch((e) => {
+        })
+      })
+    },
+    async getDict() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'f2598ba72e864eadabf0ca4b664d26b9'
+        }
+      ).then((data) => {
+        this.industryList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
+        }
+      ).then((data) => {
+        this.employmentTypeList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '9ce2e9a4636b4d41b460ce16c346d497'
+        }
+      ).then((data) => {
+        this.selectFormList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '688d2cf1c6cd4dab999a0106e09aec83'
+        }
+      ).then((data) => {
+        this.ecnomicTypeList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '37b045e160c04ddba851073b4e510cc9'
+        }
+      ).then((data) => {
+        this.enterpriseSizeList = data.list
+      })
+    },
+
+    // 获取数据字典数据
+    getDictByDicId(dicId) {
+      /* var dicListVal = []
+      return new Promise((resolve) => {
+        let id = ''
+        if (!dicId) {
+          id = '0'
+        } else {
+          id = dicId
+        }
+        requestFN(
+          '/dictionaries/getLevelsAndSCount',
+          {
+            DICTIONARIES_ID: id
+          }
+        ).then((data) => {
+          if (data.list.length > 0) {
+            dicListVal = data.list.map((e) => {
+              if (e.zcount == '0') {
+                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, leaf: true }
+              } else {
+                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, children: [], leaf: false }
+              }
+            })
+          } else {
+            dicListVal = undefined
+          }
+          return resolve(dicListVal)
+        }).catch((e) => {
+        })
+      }) */
+    },
+    // 地图相关
+    mapOpen() {
+      this.top = this.getScrollTop()
+      if (this.top) {
+        this.setScrollTop(0)
+      }
+    },
+    // 关闭地图后调用
+    mapClose() {
+      this.setScrollTop(this.top)
+      this.top = 0
+      this.showMap = false
+    },
+    getScrollTop() {
+      let scrollTop = 0
+      if (document.documentElement && document.documentElement.scrollTop) {
+        scrollTop = document.documentElement.scrollTop
+      } else if (document.body) {
+        scrollTop = document.body.scrollTop
+      }
+      return scrollTop
+    },
+    setScrollTop(top) {
+      if (!isNaN(top)) {
+        if (document.documentElement && document.documentElement.scrollTop !== undefined) {
+          document.documentElement.scrollTop = top
+        } else if (document.body) {
+          document.body.scrollTop = top
+        }
+      }
+    },
+    // 地图初始化
+    handler({ BMap, map }) {
+      this.mapOpen()
+      this.BMap = BMap
+      this.map = map
+      this.loadingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.loadingMap = false
+            $this.$set($this, 'pointLngLat', { lng: result.point.lng, lat: result.point.lat })
+            map.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放,默认关闭
+            $this.setCenter({ BMap, map })
+          }
+        })
+      })
+    },
+    // 搜索地图
+    querySearch(queryString, cb) {
+      var options = {
+        onSearchComplete: function(results) {
+          if (local.getStatus() === 0) {
+            // 判断状态是否正确
+            var s = []
+            for (var i = 0; i < results.getCurrentNumPois(); i++) {
+              var x = results.getPoi(i)
+              var item = { value: x.address + x.title, point: x.point }
+              s.push(item)
+              cb(s)
+            }
+          } else {
+            cb()
+          }
+        }
+      }
+      var local = new this.BMap.LocalSearch(this.map, options)
+      local.search(queryString)
+    },
+    handleSelect(item) {
+      var { point } = item
+      this.map.clearOverlays() // 清除地图上所有覆盖物
+      this.map.centerAndZoom(point, this.zoom)
+      const marker = new this.BMap.Marker(point) // 创建标注
+      this.map.addOverlay(marker) // 将标注添加到地图中
+      marker.enableDragging() // 可拖拽
+      this.LONGITUDE = point.lng
+      this.LATITUDE = point.lat
+    },
+    // 设置打开中心位置
+    setCenter({ BMap, map }) {
+      var lng = ''
+      var lat = ''
+      if (this.dataForm.LONGITUDE == '' || this.dataForm.LATITUDE == '') {
+        lng = '119.525971'
+        lat = '39.894727'
+      } else {
+        lng = this.dataForm.LONGITUDE
+        lat = this.dataForm.LATITUDE
+      }
+      var point = new BMap.Point(lng, lat)
+      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
+      const zoom = map.getZoom()
+      setTimeout(() => {
+        map.centerAndZoom(point, zoom)
+      }, 0)
+      // var marker = new BMap.Marker(point) // 创建标注
+      // map.addOverlay(marker) // 将标注添加到地图中
+    },
+    handleSh() {
+      this.$confirm('确定要通过吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const formData = new FormData()
+        formData.append('MAIN_DEPARTMENT', this.dataForm.MAIN_DEPARTMENT)
+        formData.append('POSSESSION', this.dataForm.POSSESSION)
+        formData.append('RELEVANT_UNIT_NAME', this.dataForm.RELEVANT_UNIT_NAME)
+        formData.append('EMPLOYMENT_FORM', this.dataForm.EMPLOYMENT_FORM)
+        formData.append('SELECT_FORM', this.dataForm.SELECT_FORM)
+        formData.append('SOCIAL_CODE', this.dataForm.SOCIAL_CODE)
+        formData.append('COMPANY_AREA', this.dataForm.COMPANY_AREA)
+
+        formData.append('CORPINFO_ID', this.$parent.CORPINFO_ID)
+        formData.append('STATE', '2')
+        formData.append('ROLE_ID', '1')
+        upload(
+          '/relevantunits/examine',
+          formData
+        ).then((data) => {
+          this.$message.success('通过成功')
+          this.$parent.activeName = 'List'
+          this.back()
+        })
+      })
+    },
+    handleBtg() {
+      this.$confirm('确定要不通过吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const formData = new FormData()
+        formData.append('MAIN_DEPARTMENT', this.dataForm.MAIN_DEPARTMENT)
+        formData.append('POSSESSION', this.dataForm.POSSESSION)
+        formData.append('RELEVANT_UNIT_NAME', this.dataForm.RELEVANT_UNIT_NAME)
+        formData.append('EMPLOYMENT_FORM', this.dataForm.EMPLOYMENT_FORM)
+        formData.append('SELECT_FORM', this.dataForm.SELECT_FORM)
+        formData.append('SOCIAL_CODE', this.dataForm.SOCIAL_CODE)
+        formData.append('COMPANY_AREA', this.dataForm.COMPANY_AREA)
+
+        formData.append('CORPINFO_ID', this.$parent.CORPINFO_ID)
+        formData.append('STATE', '3')
+        formData.append('ROLE_ID', 'bc85a526809f43c29c670c057bf25165')
+
+        upload(
+          '/relevantunits/examine',
+          formData
+        ).then((data) => {
+          this.$message.success('审核成功')
+          this.$parent.activeName = 'List'
+          this.back()
+        })
+      })
+    },
+    back() {
+      this.$parent.activeName = 'List'
+    },
+    // 添加资质信息dialog
+    handleQualificationAdd() {
+      this.dialogQualificationType = 'add'
+      this.resetQualificationForm()
+      this.dialogQualificationEdit = true
+    },
+    // 修改资质信息
+    handleQualificationEdit(ID) {
+      this.dialogQualificationType = 'edit'
+      this.formQualification = {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      }
+      requestFN(
+        '/corpqualificationinfo/goEdit',
+        {
+          CORPQUALIFICATIONINFO_ID: ID
+        }
+      ).then((data) => {
+        this.formQualification = Object.assign(this.formQualification, data.pd) // copy obj
+        this.$set(this.formQualification, 'date', [data.pd.START_DATE, data.pd.END_DATE])
+        var url = config.fileUrl + data.pd.IMG_URL
+        this.formQualification.QUALIFICATION_PIC.push({
+          'url': url
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      this.dialogQualificationEdit = true
+    },
+    // 保存资质信息
+    confirmQualification() {
+      this.$refs.formQualification.validate(valid => {
+        if (valid) {
+          this.listLoading = true
+          const formData = new FormData()
+          Object.keys(this.formQualification).map(key => {
+            formData.append(key, this.formQualification[key])
+          })
+          // qualificationPicFileRef
+          if (this.$refs['qualificationPicFileRef'].uploadFiles.length > 0) {
+            for (let i = 0; i < this.$refs['qualificationPicFileRef'].uploadFiles.length; i++) {
+              if (this.$refs['qualificationPicFileRef'].uploadFiles[i]) {
+                formData.append('qualificationPic', this.$refs['qualificationPicFileRef'].uploadFiles[i].raw)
+              }
+            }
+          }
+          upload(
+            '/corpqualificationinfo/' + this.dialogQualificationType,
+            formData
+          ).then((data) => {
+            this.$message({
+              message: '保存成功',
+              type: 'success'
+            })
+            this.listLoading = false
+            this.dialogQualificationEdit = false
+            this.formQualification = {
+              date: [],
+              FILE_NAME: '',
+              CORPQUALIFICATIONINFO_ID: '',
+              CERTIFICATE_PERIOD: '',
+              QUALIFICATION_PIC: [],
+              CORPINFO_ID: this.$parent.CORPINFO_ID,
+              QUALIFICATION_NAME: '',
+              START_DATE: '',
+              END_DATE: '',
+              CERTIFICATE_NO: '',
+              IMG_URL: ''
+            }
+            this.getQualificationList()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 删除资质信息
+    delQualification(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/corpqualificationinfo/delete',
+          {
+            CORPQUALIFICATIONINFO_ID: id
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.qualificationList = []
+          this.getQualificationList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    // 清空数据
+    resetQualificationForm() {
+      this.formQualification = {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      }
+    },
+    // 资质证书照片change
+    qualificationPicFileChange(file) {
+      this.formQualification.FILE_NAME = file.name
+      this.formQualification.QUALIFICATION_PIC.push(file)
+    },
+    // 资质图片移除
+    qualificationPicFileRemove(file, fileList) {
+      this.formQualification.FILE_NAME = ''
+      this.formQualification.QUALIFICATION_PIC = fileList
+    },
+    // 资质图片预览
+    handlePictureCardView(row) {
+      this.dialogImageUrl = config.fileUrl + row.IMG_URL
+      this.dialogVisible = true
+    },
+    // 资质有效期change事件
+    handlePeriodChange(data) {
+      this.formQualification.START_DATE = data[0]
+      this.formQualification.END_DATE = data[1]
+      this.formQualification.CERTIFICATE_PERIOD = data[0] + '-' + data[1]
+    }
+    /** 资质信息 End */
+  } // methods 结束
+}
+</script>
+
+<style lang="sass" scoped>
+.avatar-uploader
+  ul
+    margin: 0
+    li
+      padding: 0
+.el-dialog__body
+  padding: 0
+.map-flex
+  display: flex
+  width: 500px
+  align-items: center
+
+.ud-flex
+  display: flex
+.form-group
+  display: flex
+  align-items: center
+  .form-label
+    padding: 0px 15px
+    font-size: 14px
+    width: 240px
+    font-weight: 400
+    text-align: right
+    margin-bottom: 18px
+    .star
+      color: red
+      padding-right: 4px
+  .input-block
+    display: flex
+
+.disContent
+  display: flex
+  align-items: center
+  flex-wrap: wrap
+  .img-div
+    position: relative
+    margin: 0 10px 0px 0
+    width: 108px
+    height: 108px
+    border-radius: 4px
+    overflow: hidden
+    &>img
+      width: 100%
+      height: 100%
+
+.disContent-hide
+  position: absolute
+  width: 100%
+  height: 100%
+  border-radius: 4px
+  background-color: rgba(48, 48, 48, 0.59)
+  display: none
+  top: 0
+  left: 0
+  line-height: 32px
+
+  .Delete
+    position: absolute
+    bottom: 14px
+    right: 10px
+    font-size: 16px
+    color: white
+    cursor: pointer
+  .yuLan
+    position: absolute
+    bottom: 23px
+    right: 50px
+    font-size: 16px
+    color: white
+    cursor: pointer
+    .yuLanImg
+      position: absolute
+      bottom: 0
+      right: 0
+      width: 100%
+      height: 100%
+      opacity: 0
+
+.img-div:hover .disContent-hide
+  display: block
+
+  .pitchCss
+    border: 1px solid #202e78
+    transition: all linear 0.1s
+    width: 116px
+    height: 116px
+
+</style>
+
+<style lang="scss" scoped>
+.uo-flex {
+  display: flex;
+}
+</style>
+
diff --git a/src/views/xgf/toolMan/components/edit.vue b/src/views/xgf/toolMan/components/edit.vue
new file mode 100644
index 0000000..2e0317c
--- /dev/null
+++ b/src/views/xgf/toolMan/components/edit.vue
@@ -0,0 +1,1375 @@
+<template>
+  <div class="reform-bg">
+    <div class="reform-warp">
+      <div class="reform-content">
+        <el-form ref="dataForm" :rules="rules" :model="dataForm" label-width="200px">
+          <div class="level-title">
+            <h1>1、相关方单位基础信息</h1>
+          </div>
+          <el-row :gutter="24">
+            <el-col :gutter="12">
+              <el-form-item label="相关方单位名称" prop="RELEVANT_UNIT_NAME">
+                <el-input v-model="dataForm.RELEVANT_UNIT_NAME" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="股份监管部门" prop="MANAGER_DEPARTMENT_NAME">
+                <el-input v-model="dataForm.MANAGER_DEPARTMENT_NAME" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="基层单位监管部门" prop="COMPETENT_DEPT_NAME">
+                <el-input v-model="dataForm.COMPETENT_DEPT_NAME" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="股份主管部门" prop="MAIN_DEPARTMENT">
+                <Treeselect
+                  :options="treeData"
+                  :disabled="true"
+                  :normalizer="normalizer"
+                  v-model="dataForm.MAIN_DEPARTMENT"
+                  placeholder="请选择部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="基层单位主管部门" prop="SUPERVISE_CORPINFO_DEPT_NAME">
+                <el-input v-model="dataForm.SUPERVISE_CORPINFO_DEPT_NAME" disabled maxlength="255" title="单位名称"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="集团单位" prop="corpTypeName">
+                <el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开户人" prop="CREATOR">
+                <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="统一社会信用代码" prop="SOCIAL_CODE">
+                <el-input id="SOCIAL_CODE" ref="SOCIAL_CODE" v-model="dataForm.SOCIAL_CODE" maxlength="255" disabled placeholder="这里输入统一社会信用代码..." title="统一社会信用代码"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="属地" prop="POSSESSION">
+                <el-input v-model="COMPANY_AREA" disabled placeholder="属地"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="所属行业" disabled prop="INDUSTRY">
+                <el-select v-model="dataForm.INDUSTRY" disabled style="width: 100%">
+                  <el-option v-for="item in industryList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经济类型" prop="ECONOMIC_TYPE">
+                <el-select v-model="dataForm.ECONOMIC_TYPE" placeholder="请选择" style="width: 100%;" disabled>
+                  <el-option v-for="item in ecnomicTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="经度" prop="LONGITUDE">
+                <el-input v-model="dataForm.LONGITUDE" disabled placeholder="请输入内容" @focus="handleMap" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="纬度" prop="LATITUDE">
+                <div style="display: flex">
+                  <el-input v-model="dataForm.LATITUDE" disabled placeholder="请输入内容" style="width: 100%" @focus="handleMap"/>
+                  <el-button style="margin-left:10px" @click="handleMap">
+                    <span class="svg-container">
+                      <svg-icon icon-class="international" />
+                    </span>
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="单位经营地址" prop="BUSINESS_ADDRESS">
+                <el-input id="BUSINESS_ADDRESS" ref="BUSINESS_ADDRESS" v-model="dataForm.BUSINESS_ADDRESS" maxlength="255" disabled placeholder="这里输入单位经营地址..." title="单位经营地址"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业规模" prop="CORP_SIZE">
+                <el-select v-model="dataForm.CORP_SIZE" style="width: 100%;" disabled>
+                  <el-option v-for="item in enterpriseSizeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="法人姓名" prop="LEGAL_PERSON">
+                <el-input id="LEGAL_PERSON" ref="LEGAL_PERSON" v-model="dataForm.LEGAL_PERSON" maxlength="20" disabled placeholder="这里输入法人姓名..." title="法人姓名"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="LEGAL_PERSON_TEL">
+                <el-input id="LEGAL_PERSON_TEL" ref="LEGAL_PERSON_TEL" v-model="dataForm.LEGAL_PERSON_TEL" maxlength="11" disabled placeholder="这里输入联系电话..." title="联系电话"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="主要负责人" prop="CONTACT_PERSON">
+                <el-input id="CONTACT_PERSON" ref="CONTACT_PERSON" v-model="dataForm.CONTACT_PERSON" maxlength="20" disabled placeholder="这里输入主要负责人..." title="主要负责人"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="主要负责人联系电话" prop="CONTACT_TEL">
+                <el-input id="CONTACT_TEL" ref="CONTACT_TEL" v-model="dataForm.CONTACT_TEL" maxlength="11" disabled placeholder="这里输入主要负责人联系电话..." title="主要负责人联系电话"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="成立日期" prop="ESTABLISHMENT_DATE">
+                <el-date-picker v-model="dataForm.ESTABLISHMENT_DATE" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" disabled placeholder="选择日期" style="width: 100%"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="职工人数（人）" prop="EMPLOY_NUM">
+                <el-input id="EMPLOY_NUM" ref="EMPLOY_NUM" v-model="dataForm.EMPLOY_NUM" type="number" maxlength="11" disabled placeholder="这里输入职工人数..." title="职工人数"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="资产总额（万元）" prop="TOTAL_ASSETS">
+                <el-input id="TOTAL_ASSETS" ref="TOTAL_ASSETS" v-model="dataForm.TOTAL_ASSETS" type="number" maxlength="11" disabled placeholder="这里输入资产总额（万元）..." title="资产总额（万元）"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="注册资金" prop="REGISTERED_CAPITAL">
+                <el-input id="REGISTERED_CAPITAL" ref="REGISTERED_CAPITAL" v-model="dataForm.REGISTERED_CAPITAL" type="number" maxlength="11" disabled placeholder="这里输入注册资金..." title="注册资金"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
+                <Treeselect
+                  :options="employmentTypeList"
+                  :normalizer="SpecialNormalizer"
+                  v-model="dataForm.EMPLOYMENT_FORM"
+                  placeholder="请选择用工形式"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="选取形式" disabled prop="SELECT_FORM">
+                <el-select v-model="dataForm.SELECT_FORM" style="width: 100%;" disabled multiple>
+                  <el-option v-for="item in selectFormList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="营业执照" class="is-required">
+                <el-carousel v-if="businessLicenseImgs.length > 0" :interval="4000" type="card" height="200px" style="margin-top: 10px" >
+                  <el-carousel-item v-for="item in businessLicenseImgs" :key="item">
+                    <img v-viewer :src="item" style="max-width: 100%;">
+                  </el-carousel-item>
+                </el-carousel>
+                <span v-else>暂无信息</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="营业执照有效期" prop="businessLicenseDate">
+                <el-date-picker
+                  v-model="dataForm.businessLicenseDate"
+                  disabled
+                  type="daterange"
+                  clearable
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item :span="12" label="流动人员比例(%)" disabled prop="FLOATING_PERCENT">
+            <el-input id="FLOATING_PERCENT" ref="FLOATING_PERCENT" v-model="dataForm.FLOATING_PERCENT" maxlength="255" placeholder="这里输入流动人员比例..." disabled title="流动人员比例"/>
+          </el-form-item>
+          <div class="level-title">
+            <h1>2、单位资质信息</h1>
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleQualificationAdd">添加资质</el-button>-->
+          </div>
+          <el-table
+            v-loading="listLoading"
+            :data="qualificationList"
+            :header-cell-style="{
+              'font-weight': 'bold',
+              'color': '#000'
+            }"
+            tooltip-effect="dark"
+            border
+            fit
+            highlight-current-row
+          >
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="QUALIFICATION_NAME" label="资质正式名称" />
+            <el-table-column prop="" label="证书有限期">
+              <template slot-scope="{row}">
+                {{ row.START_DATE }} 至 {{ row.END_DATE }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="CERTIFICATE_NO" label="证书编号" />
+            <el-table-column label="操作" align="center" width="200">
+              <template slot-scope="{row}">
+                <el-button type="primary" icon="el-icon-view" size="mini" @click="handlePictureCardView(row)">预览</el-button>
+                <!-- <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleQualificationEdit(row.CORPQUALIFICATIONINFO_ID)">编辑</el-button>
+                <el-button type="danger" icon="el-icon-delete" size="mini" @click="delQualification(row.CORPQUALIFICATIONINFO_ID)">删除</el-button>-->
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+      <div class="ui-height" />
+      <div class="ui-foot" style="z-index: 9999">
+        <!--        <el-button :loading="buttonloading" type="warning" icon="el-icon-document" @click="confirm('1')">保存并提交审核</el-button>-->
+        <!--        <el-button :loading="buttonloading" type="primary" icon="el-icon-check" @click="confirm('0')">保存草稿</el-button>-->
+        <!-- <el-button type="primary" @click="handleSh">通过</el-button>
+        <el-button type="danger" @click="handleBtg">不通过</el-button>-->
+        <el-button plain type="info" @click="back">返 回</el-button>
+      </div>
+      <!-- 上级企业 -->
+      <el-dialog :visible.sync="dialogParentCorp" title="上级企业" width="1000px">
+        <CorpSelect v-if="dialogParentCorp" ref="corpSelect" :corpid="CORPINFO_ID" @assignCorpParent="assignCorpParent" />
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogParentCorp = false">取 消</el-button>
+          <el-button type="primary" @click="defineCorp">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 坐标选择 -->
+      <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+        <baidu-map
+          v-loading="loadingMap"
+          :zoom="zoom"
+          :scroll-wheel-zoom="true"
+          :style="{height: clientHeight+'px'}"
+          @click="getClickInfo"
+          @ready="handler">
+          <bm-view style="width: 100%; height:100%; flex: 1" />
+          <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
+            <div class="map-flex">
+
+              <div class="map-lable">关键词：</div>
+              <div style="flex:1;">
+                <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
+              </div>
+            </div>
+          </bm-control>
+        </baidu-map>
+        <div slot="footer" class="dialog-footer">
+          <span>经度：</span>
+          <el-input v-model="LONGITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+          <span>纬度：</span>
+          <el-input v-model="LATITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+          <el-button @click="dialogFormMap = false">关 闭</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 图片上传预览 -->
+      <el-dialog :visible.sync="dialogVisible">
+        <img :src="dialogImageUrl" width="100%" alt="">
+      </el-dialog>
+      <!-- 单位资质信息 编辑 -->
+      <el-dialog :visible.sync="dialogQualificationEdit" :title="dialogQualificationType==='edit'?'修改单位资质信息':'新增单位资质信息'" width="600px">
+        <el-form ref="formQualification" :rules="rulesQualification" :model="formQualification" label-width="140px" style="width: 500px;">
+          <el-form-item label="资质正式名称" prop="QUALIFICATION_NAME">
+            <el-input id="QUALIFICATION_NAME" ref="QUALIFICATION_NAME" v-model="formQualification.QUALIFICATION_NAME" maxlength="255" placeholder="这里输入资质正式名称..." title="资质正式名称"/>
+          </el-form-item>
+          <el-form-item label="证书有限期" prop="date">
+            <el-date-picker
+              v-model="formQualification.date"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="handlePeriodChange"/>
+          </el-form-item>
+          <el-form-item label="证书编号" prop="CERTIFICATE_NO">
+            <el-input id="CERTIFICATE_NO" ref="CERTIFICATE_NO" v-model="formQualification.CERTIFICATE_NO" maxlength="255" placeholder="这里输入证书编号..." title="证书编号"/>
+          </el-form-item>
+          <el-form-item label="照片" prop="QUALIFICATION_PIC">
+            <el-upload ref="qualificationPicFileRef" :file-list="formQualification.QUALIFICATION_PIC" :multiple="false" :limit="1" :auto-upload="false" :on-change="qualificationPicFileChange" :on-remove="qualificationPicFileRemove" action="#" accept=".jpg,.jpeg,.png" list-type="picture-card">
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogQualificationEdit = false">取 消</el-button>
+          <el-button type="primary" @click="confirmQualification">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import SelectTree from '@/components/SelectTree'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { upload } from '@/utils/upload'
+export default {
+  components: { SelectTree, Treeselect },
+  data() {
+    return {
+      COMPANY_AREA: '',
+      dataForm: {
+        MAIN_DEPARTMENT: '',
+        businessLicenseDate: [],
+        SUPERVISE_CORPINFO_DEPT_NAME: '',
+        COMPETENT_DEPT_NAME: '',
+        MANAGER_DEPARTMENT_NAME: '',
+        RELEVANT_UNIT_NAME: '',
+        SOCIAL_CODE: '',
+        POSSESSION: '',
+        INDUSTRY: '',
+        ECONOMIC_TYPE: '',
+        LONGITUDE: '',
+        LATITUDE: '',
+        BUSINESS_ADDRESS: '',
+        CORP_SIZE: '',
+        LEGAL_PERSON: '',
+        LEGAL_PERSON_TEL: '',
+        CONTACT_PERSON: '',
+        CONTACT_TEL: '',
+        ESTABLISHMENT_DATE: '',
+        EMPLOY_NUM: '',
+        TOTAL_ASSETS: '',
+        REGISTERED_CAPITAL: '',
+        EMPLOYMENT_FORM: '',
+        SELECT_FORM: ''
+      },
+      employmentTypeList: [], // 用工形式数据
+      selectFormList: [], // 选取形式数据
+      ecnomicTypeList: [], // 经济类型数据
+      enterpriseSizeList: [], // 企业规模数据
+      industryList: [], // 行业类型数据
+      treeData: [], // 主管部门
+      config: config,
+      corpStateList: [], // 企业经营状态
+      hylxList: [], // 国民经济行业分类 (GB-T4754-2017)
+      /** 安全生产管理制度 Begin */
+      dialogQualificationEdit: false,
+      dialogQualificationType: 'add',
+      qualificationList: [],
+      formQualification: {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      },
+      rulesQualification: {
+        QUALIFICATION_NAME: [{ required: true, message: '资质正式名称不能为空', trigger: 'blur' }],
+        date: [
+          {
+            type: 'array',
+            required: true,
+            message: '请选择日期区间',
+            fields: {
+              // tpye类型试情况而定,所以如果返回的是date就改成date,如果返回的是string就改成string
+              0: { type: 'string', trigger: 'change', required: true, message: '请选择开始日期' },
+              1: { type: 'string', trigger: 'change', required: true, message: '请选择结束日期' }
+            },
+            trigger: 'blur'
+          }
+        ],
+        CERTIFICATE_NO: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+        QUALIFICATION_PIC: [
+          {
+            type: 'array',
+            required: true,
+            message: '请上传照片',
+            trigger: 'blur'
+          }
+        ]
+      },
+      /** 安全生产管理制度 End */
+      // 地图相关
+      // clientHeight: document.documentElement.clientHeight - 250,
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      loadingMap: true,
+      listLoading: false,
+      buttonloading: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      addressKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
+      dialogImageUrl: '',
+      dialogVisible: false,
+      provinceList: [],
+      cityList: [],
+      countyList: [],
+      scaleList: [],
+      areaList: [], // 属地
+      jjlxList: [],
+      corpFoTypeList: [],
+      trainDicList: [],
+      OLDFOURTYPE: '',
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      SpecialNormalizer(node) {
+        return {
+          id: node.BIANMA,
+          label: node.NAME,
+          children: node.nodes
+        }
+      },
+      defaultProps: {
+        children: 'nodes',
+        label: 'name',
+        value: 'id'
+      },
+      // 上级企业选择
+      dialogParentCorp: false,
+      ECO_TYPE: '',
+      ecoArr: [],
+      ecoNameArr: [],
+      businessLicenseImgs: [],
+      INDUSTRY: '',
+      // imgUrl: require('@/assets/images/map.png'),
+      rules: {
+        MAIN_DEPARTMENT: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        /* RELEVANT_UNIT_NAME: [
+          { required: true, message: '单位名字不能为空', trigger: 'blur' },
+          { validator: hasName, trigger: 'blur' }
+        ], */
+        /* SOCIAL_CODE: [
+          { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
+          { validator: hasSocialCode, trigger: 'blur' },
+          {
+            pattern: /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/,
+            message: '请输入正确的统一社会信用代码'
+          }
+        ], */
+        // POSSESSION: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
+        // INDUSTRY: [{ required: true, message: '国民经济行业分类 (GB-T4754-2017)不能为空', trigger: 'blur' }],
+        ECONOMIC_TYPE: [{ required: true, message: '请选择经济类型', trigger: 'blur' }],
+        LONGITUDE: [{ required: true, message: '请选择经度', trigger: 'blur' }],
+        LATITUDE: [{ required: true, message: '请选择纬度', trigger: 'blur' }],
+        BUSINESS_ADDRESS: [{ required: true, message: '单位经营地址不能为空', trigger: 'blur' }],
+        CORP_SIZE: [{ required: true, message: '企业规模不能为空', trigger: 'blur' }],
+        LEGAL_PERSON: [{ required: true, message: '法人姓名不能为空', trigger: 'blur' }],
+        LEGAL_PERSON_TEL: [
+          { required: true, message: '法人电话不能为空', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          }
+        ],
+        CONTACT_PERSON: [{ required: true, message: '主要负责人不能为空', trigger: 'blur' }],
+        CONTACT_TEL: [
+          { required: true, message: '主要负责人电话不能为空', trigger: 'blur' },
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            message: '请输入正确的手机号码'
+          }
+        ],
+        ESTABLISHMENT_DATE: [{ required: true, message: '请选择成立日期', trigger: 'blur' }],
+        EMPLOY_NUM: [
+          { required: true, message: '职工人数不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的职工人数', trigger: 'blur' }
+        ],
+        TOTAL_ASSETS: [
+          { required: true, message: '资产总额不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的资产总额', trigger: 'blur' }
+        ],
+        REGISTERED_CAPITAL: [
+          { required: true, message: '注册资金不能为空', trigger: 'blur' },
+          { min: 1, max: 5, message: '请正确的注册资金', trigger: 'blur' }
+        ],
+        EMPLOYMENT_FORM: [{ required: true, message: '请选择用工形式', trigger: 'blur' }],
+        SELECT_FORM: [{ required: true, message: '请选择选取形式', trigger: 'blur' }]
+      },
+      propsCorpFoType: { value: 'id', id: 'id', label: 'label', children: 'children' },
+
+      ecoProps: {
+        lazy: true,
+        lazyLoad: this.lazyLoad,
+        value: 'id',
+        id: 'id',
+        label: 'label',
+        children: 'children'
+      },
+      industryProps: {
+        lazy: true,
+        lazyLoad: this.lazyLoad,
+        value: 'id',
+        id: 'id',
+        label: 'label',
+        children: 'children',
+        checkStrictly: false
+      },
+      areaProps: {
+        lazy: true,
+        lazyLoad: async(node, resolve) => {
+          const resData = await this.getAreaDict(
+            (node.data && node.data.DICTIONARIES_ID) || 'e725d2a91b8248f4b8f49889038df7de'
+          )
+          const { level } = node
+          resolve(
+            resData.map((item) => {
+              return {
+                DICTIONARIES_ID: item.DICTIONARIES_ID,
+                BIANMA: item.BIANMA,
+                NAME: item.NAME,
+                leaf: level >= 3
+              }
+            })
+          )
+        },
+        value: 'BIANMA',
+        id: 'DICTIONARIES_ID',
+        label: 'NAME',
+        children: 'children',
+        checkStrictly: true
+      },
+      // 主管部门
+      mainDepartment: '',
+      // 监管部门
+      regulatoryDepartment: ''
+    }
+  },
+  watch: {},
+  async created() {
+    const loading = this.$loading({
+      lock: true,
+      text: '读取中...',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
+    await this.getTreeList()
+    await this.getData()
+    this.getDict()
+    loading.close()
+  },
+  mounted() {
+    // this.getNextTickData()
+  },
+  methods: {
+    async getAreaDict(DICTIONARIES_ID) {
+      const { list } = await requestFN(
+        '/xgf/dictionaries/getAreaLevels',
+        {
+          DICTIONARIES_ID
+        }
+      )
+      return list
+    },
+    cascaderChange(e) {
+      // console.log('e', e)
+      const newVal = e[e.length - 1]
+      // console.log('选中', newVal[newVal.length - 1])
+      if (newVal === '1' || newVal === '2' || newVal === '3' || newVal === '4') {
+        this.$message({
+          message: '请选择正确的属地...',
+          type: 'error'
+        })
+        this.form.POSSESSION.pop()
+        // console.log('移除', this.corpStateForm.REGULATORY_DEPARTMENT_ARR)
+      }
+    },
+    getTreeList() {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          '/app/regulatory/user/departListTree',
+          {}
+        ).then((data) => {
+          this.treeData = JSON.parse(data.zTreeNodes)
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    getData() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/xgf/corp/getCorpInfoDetail',
+          {
+            CORPINFO_ID: this.$parent.CORPINFO_ID,
+            tm: new Date().getTime()
+          }
+        ).then((data) => {
+          this.businessLicenseImgs = []
+          if (data.licenseImgs) {
+            data.licenseImgs.forEach(item => {
+              this.businessLicenseImgs.push(this.config.fileUrl + item.FILEPATH)
+            })
+          }
+          data.pd.SELECT_FORM = data.pd.SELECT_FORM.split(',')
+
+          this.businessLicenseImgs = []
+          if (data.licenseImgs) {
+            data.licenseImgs.forEach(item => {
+              this.businessLicenseImgs.push(this.config.fileUrl + item.FILEPATH)
+            })
+          }
+
+          this.dataForm = Object.assign(this.dataForm, data.pd)
+          this.dataForm.POSSESSION = []
+
+          this.dataForm.businessLicenseDate = []
+          this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_START)
+          this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_END)
+          if (data.pd.PROVINCE != '') this.dataForm.POSSESSION.push(data.pd.PROVINCE)
+          if (data.pd.CITY != '') this.dataForm.POSSESSION.push(data.pd.CITY)
+          if (data.pd.COUNTY != '') this.dataForm.POSSESSION.push(data.pd.COUNTY)
+          if (data.pd.VILLAGE != '') this.dataForm.POSSESSION.push(data.pd.VILLAGE)
+          this.qualificationList = data.qualification
+          if (this.dataForm.COMPANY_AREA) {
+            this.COMPANY_AREA = this.dataForm.COMPANY_AREA.replaceAll(',', ' / ')
+          }
+
+          this.dataForm.businessLicenseDate = []
+          this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_START)
+          this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_END)
+
+          resolve()
+        }).catch((e) => {
+          this.$message({
+            message: '操作失败',
+            type: 'error'
+          })
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getNextTickData() {
+      // this.$nextTick(() => {
+      //   this.$refs.ecoCascader.presentText = this.censusRegisterPlaceName
+      // })
+      if (this.form.CORP_OF_TYPE2 && this.form.CORP_OF_TYPE2 != '') {
+        const node = {}
+        node.id = this.form.CORP_OF_TYPE2
+        this.$nextTick(() => {
+          this.$refs.corpOfTypeRef.handleNodeClick(node)
+        })
+      } else if (this.form.CORP_OF_TYPE && this.form.CORP_OF_TYPE != '') {
+        const node = {}
+        node.id = this.form.CORP_OF_TYPE
+        this.$nextTick(() => {
+          this.$refs.corpOfTypeRef.handleNodeClick(node)
+        })
+      }
+      // const nodea = {}
+      // nodea.id = this.form.TRAINTYPE
+      // this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+      //   this.$refs.keyHyRef.handleNodeClick(nodea)
+      // })
+      this.$forceUpdate()
+    },
+    /** 上级企业选择 Begin */
+    handleSelectParentCorp() {
+      this.dialogParentCorp = true
+    },
+    defineCorp() {
+      this.$refs.corpSelect.defineCorp()
+    },
+    assignCorpParent(corp) {
+      this.form.CORP_PARENT = corp.CORPINFO_ID
+      this.form.CORP_PARENT_NAME = corp.CORP_NAME
+      this.form.CORP_GROUP = this.validStr(corp.CORP_GROUP) ? corp.CORP_GROUP : corp.CORPINFO_ID
+      this.form.CORP_GROUP_NAME = this.validStr(corp.CORP_GROUP_NAME) ? corp.CORP_GROUP_NAME : corp.CORP_NAME
+      this.form.CORP_PARENTS = (this.validStr(corp.CORP_PARENTS) ? corp.CORP_PARENTS : ',') + corp.CORPINFO_ID + ','
+      // console.log('this.form.CORP_PARENT', this.form.CORP_PARENT)
+      // console.log('this.form.CORP_PARENT_NAME', this.form.CORP_PARENT_NAME)
+      // console.log('this.form.CORP_GROUP', this.form.CORP_GROUP)
+      // console.log('this.form.CORP_GROUP_NAME', this.form.CORP_GROUP_NAME)
+      // console.log('this.form.CORP_PARENTS', this.form.CORP_PARENTS)
+      this.dialogParentCorp = false
+    },
+    /** 上级企业选择 End */
+    // 加载级联的方法
+    lazyLoad(nodeValue, resolve) {
+      if (nodeValue.data && (!nodeValue.children || nodeValue.children.length == 0)) {
+        this.getDictByDicId(nodeValue.data.id).then(data => {
+          resolve(data)
+        })
+      } else {
+        resolve(null)
+      }
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.dataForm.LATITUDE
+      this.LONGITUDE = this.dataForm.LONGITUDE
+    },
+    getClickInfo(e) {
+      this.LONGITUDE = e.point.lng
+      this.LATITUDE = e.point.lat
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.dataForm.LATITUDE = this.LATITUDE
+      this.dataForm.LONGITUDE = this.LONGITUDE
+    },
+    // 提交表单
+    confirm(type) {
+      // const _this = this
+      this.$refs.dataForm.validate(valid => {
+        if (valid) {
+          const loading = this.$loading({
+            lock: true,
+            text: '提交中...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          /* if (this.dataForm.POSSESSION && this.dataForm.POSSESSION.length > 0) {
+            this.dataForm.PROVINCE = this.dataForm.POSSESSION[0] || ''
+            this.dataForm.CITY = this.dataForm.POSSESSION[1] || ''
+            this.dataForm.COUNTY = this.dataForm.POSSESSION[2] || ''
+            this.dataForm.VILLAGE = this.dataForm.POSSESSION[3] || ''
+            this.dataForm.STREET = this.dataForm.POSSESSION[4] || ''
+            this.dataForm.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : ''
+          }
+          if (_this.dataForm.INDUSTRYALL && _this.dataForm.INDUSTRYALL.length > 0) {
+            _this.dataForm.CORP_TYPE = _this.dataForm.INDUSTRYALL[0] || ''
+            _this.dataForm.CORP_TYPE2 = _this.dataForm.INDUSTRYALL[1] || ''
+            _this.dataForm.CORP_TYPE3 = _this.dataForm.INDUSTRYALL[2] || ''
+            _this.dataForm.CORP_TYPE4 = _this.dataForm.INDUSTRYALL[3] || ''
+            _this.dataForm.CORP_TYPE_NAME = _this.$refs.industryCascader.getCheckedNodes()[0].pathLabels ? _this.$refs.industryCascader.getCheckedNodes()[0].pathLabels.join('/') : ''
+          } */
+
+          const formData = new FormData()
+          Object.keys(this.dataForm).map(key => {
+            formData.append(key, this.dataForm[key])
+          })
+          formData.append('saveType', type)
+          this.buttonloading = true
+          upload(
+            '/corpinfo/saveEdit',
+            formData
+          ).then((data) => {
+            loading.close()
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.buttonloading = false
+            // this.$parent.activeName = 'CorpView'
+          }).catch((e) => {
+            loading.close()
+            this.buttonloading = false
+            this.$message({
+              message: '操作失败',
+              type: 'error'
+            })
+          })
+        }
+      })
+    },
+    // back() {
+    //   this.$parent.activeName = 'CorpView'
+    // },
+
+    getTrainDicList() {
+      return new Promise(resolve => {
+        requestFN(
+          '/dictionaries/listAllDictToParId',
+          {
+            parentId: '052369aa22d242118236cde52d0c67ea'
+          }
+        ).then((data) => {
+          resolve()
+          this.trainDicList = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    getProvinceList() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'e725d2a91b8248f4b8f49889038df7de'
+        }
+      ).then((data) => {
+        this.provinceList = data.list
+        // this.provinceList = [{ DICTIONARIES_ID: 'acd05c42faf346db9a0d067402b97c10', BIANMA: '130000', NAME: '河北省' }]
+      }).catch((e) => {
+      })
+    },
+    async getCityList() {
+      var dictID = await this.getDictID(this.form.PROVINCE)
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: dictID
+        }
+      ).then((data) => {
+        this.cityList = data.list
+      }).catch((e) => {
+      })
+    },
+    async getCountyList() {
+      var dictID = await this.getDictID(this.form.CITY)
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: dictID
+        }
+      ).then((data) => {
+        this.countyList = data.list
+      }).catch((e) => {
+      })
+    },
+    getDictID(BIANMA) {
+      return new Promise((resolve) => {
+        requestFN(
+          '/dictionaries/findByBianma',
+          {
+            BIANMA: BIANMA
+          }
+        ).then((data) => {
+          resolve(data.DICTIONARIES_ID)
+        }).catch((e) => {
+        })
+      })
+    },
+    getDict() {
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
+        }
+      ).then((data) => {
+        this.employmentTypeList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '9ce2e9a4636b4d41b460ce16c346d497'
+        }
+      ).then((data) => {
+        this.selectFormList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '688d2cf1c6cd4dab999a0106e09aec83'
+        }
+      ).then((data) => {
+        this.ecnomicTypeList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '37b045e160c04ddba851073b4e510cc9'
+        }
+      ).then((data) => {
+        this.enterpriseSizeList = data.list
+      })
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'f2598ba72e864eadabf0ca4b664d26b9'
+        }
+      ).then((data) => {
+        this.industryList = data.list
+      })
+    },
+
+    // 获取数据字典数据
+    getDictByDicId(dicId) {
+      /* var dicListVal = []
+      return new Promise((resolve) => {
+        let id = ''
+        if (!dicId) {
+          id = '0'
+        } else {
+          id = dicId
+        }
+        requestFN(
+          '/dictionaries/getLevelsAndSCount',
+          {
+            DICTIONARIES_ID: id
+          }
+        ).then((data) => {
+          if (data.list.length > 0) {
+            dicListVal = data.list.map((e) => {
+              if (e.zcount == '0') {
+                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, leaf: true }
+              } else {
+                return { value: e.DICTIONARIES_ID.toString(), numValue: e.BIANMA.toString(), label: e.NAME, id: e.DICTIONARIES_ID, children: [], leaf: false }
+              }
+            })
+          } else {
+            dicListVal = undefined
+          }
+          return resolve(dicListVal)
+        }).catch((e) => {
+        })
+      }) */
+    },
+    // 地图相关
+    mapOpen() {
+      this.top = this.getScrollTop()
+      if (this.top) {
+        this.setScrollTop(0)
+      }
+    },
+    // 关闭地图后调用
+    mapClose() {
+      this.setScrollTop(this.top)
+      this.top = 0
+      this.showMap = false
+    },
+    getScrollTop() {
+      let scrollTop = 0
+      if (document.documentElement && document.documentElement.scrollTop) {
+        scrollTop = document.documentElement.scrollTop
+      } else if (document.body) {
+        scrollTop = document.body.scrollTop
+      }
+      return scrollTop
+    },
+    setScrollTop(top) {
+      if (!isNaN(top)) {
+        if (document.documentElement && document.documentElement.scrollTop !== undefined) {
+          document.documentElement.scrollTop = top
+        } else if (document.body) {
+          document.body.scrollTop = top
+        }
+      }
+    },
+    // 地图初始化
+    handler({ BMap, map }) {
+      this.mapOpen()
+      this.BMap = BMap
+      this.map = map
+      this.loadingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.loadingMap = false
+            $this.$set($this, 'pointLngLat', { lng: result.point.lng, lat: result.point.lat })
+            map.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放,默认关闭
+            $this.setCenter({ BMap, map })
+          }
+        })
+      })
+    },
+    // 搜索地图
+    querySearch(queryString, cb) {
+      var options = {
+        onSearchComplete: function(results) {
+          if (local.getStatus() === 0) {
+            // 判断状态是否正确
+            var s = []
+            for (var i = 0; i < results.getCurrentNumPois(); i++) {
+              var x = results.getPoi(i)
+              var item = { value: x.address + x.title, point: x.point }
+              s.push(item)
+              cb(s)
+            }
+          } else {
+            cb()
+          }
+        }
+      }
+      var local = new this.BMap.LocalSearch(this.map, options)
+      local.search(queryString)
+    },
+    handleSelect(item) {
+      var { point } = item
+      this.map.clearOverlays() // 清除地图上所有覆盖物
+      this.map.centerAndZoom(point, this.zoom)
+      const marker = new this.BMap.Marker(point) // 创建标注
+      this.map.addOverlay(marker) // 将标注添加到地图中
+      marker.enableDragging() // 可拖拽
+      this.LONGITUDE = point.lng
+      this.LATITUDE = point.lat
+    },
+    // 设置打开中心位置
+    setCenter({ BMap, map }) {
+      var lng = ''
+      var lat = ''
+      if (this.dataForm.LONGITUDE == '' || this.dataForm.LATITUDE == '') {
+        lng = '119.525971'
+        lat = '39.894727'
+      } else {
+        lng = this.dataForm.LONGITUDE
+        lat = this.dataForm.LATITUDE
+      }
+      var point = new BMap.Point(lng, lat)
+      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
+      const zoom = map.getZoom()
+      setTimeout(() => {
+        map.centerAndZoom(point, zoom)
+      }, 0)
+      // var marker = new BMap.Marker(point) // 创建标注
+      // map.addOverlay(marker) // 将标注添加到地图中
+    },
+    handleSh() {
+      this.$confirm('确定要通过吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const formData = new FormData()
+        formData.append('MAIN_DEPARTMENT', this.dataForm.MAIN_DEPARTMENT)
+        formData.append('POSSESSION', this.dataForm.POSSESSION)
+        formData.append('RELEVANT_UNIT_NAME', this.dataForm.RELEVANT_UNIT_NAME)
+        formData.append('EMPLOYMENT_FORM', this.dataForm.EMPLOYMENT_FORM)
+        formData.append('SELECT_FORM', this.dataForm.SELECT_FORM)
+        formData.append('SOCIAL_CODE', this.dataForm.SOCIAL_CODE)
+        formData.append('COMPANY_AREA', this.dataForm.COMPANY_AREA)
+
+        formData.append('CORPINFO_ID', this.$parent.CORPINFO_ID)
+        formData.append('STATE', '2')
+        formData.append('ROLE_ID', '1')
+        upload(
+          '/relevantunits/examine',
+          formData
+        ).then((data) => {
+          this.$message.success('通过成功')
+          this.$parent.activeName = 'List'
+          this.back()
+        })
+      })
+    },
+    handleBtg() {
+      this.$confirm('确定要不通过吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const formData = new FormData()
+        formData.append('MAIN_DEPARTMENT', this.dataForm.MAIN_DEPARTMENT)
+        formData.append('POSSESSION', this.dataForm.POSSESSION)
+        formData.append('RELEVANT_UNIT_NAME', this.dataForm.RELEVANT_UNIT_NAME)
+        formData.append('EMPLOYMENT_FORM', this.dataForm.EMPLOYMENT_FORM)
+        formData.append('SELECT_FORM', this.dataForm.SELECT_FORM)
+        formData.append('SOCIAL_CODE', this.dataForm.SOCIAL_CODE)
+        formData.append('COMPANY_AREA', this.dataForm.COMPANY_AREA)
+
+        formData.append('CORPINFO_ID', this.$parent.CORPINFO_ID)
+        formData.append('STATE', '3')
+        formData.append('ROLE_ID', 'bc85a526809f43c29c670c057bf25165')
+
+        upload(
+          '/relevantunits/examine',
+          formData
+        ).then((data) => {
+          this.$message.success('审核成功')
+          this.$parent.activeName = 'List'
+          this.back()
+        })
+      })
+    },
+    back() {
+      this.$parent.activeName = 'List'
+    },
+    // 添加资质信息dialog
+    handleQualificationAdd() {
+      this.dialogQualificationType = 'add'
+      this.resetQualificationForm()
+      this.dialogQualificationEdit = true
+    },
+    // 修改资质信息
+    handleQualificationEdit(ID) {
+      this.dialogQualificationType = 'edit'
+      this.formQualification = {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      }
+      requestFN(
+        '/corpqualificationinfo/goEdit',
+        {
+          CORPQUALIFICATIONINFO_ID: ID
+        }
+      ).then((data) => {
+        this.formQualification = Object.assign(this.formQualification, data.pd) // copy obj
+        this.$set(this.formQualification, 'date', [data.pd.START_DATE, data.pd.END_DATE])
+        var url = config.fileUrl + data.pd.IMG_URL
+        this.formQualification.QUALIFICATION_PIC.push({
+          'url': url
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      this.dialogQualificationEdit = true
+    },
+    // 保存资质信息
+    confirmQualification() {
+      this.$refs.formQualification.validate(valid => {
+        if (valid) {
+          this.listLoading = true
+          const formData = new FormData()
+          Object.keys(this.formQualification).map(key => {
+            formData.append(key, this.formQualification[key])
+          })
+          // qualificationPicFileRef
+          if (this.$refs['qualificationPicFileRef'].uploadFiles.length > 0) {
+            for (let i = 0; i < this.$refs['qualificationPicFileRef'].uploadFiles.length; i++) {
+              if (this.$refs['qualificationPicFileRef'].uploadFiles[i]) {
+                formData.append('qualificationPic', this.$refs['qualificationPicFileRef'].uploadFiles[i].raw)
+              }
+            }
+          }
+          upload(
+            '/corpqualificationinfo/' + this.dialogQualificationType,
+            formData
+          ).then((data) => {
+            this.$message({
+              message: '保存成功',
+              type: 'success'
+            })
+            this.listLoading = false
+            this.dialogQualificationEdit = false
+            this.formQualification = {
+              date: [],
+              FILE_NAME: '',
+              CORPQUALIFICATIONINFO_ID: '',
+              CERTIFICATE_PERIOD: '',
+              QUALIFICATION_PIC: [],
+              CORPINFO_ID: this.$parent.CORPINFO_ID,
+              QUALIFICATION_NAME: '',
+              START_DATE: '',
+              END_DATE: '',
+              CERTIFICATE_NO: '',
+              IMG_URL: ''
+            }
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 删除资质信息
+    delQualification(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/corpqualificationinfo/delete',
+          {
+            CORPQUALIFICATIONINFO_ID: id
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.qualificationList = []
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    // 清空数据
+    resetQualificationForm() {
+      this.formQualification = {
+        date: [],
+        FILE_NAME: '',
+        CORPQUALIFICATIONINFO_ID: '',
+        CERTIFICATE_PERIOD: '',
+        QUALIFICATION_PIC: [],
+        CORPINFO_ID: this.$parent.CORPINFO_ID,
+        QUALIFICATION_NAME: '',
+        START_DATE: '',
+        END_DATE: '',
+        CERTIFICATE_NO: '',
+        IMG_URL: ''
+      }
+    },
+    // 资质证书照片change
+    qualificationPicFileChange(file) {
+      this.formQualification.FILE_NAME = file.name
+      this.formQualification.QUALIFICATION_PIC.push(file)
+    },
+    // 资质图片移除
+    qualificationPicFileRemove(file, fileList) {
+      this.formQualification.FILE_NAME = ''
+      this.formQualification.QUALIFICATION_PIC = fileList
+    },
+    // 资质图片预览
+    handlePictureCardView(row) {
+      this.dialogImageUrl = config.fileUrl + row.IMG_URL
+      this.dialogVisible = true
+    },
+    // 资质有效期change事件
+    handlePeriodChange(data) {
+      this.formQualification.START_DATE = data[0]
+      this.formQualification.END_DATE = data[1]
+      this.formQualification.CERTIFICATE_PERIOD = data[0] + '-' + data[1]
+    }
+    /** 资质信息 End */
+  } // methods 结束
+}
+</script>
+
+<style lang="sass" scoped>
+.avatar-uploader
+  ul
+    margin: 0
+    li
+      padding: 0
+.el-dialog__body
+  padding: 0
+.map-flex
+  display: flex
+  width: 500px
+  align-items: center
+
+.ud-flex
+  display: flex
+.form-group
+  display: flex
+  align-items: center
+  .form-label
+    padding: 0px 15px
+    font-size: 14px
+    width: 240px
+    font-weight: 400
+    text-align: right
+    margin-bottom: 18px
+    .star
+      color: red
+      padding-right: 4px
+  .input-block
+    display: flex
+
+.disContent
+  display: flex
+  align-items: center
+  flex-wrap: wrap
+  .img-div
+    position: relative
+    margin: 0 10px 0px 0
+    width: 108px
+    height: 108px
+    border-radius: 4px
+    overflow: hidden
+    &>img
+      width: 100%
+      height: 100%
+
+.disContent-hide
+  position: absolute
+  width: 100%
+  height: 100%
+  border-radius: 4px
+  background-color: rgba(48, 48, 48, 0.59)
+  display: none
+  top: 0
+  left: 0
+  line-height: 32px
+
+  .Delete
+    position: absolute
+    bottom: 14px
+    right: 10px
+    font-size: 16px
+    color: white
+    cursor: pointer
+  .yuLan
+    position: absolute
+    bottom: 23px
+    right: 50px
+    font-size: 16px
+    color: white
+    cursor: pointer
+    .yuLanImg
+      position: absolute
+      bottom: 0
+      right: 0
+      width: 100%
+      height: 100%
+      opacity: 0
+
+.img-div:hover .disContent-hide
+  display: block
+
+  .pitchCss
+    border: 1px solid #202e78
+    transition: all linear 0.1s
+    width: 116px
+    height: 116px
+
+</style>
+
+<style lang="scss" scoped>
+.uo-flex {
+  display: flex;
+}
+</style>
+
diff --git a/src/views/xgf/toolMan/components/list.vue b/src/views/xgf/toolMan/components/list.vue
new file mode 100644
index 0000000..268489c
--- /dev/null
+++ b/src/views/xgf/toolMan/components/list.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="110px">
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="相关方单位名称">
+            <el-input v-model="searchForm.RELEVANT_UNIT_NAME" placeholder="搜索相关方单位名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="list"
+      :row-key="getRowKey"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column
+        :reserve-selection="true"
+        type="selection"
+        width="55"
+        align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="相关方单位名称" />
+      <el-table-column prop="XGF_USER_NAME" label="人员名称" />
+      <el-table-column label="操作" align="center" width="200px">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-view" size="mini" @click="info(row.CORPINFO_ID)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      loading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      config: config,
+      total: 0,
+      KEYWORDS: '',
+      selection: [], // 当前页选中的数据
+      searchForm: {
+
+      },
+
+      list: []
+    }
+  },
+  created() {
+  },
+  methods: {
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    // 处理字典数据
+    goKeyReset() {
+      this.searchForm.POSSESSION = ''
+      this.searchForm.SELECT_FORM = ''
+      this.searchForm.PROVINCE = ''
+      this.searchForm.CITY = ''
+      this.searchForm.COUNTY = ''
+      this.searchForm.VILLAGE = ''
+      this.searchForm.STATE = ''
+      this.searchForm.RELEVANT_UNIT_NAME = ''
+      this.searchForm.EMPLOYMENT_FORM = ''
+      this.searchForm.KEYWORDS = ''
+      this.searchForm.CORP_TYPE = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.loading = true
+      requestFN(
+        '/xgf/corp/getCorpInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.searchForm.RELEVANT_UNIT_NAME,
+          PROVINCE: this.searchForm.POSSESSION[0] || '',
+          CITY: this.searchForm.POSSESSION[1] || '',
+          COUNTY: this.searchForm.POSSESSION[2] || '',
+          VILLAGE: this.searchForm.POSSESSION[3] || '',
+          STREET: this.searchForm.POSSESSION[4] || '',
+          STATE: this.searchForm.STATE,
+          EMPLOYMENT_FORM: this.searchForm.EMPLOYMENT_FORM,
+          SELECT_FORM: this.searchForm.SELECT_FORM,
+          CORP_TYPE: this.searchForm.CORP_TYPE
+        }
+      ).then((data) => {
+        this.loading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+        this.pd = data.pd
+      }).catch((e) => {
+        this.loading = false
+      })
+    },
+    info() {
+
+    },
+    getRowKey(row) {
+      return row.CORPINFO_ID
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton: function() {
+      var keys = 'units:add,units:del,units:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.unitsfhadminadd		// 新增权限
+        this.del = data.unitsfhadmindel		// 删除权限
+        this.edit = data.unitsfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.loading = false
+      })
+    },
+    // 获取数据字典数据
+    getDict() {
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
+        }
+      ).then((data) => {
+        this.employmentTypeList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '9ce2e9a4636b4d41b460ce16c346d497'
+        }
+      ).then((data) => {
+        this.selectFormList = data.list
+      })
+      requestFN(
+        '/xgf/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '37d8385931f14bb0b962082cf6bb3395'
+        }
+      ).then((data) => {
+        this.corpTypeList = data.list
+      })
+    }
+  }
+}
+
+</script>
diff --git a/src/views/xgf/toolMan/index.vue b/src/views/xgf/toolMan/index.vue
new file mode 100644
index 0000000..c3ab99b
--- /dev/null
+++ b/src/views/xgf/toolMan/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <List v-show="activeName=='List'" ref="list" />
+    <Edit v-if="activeName=='Edit'" />
+    <Edit v-if="activeName=='corpInfoEdit'" />
+  </div>
+</template>
+
+<script>
+import List from './components/list'
+import Edit from './components/edit'
+import corpInfoEdit from './components/corpInfoEdit'
+export default {
+  components: {
+    List: List,
+    Edit: Edit,
+    corpInfoEdit: corpInfoEdit,
+    CORPINFO_ID: ''
+  },
+  data() {
+    return {
+      activeName: 'List'
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getQuery()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From b3fae3e234435d4e358868a1d426a309760bb6b7 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 18 Dec 2023 20:24:01 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E9=9D=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/QRCode.vue   |  36 ++
 src/views/xgf/flow/components/apply.vue    | 320 +++++++++++++
 src/views/xgf/flow/components/list.vue     | 261 +++++++++++
 src/views/xgf/flow/components/picture.vue  |  36 ++
 src/views/xgf/flow/components/record.vue   | 198 ++++++++
 src/views/xgf/flow/components/sendUtil.vue | 130 ++++++
 src/views/xgf/flow/components/user.vue     | 250 ++++++++++
 src/views/xgf/flow/components/userInfo.vue | 327 +++++++++++++
 src/views/xgf/flow/components/users.vue    | 513 +++++++++++++++++++++
 src/views/xgf/flow/index.vue               |  23 +
 10 files changed, 2094 insertions(+)
 create mode 100644 src/views/xgf/flow/components/QRCode.vue
 create mode 100644 src/views/xgf/flow/components/apply.vue
 create mode 100644 src/views/xgf/flow/components/list.vue
 create mode 100644 src/views/xgf/flow/components/picture.vue
 create mode 100644 src/views/xgf/flow/components/record.vue
 create mode 100644 src/views/xgf/flow/components/sendUtil.vue
 create mode 100644 src/views/xgf/flow/components/user.vue
 create mode 100644 src/views/xgf/flow/components/userInfo.vue
 create mode 100644 src/views/xgf/flow/components/users.vue
 create mode 100644 src/views/xgf/flow/index.vue

diff --git a/src/views/xgf/flow/components/QRCode.vue b/src/views/xgf/flow/components/QRCode.vue
new file mode 100644
index 0000000..297e138
--- /dev/null
+++ b/src/views/xgf/flow/components/QRCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px" destroy-on-close	>
+      <vue-qr :text="qrCodeStr" :margin="0" :size="320" color-dark="#000" color-light="#fff"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.qrCodeStr = e.qrCodeStr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flow/components/apply.vue b/src/views/xgf/flow/components/apply.vue
new file mode 100644
index 0000000..199811d
--- /dev/null
+++ b/src/views/xgf/flow/components/apply.vue
@@ -0,0 +1,320 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="培训申请"
+    width="60%">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY"
+            label="集团单位 "
+          >
+            <Treeselect
+              :options="jituanDanweiTreeData"
+              :normalizer="normalizer"
+              v-model="form.TERRITORIALITY"
+              placeholder="请选择集团单位 "
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.TERRITORIALITY_USER_ID">
+                <el-option
+                  v-for="item in companyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER"
+            label="主管部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.MANAGER"
+              :disabled="true"
+              placeholder="请选择主管部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getmanagerUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.MANAGER_USER_ID">
+                <el-option
+                  v-for="item in managercompanyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION"
+            label="安监部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.SUPERVISION"
+              :disabled="true"
+              placeholder="请选择安监部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.SUPERVISION_USER_ID">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  components: {
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      treeData: [],
+      companyTreeData: [],
+      corpinfo: {},
+      userList: [],
+      companyUserList: [],
+      managercompanyUserList: [],
+      jituanDanwei: '',
+      jituanDanweiTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      form: {},
+      rules: {
+        // SUPERVISION: [{ required: true, message: '安监部门不能为空', trigger: 'blur' }],
+        SUPERVISION_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        MANAGER: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        MANAGER_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        TERRITORIALITY: [{ required: true, message: '属地管理部门不能为空', trigger: 'blur' }],
+        TERRITORIALITY_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    async init(e) {
+      if (e) {
+        this.users = e
+      }
+      this.visible = true
+      this.loading = false
+      this.form = {}
+      /**
+       * 获取相关方的 集团单位  corpinfo/getDataForEditByCorpInfoId
+       * 根据集团单位 找到 对应的 企业id
+       */
+      await this.getCorpinfo()
+    },
+    getCorpinfo() {
+      requestFN(
+        '/corpinfo/getDataForEditByCorpInfoId',
+        {
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.corpinfo = data.pd
+        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
+        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
+        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
+        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
+
+        if (data.pd.CORP_TYPE == 'jtdw002') {
+          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw003') {
+          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw004') {
+          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw005') {
+          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
+        }
+        this.getTreeData()
+      })
+    },
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+        // 必须指定【股份-安全监督部】
+        this.form.SUPERVISION = 'c31058273a2d40f9b83dd8e5ae3a723c'
+        this.form.MANAGER = this.corpinfo.MAIN_DEPARTMENT
+        this.getRegulatoryUserList(this.form.SUPERVISION)
+        this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
+      }).catch((e) => {
+        console.log(e)
+      })
+
+      if (this.jituanDanwei) {
+        requestFN(
+          '/companyApi/department/listTree',
+          { CORPINFO_ID: this.jituanDanwei }
+        ).then((data) => {
+          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+        })
+      }
+    },
+    getRegulatoryUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/regulatoryApi/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          ISASSESS: '1'
+        }
+      ).then((data) => {
+        this.userList = data.userList
+      }).catch((e) => {
+      })
+    },
+    // 人员
+    getUserList({ id: DEPARTMENT_ID }) {
+      requestFN(
+        '/companyApi/user/listAll',
+        {
+          DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.companyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+    getmanagerUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/regulatoryApi/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.managercompanyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.form.USER_COUNT = this.users.length
+          this.form.AUDIT_STATUS = 0
+          this.form.TYPE = 2
+          requestFN(
+            '/trainingbatch/add',
+            {
+              ...this.form,
+              users: this.users.join(',')
+            }
+          ).then((data) => {
+            this.loading = false
+            this.$message({
+              message: '申请成功',
+              type: 'success'
+            })
+            this.handleClose()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
new file mode 100644
index 0000000..0219ab9
--- /dev/null
+++ b/src/views/xgf/flow/components/list.vue
@@ -0,0 +1,261 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="用户名">
+            <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训状态">
+            <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="USERNAME" label="用户名" align="center"/>
+      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center"/>
+      <el-table-column prop="EMPLOYER_NAME" label="外派公司名称" align="center"/>
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="sendMessage([row])">提交申请</el-button>
+          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+    <user ref="userInfo" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
+    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import vueQr from 'vue-qr'
+import apply from './apply'
+import user from './user.vue'
+import SendUtil from './sendUtil.vue'
+import UserInfo from "./userInfo.vue";
+
+export default {
+  components: {UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      specialUsersList: {},
+      detailForm: {},
+      userEntryForm: {},
+      imgUrl: '',
+      SUPERVISE_CORPINFO_ID: '',
+      wenhuachengduList: [], // 文化程度
+      postList: [], // 岗位名称
+      photosOfLevel: [], // 三级教育照片
+      trainRecordList: [], // 培训记录
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      gongshangbaoxianFile: [],
+      userPhotoFile: [], // 头像
+      userCardIDPhotoFile: [], // 身份证照片
+      socialPhotoFile: [], // 身份证照片
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
+        value: 2,
+        label: '已培训(合格)'
+      }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
+      STATUS: '',
+      add: false,		// 新增按钮
+      del: false,		// 删除按钮
+      edit: false	// 修改按钮
+    }
+  },
+  created() {
+    this.getDict()
+    this.getList()
+    this.hasButton()
+  },
+  methods: {
+    handleSelectWithDifferentStatus(row, rowIndex) {
+      if (row.STATUS === 0) {
+        // 不禁用
+        return true
+      } else {
+        // 禁用
+        return false
+      }
+    },
+    getQuery() {
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          STATUS: this.STATUS,
+          EMPLOY_FLAG: '1'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    handleShow(row) {
+      this.$refs.userInfos.init(row)
+    },
+    sendMessage(row) {
+      this.$confirm('确定要提交人员撤回申请吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/trainingbatch/submitApplication', { xgf_user_ids: row.map(item => item.USER_ID).join(',') }
+        ).then((data) => {
+          this.getList()
+        })
+        this.$message({
+          type: 'success',
+          message: '申请提交成功!'
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '申请提交取消'
+        })
+      })
+    },
+    getUserInfo(row) {
+      this.$refs.userInfo.init(row)
+    },
+    handleAdd() {
+      const _selectData = this.$refs.multipleTable.selection
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '未勾选培训人员...',
+          type: 'error'
+        })
+        return false
+      }
+
+      var users = []
+      _selectData.map(item => {
+        if (item.STATUS === 0) {
+          users.push(item.USER_ID)
+        }
+      })
+
+      if (users == null || users.length == 0) {
+        this.$message({
+          message: '勾选人员暂无法提交申请...',
+          type: 'error'
+        })
+        return false
+      }
+      this.$refs.apply.init(users)
+    },
+    hasButton() {
+      var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          this.add = data.trainingbatchfhadminadd	// 增
+          this.del = data.trainingbatchfhadmindel	// 删
+          this.edit = data.trainingbatchfhadminedit	// 改
+          this.fromExcel = data.fromExcel	// 从excel导入权限
+          this.toExcel = data.toExcel		// 导出到excel权限
+        } else if (data.result == 'exception') {
+          // showException('按钮权限', data.exception)// 显示异常
+          console.info('按钮权限:', data.exception)
+        }
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    getDict: function() {
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flow/components/picture.vue b/src/views/xgf/flow/components/picture.vue
new file mode 100644
index 0000000..57e7255
--- /dev/null
+++ b/src/views/xgf/flow/components/picture.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="头像" width="370px" destroy-on-close	>
+      <el-image :src="src"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      src: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.src = e.src
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flow/components/record.vue b/src/views/xgf/flow/components/record.vue
new file mode 100644
index 0000000..e82258d
--- /dev/null
+++ b/src/views/xgf/flow/components/record.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <el-page-header content="申请记录" @back="goBack"/>
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="申请人员">
+            <el-input v-model="KEYWORDS" placeholder="请输入申请人员"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="主管部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="MANAGER"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="属地管理部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="TERRITORIALITY"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="申请状态">
+            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CREATTIME" label="申请时间" align="center" />
+      <el-table-column prop="CREATOR" label="申请人员" align="center" />
+      <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
+      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
+      <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
+        <template slot-scope="{row}">
+          {{ new Date(row.CREATTIME).getFullYear() }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="AUDIT_STATUS" label="申请状态" align="center" >
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column prop="PASS_COUNT" label="审核通过人数" align="center" /> <!-- 已更新为申请状态中的审核通过人员数-->
+      <el-table-column prop="USER_COUNT" label="申请人数" align="center" />
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+
+    <users ref="users"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import users from './users'
+export default {
+  components: { Pagination, Treeselect, users },
+  directives: { waves },
+  data() {
+    return {
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      treeData: [],
+      companyTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      MANAGER: null,
+      TERRITORIALITY: null,
+      statusList: [{ value: 0, label: '待审核' }, { value: 1, label: '审核中' }, { value: 2, label: '待培训' }, { value: 3, label: '已完成' }],
+      AUDIT_STATUS: '',
+      KEYWORDS: ''
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+  },
+  methods: {
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.MANAGER = null
+      this.TERRITORIALITY = null
+      this.AUDIT_STATUS = ''
+      this.KEYWORDS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          MANAGER: this.MANAGER,
+          TERRITORIALITY: this.TERRITORIALITY,
+          AUDIT_STATUS: this.AUDIT_STATUS,
+          KEYWORDS: this.KEYWORDS,
+          TYPE: 2,
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        console.log(this.varList)
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+      requestFN(
+        '/companyApi/department/listTree',
+        { CORPINFO_ID: this.$parent.SUPERVISE_CORPINFO_ID }
+      ).then((data) => {
+        this.companyTreeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+
+    handleShow(row) {
+      this.$refs.users.init(row)
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
new file mode 100644
index 0000000..3b46ac8
--- /dev/null
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
+      <el-form>
+        <el-form-item prop="TERRITORIALITY" label="集团单位 ">
+          <Treeselect
+            :options="jituanDanweiTreeData"
+            :normalizer="normalizer"
+            v-model="corp_id"
+            placeholder="请选择集团单位 "
+            no-options-text="暂无数据"
+            no-children-text="暂无数据"
+            style="width: 100%;"
+            @select="getInfo($event)"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">关 闭</el-button>
+        <el-button type="primary" @click="sendMessage()">推 送</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import Treeselect from '@riophae/vue-treeselect'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { Treeselect, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      jituanDanwei: '',
+      loading: false,
+      jituanDanweiTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      corp_id: null,
+      corp_name: '',
+      heirloom: {}
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.getCorpinfo()
+      this.heirloom = JSON.stringify(e)
+    },
+    getCorpinfo() {
+      requestFN(
+        '/corpinfo/getDataForEditByCorpInfoId',
+        {
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.corpinfo = data.pd
+        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
+        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
+        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
+        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
+
+        if (data.pd.CORP_TYPE == 'jtdw002') {
+          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw003') {
+          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw004') {
+          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw005') {
+          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
+        }
+        this.getTreeData()
+      })
+    },
+    getTreeData() {
+      if (this.jituanDanwei) {
+        requestFN(
+          '/companyApi/department/listTree',
+          { CORPINFO_ID: this.jituanDanwei }
+        ).then((data) => {
+          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+        })
+      }
+    },
+    getInfo(e) {
+      console.log(e)
+      this.corp_name = e.name
+    },
+    beforeClose() {
+      this.corp_id = null
+    },
+    sendMessage(row) {
+      requestFN(
+        '/trainingbatch/sendMessage',
+        {
+          list: this.heirloom,
+          corp_id: this.corp_id,
+          corp_name: this.corp_name,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.$message.success('推送成功')
+        this.visible = false
+        this.$emit('refresh', '')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flow/components/user.vue b/src/views/xgf/flow/components/user.vue
new file mode 100644
index 0000000..889dc08
--- /dev/null
+++ b/src/views/xgf/flow/components/user.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px">
+      <div v-for="item in peopleList" :key="item.CLASS_INFO_ID" style="height: 220px">
+        <div class="bg_table">
+          <div class="title">相关方安全告知培训合格证</div>
+          <div class="red">{{ item.CLASS_NO }}</div>
+          <table class="table">
+            <tr>
+              <td style="width: 120px">
+                <div class="text textone name">姓名</div>
+              </td>
+              <td style="width: 100px;">
+                <div class="text text1 tcenter">{{ item.NAME }}</div>
+              </td>
+              <td style="width: 86px">
+                <div class="text text2 tcenter">工种</div>
+              </td>
+              <td style="width: 148px;">
+                <div v-if="item.JOBS_TYPE" class="text tcenter ">{{ item.JOBS_TYPE }}</div>
+                <div v-else>暂无</div>
+              </td>
+              <td rowspan="4" style="width: 134px;">
+                <img v-if="!getShowPicture(item)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 116px; height: 146px">
+                <img v-if="getShowPicture(item)" :src="config.fileUrl + item.PHOTO" alt="" style="width: 116px; height: 146px" @click="openPicture(config.fileUrl + item.PHOTO)">
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">资质</div>
+              </td>
+              <td colspan="3">
+                <div v-if="item.CERTIFICATE" class="text">{{ item.CERTIFICATE }}</div>
+                <div v-else>暂无</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">培训时间</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.OPENING_TIME }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">有效期限</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.VALIDITY_PERIOD_END }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">所在单位</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
+              </td>
+              <td rowspan="3" style="padding-top: 6px" @click="click(config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID)">
+                <vue-qr :text="config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">身份证号</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.CARD_ID }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">手机</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.PHONE }}</div>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </el-dialog>
+    <QRCode ref="QRcode" append-to-body/>
+    <Picture ref="Picture" append-to-body/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import QRCode from './QRCode.vue'
+import Picture from './picture.vue'
+
+export default {
+  components: { QRCode, Picture, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      config: config,
+      visible: false,
+      peopleList: [],
+      CLASS_MESSAGE_ID: '',
+      CLASS_INFO_ID: '',
+      USER_ID: '',
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      console.info(e)
+      if (e && e.CLASS_INFO_ID) {
+        this.CLASS_INFO_ID = e.CLASS_INFO_ID
+      }
+      if (e && e.CLASS_MESSAGE_ID) {
+        this.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
+      }
+      if (e && e.USER_ID) {
+        this.USER_ID = e.USER_ID
+      }
+      this.qrCodeStr = config.messageUrl + '?CLASS_INFO_ID=' + this.CLASS_INFO_ID
+      this.visible = true
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN('/trainusers/getUserinfoList', {
+        CLASS_INFO_ID: this.CLASS_INFO_ID,
+        CLASS_MESSAGE_ID: this.CLASS_MESSAGE_ID,
+        USER_ID: this.USER_ID
+      })
+        .then((data) => {
+          this.peopleList = data.list
+        }).catch((e) => {
+          console.log(e)
+        })
+    },
+    getShowPicture(row) {
+      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
+        return true
+      }
+    },
+    click(e) {
+      this.$refs.QRcode.init({ qrCodeStr: e })
+    },
+    openPicture(src) {
+      this.$refs.Picture.init({ src: src })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.name{
+  width: 120px;
+  overflow: hidden;//溢出隐藏
+  white-space: nowrap; // 强制一行显示
+  text-overflow: ellipsis;// 显示。。。省略号
+}
+.red {
+  width: 660px;
+  color: #ff0000;
+  margin-left: 34px;
+  font-size: 24px;
+}
+
+.bg_table {
+  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
+  background-size: 100%;
+  width: 660px;
+  height: 430px;
+  border: 4px solid #453d3a;
+  transform: scale(0.5);
+  transform-origin: top left;
+
+  .title {
+    font-size: 28px;
+    text-align: center;
+    margin-top: 34px;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .table {
+    border-collapse: collapse;
+    width: 590px;
+    color: #453d3a;
+    font-size: 20px;
+    margin: 34px;
+    text-align: left;
+    margin-top: 10px;
+
+    .tcenter {
+      text-align: center
+    }
+
+    .w60 {
+      width: 100px;
+    }
+
+    .w74 {
+      width: 148px
+    }
+
+    th, td {
+      border: 2px solid #453d3a;
+      text-align: left;
+      height: 40px;
+      padding: 0 16px;
+
+      box-sizing: border-box;
+
+      .textone {
+        width: 80px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+      }
+
+      .text1 {
+        width: 60px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text2 {
+        width: 50px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text {
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/xgf/flow/components/userInfo.vue b/src/views/xgf/flow/components/userInfo.vue
new file mode 100644
index 0000000..6a38268
--- /dev/null
+++ b/src/views/xgf/flow/components/userInfo.vue
@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      v-if="visible"
+      :visible.sync="visible"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div v-if="false">
+        <div class="level-title">
+          <h1>培训记录</h1>
+        </div>
+        <el-table
+          :data="trainRecordList"
+          :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+          tooltip-effect="dark"
+          border
+          fit
+          highlight-current-row>
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="50" align="center"/>
+          <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+          <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+          <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+          <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+          <el-table-column label="培训有效期" align="center">
+            <template slot-scope="{row}">
+              <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+          <h1>特种作业人员信息</h1>
+        </div>
+        <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+          <tr>
+            <th style="width: 150px">证书名称</th>
+            <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+            <th style="width: 150px">作业类别</th>
+            <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+            <th style="width: 150px">操作项目</th>
+            <td>{{ item.OPERATION_TYPE_NAME }}</td>
+          </tr>
+          <tr>
+            <th>特种作业证书编号</th>
+            <td>{{ item.SPECIAL_NUMBER }}</td>
+            <th>发证机关</th>
+            <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+          </tr>
+          <tr>
+            <th>复审时间</th>
+            <td>{{ item.REVIEW_TIME }}</td>
+            <th>有效期</th>
+            <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+          </tr>
+        </table>
+        <div
+          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+          class="level-title mt-20">
+          <h1>打回信息</h1>
+        </div>
+        <table
+          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+          class="table-ui"
+          style="margin-bottom: 20px;">
+          <tr>
+            <th>打回人</th>
+            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+            <td
+              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+              {{ detailForm.TERRITORIALITY_USER_NAME }}
+            </td>
+            <th>打回原由</th>
+            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+            <td
+              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+              {{ detailForm.TERRITORIALITY_OPINION }}
+            </td>
+          </tr>
+        </table>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="visible = false">关 闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      imgUrl: '',
+      userDetailForm: {},
+      userCardIDPhotoFile: [], // 身份证照片
+      trainRecordList: [],
+      detailForm: {},
+      photosOfLevel: [], // 三级教育照片
+      specialUsersList: {},
+      insuranceFileList: [], // 保险文件
+      contractFileList: [],
+      socialPhotoFile: [],
+      gongshangbaoxianFile: [],
+      userEntryForm: {},
+      loading: false,
+      heirloom: {},
+      config: config
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.heirloom = JSON.parse(JSON.stringify(e))
+      this.getUserInfoById(this.heirloom)
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getUserInfoById(row) {
+      this.loading = true
+      requestFN(
+        'user/getDetailByUserIdAndCorpInfoId',
+        {
+          USER_ID: row.USER_ID,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+        }
+      ).then((data) => {
+        Object.assign(this.userDetailForm, data.pd)
+        this.userPhotoFile = data.userPhotoFile
+        if (this.userPhotoFile.length > 0) {
+          this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+        }
+        this.photosOfLevel = data.photosOfLevel
+        this.specialUsersList = data.specialUsers
+        this.insuranceFileList = data.insuranceFile
+        this.contractFileList = data.contractFile
+        this.userCardIDPhotoFile = data.userCardIDPhotoFile
+        this.socialPhotoFile = data.socialPhotoFile
+        this.gongshangbaoxianFile = data.gongshangbaoxianFile
+        // qr内容初始化
+        if (row.STATUS === '2') {
+          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
+        } else {
+          this.qrCodeStr = ''
+        }
+
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: row.USER_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          this.detailForm = Object.assign(this.detailForm, data.userDetail)
+          this.trainRecordList = data.recordList
+          this.loading = false
+        }).catch((e) => {
+          console.log(e)
+        })
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flow/components/users.vue b/src/views/xgf/flow/components/users.vue
new file mode 100644
index 0000000..2d11653
--- /dev/null
+++ b/src/views/xgf/flow/components/users.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-dialog
+      v-if="visible"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      :append-to-body="true"
+      title="申请详情"
+      width="60%">
+      <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
+        <h1>申请信息</h1>
+      </div>
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 17%">申请人</th>
+          <td style="width: 17%">{{ pd.CREATOR }}</td>
+          <th style="width: 17%">申请时间</th>
+          <td style="width: 17%">{{ pd.CREATTIME }}</td>
+          <th style="width: 17%">备注</th>
+          <td style="width: 15%">{{ pd.DESCR }}</td>
+        </tr>
+        <tr>
+          <th style="width: 30px">安监部门</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
+          <th style="width: 30px">审核人</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_USER_NAME }}</td>
+          <th style="width: 30px">审核时间</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_TIME }}</td>
+        </tr>
+        <tr>
+          <th>主管部门</th>
+          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.MANAGER_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.MANAGER_TIME }}</td>
+        </tr>
+        <tr>
+          <th>属地管理部门</th>
+          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.TERRITORIALITY_TIME }}</td>
+        </tr>
+        <tr v-if="pd.AUDIT_DESCR">
+          <th>股份公司意见</th>
+          <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
+        </tr>
+        <tr v-if="pd.CORP_AUDIT_DESCR">
+          <th>分公司意见</th>
+          <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>申请人员列表</h1>
+      </div>
+      <el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="USERNAME" label="用户名" align="center" />
+        <el-table-column prop="NAME" label="姓名" align="center" />
+        <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" />
+        <el-table-column prop="STATE" label="审核状态" align="center" >
+          <template slot-scope="{row}">
+            <el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag>
+            <el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
+            <el-tag v-else type="success">待审核</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200" >
+          <template slot-scope="{row}">
+            <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeWindow">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-if="userInfoDialog"
+      :visible.sync="userInfoDialog"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>培训记录</h1>
+      </div>
+      <el-table
+        :data="trainRecordList"
+        :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center"/>
+        <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+        <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+        <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+        <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+        <el-table-column label="培训有效期" align="center">
+          <template slot-scope="{row}">
+            <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+        <h1>特种作业人员信息</h1>
+      </div>
+      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 150px">证书名称</th>
+          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+          <th style="width: 150px">作业类别</th>
+          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+          <th style="width: 150px">操作项目</th>
+          <td>{{ item.OPERATION_TYPE_NAME }}</td>
+        </tr>
+        <tr>
+          <th>特种作业证书编号</th>
+          <td>{{ item.SPECIAL_NUMBER }}</td>
+          <th>发证机关</th>
+          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+        </tr>
+        <tr>
+          <th>复审时间</th>
+          <td>{{ item.REVIEW_TIME }}</td>
+          <th>有效期</th>
+          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+        </tr>
+      </table>
+      <div
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="level-title mt-20">
+        <h1>打回信息</h1>
+      </div>
+      <table
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="table-ui"
+        style="margin-bottom: 20px;">
+        <tr>
+          <th>打回人</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_USER_NAME }}
+          </td>
+          <th>打回原由</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_OPINION }}
+          </td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="userInfoDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
+      <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
+        <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="QRCodeDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+  components: {
+    Pagination,
+    vueQr
+  },
+  data() {
+    return {
+      config: config,
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      userInfoDialog: false,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      userEntryForm: {},
+      specialUsersList: {},
+      imgUrl: '',
+      wenhuachengduList: [], // 文化程度
+      userCardIDPhotoFile: [], // 身份证照片
+      postList: [], // 岗位名称
+      trainRecordList: [], // 培训记录
+      visible: false,
+      pd: {},
+      userList: [],
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      photosOfLevel: []
+    }
+  },
+  methods: {
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    init(e) {
+      if (e) {
+        this.pd = e
+      }
+      this.visible = true
+      this.userList = []
+      this.getDict()
+      this.getUserList()
+    },
+    // 获取数据字典数据
+    getDict: function() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '1144b16d85f14b108ea7859e2be9d001'
+        }
+      ).then((data) => {
+        this.flowAreaList = data.list
+      }).catch((e) => {
+
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    // 人员
+    getUserList() {
+      requestFN(
+        '/trainingbatch/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID
+        }
+      ).then((data) => {
+        this.userList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+      })
+    },
+    // 二维码
+    showQRCode(id) {
+      this.QRCodeDialog = true
+      const arr = [{ USER_ID: id, CODE_TYPE: '1' }]
+      this.qrcodeStr = JSON.stringify(arr)
+    },
+    // 查看
+    async handleShow(USER_ID) {
+      await this.getUserInfoById(USER_ID)
+      await this.getOtherUserInfoById(USER_ID)
+      this.userInfoDialog = true
+    },
+    getUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: id,
+            TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          if (this.userDetailForm.PHOTO) {
+            this.imgUrl = config.fileUrl + this.userDetailForm.PHOTO
+          }
+          this.trainRecordList = data.recordList
+          // this.insuranceFileList = data.insuranceFile
+          // this.contractFileList = data.contractFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    getOtherUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          'user/getDetailByUserIdAndCorpInfoId',
+          {
+            USER_ID: id,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+            CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+          }
+        ).then((data) => {
+          Object.assign(this.userDetailForm, data.pd)
+          this.userPhotoFile = data.userPhotoFile
+          if (this.userPhotoFile.length > 0) {
+            this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+          }
+          this.insuranceFileList = data.insuranceFile
+          this.specialUsersList = data.specialUsers
+          this.contractFileList = data.contractFile
+          this.userCardIDPhotoFile = data.userCardIDPhotoFile
+          this.socialPhotoFile = data.socialPhotoFile
+          this.gongshangbaoxianFile = data.gongshangbaoxianFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    // 转换是否
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    },
+    // 转换字典数据
+    formatDictioariesLabel(value, type) {
+      var list = []
+      if (type == '0') {
+        list = this.wenhuachengduList
+      } else if (type == '1') {
+        list = this.postList
+      }
+      if (value) {
+        if (list.length > 0) {
+          var data = ''
+          for (let i = 0; i < list.length; i++) {
+            const obj = list[i]
+            if (value == obj.BIANMA) {
+              data = obj.NAME
+              break
+            }
+          }
+          return data
+        } else {
+          return value
+        }
+      } else {
+        return ''
+      }
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/index.vue b/src/views/xgf/flow/index.vue
new file mode 100644
index 0000000..70cda6e
--- /dev/null
+++ b/src/views/xgf/flow/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import Record from './components/record'
+export default {
+  components: {
+    List: List,
+    Record: Record
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 731986f7da2b55bdaaaf39282b5c3c8f5b1efda8 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 19 Dec 2023 15:01:43 +0800
Subject: [PATCH 03/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/list.vue     | 37 +++-------
 src/views/xgf/flow/components/sendUtil.vue | 81 +++-------------------
 2 files changed, 17 insertions(+), 101 deletions(-)

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 0219ab9..8bbe506 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -38,20 +38,18 @@
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
-      <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center"/>
-      <el-table-column prop="EMPLOYER_NAME" label="外派公司名称" align="center"/>
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="sendMessage([row])">提交申请</el-button>
-          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证
-          </el-button>
+          <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
+          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
+        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量同意</el-button>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
@@ -69,10 +67,10 @@ import vueQr from 'vue-qr'
 import apply from './apply'
 import user from './user.vue'
 import SendUtil from './sendUtil.vue'
-import UserInfo from "./userInfo.vue";
+import UserInfo from './userInfo.vue'
 
 export default {
-  components: {UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
   directives: { waves },
   data() {
     return {
@@ -163,27 +161,8 @@ export default {
     handleShow(row) {
       this.$refs.userInfos.init(row)
     },
-    sendMessage(row) {
-      this.$confirm('确定要提交人员撤回申请吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        requestFN(
-          '/trainingbatch/submitApplication', { xgf_user_ids: row.map(item => item.USER_ID).join(',') }
-        ).then((data) => {
-          this.getList()
-        })
-        this.$message({
-          type: 'success',
-          message: '申请提交成功!'
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '申请提交取消'
-        })
-      })
+    approve(row) {
+      this.$refs.sendUtil.init(row)
     },
     getUserInfo(row) {
       this.$refs.userInfo.init(row)
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 3b46ac8..a7fdb5b 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -2,22 +2,16 @@
   <div>
     <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
       <el-form>
-        <el-form-item prop="TERRITORIALITY" label="集团单位 ">
-          <Treeselect
-            :options="jituanDanweiTreeData"
-            :normalizer="normalizer"
-            v-model="corp_id"
-            placeholder="请选择集团单位 "
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            style="width: 100%;"
-            @select="getInfo($event)"
-          />
+        <el-form-item prop="TERRITORIALITY" label="是否通过 ">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option label="是" value="1"/>
+            <el-option label="否" value="0"/>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="visible = false">关 闭</el-button>
-        <el-button type="primary" @click="sendMessage()">推 送</el-button>
+        <el-button type="primary" @click="sendMessage()">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -39,81 +33,24 @@ export default {
   data() {
     return {
       visible: false,
-      jituanDanwei: '',
       loading: false,
-      jituanDanweiTreeData: [],
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
-      corp_id: null,
-      corp_name: '',
+      value: null,
       heirloom: {}
     }
   },
   methods: {
     init(e) {
       this.visible = true
-      this.getCorpinfo()
       this.heirloom = JSON.stringify(e)
     },
-    getCorpinfo() {
-      requestFN(
-        '/corpinfo/getDataForEditByCorpInfoId',
-        {
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-          tm: new Date().getTime()
-        }
-      ).then((data) => {
-        this.corpinfo = data.pd
-        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
-        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
-        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
-        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
-
-        if (data.pd.CORP_TYPE == 'jtdw002') {
-          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw003') {
-          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw004') {
-          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw005') {
-          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
-        }
-        this.getTreeData()
-      })
-    },
-    getTreeData() {
-      if (this.jituanDanwei) {
-        requestFN(
-          '/companyApi/department/listTree',
-          { CORPINFO_ID: this.jituanDanwei }
-        ).then((data) => {
-          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
-        }).catch((e) => {
-        })
-      }
-    },
-    getInfo(e) {
-      console.log(e)
-      this.corp_name = e.name
-    },
     beforeClose() {
-      this.corp_id = null
     },
     sendMessage(row) {
       requestFN(
-        '/trainingbatch/sendMessage',
+        '/xgf/user/approve',
         {
           list: this.heirloom,
-          corp_id: this.corp_id,
-          corp_name: this.corp_name,
+          STATUS: this.value,
           tm: new Date().getTime()
         }
       ).then((data) => {

From bb8fdbd9b7c005f3613dc82728b382b78f2ac28e Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 19 Dec 2023 17:56:52 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=81=AB?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=95=B0=E6=8D=AE=E5=BB=B6=E6=97=B6=E7=9B=91?=
 =?UTF-8?q?=E7=81=AB=E5=AE=A1=E6=A0=B8=E4=BA=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hotwork/hotwork/components/list.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/hotwork/hotwork/components/list.vue b/src/views/hotwork/hotwork/components/list.vue
index e25b397..c8f5d5e 100644
--- a/src/views/hotwork/hotwork/components/list.vue
+++ b/src/views/hotwork/hotwork/components/list.vue
@@ -84,7 +84,11 @@
           {{ translate(row.STATE.toString(), statusList) }}
         </template>
       </el-table-column>
-      <el-table-column prop="examineUserName" label="审核人" />
+      <el-table-column prop="examineUserName" label="审核人" >
+        <template slot-scope="{row}">
+          {{ row.examineUserName || row.examineDeptName }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <!--          <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
@@ -178,7 +182,7 @@ export default {
         { id: '35', name: '（港股）安全监督部门待初审' },
         { id: '36', name: '安委会办公室待审批' },
         { id: '37', name: '安全总监待审批' },
-        { id: '10', name: '延时动火' },
+        { id: '10', name: '延时监火' },
         { id: '11', name: '归档' },
         { id: '-1', name: '审核不通过' },
         { id: '-2', name: '特级不通过' },

From d016a52372bafacb366c2f6ba60f07bb35906042 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 19 Dec 2023 20:03:23 +0800
Subject: [PATCH 05/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/list.vue        |   2 +-
 src/views/xgf/flowApply/components/QRCode.vue |  36 ++
 src/views/xgf/flowApply/components/apply.vue  | 287 ++++++++++
 src/views/xgf/flowApply/components/list.vue   | 228 ++++++++
 .../xgf/flowApply/components/picture.vue      |  36 ++
 src/views/xgf/flowApply/components/record.vue | 198 +++++++
 .../xgf/flowApply/components/sendUtil.vue     |  67 +++
 src/views/xgf/flowApply/components/user.vue   | 250 +++++++++
 .../xgf/flowApply/components/userInfo.vue     | 327 +++++++++++
 src/views/xgf/flowApply/components/users.vue  | 513 ++++++++++++++++++
 src/views/xgf/flowApply/index.vue             |  23 +
 11 files changed, 1966 insertions(+), 1 deletion(-)
 create mode 100644 src/views/xgf/flowApply/components/QRCode.vue
 create mode 100644 src/views/xgf/flowApply/components/apply.vue
 create mode 100644 src/views/xgf/flowApply/components/list.vue
 create mode 100644 src/views/xgf/flowApply/components/picture.vue
 create mode 100644 src/views/xgf/flowApply/components/record.vue
 create mode 100644 src/views/xgf/flowApply/components/sendUtil.vue
 create mode 100644 src/views/xgf/flowApply/components/user.vue
 create mode 100644 src/views/xgf/flowApply/components/userInfo.vue
 create mode 100644 src/views/xgf/flowApply/components/users.vue
 create mode 100644 src/views/xgf/flowApply/index.vue

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 8bbe506..636a33f 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -146,7 +146,7 @@ export default {
         '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          STATUS: this.STATUS,
+          STATUS: '1',
           EMPLOY_FLAG: '1'
         }
       ).then((data) => {
diff --git a/src/views/xgf/flowApply/components/QRCode.vue b/src/views/xgf/flowApply/components/QRCode.vue
new file mode 100644
index 0000000..297e138
--- /dev/null
+++ b/src/views/xgf/flowApply/components/QRCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px" destroy-on-close	>
+      <vue-qr :text="qrCodeStr" :margin="0" :size="320" color-dark="#000" color-light="#fff"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.qrCodeStr = e.qrCodeStr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
new file mode 100644
index 0000000..6775299
--- /dev/null
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -0,0 +1,287 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :append-to-body="true"
+    title="培训申请"
+    width="60%">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY"
+            label="集团单位 "
+          >
+            <Treeselect
+              :options="jituanDanweiTreeData"
+              :normalizer="normalizer"
+              v-model="form.TERRITORIALITY"
+              placeholder="请选择集团单位 "
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.TERRITORIALITY_USER_ID">
+                <el-option
+                  v-for="item in companyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER"
+            label="主管部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.MANAGER"
+              :disabled="true"
+              placeholder="请选择主管部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getmanagerUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.MANAGER_USER_ID">
+                <el-option
+                  v-for="item in managercompanyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION"
+            label="安监部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.SUPERVISION"
+              :disabled="true"
+              placeholder="请选择安监部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.SUPERVISION_USER_ID">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  components: {
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      treeData: [],
+      companyTreeData: [],
+      corpinfo: {},
+      userList: [],
+      companyUserList: [],
+      managercompanyUserList: [],
+      jituanDanwei: '',
+      jituanDanweiTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      form: {},
+      rules: {
+        SUPERVISION_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        MANAGER: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        MANAGER_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        TERRITORIALITY: [{ required: true, message: '属地管理部门不能为空', trigger: 'blur' }],
+        TERRITORIALITY_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      if (e) {
+        this.users = e
+      }
+      this.visible = true
+      this.loading = false
+      requestFN(
+        '/openApi/department/listTree',
+        { CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, tm: new Date().getTime() }
+      ).then((data) => {
+        this.form.MANAGER = this.users[0].MANAGER_DEPARTMENT_ID
+        this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        this.getTreeData()
+      })
+    },
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/openApi/corpDepartment/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+        // 必须指定【股份-安全监督部】
+        this.form.SUPERVISION = 'c31058273a2d40f9b83dd8e5ae3a723c'
+        this.getRegulatoryUserList(this.form.SUPERVISION)
+        this.getmanagerUserList(this.form.MANAGER)
+      }).catch((e) => {
+        console.log(e)
+      })
+
+      if (this.jituanDanwei) {
+        requestFN(
+          '/companyApi/department/listTree',
+          { CORPINFO_ID: this.jituanDanwei }
+        ).then((data) => {
+          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+        })
+      }
+    },
+    getRegulatoryUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/user/getRegUserInfo',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          ISASSESS: '1'
+        }
+      ).then((data) => {
+        this.userList = data.list
+      }).catch((e) => {
+      })
+    },
+    // 人员
+    getUserList({ id: DEPARTMENT_ID }) {
+      requestFN(
+        '/user/listAll',
+        { DEPARTMENT_ID: DEPARTMENT_ID }
+      ).then((data) => {
+        this.companyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+    getmanagerUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/user/getRegUserInfo',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.managercompanyUserList = data.list
+      }).catch((e) => {
+      })
+    },
+
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.form.USER_COUNT = this.users.length
+          this.form.AUDIT_STATUS = 0
+          this.form.TYPE = 2
+          requestFN(
+            '/trainingbatch/add',
+            {
+              ...this.form,
+              users: this.users.join(',')
+            }
+          ).then((data) => {
+            this.loading = false
+            this.$message({
+              message: '申请成功',
+              type: 'success'
+            })
+            this.handleClose()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.visible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
new file mode 100644
index 0000000..db3d5cb
--- /dev/null
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="用户名">
+            <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训状态">
+            <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="USERNAME" label="用户名" align="center"/>
+      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
+      <el-table-column label="操作" align="center" width="150">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
+          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量申请</el-button>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+    <user ref="userInfo" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
+    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+    <apply ref="apply" append-to-body @refresh="getList"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import vueQr from 'vue-qr'
+import apply from './apply'
+import user from './user.vue'
+import SendUtil from './sendUtil.vue'
+import UserInfo from './userInfo.vue'
+
+export default {
+  components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      specialUsersList: {},
+      detailForm: {},
+      userEntryForm: {},
+      imgUrl: '',
+      SUPERVISE_CORPINFO_ID: '',
+      wenhuachengduList: [], // 文化程度
+      postList: [], // 岗位名称
+      photosOfLevel: [], // 三级教育照片
+      trainRecordList: [], // 培训记录
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      gongshangbaoxianFile: [],
+      userPhotoFile: [], // 头像
+      userCardIDPhotoFile: [], // 身份证照片
+      socialPhotoFile: [], // 身份证照片
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
+        value: 2,
+        label: '已培训(合格)'
+      }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
+      STATUS: '',
+      add: false,		// 新增按钮
+      del: false,		// 删除按钮
+      edit: false	// 修改按钮
+    }
+  },
+  created() {
+    this.getDict()
+    this.getList()
+    this.hasButton()
+  },
+  methods: {
+    getQuery() {
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          STATUS: '2',
+          EMPLOY_FLAG: '1'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    handleShow(row) {
+      this.$refs.userInfos.init(row)
+    },
+    approve(row) {
+      this.$refs.sendUtil.init(row)
+    },
+    getUserInfo(row) {
+      this.$refs.userInfo.init(row)
+    },
+    handleAdd() {
+      const _selectData = this.$refs.multipleTable.selection
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '未勾选培训人员...',
+          type: 'error'
+        })
+        return false
+      }
+      let rule = ''
+      for (let i = 0; _selectData.length > i; i++) {
+        if (rule === '') {
+          rule = _selectData[i].MANAGER_DEPARTMENT_ID
+        } else {
+          if (rule !== _selectData[i].MANAGER_DEPARTMENT_ID) {
+            this.$message.error('主管部门不是一个不能提交')
+          }
+        }
+      }
+      this.$refs.apply.init(_selectData)
+    },
+
+    hasButton() {
+      var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          this.add = data.trainingbatchfhadminadd	// 增
+          this.del = data.trainingbatchfhadmindel	// 删
+          this.edit = data.trainingbatchfhadminedit	// 改
+          this.fromExcel = data.fromExcel	// 从excel导入权限
+          this.toExcel = data.toExcel		// 导出到excel权限
+        } else if (data.result == 'exception') {
+          // showException('按钮权限', data.exception)// 显示异常
+          console.info('按钮权限:', data.exception)
+        }
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    getDict: function() {
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flowApply/components/picture.vue b/src/views/xgf/flowApply/components/picture.vue
new file mode 100644
index 0000000..57e7255
--- /dev/null
+++ b/src/views/xgf/flowApply/components/picture.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="头像" width="370px" destroy-on-close	>
+      <el-image :src="src"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      src: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.src = e.src
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowApply/components/record.vue b/src/views/xgf/flowApply/components/record.vue
new file mode 100644
index 0000000..e82258d
--- /dev/null
+++ b/src/views/xgf/flowApply/components/record.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <el-page-header content="申请记录" @back="goBack"/>
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="申请人员">
+            <el-input v-model="KEYWORDS" placeholder="请输入申请人员"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="主管部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="MANAGER"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="属地管理部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="TERRITORIALITY"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="申请状态">
+            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CREATTIME" label="申请时间" align="center" />
+      <el-table-column prop="CREATOR" label="申请人员" align="center" />
+      <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
+      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
+      <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
+        <template slot-scope="{row}">
+          {{ new Date(row.CREATTIME).getFullYear() }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="AUDIT_STATUS" label="申请状态" align="center" >
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column prop="PASS_COUNT" label="审核通过人数" align="center" /> <!-- 已更新为申请状态中的审核通过人员数-->
+      <el-table-column prop="USER_COUNT" label="申请人数" align="center" />
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+
+    <users ref="users"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import users from './users'
+export default {
+  components: { Pagination, Treeselect, users },
+  directives: { waves },
+  data() {
+    return {
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      treeData: [],
+      companyTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      MANAGER: null,
+      TERRITORIALITY: null,
+      statusList: [{ value: 0, label: '待审核' }, { value: 1, label: '审核中' }, { value: 2, label: '待培训' }, { value: 3, label: '已完成' }],
+      AUDIT_STATUS: '',
+      KEYWORDS: ''
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+  },
+  methods: {
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.MANAGER = null
+      this.TERRITORIALITY = null
+      this.AUDIT_STATUS = ''
+      this.KEYWORDS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          MANAGER: this.MANAGER,
+          TERRITORIALITY: this.TERRITORIALITY,
+          AUDIT_STATUS: this.AUDIT_STATUS,
+          KEYWORDS: this.KEYWORDS,
+          TYPE: 2,
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        console.log(this.varList)
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+      requestFN(
+        '/companyApi/department/listTree',
+        { CORPINFO_ID: this.$parent.SUPERVISE_CORPINFO_ID }
+      ).then((data) => {
+        this.companyTreeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+
+    handleShow(row) {
+      this.$refs.users.init(row)
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flowApply/components/sendUtil.vue b/src/views/xgf/flowApply/components/sendUtil.vue
new file mode 100644
index 0000000..a7fdb5b
--- /dev/null
+++ b/src/views/xgf/flowApply/components/sendUtil.vue
@@ -0,0 +1,67 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
+      <el-form>
+        <el-form-item prop="TERRITORIALITY" label="是否通过 ">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option label="是" value="1"/>
+            <el-option label="否" value="0"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">关 闭</el-button>
+        <el-button type="primary" @click="sendMessage()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import Treeselect from '@riophae/vue-treeselect'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { Treeselect, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      value: null,
+      heirloom: {}
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.heirloom = JSON.stringify(e)
+    },
+    beforeClose() {
+    },
+    sendMessage(row) {
+      requestFN(
+        '/xgf/user/approve',
+        {
+          list: this.heirloom,
+          STATUS: this.value,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.$message.success('推送成功')
+        this.visible = false
+        this.$emit('refresh', '')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowApply/components/user.vue b/src/views/xgf/flowApply/components/user.vue
new file mode 100644
index 0000000..889dc08
--- /dev/null
+++ b/src/views/xgf/flowApply/components/user.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px">
+      <div v-for="item in peopleList" :key="item.CLASS_INFO_ID" style="height: 220px">
+        <div class="bg_table">
+          <div class="title">相关方安全告知培训合格证</div>
+          <div class="red">{{ item.CLASS_NO }}</div>
+          <table class="table">
+            <tr>
+              <td style="width: 120px">
+                <div class="text textone name">姓名</div>
+              </td>
+              <td style="width: 100px;">
+                <div class="text text1 tcenter">{{ item.NAME }}</div>
+              </td>
+              <td style="width: 86px">
+                <div class="text text2 tcenter">工种</div>
+              </td>
+              <td style="width: 148px;">
+                <div v-if="item.JOBS_TYPE" class="text tcenter ">{{ item.JOBS_TYPE }}</div>
+                <div v-else>暂无</div>
+              </td>
+              <td rowspan="4" style="width: 134px;">
+                <img v-if="!getShowPicture(item)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 116px; height: 146px">
+                <img v-if="getShowPicture(item)" :src="config.fileUrl + item.PHOTO" alt="" style="width: 116px; height: 146px" @click="openPicture(config.fileUrl + item.PHOTO)">
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">资质</div>
+              </td>
+              <td colspan="3">
+                <div v-if="item.CERTIFICATE" class="text">{{ item.CERTIFICATE }}</div>
+                <div v-else>暂无</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">培训时间</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.OPENING_TIME }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">有效期限</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.VALIDITY_PERIOD_END }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">所在单位</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
+              </td>
+              <td rowspan="3" style="padding-top: 6px" @click="click(config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID)">
+                <vue-qr :text="config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">身份证号</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.CARD_ID }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">手机</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.PHONE }}</div>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </el-dialog>
+    <QRCode ref="QRcode" append-to-body/>
+    <Picture ref="Picture" append-to-body/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import QRCode from './QRCode.vue'
+import Picture from './picture.vue'
+
+export default {
+  components: { QRCode, Picture, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      config: config,
+      visible: false,
+      peopleList: [],
+      CLASS_MESSAGE_ID: '',
+      CLASS_INFO_ID: '',
+      USER_ID: '',
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      console.info(e)
+      if (e && e.CLASS_INFO_ID) {
+        this.CLASS_INFO_ID = e.CLASS_INFO_ID
+      }
+      if (e && e.CLASS_MESSAGE_ID) {
+        this.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
+      }
+      if (e && e.USER_ID) {
+        this.USER_ID = e.USER_ID
+      }
+      this.qrCodeStr = config.messageUrl + '?CLASS_INFO_ID=' + this.CLASS_INFO_ID
+      this.visible = true
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN('/trainusers/getUserinfoList', {
+        CLASS_INFO_ID: this.CLASS_INFO_ID,
+        CLASS_MESSAGE_ID: this.CLASS_MESSAGE_ID,
+        USER_ID: this.USER_ID
+      })
+        .then((data) => {
+          this.peopleList = data.list
+        }).catch((e) => {
+          console.log(e)
+        })
+    },
+    getShowPicture(row) {
+      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
+        return true
+      }
+    },
+    click(e) {
+      this.$refs.QRcode.init({ qrCodeStr: e })
+    },
+    openPicture(src) {
+      this.$refs.Picture.init({ src: src })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.name{
+  width: 120px;
+  overflow: hidden;//溢出隐藏
+  white-space: nowrap; // 强制一行显示
+  text-overflow: ellipsis;// 显示。。。省略号
+}
+.red {
+  width: 660px;
+  color: #ff0000;
+  margin-left: 34px;
+  font-size: 24px;
+}
+
+.bg_table {
+  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
+  background-size: 100%;
+  width: 660px;
+  height: 430px;
+  border: 4px solid #453d3a;
+  transform: scale(0.5);
+  transform-origin: top left;
+
+  .title {
+    font-size: 28px;
+    text-align: center;
+    margin-top: 34px;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .table {
+    border-collapse: collapse;
+    width: 590px;
+    color: #453d3a;
+    font-size: 20px;
+    margin: 34px;
+    text-align: left;
+    margin-top: 10px;
+
+    .tcenter {
+      text-align: center
+    }
+
+    .w60 {
+      width: 100px;
+    }
+
+    .w74 {
+      width: 148px
+    }
+
+    th, td {
+      border: 2px solid #453d3a;
+      text-align: left;
+      height: 40px;
+      padding: 0 16px;
+
+      box-sizing: border-box;
+
+      .textone {
+        width: 80px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+      }
+
+      .text1 {
+        width: 60px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text2 {
+        width: 50px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text {
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
new file mode 100644
index 0000000..6a38268
--- /dev/null
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      v-if="visible"
+      :visible.sync="visible"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div v-if="false">
+        <div class="level-title">
+          <h1>培训记录</h1>
+        </div>
+        <el-table
+          :data="trainRecordList"
+          :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+          tooltip-effect="dark"
+          border
+          fit
+          highlight-current-row>
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="50" align="center"/>
+          <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+          <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+          <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+          <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+          <el-table-column label="培训有效期" align="center">
+            <template slot-scope="{row}">
+              <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+          <h1>特种作业人员信息</h1>
+        </div>
+        <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+          <tr>
+            <th style="width: 150px">证书名称</th>
+            <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+            <th style="width: 150px">作业类别</th>
+            <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+            <th style="width: 150px">操作项目</th>
+            <td>{{ item.OPERATION_TYPE_NAME }}</td>
+          </tr>
+          <tr>
+            <th>特种作业证书编号</th>
+            <td>{{ item.SPECIAL_NUMBER }}</td>
+            <th>发证机关</th>
+            <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+          </tr>
+          <tr>
+            <th>复审时间</th>
+            <td>{{ item.REVIEW_TIME }}</td>
+            <th>有效期</th>
+            <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+          </tr>
+        </table>
+        <div
+          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+          class="level-title mt-20">
+          <h1>打回信息</h1>
+        </div>
+        <table
+          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+          class="table-ui"
+          style="margin-bottom: 20px;">
+          <tr>
+            <th>打回人</th>
+            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+            <td
+              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+              {{ detailForm.TERRITORIALITY_USER_NAME }}
+            </td>
+            <th>打回原由</th>
+            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+            <td
+              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+              {{ detailForm.TERRITORIALITY_OPINION }}
+            </td>
+          </tr>
+        </table>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="visible = false">关 闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      imgUrl: '',
+      userDetailForm: {},
+      userCardIDPhotoFile: [], // 身份证照片
+      trainRecordList: [],
+      detailForm: {},
+      photosOfLevel: [], // 三级教育照片
+      specialUsersList: {},
+      insuranceFileList: [], // 保险文件
+      contractFileList: [],
+      socialPhotoFile: [],
+      gongshangbaoxianFile: [],
+      userEntryForm: {},
+      loading: false,
+      heirloom: {},
+      config: config
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.heirloom = JSON.parse(JSON.stringify(e))
+      this.getUserInfoById(this.heirloom)
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getUserInfoById(row) {
+      this.loading = true
+      requestFN(
+        'user/getDetailByUserIdAndCorpInfoId',
+        {
+          USER_ID: row.USER_ID,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+        }
+      ).then((data) => {
+        Object.assign(this.userDetailForm, data.pd)
+        this.userPhotoFile = data.userPhotoFile
+        if (this.userPhotoFile.length > 0) {
+          this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+        }
+        this.photosOfLevel = data.photosOfLevel
+        this.specialUsersList = data.specialUsers
+        this.insuranceFileList = data.insuranceFile
+        this.contractFileList = data.contractFile
+        this.userCardIDPhotoFile = data.userCardIDPhotoFile
+        this.socialPhotoFile = data.socialPhotoFile
+        this.gongshangbaoxianFile = data.gongshangbaoxianFile
+        // qr内容初始化
+        if (row.STATUS === '2') {
+          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
+        } else {
+          this.qrCodeStr = ''
+        }
+
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: row.USER_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          this.detailForm = Object.assign(this.detailForm, data.userDetail)
+          this.trainRecordList = data.recordList
+          this.loading = false
+        }).catch((e) => {
+          console.log(e)
+        })
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowApply/components/users.vue b/src/views/xgf/flowApply/components/users.vue
new file mode 100644
index 0000000..2d11653
--- /dev/null
+++ b/src/views/xgf/flowApply/components/users.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-dialog
+      v-if="visible"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      :append-to-body="true"
+      title="申请详情"
+      width="60%">
+      <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
+        <h1>申请信息</h1>
+      </div>
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 17%">申请人</th>
+          <td style="width: 17%">{{ pd.CREATOR }}</td>
+          <th style="width: 17%">申请时间</th>
+          <td style="width: 17%">{{ pd.CREATTIME }}</td>
+          <th style="width: 17%">备注</th>
+          <td style="width: 15%">{{ pd.DESCR }}</td>
+        </tr>
+        <tr>
+          <th style="width: 30px">安监部门</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
+          <th style="width: 30px">审核人</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_USER_NAME }}</td>
+          <th style="width: 30px">审核时间</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_TIME }}</td>
+        </tr>
+        <tr>
+          <th>主管部门</th>
+          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.MANAGER_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.MANAGER_TIME }}</td>
+        </tr>
+        <tr>
+          <th>属地管理部门</th>
+          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.TERRITORIALITY_TIME }}</td>
+        </tr>
+        <tr v-if="pd.AUDIT_DESCR">
+          <th>股份公司意见</th>
+          <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
+        </tr>
+        <tr v-if="pd.CORP_AUDIT_DESCR">
+          <th>分公司意见</th>
+          <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>申请人员列表</h1>
+      </div>
+      <el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="USERNAME" label="用户名" align="center" />
+        <el-table-column prop="NAME" label="姓名" align="center" />
+        <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" />
+        <el-table-column prop="STATE" label="审核状态" align="center" >
+          <template slot-scope="{row}">
+            <el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag>
+            <el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
+            <el-tag v-else type="success">待审核</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200" >
+          <template slot-scope="{row}">
+            <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeWindow">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-if="userInfoDialog"
+      :visible.sync="userInfoDialog"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>培训记录</h1>
+      </div>
+      <el-table
+        :data="trainRecordList"
+        :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center"/>
+        <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+        <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+        <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+        <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+        <el-table-column label="培训有效期" align="center">
+          <template slot-scope="{row}">
+            <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+        <h1>特种作业人员信息</h1>
+      </div>
+      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 150px">证书名称</th>
+          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+          <th style="width: 150px">作业类别</th>
+          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+          <th style="width: 150px">操作项目</th>
+          <td>{{ item.OPERATION_TYPE_NAME }}</td>
+        </tr>
+        <tr>
+          <th>特种作业证书编号</th>
+          <td>{{ item.SPECIAL_NUMBER }}</td>
+          <th>发证机关</th>
+          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+        </tr>
+        <tr>
+          <th>复审时间</th>
+          <td>{{ item.REVIEW_TIME }}</td>
+          <th>有效期</th>
+          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+        </tr>
+      </table>
+      <div
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="level-title mt-20">
+        <h1>打回信息</h1>
+      </div>
+      <table
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="table-ui"
+        style="margin-bottom: 20px;">
+        <tr>
+          <th>打回人</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_USER_NAME }}
+          </td>
+          <th>打回原由</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_OPINION }}
+          </td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="userInfoDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
+      <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
+        <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="QRCodeDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+  components: {
+    Pagination,
+    vueQr
+  },
+  data() {
+    return {
+      config: config,
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      userInfoDialog: false,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      userEntryForm: {},
+      specialUsersList: {},
+      imgUrl: '',
+      wenhuachengduList: [], // 文化程度
+      userCardIDPhotoFile: [], // 身份证照片
+      postList: [], // 岗位名称
+      trainRecordList: [], // 培训记录
+      visible: false,
+      pd: {},
+      userList: [],
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      photosOfLevel: []
+    }
+  },
+  methods: {
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    init(e) {
+      if (e) {
+        this.pd = e
+      }
+      this.visible = true
+      this.userList = []
+      this.getDict()
+      this.getUserList()
+    },
+    // 获取数据字典数据
+    getDict: function() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '1144b16d85f14b108ea7859e2be9d001'
+        }
+      ).then((data) => {
+        this.flowAreaList = data.list
+      }).catch((e) => {
+
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    // 人员
+    getUserList() {
+      requestFN(
+        '/trainingbatch/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID
+        }
+      ).then((data) => {
+        this.userList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+      })
+    },
+    // 二维码
+    showQRCode(id) {
+      this.QRCodeDialog = true
+      const arr = [{ USER_ID: id, CODE_TYPE: '1' }]
+      this.qrcodeStr = JSON.stringify(arr)
+    },
+    // 查看
+    async handleShow(USER_ID) {
+      await this.getUserInfoById(USER_ID)
+      await this.getOtherUserInfoById(USER_ID)
+      this.userInfoDialog = true
+    },
+    getUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: id,
+            TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          if (this.userDetailForm.PHOTO) {
+            this.imgUrl = config.fileUrl + this.userDetailForm.PHOTO
+          }
+          this.trainRecordList = data.recordList
+          // this.insuranceFileList = data.insuranceFile
+          // this.contractFileList = data.contractFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    getOtherUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          'user/getDetailByUserIdAndCorpInfoId',
+          {
+            USER_ID: id,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+            CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+          }
+        ).then((data) => {
+          Object.assign(this.userDetailForm, data.pd)
+          this.userPhotoFile = data.userPhotoFile
+          if (this.userPhotoFile.length > 0) {
+            this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+          }
+          this.insuranceFileList = data.insuranceFile
+          this.specialUsersList = data.specialUsers
+          this.contractFileList = data.contractFile
+          this.userCardIDPhotoFile = data.userCardIDPhotoFile
+          this.socialPhotoFile = data.socialPhotoFile
+          this.gongshangbaoxianFile = data.gongshangbaoxianFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    // 转换是否
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    },
+    // 转换字典数据
+    formatDictioariesLabel(value, type) {
+      var list = []
+      if (type == '0') {
+        list = this.wenhuachengduList
+      } else if (type == '1') {
+        list = this.postList
+      }
+      if (value) {
+        if (list.length > 0) {
+          var data = ''
+          for (let i = 0; i < list.length; i++) {
+            const obj = list[i]
+            if (value == obj.BIANMA) {
+              data = obj.NAME
+              break
+            }
+          }
+          return data
+        } else {
+          return value
+        }
+      } else {
+        return ''
+      }
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flowApply/index.vue b/src/views/xgf/flowApply/index.vue
new file mode 100644
index 0000000..70cda6e
--- /dev/null
+++ b/src/views/xgf/flowApply/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import Record from './components/record'
+export default {
+  components: {
+    List: List,
+    Record: Record
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 0e7c6e0c72f35081eb1ada4f30145002d57be184 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 20 Dec 2023 14:49:01 +0800
Subject: [PATCH 06/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/apply.vue |   7 +-
 src/views/xgf/flow_audit/index.vue           |  20 +-
 src/views/xgf/flow_audit/users.vue           | 309 ++++---------------
 3 files changed, 77 insertions(+), 259 deletions(-)

diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
index 6775299..b9835f9 100644
--- a/src/views/xgf/flowApply/components/apply.vue
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -247,7 +247,6 @@ export default {
       }).catch((e) => {
       })
     },
-
     save() {
       this.$refs.form.validate(valid => {
         if (valid) {
@@ -255,11 +254,14 @@ export default {
           this.form.USER_COUNT = this.users.length
           this.form.AUDIT_STATUS = 0
           this.form.TYPE = 2
+          const userIds = this.users.map((item) => { return item.XGF_USER_ID })
           requestFN(
             '/trainingbatch/add',
             {
               ...this.form,
-              users: this.users.join(',')
+              users: userIds.join(','),
+              BELONG_TO_CORP: this.users[0].BELONG_TO_CORP,
+              BELONG_TO_CORP_NAME: this.users[0].BELONG_TO_CORP_NAME
             }
           ).then((data) => {
             this.loading = false
@@ -278,6 +280,7 @@ export default {
     },
     handleClose() {
       this.visible = false
+      this.$emit('refresh', '')
     },
     closeWindow() {
       this.visible = false
diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index 2cc1e97..bf75d0d 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -1,4 +1,4 @@
-<template>
+flowTrain/batchList<template>
   <div class="app-container">
     <el-form label-width="100px">
       <el-row>
@@ -35,11 +35,11 @@
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称" />
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="相关方单位名称" />
       <el-table-column prop="CREATTIME" label="申请时间" />
       <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部" />
       <el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" />
-      <el-table-column prop="MAIN_DEPARTMENT_NAME" label="主管部门" />
+      <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" />
       <el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" />
       <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
       <el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
@@ -58,7 +58,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button v-if="(row.AUDIT_STATUS === 1 || row.AUDIT_STATUS === 0 ) && (row.MANAGER_USER_ID === USER_ID && row.managerCount !== row.USER_COUNT ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.territorialityCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAININGBATCH_ID)">审核</el-button>
+          <el-button v-if="judge(row)" type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAINING_BATCH_ID)">审核</el-button>
           <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.TRAININGBATCH_ID)">查看</el-button>
         </template>
       </el-table-column>
@@ -145,6 +145,18 @@ export default {
 
     handleShow(id) {
       this.$refs.users.init(id, '0')
+    },
+    judge(row) {
+      if (row.STEP_STATUS === '0') {
+        return this.USER_ID === row.TERRITORIALITY_USER_ID
+      }
+      if (row.STEP_STATUS === '1') {
+        return this.USER_ID === row.MANAGER_USER_ID
+      }
+      if (row.STEP_STATUS === '2') {
+        return this.USER_ID === row.SUPERVISION_USER_ID
+      }
+      return false
     }
   }
 }
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index a91766a..090301c 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -22,7 +22,7 @@
 
         <tr>
           <th>安全监督部门</th>
-          <td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
+          <td>{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
           <th>审核人员</th>
           <td>{{ pd.SUPERVISION_USER_NAME }}</td>
           <th>审核时间</th>
@@ -30,7 +30,7 @@
         </tr>
         <tr>
           <th>主管部门</th>
-          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
+          <td>{{ pd.MANAGER_DEPARTMENT_NAME }}</td>
           <th>审核人员</th>
           <td>{{ pd.MANAGER_USER_NAME }}</td>
           <th>审核时间</th>
@@ -38,9 +38,9 @@
         </tr>
         <tr>
           <th>集团单位</th>
-          <td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
+          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
           <th>审核人员</th>
-          <td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
+          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
           <th>审核时间</th>
           <td>{{ pd.TERRITORIALITY_TIME }}</td>
         </tr>
@@ -65,8 +65,8 @@
         <el-table-column type="index" label="序号" width="50" align="center"/>
         <el-table-column prop="USERNAME" label="用户名"/>
         <el-table-column prop="NAME" label="姓名"/>
-        <el-table-column prop="DEPARTMENT_NAME" label="部门"/>
-        <el-table-column prop="STATUS" label="评审状态">
+        <el-table-column prop="BELONG_TO_CORP_NAME" label="部门"/>
+        <el-table-column prop="STUDY_STATUS" label="评审状态">
           <template slot-scope="{row}">
             <span>{{ getType(row) }}</span>
           </template>
@@ -74,20 +74,8 @@
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="{row}">
             <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
-            <el-button
-              v-if="row.STATUS === 2 && row.TRAIN_STATUS === '1' && row.SUPERVISION_STATE == 1 && row.MANAGER_STATE == 1 && row.TERRITORIALITY_STATE==1"
-              type="success"
-              icon="el-icon-edit"
-              size="mini"
-              @click="getUserInfo(row)">电子合格证
-            </el-button>
-            <el-button
-              v-if="(row.STATUS === 0 || row.STATUS === 1) && viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS))) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0"
-              type="success"
-              icon="el-icon-edit"
-              size="mini"
-              @click="examineShow(row)">审核
-            </el-button>
+            <el-button v-if="row.STATUS === 2" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
+            <el-button v-if="row[pd.step] === 9" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -97,173 +85,9 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeWindow">关 闭</el-button>
+        <el-button type="primary" @click="comfirm">确定提交审批</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      v-if="userInfoDialog"
-      :visible.sync="userInfoDialog"
-      :append-to-body="true"
-      title="查看"
-      width="60%">
-      <table class="table-ui" style="margin-bottom: 20px;">
-        <div class="level-title">
-          <h1>人员信息</h1>
-        </div>
-        <tr>
-          <th>照片</th>
-          <td>
-            <span v-if="imgUrl != ''">
-              <div class="img-flex">
-                <viewer>
-                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-            <span v-else/>
-          </td>
-          <th>姓名</th>
-          <td>{{ userDetailForm.NAME }}</td>
-          <th>性别</th>
-          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-        </tr>
-        <tr>
-          <th>出生年月</th>
-          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-          <th>年龄</th>
-          <td>{{ userDetailForm.AGE }}</td>
-          <th>手机号</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>身份证</th>
-          <td>{{ userDetailForm.CARD_ID }}</td>
-          <th>身份证照片</th>
-          <!--if条件不可删除-->
-          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in userCardIDPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-
-        <tr>
-          <th>民族</th>
-          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-          <th>婚姻状况</th>
-          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-          <th>政治面貌</th>
-          <td>{{ userDetailForm.zzName }} {{
-            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-          }}
-          </td>
-        </tr>
-
-        <tr>
-          <th>户口所在地</th>
-          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-          <th>现住址</th>
-          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-          <th>联系电话</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>文化程度</th>
-          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-          <th>岗位名称(工种)</th>
-          <td colspan="3">{{ userDetailForm.POST_ID }}</td>
-        </tr>
-        <tr>
-          <th>是否缴纳社保</th>
-          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in socialPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否参加三级安全培训</th>
-          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in photosOfLevel"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否缴纳保险</th>
-          <td>{{ formatLabelBf(userDetailForm.IS_BF) }}</td>
-          <th>是否特殊工种</th>
-          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-          <th>是否流动人员</th>
-          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-        </tr>
-      </table>
-
-      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-        <h1>特种作业人员信息</h1>
-      </div>
-      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-        <tr>
-          <th style="width: 150px">证书名称</th>
-          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-          <th style="width: 150px">作业类别</th>
-          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-          <th style="width: 150px">操作项目</th>
-          <td>{{ item.OPERATION_TYPE_NAME }}</td>
-        </tr>
-        <tr>
-          <th>特种作业证书编号</th>
-          <td>{{ item.SPECIAL_NUMBER }}</td>
-          <th>发证机关</th>
-          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-        </tr>
-        <tr>
-          <th>复审时间</th>
-          <td>{{ item.REVIEW_TIME }}</td>
-          <th>有效期</th>
-          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-        </tr>
-      </table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="userInfoDialog = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
     <el-dialog :visible.sync="dialogVisible" title="审核">
       <el-form ref="StreetListingForm" :model="form" label-width="110px" style="width: 500px;">
         <el-form-item label="审核是否通过" prop="IS_LISTING">
@@ -300,13 +124,10 @@ export default {
     return {
       USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
       config: config,
-      userInfoDialog: false,
       userDetailForm: {},
       imgUrl: '',
-      wenhuachengduList: [], // 文化程度
       gongshangbaoxianFile: [],
       photosOfLevel: [],
-      postList: [], // 岗位名称
       visible: false,
       pd: {},
       userList: [],
@@ -316,13 +137,13 @@ export default {
         page: 1,
         limit: 20
       },
-      TRAININGBATCH_ID: '',
+      TRAININ_GBATCH_ID: '',
       total: 0,
       viewState: '0',
       dialogVisible: false,
       form: {
-        TRAININGBATCH_ID: this.TRAININGBATCH_ID,
-        TRAINUSERS_ID: '', // 培训批次 详情id
+        TRAINING_BATCH_ID: this.TRAINING_BATCH_ID,
+        TRAIN_USERS_ID: '', // 培训批次 详情id
         USER_COUNT: '', // 批次的人数
         type: 2,
         IS_STATE: 1,
@@ -337,15 +158,16 @@ export default {
   },
   methods: {
     init(id, viewState) {
-      this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
-      this.form.TRAINUSERS_ID = ''
+      console.log(id, viewState)
+      this.form.TRAINING_BATCH_ID = this.TRAINING_BATCH_ID
+      this.form.TRAIN_USERS_ID = ''
       this.form.USER_COUNT = ''
       this.form.type = '2'
       this.form.IS_STATE = 1
       this.form.OPINION = ''
       this.viewState = viewState
       if (id) {
-        this.TRAININGBATCH_ID = id
+        this.TRAINING_BATCH_ID = id
         this.getDataById(id)
         this.getUserList(id)
       }
@@ -353,31 +175,11 @@ export default {
       this.visible = true
       this.userList = []
     },
-    /** 根据id 获取数据  **/
-    formatLabelBf(value) {
-      if (value) {
-        var valList = value.split(',')
-        var label = []
-        for (let i = 0; i < valList.length; i++) {
-          if (valList[i] == 0) {
-            label.push('无')
-            break
-          }
-          if (valList[i] == 1) {
-            label.push('商业保险')
-          }
-          if (valList[i] == 2) {
-            label.push('工伤保险')
-          }
-        }
-        return label.join(',')
-      }
-    },
     getDataById(id) {
       requestFN(
         '/flowTrain/getDetailsById',
         {
-          TRAININGBATCH_ID: id
+          TRAINING_BATCH_ID: id
         }
       ).then((data) => {
         this.pd = data.pd
@@ -387,16 +189,6 @@ export default {
     getUserInfo(row) {
       this.$refs.userInfo.init(row)
     },
-    // 转换是否
-    formatLabel(value) {
-      if (value == '1') {
-        return '是'
-      } else if (value == '0') {
-        return '否'
-      } else {
-        return ''
-      }
-    },
     // 查看
     async handleShow(row) {
       await this.getUserInfoById(row.USER_ID)
@@ -422,16 +214,12 @@ export default {
       }
     },
     examineShow(row) {
-      this.form.TRAINUSERS_ID = row.TRAINUSERS_ID
-      this.form.USER_COUNT = this.pd.USER_COUNT
-      this.form.type = '2'
-      this.form.USER_ID = row.USER_ID
-      this.form.STEP_STATUS = row.STEP_STATUS
+      this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID
       this.dialogVisible = true
     },
     // 提交审批意见
     approve() {
-      this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
+      this.form.TRAINING_BATCH_ID = this.TRAININ_GBATCH_ID
       if (!(this.form.IS_STATE === 1 || this.form.IS_STATE === 0)) {
         this.$message.error('请先择')
         return
@@ -445,18 +233,17 @@ export default {
       requestFN(
         '/flowTrain/approveUser', { ...this.form }
       ).then((data) => {
-        if (data.result == 'success') {
+        if (data.result === 'success') {
           this.$message.success('审批成功')
-          this.init(this.TRAININGBATCH_ID, this.viewState)
-        } else if (data.result == 'exception') {
-          // showException('按钮权限', data.exception)// 显示异常
+          this.init(this.TRAINING_BATCH_ID, this.viewState)
+        } else if (data.result === 'exception') {
           this.$message({
             message: data.msg,
             type: 'success'
           })
         }
-        this.getUserList(this.TRAININGBATCH_ID)
-        this.getDataById(this.TRAININGBATCH_ID)
+        this.getUserList(this.TRAINING_BATCH_ID)
+        this.getDataById(this.TRAINING_BATCH_ID)
         this.dialogVisible = false
       }).catch((e) => {
       })
@@ -496,7 +283,7 @@ export default {
       requestFN(
         '/flowTrain/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          TRAININGBATCH_ID: id
+          TRAINING_BATCH_ID: id
         }
       ).then((data) => {
         this.userList = data.varList
@@ -513,25 +300,41 @@ export default {
       this.handleClose()
     },
     getType(row) {
-      if (row.SUPERVISION_STATE === 9 && row.MANAGER_STATE === 9 && row.TERRITORIALITY_STATE === 9) {
-        return '未评审'
+      if (row.RESULT_STATUS === 1) {
+        return '审批中'
       }
-      if (row.SUPERVISION_STATE === 1 && row.MANAGER_STATE === 1 && row.TERRITORIALITY_STATE === 1) {
-        return '通过'
+      if (row.RESULT_STATUS === 2) {
+        return '审批通过'
       }
-      if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) {
-        return '未通过'
-      }
-      if ((row.SUPERVISION_STATE === 1 || row.MANAGER_STATE === 1 || row.TERRITORIALITY_STATE === 1) &&
-        (row.SUPERVISION_STATE === 9 || row.MANAGER_STATE === 9 || row.TERRITORIALITY_STATE === 9) &&
-        !(row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0)) {
-        return '评审中'
+      if (row.RESULT_STATUS === 3) {
+        return '审批不通过'
       }
     },
-    tableRowClassName({ row, rowIndex }) {
-      if (row.STEP_STATUS === '3') {
-        return 'warning-row'
-      }
+    comfirm() {
+      this.$confirm('确定提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/flowTrain/endApproval',
+          {
+            TRAINING_BATCH_ID: this.TRAINING_BATCH_ID
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            this.$message.success('提交成功')
+            this.init(this.TRAINING_BATCH_ID, this.viewState)
+          } else if (data.result == 'exception') {
+            this.$message({
+              message: data.msg,
+              type: 'success'
+            })
+          }
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
     }
   }
 }

From d466a36339790df2101f07c681de9e06eb87bc5e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 20 Dec 2023 15:01:46 +0800
Subject: [PATCH 07/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_audit/index.vue |  6 +++---
 src/views/xgf/flow_audit/users.vue | 33 +++++++++++-------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index bf75d0d..382f587 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -59,7 +59,7 @@ flowTrain/batchList<template>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <el-button v-if="judge(row)" type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAINING_BATCH_ID)">审核</el-button>
-          <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.TRAININGBATCH_ID)">查看</el-button>
+          <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow({id:row.TRAINING_BATCH_ID,vectory:judge(row)})">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -143,8 +143,8 @@ export default {
       this.$refs.users.init(id, '1')
     },
 
-    handleShow(id) {
-      this.$refs.users.init(id, '0')
+    handleShow(e) {
+      this.$refs.users.init(e.id, '0', e.vectory)
     },
     judge(row) {
       if (row.STEP_STATUS === '0') {
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 090301c..b587060 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -85,7 +85,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeWindow">关 闭</el-button>
-        <el-button type="primary" @click="comfirm">确定提交审批</el-button>
+        <el-button v-if="vectory" type="primary" @click="comfirm">确定提交审批</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogVisible" title="审核">
@@ -153,12 +153,13 @@ export default {
       heirloom: {},
       specialUsersList: {},
       message: '',
-      operator: ''
+      operator: '',
+      vectory: false
     }
   },
   methods: {
-    init(id, viewState) {
-      console.log(id, viewState)
+    init(id, viewState, vectory) {
+      this.vectory = vectory
       this.form.TRAINING_BATCH_ID = this.TRAINING_BATCH_ID
       this.form.TRAIN_USERS_ID = ''
       this.form.USER_COUNT = ''
@@ -255,23 +256,18 @@ export default {
           {
             USER_ID: id,
             CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
-            // CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
           }
         ).then((data) => {
           this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
           this.listLoading = false
-          // this.userDetailForm = Object.assign(this.userDetailForm, data.pd)
           this.userPhotoFile = data.userPhotoFile
           if (this.userPhotoFile.length > 0) {
             this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
           }
-          // this.insuranceFileList = data.insuranceFile
-          // this.contractFileList = data.contractFile
           this.photosOfLevel = data.photosOfLevel
           this.userCardIDPhotoFile = data.userCardIDPhotoFile
           this.socialPhotoFile = data.socialPhotoFile
           this.specialUsersList = data.specialUsers
-          // this.gongshangbaoxianFile = data.gongshangbaoxianFile
           resolve()
         }).catch((e) => {
           reject()
@@ -300,13 +296,14 @@ export default {
       this.handleClose()
     },
     getType(row) {
-      if (row.RESULT_STATUS === 1) {
+      console.log(row)
+      if (row.RESULT_STATUS === '1') {
         return '审批中'
       }
-      if (row.RESULT_STATUS === 2) {
+      if (row.RESULT_STATUS === '2') {
         return '审批通过'
       }
-      if (row.RESULT_STATUS === 3) {
+      if (row.RESULT_STATUS === '3') {
         return '审批不通过'
       }
     },
@@ -322,16 +319,10 @@ export default {
             TRAINING_BATCH_ID: this.TRAINING_BATCH_ID
           }
         ).then((data) => {
-          if (data.result == 'success') {
-            this.$message.success('提交成功')
-            this.init(this.TRAINING_BATCH_ID, this.viewState)
-          } else if (data.result == 'exception') {
-            this.$message({
-              message: data.msg,
-              type: 'success'
-            })
-          }
+          this.visible = false
+          this.handleClose()
         }).catch((e) => {
+          console.log(e)
         })
       }).catch(() => {
       })

From 41416cad216e40359a2f68818f3e313820797668 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 20 Dec 2023 15:57:27 +0800
Subject: [PATCH 08/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_audit/index.vue | 14 +++++++-------
 src/views/xgf/flow_audit/users.vue |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index 382f587..09d86e3 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -50,15 +50,15 @@ flowTrain/batchList<template>
       </el-table-column>
       <el-table-column prop="AUDIT_STATUS" label="申请状态" >
         <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.STEP_STATUS === '0'">集团单位审批中</span>
+          <span v-if="row.STEP_STATUS === '1'">股份主管部门审批中</span>
+          <span v-if="row.STEP_STATUS === '2'">股份安监部门审批中</span>
+          <span v-if="row.STEP_STATUS === '3'">审批通过</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button v-if="judge(row)" type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAINING_BATCH_ID)">审核</el-button>
+          <el-button v-if="judge(row)" type="success" icon="el-icon-edit" size="mini" @click="handleAudit({id:row.TRAINING_BATCH_ID,vectory:judge(row)})">审核</el-button>
           <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow({id:row.TRAINING_BATCH_ID,vectory:judge(row)})">查看</el-button>
         </template>
       </el-table-column>
@@ -139,8 +139,8 @@ export default {
         })
     },
 
-    handleAudit(id) {
-      this.$refs.users.init(id, '1')
+    handleAudit(e) {
+      this.$refs.users.init(e.id, '1', e.vectory)
     },
 
     handleShow(e) {
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index b587060..0205575 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -160,6 +160,7 @@ export default {
   methods: {
     init(id, viewState, vectory) {
       this.vectory = vectory
+      console.log(this.vectory)
       this.form.TRAINING_BATCH_ID = this.TRAINING_BATCH_ID
       this.form.TRAIN_USERS_ID = ''
       this.form.USER_COUNT = ''
@@ -236,7 +237,7 @@ export default {
       ).then((data) => {
         if (data.result === 'success') {
           this.$message.success('审批成功')
-          this.init(this.TRAINING_BATCH_ID, this.viewState)
+          this.init(this.TRAINING_BATCH_ID, this.viewState, this.vectory)
         } else if (data.result === 'exception') {
           this.$message({
             message: data.msg,

From 40422a86287657312f08311fb079d462d1fe9bab Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 20 Dec 2023 19:51:13 +0800
Subject: [PATCH 09/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/flowApply/components/userInfo.vue     | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 6a38268..79f9018 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -266,46 +266,47 @@ export default {
     getUserInfoById(row) {
       this.loading = true
       requestFN(
-        'user/getDetailByUserIdAndCorpInfoId',
+        '/xgf/user/getInfo',
         {
-          USER_ID: row.USER_ID,
+          XGF_USER_ID: row.XGF_USER_ID,
           CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
           CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
         }
       ).then((data) => {
-        Object.assign(this.userDetailForm, data.pd)
-        this.userPhotoFile = data.userPhotoFile
+        Object.assign(this.userDetailForm, data.info)
+        this.loading = false
+        /*        this.userPhotoFile = data.userPhotoFile
         if (this.userPhotoFile.length > 0) {
           this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
-        }
-        this.photosOfLevel = data.photosOfLevel
-        this.specialUsersList = data.specialUsers
-        this.insuranceFileList = data.insuranceFile
-        this.contractFileList = data.contractFile
-        this.userCardIDPhotoFile = data.userCardIDPhotoFile
-        this.socialPhotoFile = data.socialPhotoFile
-        this.gongshangbaoxianFile = data.gongshangbaoxianFile
+        }*/
+        // this.photosOfLevel = data.photosOfLevel
+        // this.specialUsersList = data.specialUsers
+        // this.insuranceFileList = data.insuranceFile
+        // this.contractFileList = data.contractFile
+        // this.userCardIDPhotoFile = data.userCardIDPhotoFile
+        // this.socialPhotoFile = data.socialPhotoFile
+        // this.gongshangbaoxianFile = data.gongshangbaoxianFile
         // qr内容初始化
-        if (row.STATUS === '2') {
-          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
-        } else {
-          this.qrCodeStr = ''
-        }
+        // if (row.STATUS === '2') {
+        //   this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
+        // } else {
+        //   this.qrCodeStr = ''
+        // }
 
-        requestFN(
-          '/user/getFloatPersonDetailById',
-          {
-            USER_ID: row.USER_ID,
-            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-          }
-        ).then((data) => {
-          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
-          this.detailForm = Object.assign(this.detailForm, data.userDetail)
-          this.trainRecordList = data.recordList
-          this.loading = false
-        }).catch((e) => {
-          console.log(e)
-        })
+        // requestFN(
+        //   '/user/getFloatPersonDetailById',
+        //   {
+        //     USER_ID: row.USER_ID,
+        //     CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+        //   }
+        // ).then((data) => {
+        //   this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+        //   this.detailForm = Object.assign(this.detailForm, data.userDetail)
+        //   this.trainRecordList = data.recordList
+        //   this.loading = false
+        // }).catch((e) => {
+        //   console.log(e)
+        // })
       }).catch((e) => {
         console.log(e)
       })

From 25b9ee79596836750fd10e1da59aa2e5a29471fd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 21 Dec 2023 13:58:55 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E7=BB=9F=E4=B8=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/flowApply/components/userInfo.vue     | 553 ++++++++++--------
 src/views/xgf/flow_audit/users.vue            |  27 +-
 2 files changed, 322 insertions(+), 258 deletions(-)

diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 79f9018..7f497ec 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -6,213 +6,303 @@
       :visible.sync="visible"
       :append-to-body="true"
       title="查看"
-      width="60%">
-      <table class="table-ui" style="margin-bottom: 20px;">
-        <div class="level-title">
-          <h1>人员信息</h1>
-        </div>
-        <tr>
-          <th>照片</th>
-          <td>
-            <span v-if="imgUrl != ''">
-              <div class="img-flex">
-                <viewer>
-                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-            <span v-else/>
-          </td>
-          <th>姓名</th>
-          <td>{{ userDetailForm.NAME }}</td>
-          <th>性别</th>
-          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-        </tr>
-        <tr>
-          <th>出生年月</th>
-          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-          <th>年龄</th>
-          <td>{{ userDetailForm.AGE }}</td>
-          <th>手机号</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>身份证</th>
-          <td>{{ userDetailForm.CARD_ID }}</td>
-          <th>身份证照片</th>
-          <!--if条件不可删除-->
-          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in userCardIDPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
+      width="80%">
+      <div class="information">
+        <el-scrollbar style="height: 550px;margin-bottom: 10px">
+          <table class="table-ui" style="margin-bottom: 20px;">
+            <div class="level-title">
+              <h1>人员信息</h1>
+            </div>
+            <tr>
+              <th>照片</th>
+              <td>
+                <span v-if="imgUrl != ''">
+                  <div class="img-flex">
+                    <viewer>
+                      <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+                <span v-else/>
+              </td>
+              <th>姓名</th>
+              <td>{{ userDetailForm.NAME }}</td>
+              <th>性别</th>
+              <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+            </tr>
+            <tr>
+              <th>出生年月</th>
+              <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+              <th>年龄</th>
+              <td>{{ userDetailForm.AGE }}</td>
+              <th>手机号</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>身份证</th>
+              <td>{{ userDetailForm.CARD_ID }}</td>
+              <th>身份证照片</th>
+              <!--if条件不可删除-->
+              <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in userCardIDPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
 
-        <tr>
-          <th>民族</th>
-          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-          <th>婚姻状况</th>
-          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-          <th>政治面貌</th>
-          <td>{{ userDetailForm.zzName }} {{
-            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-          }}
-          </td>
-        </tr>
+            <tr>
+              <th>民族</th>
+              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <th>婚姻状况</th>
+              <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+              <th>政治面貌</th>
+              <td>{{ userDetailForm.zzName }} {{
+                userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+              }}
+              </td>
+            </tr>
 
-        <tr>
-          <th>户口所在地</th>
-          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-          <th>现住址</th>
-          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-          <th>联系电话</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>文化程度</th>
-          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-          <th>岗位名称(工种)</th>
-          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
-        </tr>
-        <tr>
-          <th>是否缴纳社保</th>
-          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in socialPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
+            <tr>
+              <th>户口所在地</th>
+              <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+              <th>现住址</th>
+              <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+              <th>联系电话</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>文化程度</th>
+              <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+              <th>岗位名称(工种)</th>
+              <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+            </tr>
+            <tr>
+              <th>是否缴纳社保</th>
+              <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in socialPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否参加三级安全培训</th>
+              <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+              <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+              <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in photosOfLevel"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否缴纳保险</th>
+              <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+              <th>是否特殊工种</th>
+              <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+              <th>是否流动人员</th>
+              <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+            </tr>
+          </table>
+          <div>
+            <div class="level-title">
+              <h1>培训记录</h1>
+            </div>
+            <el-table
+              :data="trainRecordList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="selection" width="55" align="center"/>
+              <el-table-column type="index" label="序号" width="50" align="center"/>
+              <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+              <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+              <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+              <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+              <el-table-column label="培训有效期" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+              <h1>特种作业人员信息</h1>
+            </div>
+            <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+              <tr>
+                <th style="width: 150px">证书名称</th>
+                <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+                <th style="width: 150px">作业类别</th>
+                <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+                <th style="width: 150px">操作项目</th>
+                <td>{{ item.OPERATION_TYPE_NAME }}</td>
+              </tr>
+              <tr>
+                <th>特种作业证书编号</th>
+                <td>{{ item.SPECIAL_NUMBER }}</td>
+                <th>发证机关</th>
+                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+              </tr>
+              <tr>
+                <th>复审时间</th>
+                <td>{{ item.REVIEW_TIME }}</td>
+                <th>有效期</th>
+                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+              </tr>
+            </table>
+            <div v-if="applyList.length > 0" class="level-title mt-20">
+              <h1>申请信息</h1>
+            </div>
+            <el-table
+              v-if="applyList.length > 0"
+              :data="applyList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <el-row>
+                    <el-form label-position="left" inline class="demo-table-expand">
+                      <el-col :span="5">
+                        <el-form-item label="属地管理部门">
+                          <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批结果">
+                          <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
+                          <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.MANAGER_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
+                          <span v-if="props.row.MANAGER_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.MANAGER_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.SUPERVISION_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
+                          <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.SUPERVISION_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+                    </el-form>
+                  </el-row>
+                </template>
+              </el-table-column>
+              <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
+              <el-table-column prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="TERRITORIALITY_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
+                  <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
+              <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="MANAGER_STATE" label="审批人" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.MANAGER_STATE === 0">不通过</span>
+                  <span v-if="row.MANAGER_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
+              <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="SUPERVISION_STATE" label="审批人" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
+                  <span v-if="row.SUPERVISION_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">关 闭</el-button>
               </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否参加三级安全培训</th>
-          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in photosOfLevel"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否缴纳保险</th>
-          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
-          <th>是否特殊工种</th>
-          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-          <th>是否流动人员</th>
-          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-        </tr>
-      </table>
-      <div v-if="false">
-        <div class="level-title">
-          <h1>培训记录</h1>
-        </div>
-        <el-table
-          :data="trainRecordList"
-          :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-          tooltip-effect="dark"
-          border
-          fit
-          highlight-current-row>
-          <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column type="index" label="序号" width="50" align="center"/>
-          <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
-          <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
-          <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
-          <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-          <el-table-column label="培训有效期" align="center">
-            <template slot-scope="{row}">
-              <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-          <h1>特种作业人员信息</h1>
-        </div>
-        <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-          <tr>
-            <th style="width: 150px">证书名称</th>
-            <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-            <th style="width: 150px">作业类别</th>
-            <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-            <th style="width: 150px">操作项目</th>
-            <td>{{ item.OPERATION_TYPE_NAME }}</td>
-          </tr>
-          <tr>
-            <th>特种作业证书编号</th>
-            <td>{{ item.SPECIAL_NUMBER }}</td>
-            <th>发证机关</th>
-            <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-          </tr>
-          <tr>
-            <th>复审时间</th>
-            <td>{{ item.REVIEW_TIME }}</td>
-            <th>有效期</th>
-            <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-          </tr>
-        </table>
-        <div
-          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-          class="level-title mt-20">
-          <h1>打回信息</h1>
-        </div>
-        <table
-          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-          class="table-ui"
-          style="margin-bottom: 20px;">
-          <tr>
-            <th>打回人</th>
-            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
-            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
-            <td
-              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-              {{ detailForm.TERRITORIALITY_USER_NAME }}
-            </td>
-            <th>打回原由</th>
-            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
-            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
-            <td
-              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-              {{ detailForm.TERRITORIALITY_OPINION }}
-            </td>
-          </tr>
-        </table>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="visible = false">关 闭</el-button>
-        </div>
+            </el-table>
+          </div>
+        </el-scrollbar>
       </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取 消</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -237,14 +327,13 @@ export default {
       userDetailForm: {},
       userCardIDPhotoFile: [], // 身份证照片
       trainRecordList: [],
-      detailForm: {},
       photosOfLevel: [], // 三级教育照片
       specialUsersList: {},
       insuranceFileList: [], // 保险文件
       contractFileList: [],
       socialPhotoFile: [],
       gongshangbaoxianFile: [],
-      userEntryForm: {},
+      applyList: [],
       loading: false,
       heirloom: {},
       config: config
@@ -273,40 +362,27 @@ export default {
           CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
         }
       ).then((data) => {
-        Object.assign(this.userDetailForm, data.info)
         this.loading = false
-        /*        this.userPhotoFile = data.userPhotoFile
+        Object.assign(this.userDetailForm, data.info)
+        const picture = data.img
+        this.userPhotoFile = picture.userPhotoFile
         if (this.userPhotoFile.length > 0) {
           this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
-        }*/
-        // this.photosOfLevel = data.photosOfLevel
-        // this.specialUsersList = data.specialUsers
-        // this.insuranceFileList = data.insuranceFile
-        // this.contractFileList = data.contractFile
-        // this.userCardIDPhotoFile = data.userCardIDPhotoFile
-        // this.socialPhotoFile = data.socialPhotoFile
-        // this.gongshangbaoxianFile = data.gongshangbaoxianFile
-        // qr内容初始化
-        // if (row.STATUS === '2') {
-        //   this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
-        // } else {
-        //   this.qrCodeStr = ''
-        // }
-
-        // requestFN(
-        //   '/user/getFloatPersonDetailById',
-        //   {
-        //     USER_ID: row.USER_ID,
-        //     CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-        //   }
-        // ).then((data) => {
-        //   this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
-        //   this.detailForm = Object.assign(this.detailForm, data.userDetail)
-        //   this.trainRecordList = data.recordList
-        //   this.loading = false
-        // }).catch((e) => {
-        //   console.log(e)
-        // })
+        }
+        this.photosOfLevel = picture.photosOfLevel
+        this.specialUsersList = picture.specialUsers
+        this.insuranceFileList = picture.insuranceFile
+        this.contractFileList = picture.contractFile
+        this.userCardIDPhotoFile = picture.userCardIDPhotoFile
+        this.socialPhotoFile = picture.socialPhotoFile
+        this.gongshangbaoxianFile = picture.gongshangbaoxianFile
+        if (row.STATUS === '2') {
+          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
+        } else {
+          this.qrCodeStr = ''
+        }
+        this.trainRecordList = data.trainRecordList
+        this.applyList = data.applyList
       }).catch((e) => {
         console.log(e)
       })
@@ -326,3 +402,8 @@ export default {
 
 <style lang="scss" scoped>
 </style>
+<style scoped>
+.information >>> .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+</style>
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 0205575..d2d3aa5 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -107,6 +107,7 @@
       </span>
     </el-dialog>
     <user ref="userInfo" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
   </div>
 </template>
 
@@ -115,9 +116,11 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import user from './user.vue'
+import UserInfo from '../flowApply/components/userInfo.vue'
 
 export default {
   components: {
+    UserInfo,
     Pagination, user
   },
   data() {
@@ -192,28 +195,8 @@ export default {
       this.$refs.userInfo.init(row)
     },
     // 查看
-    async handleShow(row) {
-      await this.getUserInfoById(row.USER_ID)
-      this.userInfoDialog = true
-      this.heirloom = row
-      console.log(row.SUPERVISION_STATE, row.MANAGER_STATE, row.TERRITORIALITY_STATE)
-      if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) {
-        if (row.SUPERVISION_STATE === 0) {
-          this.message = row.SUPERVISION_OPINION
-          this.operator = row.SUPERVISION_USER_NAME
-        }
-        if (row.MANAGER_STATE === 0) {
-          this.message = row.MANAGER_OPINION
-          this.operator = row.MANAGER_USER_NAME
-        }
-        if (row.TERRITORIALITY_STATE === 0) {
-          this.message = row.TERRITORIALITY_OPINION
-          this.operator = row.TERRITORIALITY_USER_NAME
-        }
-      } else {
-        this.message = ''
-        this.operator = ''
-      }
+    handleShow(row) {
+      this.$refs.userInfos.init(row)
     },
     examineShow(row) {
       this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID

From f120b93b80d00562638d269d74c1f57540d8c3e7 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 21 Dec 2023 19:55:07 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/apply.vue | 2 +-
 src/views/xgf/flowApply/components/list.vue  | 3 ++-
 src/views/xgf/flow_audit/users.vue           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
index b9835f9..a3b5532 100644
--- a/src/views/xgf/flowApply/components/apply.vue
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -6,7 +6,7 @@
     title="培训申请"
     width="60%">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
+      <el-row v-if="false">
         <el-col :span="12">
           <el-form-item
             prop="TERRITORIALITY"
diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
index db3d5cb..20bec60 100644
--- a/src/views/xgf/flowApply/components/list.vue
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -139,7 +139,8 @@ export default {
         {
           KEYWORDS: this.KEYWORDS,
           STATUS: '2',
-          EMPLOY_FLAG: '1'
+          EMPLOY_FLAG: '1',
+          UN_STUDY_STATUS: '2'
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index d2d3aa5..01602bd 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -36,7 +36,7 @@
           <th>审核时间</th>
           <td>{{ pd.MANAGER_TIME }}</td>
         </tr>
-        <tr>
+        <tr v-if="pd.TERRITORIALITY_DEPARTMENT_NAME && pd.TERRITORIALITY_DEPARTMENT_NAME !== ''">
           <th>集团单位</th>
           <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
           <th>审核人员</th>

From 7d18e1bb2ae0f1ec76dae7fb86958b114296bb6d Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 13:39:09 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
index 20bec60..f5ec2c4 100644
--- a/src/views/xgf/flowApply/components/list.vue
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -140,7 +140,7 @@ export default {
           KEYWORDS: this.KEYWORDS,
           STATUS: '2',
           EMPLOY_FLAG: '1',
-          UN_STUDY_STATUS: '2'
+          STUDY_STATUS: '9'
         }
       ).then((data) => {
         this.listLoading = false

From 41fa0b4d39b472b2d49d03f8fe0e382225188ad5 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 13:53:24 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/apply.vue | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
index a3b5532..f748966 100644
--- a/src/views/xgf/flowApply/components/apply.vue
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -178,6 +178,27 @@ export default {
       if (e) {
         this.users = e
       }
+      // 判断是否有主管部门
+      for (let i; this.users.length > 0; i++) {
+        if (!this.users[0].MANAGER_DEPARTMENT_ID || this.users[0].MANAGER_DEPARTMENT_ID === '') {
+          this.$message({
+            message: '系统未指定主管部门，请将完善相关方信息',
+            type: 'error'
+          })
+          return false
+        }
+      }
+      // 判断主管部门是否一致
+      const warden = this.users[0].MANAGER_DEPARTMENT_ID
+      for (let i; this.users.length > 0; i++) {
+        if (warden !== this.users[i].MANAGER_DEPARTMENT_ID) {
+          this.$message({
+            message: '选择的人员(' + this.users[i].NAME + ')主管部门不一致，请重新选择',
+            type: 'error'
+          })
+          return false
+        }
+      }
       this.visible = true
       this.loading = false
       requestFN(

From f361d4558eb23118e49e57e1482d0e1c15c9a73a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 15:49:12 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/apply.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/xgf/flowApply/components/apply.vue b/src/views/xgf/flowApply/components/apply.vue
index f748966..3c96882 100644
--- a/src/views/xgf/flowApply/components/apply.vue
+++ b/src/views/xgf/flowApply/components/apply.vue
@@ -179,8 +179,8 @@ export default {
         this.users = e
       }
       // 判断是否有主管部门
-      for (let i; this.users.length > 0; i++) {
-        if (!this.users[0].MANAGER_DEPARTMENT_ID || this.users[0].MANAGER_DEPARTMENT_ID === '') {
+      for (let i; this.users.length > i; i++) {
+        if (!this.users[0].MAIN_DEPARTMENT_ID || this.users[0].MAIN_DEPARTMENT_ID === '') {
           this.$message({
             message: '系统未指定主管部门，请将完善相关方信息',
             type: 'error'
@@ -189,9 +189,9 @@ export default {
         }
       }
       // 判断主管部门是否一致
-      const warden = this.users[0].MANAGER_DEPARTMENT_ID
-      for (let i; this.users.length > 0; i++) {
-        if (warden !== this.users[i].MANAGER_DEPARTMENT_ID) {
+      const warden = this.users[0].MAIN_DEPARTMENT_ID
+      for (let i; this.users.length > i; i++) {
+        if (warden !== this.users[i].MAIN_DEPARTMENT_ID) {
           this.$message({
             message: '选择的人员(' + this.users[i].NAME + ')主管部门不一致，请重新选择',
             type: 'error'
@@ -205,7 +205,7 @@ export default {
         '/openApi/department/listTree',
         { CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, tm: new Date().getTime() }
       ).then((data) => {
-        this.form.MANAGER = this.users[0].MANAGER_DEPARTMENT_ID
+        this.form.MANAGER = this.users[0].MAIN_DEPARTMENT_ID
         this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
         this.getTreeData()
       })

From 7e0f9d22643c4b73501265601fbda10243129e24 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 17:07:44 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/list.vue        |  2 +-
 src/views/xgf/flow/components/sendUtil.vue    |  4 ++++
 src/views/xgf/flowApply/components/list.vue   |  2 +-
 .../xgf/flowApply/components/userInfo.vue     | 22 +++++++++----------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 636a33f..bf01575 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index a7fdb5b..cd9aab3 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -46,6 +46,10 @@ export default {
     beforeClose() {
     },
     sendMessage(row) {
+      if (this.value) {
+        this.$message.error('请选择是否通过')
+        return
+      }
       requestFN(
         '/xgf/user/approve',
         {
diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
index f5ec2c4..785481a 100644
--- a/src/views/xgf/flowApply/components/list.vue
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 7f497ec..a3cc60a 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -200,23 +200,23 @@
                 <template slot-scope="props">
                   <el-row>
                     <el-form label-position="left" inline class="demo-table-expand">
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item label="属地管理部门">
                           <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item label="审批人">
                           <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item label="审批结果">
                           <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
                           <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="9">
+                      <el-col v-if="false" :span="9">
                         <el-form-item label="审批意见">
                           <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
                         </el-form-item>
@@ -233,7 +233,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批人">
+                        <el-form-item label="审批结果">
                           <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
                           <span v-if="props.row.MANAGER_STATE ===1">通过</span>
                         </el-form-item>
@@ -255,7 +255,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批人">
+                        <el-form-item label="审批结果">
                           <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
                           <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
                         </el-form-item>
@@ -269,9 +269,9 @@
                   </el-row>
                 </template>
               </el-table-column>
-              <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
-              <el-table-column prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="TERRITORIALITY_STATE" label="审批结果" align="center">
+              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
                   <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
@@ -279,7 +279,7 @@
               </el-table-column>
               <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
               <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="MANAGER_STATE" label="审批人" align="center">
+              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.MANAGER_STATE === 0">不通过</span>
                   <span v-if="row.MANAGER_STATE ===1">通过</span>
@@ -287,7 +287,7 @@
               </el-table-column>
               <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
               <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="SUPERVISION_STATE" label="审批人" align="center">
+              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
                   <span v-if="row.SUPERVISION_STATE ===1">通过</span>

From 735338ed11b99919b31a189411eeb0d05cc07d53 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 23 Dec 2023 10:27:03 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index cd9aab3..720da2f 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="审批" width="370px" destroy-on-close>
       <el-form>
         <el-form-item prop="TERRITORIALITY" label="是否通过 ">
           <el-select v-model="value" placeholder="请选择">
@@ -46,7 +46,7 @@ export default {
     beforeClose() {
     },
     sendMessage(row) {
-      if (this.value) {
+      if (!this.value || this.value === '') {
         this.$message.error('请选择是否通过')
         return
       }

From b1d32efa490478a1c34324231c6d6191fce51fc2 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 23 Dec 2023 10:50:36 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowApply/components/list.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
index 785481a..eb97626 100644
--- a/src/views/xgf/flowApply/components/list.vue
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -30,11 +30,13 @@
       ref="multipleTable"
       :data="varList"
       :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      :row-key="getRowKeys"
       tooltip-effect="dark"
       border
       fit
-      highlight-current-row>
-      <el-table-column type="selection" width="55" align="center"/>
+      highlight-current-row
+      @selection-change="handleSelectionChange">
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
@@ -108,7 +110,8 @@ export default {
       STATUS: '',
       add: false,		// 新增按钮
       del: false,		// 删除按钮
-      edit: false	// 修改按钮
+      edit: false,	// 修改按钮
+      multipleSelection: []
     }
   },
   created() {
@@ -222,6 +225,12 @@ export default {
       }).catch((e) => {
         this.listLoading = false
       })
+    },
+    getRowKeys(row) {
+      return row.XGF_USER_ID
+    },
+    handleSelectionChange(val) {
+      console.log(val)
     }
   }
 }

From 206d7bd90c2075c8460a0ffaffb5d776501b491f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 23 Dec 2023 15:08:42 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_audit/users.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 01602bd..c3c504d 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -230,6 +230,15 @@ export default {
         this.getUserList(this.TRAINING_BATCH_ID)
         this.getDataById(this.TRAINING_BATCH_ID)
         this.dialogVisible = false
+        this.form = {
+          TRAINING_BATCH_ID: this.TRAINING_BATCH_ID,
+          TRAIN_USERS_ID: '',
+          USER_COUNT: '',
+          type: 2,
+          IS_STATE: 1,
+          OPINION: '',
+          USER_ID: ''
+        }
       }).catch((e) => {
       })
     },

From a1d226aae061b117727dbd5cbc8b7e58aaafc7ec Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 25 Dec 2023 18:17:08 +0800
Subject: [PATCH 19/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/userInfo.vue    | 546 ++++++++++--------
 .../xgf/flowApply/components/userInfo.vue     |  20 +-
 src/views/xgf/flowList/components/QRCode.vue  |  36 ++
 src/views/xgf/flowList/components/apply.vue   | 311 ++++++++++
 src/views/xgf/flowList/components/list.vue    | 237 ++++++++
 src/views/xgf/flowList/components/picture.vue |  36 ++
 src/views/xgf/flowList/components/record.vue  | 198 +++++++
 .../xgf/flowList/components/sendUtil.vue      |  67 +++
 src/views/xgf/flowList/components/user.vue    | 250 ++++++++
 .../xgf/flowList/components/userInfo.vue      | 409 +++++++++++++
 src/views/xgf/flowList/components/users.vue   | 513 ++++++++++++++++
 src/views/xgf/flowList/index.vue              |  23 +
 src/views/xgf/flow_audit/index.vue            |   6 +-
 src/views/xgf/flow_audit/users.vue            |   1 -
 14 files changed, 2407 insertions(+), 246 deletions(-)
 create mode 100644 src/views/xgf/flowList/components/QRCode.vue
 create mode 100644 src/views/xgf/flowList/components/apply.vue
 create mode 100644 src/views/xgf/flowList/components/list.vue
 create mode 100644 src/views/xgf/flowList/components/picture.vue
 create mode 100644 src/views/xgf/flowList/components/record.vue
 create mode 100644 src/views/xgf/flowList/components/sendUtil.vue
 create mode 100644 src/views/xgf/flowList/components/user.vue
 create mode 100644 src/views/xgf/flowList/components/userInfo.vue
 create mode 100644 src/views/xgf/flowList/components/users.vue
 create mode 100644 src/views/xgf/flowList/index.vue

diff --git a/src/views/xgf/flow/components/userInfo.vue b/src/views/xgf/flow/components/userInfo.vue
index 6a38268..3b7e987 100644
--- a/src/views/xgf/flow/components/userInfo.vue
+++ b/src/views/xgf/flow/components/userInfo.vue
@@ -6,213 +6,303 @@
       :visible.sync="visible"
       :append-to-body="true"
       title="查看"
-      width="60%">
-      <table class="table-ui" style="margin-bottom: 20px;">
-        <div class="level-title">
-          <h1>人员信息</h1>
-        </div>
-        <tr>
-          <th>照片</th>
-          <td>
-            <span v-if="imgUrl != ''">
-              <div class="img-flex">
-                <viewer>
-                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-            <span v-else/>
-          </td>
-          <th>姓名</th>
-          <td>{{ userDetailForm.NAME }}</td>
-          <th>性别</th>
-          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-        </tr>
-        <tr>
-          <th>出生年月</th>
-          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-          <th>年龄</th>
-          <td>{{ userDetailForm.AGE }}</td>
-          <th>手机号</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>身份证</th>
-          <td>{{ userDetailForm.CARD_ID }}</td>
-          <th>身份证照片</th>
-          <!--if条件不可删除-->
-          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in userCardIDPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
+      width="80%">
+      <div class="information">
+        <el-scrollbar style="height: 550px;margin-bottom: 10px">
+          <table class="table-ui" style="margin-bottom: 20px;">
+            <div class="level-title">
+              <h1>人员信息</h1>
+            </div>
+            <tr>
+              <th>照片</th>
+              <td>
+                <span v-if="imgUrl != ''">
+                  <div class="img-flex">
+                    <viewer>
+                      <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+                <span v-else/>
+              </td>
+              <th>姓名</th>
+              <td>{{ userDetailForm.NAME }}</td>
+              <th>性别</th>
+              <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+            </tr>
+            <tr>
+              <th>出生年月</th>
+              <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+              <th>年龄</th>
+              <td>{{ userDetailForm.AGE }}</td>
+              <th>手机号</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>身份证</th>
+              <td>{{ userDetailForm.CARD_ID }}</td>
+              <th>身份证照片</th>
+              <!--if条件不可删除-->
+              <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in userCardIDPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
 
-        <tr>
-          <th>民族</th>
-          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-          <th>婚姻状况</th>
-          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-          <th>政治面貌</th>
-          <td>{{ userDetailForm.zzName }} {{
-            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-          }}
-          </td>
-        </tr>
+            <tr>
+              <th>民族</th>
+              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <th>婚姻状况</th>
+              <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+              <th>政治面貌</th>
+              <td>{{ userDetailForm.zzName }} {{
+                userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+              }}
+              </td>
+            </tr>
 
-        <tr>
-          <th>户口所在地</th>
-          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-          <th>现住址</th>
-          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-          <th>联系电话</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>文化程度</th>
-          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-          <th>岗位名称(工种)</th>
-          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
-        </tr>
-        <tr>
-          <th>是否缴纳社保</th>
-          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in socialPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
+            <tr>
+              <th>户口所在地</th>
+              <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+              <th>现住址</th>
+              <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+              <th>联系电话</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>文化程度</th>
+              <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+              <th>岗位名称(工种)</th>
+              <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+            </tr>
+            <tr>
+              <th>是否缴纳社保</th>
+              <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in socialPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否参加三级安全培训</th>
+              <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+              <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+              <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in photosOfLevel"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否缴纳保险</th>
+              <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+              <th>是否特殊工种</th>
+              <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+              <th>是否流动人员</th>
+              <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+            </tr>
+          </table>
+          <div>
+            <div class="level-title">
+              <h1>培训记录</h1>
+            </div>
+            <el-table
+              :data="trainRecordList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="selection" width="55" align="center"/>
+              <el-table-column type="index" label="序号" width="50" align="center"/>
+              <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+              <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+              <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+              <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+              <el-table-column label="培训有效期" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+              <h1>特种作业人员信息</h1>
+            </div>
+            <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+              <tr>
+                <th style="width: 150px">证书名称</th>
+                <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+                <th style="width: 150px">作业类别</th>
+                <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+                <th style="width: 150px">操作项目</th>
+                <td>{{ item.OPERATION_TYPE_NAME }}</td>
+              </tr>
+              <tr>
+                <th>特种作业证书编号</th>
+                <td>{{ item.SPECIAL_NUMBER }}</td>
+                <th>发证机关</th>
+                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+              </tr>
+              <tr>
+                <th>复审时间</th>
+                <td>{{ item.REVIEW_TIME }}</td>
+                <th>有效期</th>
+                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+              </tr>
+            </table>
+            <div v-if="applyList.length > 0" class="level-title mt-20">
+              <h1>申请信息</h1>
+            </div>
+            <el-table
+              v-if="applyList.length > 0"
+              :data="applyList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <el-row>
+                    <el-form label-position="left" inline class="demo-table-expand">
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="属地管理部门">
+                          <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批人">
+                          <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批结果">
+                          <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
+                          <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item v-if="false" label="审批意见">
+                          <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.MANAGER_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
+                          <span v-if="props.row.MANAGER_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.MANAGER_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.SUPERVISION_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
+                          <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.SUPERVISION_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+                    </el-form>
+                  </el-row>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
+                  <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
+              <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.MANAGER_STATE === 0">不通过</span>
+                  <span v-if="row.MANAGER_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
+              <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
+                  <span v-if="row.SUPERVISION_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">关 闭</el-button>
               </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否参加三级安全培训</th>
-          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in photosOfLevel"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否缴纳保险</th>
-          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
-          <th>是否特殊工种</th>
-          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-          <th>是否流动人员</th>
-          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-        </tr>
-      </table>
-      <div v-if="false">
-        <div class="level-title">
-          <h1>培训记录</h1>
-        </div>
-        <el-table
-          :data="trainRecordList"
-          :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-          tooltip-effect="dark"
-          border
-          fit
-          highlight-current-row>
-          <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column type="index" label="序号" width="50" align="center"/>
-          <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
-          <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
-          <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
-          <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-          <el-table-column label="培训有效期" align="center">
-            <template slot-scope="{row}">
-              <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-          <h1>特种作业人员信息</h1>
-        </div>
-        <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-          <tr>
-            <th style="width: 150px">证书名称</th>
-            <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-            <th style="width: 150px">作业类别</th>
-            <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-            <th style="width: 150px">操作项目</th>
-            <td>{{ item.OPERATION_TYPE_NAME }}</td>
-          </tr>
-          <tr>
-            <th>特种作业证书编号</th>
-            <td>{{ item.SPECIAL_NUMBER }}</td>
-            <th>发证机关</th>
-            <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-          </tr>
-          <tr>
-            <th>复审时间</th>
-            <td>{{ item.REVIEW_TIME }}</td>
-            <th>有效期</th>
-            <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-          </tr>
-        </table>
-        <div
-          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-          class="level-title mt-20">
-          <h1>打回信息</h1>
-        </div>
-        <table
-          v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-          class="table-ui"
-          style="margin-bottom: 20px;">
-          <tr>
-            <th>打回人</th>
-            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
-            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
-            <td
-              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-              {{ detailForm.TERRITORIALITY_USER_NAME }}
-            </td>
-            <th>打回原由</th>
-            <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
-            <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
-            <td
-              v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-              {{ detailForm.TERRITORIALITY_OPINION }}
-            </td>
-          </tr>
-        </table>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="visible = false">关 闭</el-button>
-        </div>
+            </el-table>
+          </div>
+        </el-scrollbar>
       </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取 消</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -237,14 +327,13 @@ export default {
       userDetailForm: {},
       userCardIDPhotoFile: [], // 身份证照片
       trainRecordList: [],
-      detailForm: {},
       photosOfLevel: [], // 三级教育照片
       specialUsersList: {},
       insuranceFileList: [], // 保险文件
       contractFileList: [],
       socialPhotoFile: [],
       gongshangbaoxianFile: [],
-      userEntryForm: {},
+      applyList: [],
       loading: false,
       heirloom: {},
       config: config
@@ -266,46 +355,34 @@ export default {
     getUserInfoById(row) {
       this.loading = true
       requestFN(
-        'user/getDetailByUserIdAndCorpInfoId',
+        '/xgf/user/getInfo',
         {
-          USER_ID: row.USER_ID,
+          XGF_USER_ID: row.XGF_USER_ID,
           CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
           CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
         }
       ).then((data) => {
-        Object.assign(this.userDetailForm, data.pd)
-        this.userPhotoFile = data.userPhotoFile
+        this.loading = false
+        Object.assign(this.userDetailForm, data.info)
+        const picture = data.img
+        this.userPhotoFile = picture.userPhotoFile
         if (this.userPhotoFile.length > 0) {
           this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
         }
-        this.photosOfLevel = data.photosOfLevel
-        this.specialUsersList = data.specialUsers
-        this.insuranceFileList = data.insuranceFile
-        this.contractFileList = data.contractFile
-        this.userCardIDPhotoFile = data.userCardIDPhotoFile
-        this.socialPhotoFile = data.socialPhotoFile
-        this.gongshangbaoxianFile = data.gongshangbaoxianFile
-        // qr内容初始化
+        this.photosOfLevel = picture.photosOfLevel
+        this.specialUsersList = picture.specialUsers
+        this.insuranceFileList = picture.insuranceFile
+        this.contractFileList = picture.contractFile
+        this.userCardIDPhotoFile = picture.userCardIDPhotoFile
+        this.socialPhotoFile = picture.socialPhotoFile
+        this.gongshangbaoxianFile = picture.gongshangbaoxianFile
         if (row.STATUS === '2') {
           this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
         } else {
           this.qrCodeStr = ''
         }
-
-        requestFN(
-          '/user/getFloatPersonDetailById',
-          {
-            USER_ID: row.USER_ID,
-            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-          }
-        ).then((data) => {
-          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
-          this.detailForm = Object.assign(this.detailForm, data.userDetail)
-          this.trainRecordList = data.recordList
-          this.loading = false
-        }).catch((e) => {
-          console.log(e)
-        })
+        this.trainRecordList = data.trainRecordList
+        this.applyList = data.applyList
       }).catch((e) => {
         console.log(e)
       })
@@ -325,3 +402,8 @@ export default {
 
 <style lang="scss" scoped>
 </style>
+<style scoped>
+.information >>> .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+</style>
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index a3cc60a..3b7e987 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -200,24 +200,24 @@
                 <template slot-scope="props">
                   <el-row>
                     <el-form label-position="left" inline class="demo-table-expand">
-                      <el-col v-if="false" :span="5">
-                        <el-form-item label="属地管理部门">
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="属地管理部门">
                           <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col v-if="false" :span="5">
-                        <el-form-item label="审批人">
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批人">
                           <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col v-if="false" :span="5">
-                        <el-form-item label="审批结果">
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批结果">
                           <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
                           <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
                         </el-form-item>
                       </el-col>
-                      <el-col v-if="false" :span="9">
-                        <el-form-item label="审批意见">
+                      <el-col :span="9">
+                        <el-form-item v-if="false" label="审批意见">
                           <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
                         </el-form-item>
                       </el-col>
@@ -233,7 +233,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批结果">
+                        <el-form-item label="审批人">
                           <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
                           <span v-if="props.row.MANAGER_STATE ===1">通过</span>
                         </el-form-item>
@@ -255,7 +255,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批结果">
+                        <el-form-item label="审批人">
                           <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
                           <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
                         </el-form-item>
diff --git a/src/views/xgf/flowList/components/QRCode.vue b/src/views/xgf/flowList/components/QRCode.vue
new file mode 100644
index 0000000..297e138
--- /dev/null
+++ b/src/views/xgf/flowList/components/QRCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px" destroy-on-close	>
+      <vue-qr :text="qrCodeStr" :margin="0" :size="320" color-dark="#000" color-light="#fff"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.qrCodeStr = e.qrCodeStr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowList/components/apply.vue b/src/views/xgf/flowList/components/apply.vue
new file mode 100644
index 0000000..3c96882
--- /dev/null
+++ b/src/views/xgf/flowList/components/apply.vue
@@ -0,0 +1,311 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :append-to-body="true"
+    title="培训申请"
+    width="60%">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row v-if="false">
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY"
+            label="集团单位 "
+          >
+            <Treeselect
+              :options="jituanDanweiTreeData"
+              :normalizer="normalizer"
+              v-model="form.TERRITORIALITY"
+              placeholder="请选择集团单位 "
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.TERRITORIALITY_USER_ID">
+                <el-option
+                  v-for="item in companyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER"
+            label="主管部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.MANAGER"
+              :disabled="true"
+              placeholder="请选择主管部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getmanagerUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.MANAGER_USER_ID">
+                <el-option
+                  v-for="item in managercompanyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION"
+            label="安监部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.SUPERVISION"
+              :disabled="true"
+              placeholder="请选择安监部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.SUPERVISION_USER_ID">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  components: {
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      treeData: [],
+      companyTreeData: [],
+      corpinfo: {},
+      userList: [],
+      companyUserList: [],
+      managercompanyUserList: [],
+      jituanDanwei: '',
+      jituanDanweiTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      form: {},
+      rules: {
+        SUPERVISION_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        MANAGER: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        MANAGER_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        TERRITORIALITY: [{ required: true, message: '属地管理部门不能为空', trigger: 'blur' }],
+        TERRITORIALITY_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      if (e) {
+        this.users = e
+      }
+      // 判断是否有主管部门
+      for (let i; this.users.length > i; i++) {
+        if (!this.users[0].MAIN_DEPARTMENT_ID || this.users[0].MAIN_DEPARTMENT_ID === '') {
+          this.$message({
+            message: '系统未指定主管部门，请将完善相关方信息',
+            type: 'error'
+          })
+          return false
+        }
+      }
+      // 判断主管部门是否一致
+      const warden = this.users[0].MAIN_DEPARTMENT_ID
+      for (let i; this.users.length > i; i++) {
+        if (warden !== this.users[i].MAIN_DEPARTMENT_ID) {
+          this.$message({
+            message: '选择的人员(' + this.users[i].NAME + ')主管部门不一致，请重新选择',
+            type: 'error'
+          })
+          return false
+        }
+      }
+      this.visible = true
+      this.loading = false
+      requestFN(
+        '/openApi/department/listTree',
+        { CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, tm: new Date().getTime() }
+      ).then((data) => {
+        this.form.MANAGER = this.users[0].MAIN_DEPARTMENT_ID
+        this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        this.getTreeData()
+      })
+    },
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/openApi/corpDepartment/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+        // 必须指定【股份-安全监督部】
+        this.form.SUPERVISION = 'c31058273a2d40f9b83dd8e5ae3a723c'
+        this.getRegulatoryUserList(this.form.SUPERVISION)
+        this.getmanagerUserList(this.form.MANAGER)
+      }).catch((e) => {
+        console.log(e)
+      })
+
+      if (this.jituanDanwei) {
+        requestFN(
+          '/companyApi/department/listTree',
+          { CORPINFO_ID: this.jituanDanwei }
+        ).then((data) => {
+          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+        })
+      }
+    },
+    getRegulatoryUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/user/getRegUserInfo',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          ISASSESS: '1'
+        }
+      ).then((data) => {
+        this.userList = data.list
+      }).catch((e) => {
+      })
+    },
+    // 人员
+    getUserList({ id: DEPARTMENT_ID }) {
+      requestFN(
+        '/user/listAll',
+        { DEPARTMENT_ID: DEPARTMENT_ID }
+      ).then((data) => {
+        this.companyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+    getmanagerUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/user/getRegUserInfo',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.managercompanyUserList = data.list
+      }).catch((e) => {
+      })
+    },
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.form.USER_COUNT = this.users.length
+          this.form.AUDIT_STATUS = 0
+          this.form.TYPE = 2
+          const userIds = this.users.map((item) => { return item.XGF_USER_ID })
+          requestFN(
+            '/trainingbatch/add',
+            {
+              ...this.form,
+              users: userIds.join(','),
+              BELONG_TO_CORP: this.users[0].BELONG_TO_CORP,
+              BELONG_TO_CORP_NAME: this.users[0].BELONG_TO_CORP_NAME
+            }
+          ).then((data) => {
+            this.loading = false
+            this.$message({
+              message: '申请成功',
+              type: 'success'
+            })
+            this.handleClose()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('refresh', '')
+    },
+    closeWindow() {
+      this.visible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flowList/components/list.vue b/src/views/xgf/flowList/components/list.vue
new file mode 100644
index 0000000..77b19dd
--- /dev/null
+++ b/src/views/xgf/flowList/components/list.vue
@@ -0,0 +1,237 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="用户名">
+            <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="false" :span="6">
+          <el-form-item label="培训状态">
+            <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      :row-key="getRowKeys"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+      @selection-change="handleSelectionChange">
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="USERNAME" label="用户名" align="center"/>
+      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
+      <el-table-column label="操作" align="center" width="150">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
+          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量申请</el-button>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+    <user ref="userInfo" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
+    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+    <apply ref="apply" append-to-body @refresh="getList"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import vueQr from 'vue-qr'
+import apply from './apply'
+import user from './user.vue'
+import SendUtil from './sendUtil.vue'
+import UserInfo from './userInfo.vue'
+
+export default {
+  components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      specialUsersList: {},
+      detailForm: {},
+      userEntryForm: {},
+      imgUrl: '',
+      SUPERVISE_CORPINFO_ID: '',
+      wenhuachengduList: [], // 文化程度
+      postList: [], // 岗位名称
+      photosOfLevel: [], // 三级教育照片
+      trainRecordList: [], // 培训记录
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      gongshangbaoxianFile: [],
+      userPhotoFile: [], // 头像
+      userCardIDPhotoFile: [], // 身份证照片
+      socialPhotoFile: [], // 身份证照片
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
+        value: 2,
+        label: '已培训(合格)'
+      }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
+      STATUS: '',
+      add: false,		// 新增按钮
+      del: false,		// 删除按钮
+      edit: false,	// 修改按钮
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.getDict()
+    this.getList()
+    this.hasButton()
+  },
+  methods: {
+    getQuery() {
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          STATUS: '2',
+          EMPLOY_FLAG: '1'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    handleShow(row) {
+      this.$refs.userInfos.init(row)
+    },
+    approve(row) {
+      this.$refs.sendUtil.init(row)
+    },
+    getUserInfo(row) {
+      this.$refs.userInfo.init(row)
+    },
+    handleAdd() {
+      const _selectData = this.$refs.multipleTable.selection
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '未勾选培训人员...',
+          type: 'error'
+        })
+        return false
+      }
+      let rule = ''
+      for (let i = 0; _selectData.length > i; i++) {
+        if (rule === '') {
+          rule = _selectData[i].MANAGER_DEPARTMENT_ID
+        } else {
+          if (rule !== _selectData[i].MANAGER_DEPARTMENT_ID) {
+            this.$message.error('主管部门不是一个不能提交')
+          }
+        }
+      }
+      this.$refs.apply.init(_selectData)
+    },
+
+    hasButton() {
+      var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          this.add = data.trainingbatchfhadminadd	// 增
+          this.del = data.trainingbatchfhadmindel	// 删
+          this.edit = data.trainingbatchfhadminedit	// 改
+          this.fromExcel = data.fromExcel	// 从excel导入权限
+          this.toExcel = data.toExcel		// 导出到excel权限
+        } else if (data.result == 'exception') {
+          // showException('按钮权限', data.exception)// 显示异常
+          console.info('按钮权限:', data.exception)
+        }
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    getDict: function() {
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getRowKeys(row) {
+      return row.XGF_USER_ID
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flowList/components/picture.vue b/src/views/xgf/flowList/components/picture.vue
new file mode 100644
index 0000000..57e7255
--- /dev/null
+++ b/src/views/xgf/flowList/components/picture.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="头像" width="370px" destroy-on-close	>
+      <el-image :src="src"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      src: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.src = e.src
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowList/components/record.vue b/src/views/xgf/flowList/components/record.vue
new file mode 100644
index 0000000..e82258d
--- /dev/null
+++ b/src/views/xgf/flowList/components/record.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <el-page-header content="申请记录" @back="goBack"/>
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="申请人员">
+            <el-input v-model="KEYWORDS" placeholder="请输入申请人员"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="主管部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="MANAGER"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="属地管理部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="TERRITORIALITY"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="申请状态">
+            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CREATTIME" label="申请时间" align="center" />
+      <el-table-column prop="CREATOR" label="申请人员" align="center" />
+      <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
+      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
+      <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
+        <template slot-scope="{row}">
+          {{ new Date(row.CREATTIME).getFullYear() }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="AUDIT_STATUS" label="申请状态" align="center" >
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column prop="PASS_COUNT" label="审核通过人数" align="center" /> <!-- 已更新为申请状态中的审核通过人员数-->
+      <el-table-column prop="USER_COUNT" label="申请人数" align="center" />
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+
+    <users ref="users"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import users from './users'
+export default {
+  components: { Pagination, Treeselect, users },
+  directives: { waves },
+  data() {
+    return {
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      treeData: [],
+      companyTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      MANAGER: null,
+      TERRITORIALITY: null,
+      statusList: [{ value: 0, label: '待审核' }, { value: 1, label: '审核中' }, { value: 2, label: '待培训' }, { value: 3, label: '已完成' }],
+      AUDIT_STATUS: '',
+      KEYWORDS: ''
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+  },
+  methods: {
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.MANAGER = null
+      this.TERRITORIALITY = null
+      this.AUDIT_STATUS = ''
+      this.KEYWORDS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          MANAGER: this.MANAGER,
+          TERRITORIALITY: this.TERRITORIALITY,
+          AUDIT_STATUS: this.AUDIT_STATUS,
+          KEYWORDS: this.KEYWORDS,
+          TYPE: 2,
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        console.log(this.varList)
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+      requestFN(
+        '/companyApi/department/listTree',
+        { CORPINFO_ID: this.$parent.SUPERVISE_CORPINFO_ID }
+      ).then((data) => {
+        this.companyTreeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+
+    handleShow(row) {
+      this.$refs.users.init(row)
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+  }
+}
+</script>
+
diff --git a/src/views/xgf/flowList/components/sendUtil.vue b/src/views/xgf/flowList/components/sendUtil.vue
new file mode 100644
index 0000000..a7fdb5b
--- /dev/null
+++ b/src/views/xgf/flowList/components/sendUtil.vue
@@ -0,0 +1,67 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
+      <el-form>
+        <el-form-item prop="TERRITORIALITY" label="是否通过 ">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option label="是" value="1"/>
+            <el-option label="否" value="0"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">关 闭</el-button>
+        <el-button type="primary" @click="sendMessage()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import Treeselect from '@riophae/vue-treeselect'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { Treeselect, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      value: null,
+      heirloom: {}
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.heirloom = JSON.stringify(e)
+    },
+    beforeClose() {
+    },
+    sendMessage(row) {
+      requestFN(
+        '/xgf/user/approve',
+        {
+          list: this.heirloom,
+          STATUS: this.value,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.$message.success('推送成功')
+        this.visible = false
+        this.$emit('refresh', '')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/xgf/flowList/components/user.vue b/src/views/xgf/flowList/components/user.vue
new file mode 100644
index 0000000..889dc08
--- /dev/null
+++ b/src/views/xgf/flowList/components/user.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px">
+      <div v-for="item in peopleList" :key="item.CLASS_INFO_ID" style="height: 220px">
+        <div class="bg_table">
+          <div class="title">相关方安全告知培训合格证</div>
+          <div class="red">{{ item.CLASS_NO }}</div>
+          <table class="table">
+            <tr>
+              <td style="width: 120px">
+                <div class="text textone name">姓名</div>
+              </td>
+              <td style="width: 100px;">
+                <div class="text text1 tcenter">{{ item.NAME }}</div>
+              </td>
+              <td style="width: 86px">
+                <div class="text text2 tcenter">工种</div>
+              </td>
+              <td style="width: 148px;">
+                <div v-if="item.JOBS_TYPE" class="text tcenter ">{{ item.JOBS_TYPE }}</div>
+                <div v-else>暂无</div>
+              </td>
+              <td rowspan="4" style="width: 134px;">
+                <img v-if="!getShowPicture(item)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 116px; height: 146px">
+                <img v-if="getShowPicture(item)" :src="config.fileUrl + item.PHOTO" alt="" style="width: 116px; height: 146px" @click="openPicture(config.fileUrl + item.PHOTO)">
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">资质</div>
+              </td>
+              <td colspan="3">
+                <div v-if="item.CERTIFICATE" class="text">{{ item.CERTIFICATE }}</div>
+                <div v-else>暂无</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">培训时间</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.OPENING_TIME }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">有效期限</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.VALIDITY_PERIOD_END }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">所在单位</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
+              </td>
+              <td rowspan="3" style="padding-top: 6px" @click="click(config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID)">
+                <vue-qr :text="config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">身份证号</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.CARD_ID }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">手机</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.PHONE }}</div>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </el-dialog>
+    <QRCode ref="QRcode" append-to-body/>
+    <Picture ref="Picture" append-to-body/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import QRCode from './QRCode.vue'
+import Picture from './picture.vue'
+
+export default {
+  components: { QRCode, Picture, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      config: config,
+      visible: false,
+      peopleList: [],
+      CLASS_MESSAGE_ID: '',
+      CLASS_INFO_ID: '',
+      USER_ID: '',
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      console.info(e)
+      if (e && e.CLASS_INFO_ID) {
+        this.CLASS_INFO_ID = e.CLASS_INFO_ID
+      }
+      if (e && e.CLASS_MESSAGE_ID) {
+        this.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
+      }
+      if (e && e.USER_ID) {
+        this.USER_ID = e.USER_ID
+      }
+      this.qrCodeStr = config.messageUrl + '?CLASS_INFO_ID=' + this.CLASS_INFO_ID
+      this.visible = true
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN('/trainusers/getUserinfoList', {
+        CLASS_INFO_ID: this.CLASS_INFO_ID,
+        CLASS_MESSAGE_ID: this.CLASS_MESSAGE_ID,
+        USER_ID: this.USER_ID
+      })
+        .then((data) => {
+          this.peopleList = data.list
+        }).catch((e) => {
+          console.log(e)
+        })
+    },
+    getShowPicture(row) {
+      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
+        return true
+      }
+    },
+    click(e) {
+      this.$refs.QRcode.init({ qrCodeStr: e })
+    },
+    openPicture(src) {
+      this.$refs.Picture.init({ src: src })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.name{
+  width: 120px;
+  overflow: hidden;//溢出隐藏
+  white-space: nowrap; // 强制一行显示
+  text-overflow: ellipsis;// 显示。。。省略号
+}
+.red {
+  width: 660px;
+  color: #ff0000;
+  margin-left: 34px;
+  font-size: 24px;
+}
+
+.bg_table {
+  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
+  background-size: 100%;
+  width: 660px;
+  height: 430px;
+  border: 4px solid #453d3a;
+  transform: scale(0.5);
+  transform-origin: top left;
+
+  .title {
+    font-size: 28px;
+    text-align: center;
+    margin-top: 34px;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .table {
+    border-collapse: collapse;
+    width: 590px;
+    color: #453d3a;
+    font-size: 20px;
+    margin: 34px;
+    text-align: left;
+    margin-top: 10px;
+
+    .tcenter {
+      text-align: center
+    }
+
+    .w60 {
+      width: 100px;
+    }
+
+    .w74 {
+      width: 148px
+    }
+
+    th, td {
+      border: 2px solid #453d3a;
+      text-align: left;
+      height: 40px;
+      padding: 0 16px;
+
+      box-sizing: border-box;
+
+      .textone {
+        width: 80px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+      }
+
+      .text1 {
+        width: 60px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text2 {
+        width: 50px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text {
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/xgf/flowList/components/userInfo.vue b/src/views/xgf/flowList/components/userInfo.vue
new file mode 100644
index 0000000..3b7e987
--- /dev/null
+++ b/src/views/xgf/flowList/components/userInfo.vue
@@ -0,0 +1,409 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      v-if="visible"
+      :visible.sync="visible"
+      :append-to-body="true"
+      title="查看"
+      width="80%">
+      <div class="information">
+        <el-scrollbar style="height: 550px;margin-bottom: 10px">
+          <table class="table-ui" style="margin-bottom: 20px;">
+            <div class="level-title">
+              <h1>人员信息</h1>
+            </div>
+            <tr>
+              <th>照片</th>
+              <td>
+                <span v-if="imgUrl != ''">
+                  <div class="img-flex">
+                    <viewer>
+                      <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+                <span v-else/>
+              </td>
+              <th>姓名</th>
+              <td>{{ userDetailForm.NAME }}</td>
+              <th>性别</th>
+              <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+            </tr>
+            <tr>
+              <th>出生年月</th>
+              <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+              <th>年龄</th>
+              <td>{{ userDetailForm.AGE }}</td>
+              <th>手机号</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>身份证</th>
+              <td>{{ userDetailForm.CARD_ID }}</td>
+              <th>身份证照片</th>
+              <!--if条件不可删除-->
+              <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in userCardIDPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+
+            <tr>
+              <th>民族</th>
+              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <th>婚姻状况</th>
+              <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+              <th>政治面貌</th>
+              <td>{{ userDetailForm.zzName }} {{
+                userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+              }}
+              </td>
+            </tr>
+
+            <tr>
+              <th>户口所在地</th>
+              <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+              <th>现住址</th>
+              <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+              <th>联系电话</th>
+              <td>{{ userDetailForm.PHONE }}</td>
+            </tr>
+            <tr>
+              <th>文化程度</th>
+              <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+              <th>岗位名称(工种)</th>
+              <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+            </tr>
+            <tr>
+              <th>是否缴纳社保</th>
+              <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+              <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+              <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in socialPhotoFile"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否参加三级安全培训</th>
+              <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+              <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+              <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+                <span>
+                  <div class="img-flex">
+                    <viewer>
+                      <img
+                        v-for="item in photosOfLevel"
+                        :src="config.fileUrl + item.FILEPATH"
+                        :key="item.IMGFILES_ID"
+                        width="40"
+                        height="40"
+                        style="object-fit: cover;">
+                    </viewer>
+                  </div>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否缴纳保险</th>
+              <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+              <th>是否特殊工种</th>
+              <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+              <th>是否流动人员</th>
+              <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+            </tr>
+          </table>
+          <div>
+            <div class="level-title">
+              <h1>培训记录</h1>
+            </div>
+            <el-table
+              :data="trainRecordList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="selection" width="55" align="center"/>
+              <el-table-column type="index" label="序号" width="50" align="center"/>
+              <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+              <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+              <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+              <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+              <el-table-column label="培训有效期" align="center">
+                <template slot-scope="{row}">
+                  <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+              <h1>特种作业人员信息</h1>
+            </div>
+            <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+              <tr>
+                <th style="width: 150px">证书名称</th>
+                <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+                <th style="width: 150px">作业类别</th>
+                <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+                <th style="width: 150px">操作项目</th>
+                <td>{{ item.OPERATION_TYPE_NAME }}</td>
+              </tr>
+              <tr>
+                <th>特种作业证书编号</th>
+                <td>{{ item.SPECIAL_NUMBER }}</td>
+                <th>发证机关</th>
+                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+              </tr>
+              <tr>
+                <th>复审时间</th>
+                <td>{{ item.REVIEW_TIME }}</td>
+                <th>有效期</th>
+                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+              </tr>
+            </table>
+            <div v-if="applyList.length > 0" class="level-title mt-20">
+              <h1>申请信息</h1>
+            </div>
+            <el-table
+              v-if="applyList.length > 0"
+              :data="applyList"
+              :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+              tooltip-effect="dark"
+              border
+              fit
+              highlight-current-row>
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <el-row>
+                    <el-form label-position="left" inline class="demo-table-expand">
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="属地管理部门">
+                          <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批人">
+                          <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item v-if="false" label="审批结果">
+                          <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
+                          <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item v-if="false" label="审批意见">
+                          <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.MANAGER_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
+                          <span v-if="props.row.MANAGER_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.MANAGER_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="5">
+                        <el-form-item label="主管部门">
+                          <span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span>{{ props.row.SUPERVISION_USER_NAME }}</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item label="审批人">
+                          <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
+                          <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="9">
+                        <el-form-item label="审批意见">
+                          <span>{{ props.row.SUPERVISION_OPINION }}</span>
+                        </el-form-item>
+                      </el-col>
+                    </el-form>
+                  </el-row>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
+                  <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
+              <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.MANAGER_STATE === 0">不通过</span>
+                  <span v-if="row.MANAGER_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
+              <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
+              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
+                <template slot-scope="{row}">
+                  <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
+                  <span v-if="row.SUPERVISION_STATE ===1">通过</span>
+                </template>
+              </el-table-column>
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">关 闭</el-button>
+              </div>
+            </el-table>
+          </div>
+        </el-scrollbar>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      imgUrl: '',
+      userDetailForm: {},
+      userCardIDPhotoFile: [], // 身份证照片
+      trainRecordList: [],
+      photosOfLevel: [], // 三级教育照片
+      specialUsersList: {},
+      insuranceFileList: [], // 保险文件
+      contractFileList: [],
+      socialPhotoFile: [],
+      gongshangbaoxianFile: [],
+      applyList: [],
+      loading: false,
+      heirloom: {},
+      config: config
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.heirloom = JSON.parse(JSON.stringify(e))
+      this.getUserInfoById(this.heirloom)
+    },
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    getUserInfoById(row) {
+      this.loading = true
+      requestFN(
+        '/xgf/user/getInfo',
+        {
+          XGF_USER_ID: row.XGF_USER_ID,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+        }
+      ).then((data) => {
+        this.loading = false
+        Object.assign(this.userDetailForm, data.info)
+        const picture = data.img
+        this.userPhotoFile = picture.userPhotoFile
+        if (this.userPhotoFile.length > 0) {
+          this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+        }
+        this.photosOfLevel = picture.photosOfLevel
+        this.specialUsersList = picture.specialUsers
+        this.insuranceFileList = picture.insuranceFile
+        this.contractFileList = picture.contractFile
+        this.userCardIDPhotoFile = picture.userCardIDPhotoFile
+        this.socialPhotoFile = picture.socialPhotoFile
+        this.gongshangbaoxianFile = picture.gongshangbaoxianFile
+        if (row.STATUS === '2') {
+          this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
+        } else {
+          this.qrCodeStr = ''
+        }
+        this.trainRecordList = data.trainRecordList
+        this.applyList = data.applyList
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
+<style scoped>
+.information >>> .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+</style>
diff --git a/src/views/xgf/flowList/components/users.vue b/src/views/xgf/flowList/components/users.vue
new file mode 100644
index 0000000..2d11653
--- /dev/null
+++ b/src/views/xgf/flowList/components/users.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-dialog
+      v-if="visible"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      :append-to-body="true"
+      title="申请详情"
+      width="60%">
+      <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
+        <h1>申请信息</h1>
+      </div>
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 17%">申请人</th>
+          <td style="width: 17%">{{ pd.CREATOR }}</td>
+          <th style="width: 17%">申请时间</th>
+          <td style="width: 17%">{{ pd.CREATTIME }}</td>
+          <th style="width: 17%">备注</th>
+          <td style="width: 15%">{{ pd.DESCR }}</td>
+        </tr>
+        <tr>
+          <th style="width: 30px">安监部门</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
+          <th style="width: 30px">审核人</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_USER_NAME }}</td>
+          <th style="width: 30px">审核时间</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_TIME }}</td>
+        </tr>
+        <tr>
+          <th>主管部门</th>
+          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.MANAGER_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.MANAGER_TIME }}</td>
+        </tr>
+        <tr>
+          <th>属地管理部门</th>
+          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.TERRITORIALITY_TIME }}</td>
+        </tr>
+        <tr v-if="pd.AUDIT_DESCR">
+          <th>股份公司意见</th>
+          <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
+        </tr>
+        <tr v-if="pd.CORP_AUDIT_DESCR">
+          <th>分公司意见</th>
+          <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>申请人员列表</h1>
+      </div>
+      <el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="USERNAME" label="用户名" align="center" />
+        <el-table-column prop="NAME" label="姓名" align="center" />
+        <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" />
+        <el-table-column prop="STATE" label="审核状态" align="center" >
+          <template slot-scope="{row}">
+            <el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag>
+            <el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
+            <el-tag v-else type="success">待审核</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200" >
+          <template slot-scope="{row}">
+            <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeWindow">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-if="userInfoDialog"
+      :visible.sync="userInfoDialog"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>培训记录</h1>
+      </div>
+      <el-table
+        :data="trainRecordList"
+        :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center"/>
+        <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+        <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+        <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+        <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+        <el-table-column label="培训有效期" align="center">
+          <template slot-scope="{row}">
+            <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+        <h1>特种作业人员信息</h1>
+      </div>
+      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 150px">证书名称</th>
+          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+          <th style="width: 150px">作业类别</th>
+          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+          <th style="width: 150px">操作项目</th>
+          <td>{{ item.OPERATION_TYPE_NAME }}</td>
+        </tr>
+        <tr>
+          <th>特种作业证书编号</th>
+          <td>{{ item.SPECIAL_NUMBER }}</td>
+          <th>发证机关</th>
+          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+        </tr>
+        <tr>
+          <th>复审时间</th>
+          <td>{{ item.REVIEW_TIME }}</td>
+          <th>有效期</th>
+          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+        </tr>
+      </table>
+      <div
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="level-title mt-20">
+        <h1>打回信息</h1>
+      </div>
+      <table
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="table-ui"
+        style="margin-bottom: 20px;">
+        <tr>
+          <th>打回人</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_USER_NAME }}
+          </td>
+          <th>打回原由</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_OPINION }}
+          </td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="userInfoDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
+      <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
+        <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="QRCodeDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+  components: {
+    Pagination,
+    vueQr
+  },
+  data() {
+    return {
+      config: config,
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      userInfoDialog: false,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      userEntryForm: {},
+      specialUsersList: {},
+      imgUrl: '',
+      wenhuachengduList: [], // 文化程度
+      userCardIDPhotoFile: [], // 身份证照片
+      postList: [], // 岗位名称
+      trainRecordList: [], // 培训记录
+      visible: false,
+      pd: {},
+      userList: [],
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      photosOfLevel: []
+    }
+  },
+  methods: {
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    init(e) {
+      if (e) {
+        this.pd = e
+      }
+      this.visible = true
+      this.userList = []
+      this.getDict()
+      this.getUserList()
+    },
+    // 获取数据字典数据
+    getDict: function() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '1144b16d85f14b108ea7859e2be9d001'
+        }
+      ).then((data) => {
+        this.flowAreaList = data.list
+      }).catch((e) => {
+
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    // 人员
+    getUserList() {
+      requestFN(
+        '/trainingbatch/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID
+        }
+      ).then((data) => {
+        this.userList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+      })
+    },
+    // 二维码
+    showQRCode(id) {
+      this.QRCodeDialog = true
+      const arr = [{ USER_ID: id, CODE_TYPE: '1' }]
+      this.qrcodeStr = JSON.stringify(arr)
+    },
+    // 查看
+    async handleShow(USER_ID) {
+      await this.getUserInfoById(USER_ID)
+      await this.getOtherUserInfoById(USER_ID)
+      this.userInfoDialog = true
+    },
+    getUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: id,
+            TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          if (this.userDetailForm.PHOTO) {
+            this.imgUrl = config.fileUrl + this.userDetailForm.PHOTO
+          }
+          this.trainRecordList = data.recordList
+          // this.insuranceFileList = data.insuranceFile
+          // this.contractFileList = data.contractFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    getOtherUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          'user/getDetailByUserIdAndCorpInfoId',
+          {
+            USER_ID: id,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+            CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+          }
+        ).then((data) => {
+          Object.assign(this.userDetailForm, data.pd)
+          this.userPhotoFile = data.userPhotoFile
+          if (this.userPhotoFile.length > 0) {
+            this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+          }
+          this.insuranceFileList = data.insuranceFile
+          this.specialUsersList = data.specialUsers
+          this.contractFileList = data.contractFile
+          this.userCardIDPhotoFile = data.userCardIDPhotoFile
+          this.socialPhotoFile = data.socialPhotoFile
+          this.gongshangbaoxianFile = data.gongshangbaoxianFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    // 转换是否
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    },
+    // 转换字典数据
+    formatDictioariesLabel(value, type) {
+      var list = []
+      if (type == '0') {
+        list = this.wenhuachengduList
+      } else if (type == '1') {
+        list = this.postList
+      }
+      if (value) {
+        if (list.length > 0) {
+          var data = ''
+          for (let i = 0; i < list.length; i++) {
+            const obj = list[i]
+            if (value == obj.BIANMA) {
+              data = obj.NAME
+              break
+            }
+          }
+          return data
+        } else {
+          return value
+        }
+      } else {
+        return ''
+      }
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flowList/index.vue b/src/views/xgf/flowList/index.vue
new file mode 100644
index 0000000..70cda6e
--- /dev/null
+++ b/src/views/xgf/flowList/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import Record from './components/record'
+export default {
+  components: {
+    List: List,
+    Record: Record
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index 09d86e3..c159d43 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -41,8 +41,8 @@ flowTrain/batchList<template>
       <el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" />
       <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" />
       <el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" />
-      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
-      <el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
+      <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
+      <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
       <el-table-column prop="TRAIN_DATE" label="申请年份" >
         <template slot-scope="{row}">
           {{ new Date(row.CREATTIME).getFullYear() }}
@@ -120,7 +120,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/flowTrain/batchList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/flowTrain/oldBatchList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           XGF_NAME_REG: this.XGF_NAME,
           ENTRUST_STARTTIME: this.dates[0],
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index c3c504d..a75ccbd 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -163,7 +163,6 @@ export default {
   methods: {
     init(id, viewState, vectory) {
       this.vectory = vectory
-      console.log(this.vectory)
       this.form.TRAINING_BATCH_ID = this.TRAINING_BATCH_ID
       this.form.TRAIN_USERS_ID = ''
       this.form.USER_COUNT = ''

From 53776e287913a486b5109a8d396be030928466fc Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 26 Dec 2023 12:35:27 +0800
Subject: [PATCH 20/20] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flowList/components/list.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/xgf/flowList/components/list.vue b/src/views/xgf/flowList/components/list.vue
index 77b19dd..9b09550 100644
--- a/src/views/xgf/flowList/components/list.vue
+++ b/src/views/xgf/flowList/components/list.vue
@@ -51,7 +51,7 @@
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量申请</el-button>
+        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量申请</el-button>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
@@ -142,7 +142,8 @@ export default {
         {
           KEYWORDS: this.KEYWORDS,
           STATUS: '2',
-          EMPLOY_FLAG: '1'
+          EMPLOY_FLAG: '1',
+          VALID_FLAG: '1'
         }
       ).then((data) => {
         this.listLoading = false