src/main.js

@@ -54,18 +54,6 @@ Vue.config.productionTip = false
 Vue.use(Element, {
   size: Cookies.get('size') || 'small' // set element-ui default size
 })
-
-// 树数据结构去除空子级
-Vue.prototype.removeEmptyChildren = function(data) {
-  for (let i = 0; i < data.length; i++) {
-    if (data[i].nodes && data[i].nodes.length > 0) {
-      this.removeEmptyChildren(data[i].nodes)
-    } else {
-      delete data[i].nodes
-    }
-  }
-  return data
-}
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

src/views/PersonManager/user/components/list.vue

@@ -118,7 +118,12 @@
               <span v-if="row.USER_ID != userId">
                 <el-tag v-if="row.STATUS == 1" type="warning">培训中</el-tag>
                 <el-tag v-if="row.STATUS == 0" type="info">未培训</el-tag>
-                <el-tag v-if="row.STATUS == 2" type="success">已培训</el-tag>
+                <el-tag v-if="row.STATUS == 2" type="success">
+                  <template v-if="row.TRAIN_STATUS == '1'">
+                    已培训（合格）
+                  </template>
+                  <template v-else>已培训（不合格）</template>
+                </el-tag>
                 <el-tag v-if="row.STATUS == 9">申请中</el-tag>
               </span>
               <span v-else />

src/views/corpinfo/edit/components/corpInfoEdit.vue

@@ -877,7 +877,6 @@ export default {
           this.dataForm.businessLicenseDate = []
           this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_START)
           this.dataForm.businessLicenseDate.push(this.dataForm.LICENSE_END)
-          this.dataForm.USER_NAME = this.dataForm.USER_NAME ? this.dataForm.USER_NAME : this.dataForm.USER_NAME_B
           this.$forceUpdate()
           // 将对象中的 选取形式 转为数组以多选形式展现  2023-08-31  转换开始
           if (this.dataForm.SELECT_FORM) {

src/views/system/dept/index.vue

@@ -16,6 +16,11 @@
           @node-click="handleNodeClick"/>
       </el-aside>
       <el-main>
+        <!-- <div class="filter-btn-group">
+          <div>
+            <el-button @click="showGraph()">结构图</el-button>
+          </div>
+        </div>-->
         <el-table
           v-loading="listLoading"
           ref="multipleTable"
@@ -78,6 +83,23 @@
         <el-form-item label="部门职能">
           <el-input :rows="3" v-model="form.FUNCTIONS" type="textarea" placeholder="这里输入部门职能..." />
         </el-form-item>
+        <!-- <el-form-item label="是否监管部门">
+          <el-radio-group v-model="form.IS_REGULATORY" @change="changeIssup">
+            <el-radio :label="'1'">是</el-radio>
+            <el-radio :label="'0'">否</el-radio>
+          </el-radio-group>
+        </el-form-item>-->
+        <!-- <el-form-item v-show="form.IS_REGULATORY=='1'" label="监管部门" prop="MAIN_DEPARTMENT" class="is-required">
+          <SelectTree
+            ref="deptTree"
+            :clearable="false"
+            :options="treeData"
+            :props="defaultProps"
+            v-model="form.MAIN_DEPARTMENT"
+            placeholder="请选择监管部门"
+            style="width: 100%"
+          />
+        </el-form-item>-->
         <el-form-item label="备注">
           <el-input :rows="3" v-model="form.BZ" type="textarea" placeholder="这里输入备注..." />
         </el-form-item>
@@ -364,7 +386,6 @@ export default {
         }
       ).then((data) => {
         this.form = Object.assign({}, data.pd) // copy obj
-        this.form.DEPT_SORT = Number(this.form.DEPT_SORT)
         this.pds = data.pds || []						// 父级部门信息
 
         this.dialogFormAdd = true

src/views/train/flow/components/list.vue

@@ -45,10 +45,12 @@
       <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="100">
+      <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 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="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>

src/views/train/synInfo/components/sendUtil.vue

@@ -5,58 +5,18 @@
       :append-to-body="appendToBody"
       :before-close="beforeClose"
       title="推送"
-      width="1100px"
+      width="500px"
       destroy-on-close>
-      <el-form ref="form" :model="form" :rules="rules" label-width="200px" label-position="right" type="flex">
+      <el-form label-position="right" label-width="100px">
-        <el-row>
+        <el-form-item prop="TERRITORIALITY" label="集团单位 ">
-          <el-col :span="12">
+          <el-select v-model="corp_id" placeholder="请选择集团单位 " style="width: 90%" @change="getInfo">
-            <el-form-item prop="APPOINT_CORP_ID" label="单位 ">
+            <el-option
-              <el-select v-model="corp_id" filterable placeholder="请选择单位 " style="width: 300px" @change="getInfo">
+              v-for="item in jituanDanweiTreeData"
-                <el-option
+              :key="item.CORPINFO_ID"
-                  v-for="item in jituanDanweiTreeData"
+              :label="item.CORP_NAME"
-                  :key="item.CORPINFO_ID"
+              :value="JSON.stringify(item)"/>
-                  :label="item.CORP_NAME"
+          </el-select>
-                  :value="JSON.stringify(item)"/>
+        </el-form-item>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="APPOINT_DEPARTMENT_ID" label="指定部门:">
-              <Treeselect
-                :options="departmentTree"
-                :normalizer="normalizer"
-                v-model="form.APPOINT_DEPARTMENT_ID"
-                placeholder="请选择部门"
-                no-options-text="暂无数据"
-                no-children-text="暂无数据"
-                style="width: 300px"
-                @select="getPeopleList($event)"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
-            <el-form-item prop="APPOINT_USER_ID" label="指定审批人:">
-              <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
-                <el-option v-for="item in peopleList" :key="item.USER_ID" :value="JSON.stringify(item)" :label="item.NAME"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="APPOINT_ANNEX" label="承诺书:">
-              <upload-file
-                :file-list.sync="form.APPOINT_ANNEX"
-                :multiple="false"
-                :accept="'.pdf,.jpg,.png,doc,docx'"
-                :limit="1"
-                :size="1024"
-                :upload-type="1"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="visible = false">关 闭</el-button>
@@ -70,11 +30,9 @@
 import vueQr from 'vue-qr'
 import Treeselect from '@riophae/vue-treeselect'
 import { requestFN } from '@/utils/request'
-import uploadFile from '../../../util/uploadFile/index.vue'
-import { upload } from '@/utils/upload'
 
 export default {
-  components: { Treeselect, vueQr, uploadFile },
+  components: { Treeselect, vueQr },
   props: {
     appendToBody: {
       type: Boolean,
@@ -90,43 +48,7 @@ export default {
       corp_id: null,
       corp_name: '',
       heirloom: {},
-      listFlag: false,
+      listFlag: false
-      departmentTree: [],
-      peopleList: [],
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
-      form: {
-        STATUS: null,
-        APPOINT_CORP_ID: '',
-        APPOINT_CORP_NAME: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        APPOINT_ANNEX: [],
-        user: '',
-        tm: new Date().getTime(),
-        list: []
-      },
-      rules: {
-        APPOINT_DEPARTMENT_ID: [
-          { required: true, message: '请选择指定部门', trigger: 'change' }
-        ],
-        APPOINT_USER_ID: [
-          { required: true, message: '请选择指定审批人', trigger: 'change' }
-        ],
-        APPOINT_CORP_ID: [
-          { required: true, message: '请选择企业', trigger: 'change' }
-        ],
-        APPOINT_ANNEX: [
-          { required: true, message: '请上传文件', trigger: 'change' }
-        ]
-      }
     }
   },
   methods: {
@@ -158,88 +80,32 @@ export default {
     },
     getInfo(e) {
       const info = JSON.parse(e)
-      this.form.APPOINT_CORP_ID = info.CORPINFO_ID
+      this.corp_name = info.CORP_NAME
-      this.form.APPOINT_CORP_NAME = info.CORP_NAME
-      this.form.APPOINT_DEPARTMENT_ID = null
-      this.form.APPOINT_DEPARTMENT_NAME = ''
-      this.form.APPOINT_USER_ID = ''
-      this.form.APPOINT_USER_NAME = ''
-      this.form.user = ''
-      this.getDepartmentTree()
     },
     beforeClose() {
       this.corp_id = null
       this.visible = false
-      this.form = {
-        STATUS: null,
-        APPOINT_CORP_ID: '',
-        APPOINT_CORP_NAME: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        user: '',
-        tm: new Date().getTime(),
-        list: []
-      }
     },
     sendMessage() {
-      this.$refs.form.validate((valid) => {
+      const corp_id = JSON.parse(this.corp_id).CORPINFO_ID
-        if (!valid) {
-          this.$message.error('请填写完整信息')
-        } else {
-          this.form.list = this.heirloom
-          const formData = new FormData()
-          Object.keys(this.form).map(key => {
-            formData.append(key, this.form[key])
-          })
-          formData.append('chenNuoShu', this.form.APPOINT_ANNEX[0].raw)
-          upload('/trainingbatch/sendMessage', formData
-          ).then((data) => {
-            if (data.code !== '0') {
-              this.$message.error(data.msg)
-            } else {
-              this.$message.success('推送成功')
-              this.visible = false
-              this.$emit('refresh', '')
-              this.beforeClose()
-            }
-          })
-        }
-      })
-    },
-    getDepartmentTree() {
       requestFN(
-        '/companyApi/department/listTree',
+        '/trainingbatch/sendMessage',
-        { CORPINFO_ID: this.form.APPOINT_CORP_ID }
-      ).then((data) => {
-        this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
-    getPeopleList(e) {
-      this.form.APPOINT_DEPARTMENT_NAME = e.name
-      requestFN(
-        '/companyApi/user/listAll',
         {
-          DEPARTMENT_ID: e.id
+          list: this.heirloom,
+          corp_id: corp_id,
+          corp_name: this.corp_name,
+          tm: new Date().getTime()
         }
       ).then((data) => {
-        this.form.APPOINT_USER_ID = ''
+        if (data.code !== '0') {
-        this.form.APPOINT_USER_NAME = ''
+          this.$message.error(data.msg)
-        this.form.user = ''
+        } else {
-        this.peopleList = data.userList
+          this.$message.success('推送成功')
-      }).catch((e) => {
+          this.visible = false
-        console.log(e)
+          this.$emit('refresh', '')
+        }
       })
-    },
-    chooseUser(e) {
-      const entity = JSON.parse(e)
-      this.form.APPOINT_USER_ID = entity.USER_ID
-      this.form.APPOINT_USER_NAME = entity.NAME
     }
-
   }
 }
 </script>

src/views/util/uploadFile/index.vue

@@ -39,7 +39,7 @@ export default {
     },
     info: {
       type: String,
-      default: '文件大小不超过500MB'
+      default: '文件大小不超过500kb'
     }
   },
   data() {

更新.md

@@ -1 +0,0 @@
-升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程