fix: BUG修改
This commit is contained in:
kun
parent
6d56422b44
commit
20dd62e091
@ -1,4 +1,4 @@
|
||||
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.2894818dffea468ddc2107034baa0082.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
|
||||
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.87175123858093ffc18168c24c1ea391.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
|
||||
var rootURL = host + "/";
|
||||
// var rootURL = "http://192.168.34.221:28888/";
|
||||
// var rootURL = "http://192.168.34.221:9111/"; //本地
|
||||
@ -16,4 +16,4 @@
|
||||
// rootURL = "http://192.168.34.155:19111/" //本地
|
||||
// locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/'
|
||||
locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/'
|
||||
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.57836df18953bdc17acc.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>
|
||||
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.f54bc54e6e52d34697c4.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
public/doc/h5Entry/static/js/2.d5509e040de1b8fe107c.js
Normal file
2
public/doc/h5Entry/static/js/2.d5509e040de1b8fe107c.js
Normal file
@ -0,0 +1,2 @@
|
||||
webpackJsonp([2],{"2NXm":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("mvHQ"),o=n.n(i),a=n("woOf"),r=n.n(a),s=n("bOdI"),c=n.n(s),u={data:function(){return{userData:{}}},created:function(){this.httpUrl=rootURL;var t=locationURL,e=t.split("?")[1];console.log(t);var n={};e.split("&").forEach(function(t,e){if(console.log(t),2==e){var i=t.split("=")[0],o=t.split("=")[1].split("#")[0],a=c()({},i,o);r()(n,a)}else{var s=t.split("=")[0],u=t.split("=")[1],l=c()({},s,u);r()(n,l)}}),console.log(n,777888),localStorage.setItem("userData",o()(n)),this.userData=n},methods:{memberRegister:function(){this.$router.push({path:"/infoInput"})},educationEnter:function(){window.open(window.location.origin+"#/authentication?eduId="+this.userData.educationId+"&projectSn="+this.userData.projectSn)},entryCodeEnter:function(){window.open(window.location.origin+"#/entryCode?projectSn="+this.userData.projectSn)}}},l={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"home"},[n("div",{staticClass:"content-part"},[n("div",{staticClass:"part-title"},[t._v("人员登记考试系统")]),t._v(" "),n("div",{staticClass:"part-alarm"},[t._v("请先进行人员登记,再进行考试")]),t._v(" "),n("div",{staticClass:"btn member",on:{click:t.memberRegister}},[t._v("人员登记")]),t._v(" "),n("div",{staticClass:"btn education",on:{click:t.educationEnter}},[t._v("教育培训")])])])},staticRenderFns:[]};var d=n("VU/8")(u,l,!1,function(t){n("VCU+")},"data-v-7fa8e668",null);e.default=d.exports},"9bBU":function(t,e,n){n("mClu");var i=n("FeBl").Object;t.exports=function(t,e,n){return i.defineProperty(t,e,n)}},C4MV:function(t,e,n){t.exports={default:n("9bBU"),__esModule:!0}},"VCU+":function(t,e){},bOdI:function(t,e,n){"use strict";e.__esModule=!0;var i,o=n("C4MV"),a=(i=o)&&i.__esModule?i:{default:i};e.default=function(t,e,n){return e in t?(0,a.default)(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},mClu:function(t,e,n){var i=n("kM2E");i(i.S+i.F*!n("+E39"),"Object",{defineProperty:n("evD5").f})}});
|
||||
//# sourceMappingURL=2.d5509e040de1b8fe107c.js.map
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,2 @@
|
||||
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"578ea456fe8c81e20520",2:"d5509e040de1b8fe107c",3:"4dbc61fae8f9d7188195",4:"cc318b807ecd505f3946",5:"ef7329314c5270b36976"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
|
||||
//# sourceMappingURL=manifest.f54bc54e6e52d34697c4.js.map
|
||||
File diff suppressed because one or more lines are too long
@ -282,6 +282,20 @@ export default {
|
||||
},
|
||||
//切换 整改人
|
||||
changeDutyId(value) {
|
||||
console.log(value)
|
||||
console.log(this.form,666777)
|
||||
console.log(this.notifierOrPeopleList,888999)
|
||||
if(this.form.dutyId.length > 0){
|
||||
let shouldHavePersonIdList = this.notifierOrPeopleList.map(item => {
|
||||
if(this.form.dutyId.includes(item.enterpriseId)){
|
||||
return item.userId
|
||||
}
|
||||
})
|
||||
const newArr = this.form.personId.filter(item => shouldHavePersonIdList.includes(item))
|
||||
this.form.personId = newArr;
|
||||
} else {
|
||||
this.form.personId = [];
|
||||
}
|
||||
this.getUpdatePersonListFn();
|
||||
},
|
||||
//切换 通知人
|
||||
@ -311,11 +325,17 @@ export default {
|
||||
this.form.dutyId = value.enterpriseInfos.map(item => {
|
||||
return item.id
|
||||
})
|
||||
this.getUpdatePersonListFn();
|
||||
}
|
||||
if(value.systemUsers && value.systemUsers.length > 0){
|
||||
this.form.personId = value.systemUsers.map(item => {
|
||||
return item.userId
|
||||
const newArr = [];
|
||||
value.systemUsers.map(item => {
|
||||
if(item.userId){
|
||||
newArr.push(item.userId)
|
||||
}
|
||||
})
|
||||
this.form.personId = newArr;
|
||||
console.log(this.form.personId,123456789)
|
||||
}
|
||||
this.form.remark = value.remark
|
||||
this.form.id = value.id
|
||||
@ -401,8 +421,11 @@ export default {
|
||||
})
|
||||
}
|
||||
if(this.form.personId && this.form.personId.length > 0){
|
||||
console.log(this.form.personId,777888)
|
||||
data.systemUsers = this.form.personId.map(item => {
|
||||
if(item){
|
||||
return {userId: item}
|
||||
}
|
||||
})
|
||||
}
|
||||
if (this.dialogType == 1) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -296,6 +296,23 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="分包单位" prop="enterpriseId">
|
||||
<el-select
|
||||
v-model="addEditForm.enterpriseId"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
@change="changeDutyId"
|
||||
>
|
||||
<el-option
|
||||
:label="item.enterpriseName"
|
||||
:value="item.id"
|
||||
v-for="(item, index) in enterpriseListData"
|
||||
:key="index"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 检查人员 -->
|
||||
<el-form-item
|
||||
:label="
|
||||
@ -369,6 +386,9 @@ import {
|
||||
} from '@/assets/js/api/safeManage.js'
|
||||
import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage'
|
||||
import messageV2Vue from '../../../messageV2.vue'
|
||||
import {
|
||||
getEnterpriseInfoList
|
||||
} from "@/assets/js/api/laborPerson";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -397,7 +417,8 @@ export default {
|
||||
sn: '',
|
||||
startTime: '',
|
||||
taskName: '',
|
||||
inspectUser: []
|
||||
inspectUser: [],
|
||||
enterpriseId: ""
|
||||
},
|
||||
addEditFormRules: {
|
||||
inspectTypeId: [
|
||||
@ -444,22 +465,56 @@ export default {
|
||||
this.$t('message.safeMangeCheck.dialog.person'),
|
||||
trigger: 'change'
|
||||
}
|
||||
]
|
||||
],
|
||||
enterpriseId: [
|
||||
// 请选择分包单位
|
||||
{
|
||||
required: true,
|
||||
message: "请选择",
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
},
|
||||
dialogVisible: false,
|
||||
isAdd: true,
|
||||
checkDaterange: [],
|
||||
frequencyType: this.$t('message.safeMangeCheck.frequency'),
|
||||
accountList: []
|
||||
accountList: [],
|
||||
enterpriseListData: []
|
||||
}
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.loadList()
|
||||
this.getCheckTypeList()
|
||||
this.getAccountList()
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
//切换 整改人
|
||||
changeDutyId(value) {
|
||||
if(this.addEditForm.enterpriseId){
|
||||
// let shouldHavePersonIdList = this.accountList.map(item => {
|
||||
// if(this.addEditForm.enterpriseId.includes(item.enterpriseId)){
|
||||
// return item.userId
|
||||
// }
|
||||
// })
|
||||
// const newArr = this.addEditForm.inspectUser.filter(item => shouldHavePersonIdList.includes(item))
|
||||
// this.addEditForm.inspectUser = newArr;
|
||||
this.getAccountList();
|
||||
} else {
|
||||
this.addEditForm.inspectUser = [];
|
||||
this.accountList = []
|
||||
}
|
||||
},
|
||||
//获取企业 || 劳务公司 列表
|
||||
getProjectList() {
|
||||
let data = {
|
||||
projectSn: this.$store.state.projectSn
|
||||
};
|
||||
getEnterpriseInfoList(data).then((res) => {
|
||||
this.enterpriseListData = res.result;
|
||||
});
|
||||
},
|
||||
refreshFn() {
|
||||
this.searchForm.inspectTypeId = ''
|
||||
this.daterange = []
|
||||
@ -477,7 +532,8 @@ export default {
|
||||
},
|
||||
getAccountList() {
|
||||
getProjectChilderSystemUserListApi({
|
||||
projectSn: this.$store.state.projectSn
|
||||
projectSn: this.$store.state.projectSn,
|
||||
enterpriseId: this.addEditForm.enterpriseId
|
||||
}).then((result) => {
|
||||
this.accountList = result.result
|
||||
})
|
||||
@ -518,6 +574,7 @@ export default {
|
||||
this.addEditForm.sn = this.$store.state.projectSn
|
||||
let json = this.addEditForm
|
||||
json.inspectUser = json.inspectUser.join(',')
|
||||
json.enterpriseId = json.enterpriseId
|
||||
json.createUser = this.$store.state.userInfo.userId
|
||||
json.type = 2
|
||||
console.log('--------新增参数', json)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user