From e2ae1d8c4104ddbfdceff86cba8c8a4b5440f403 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 5 Aug 2022 17:12:43 +0800 Subject: [PATCH] 0805 --- common/http.api.js | 18 +- pages.json | 8 + pages/login/login_.vue | 4 +- pages/my/my.vue | 114 +------ pages/my/myInfo.vue | 371 ++++++++++------------ pages/workSpace/operation/gasList.vue | 380 +++++++++++++++++++++++ pages/workSpace/operation/workerList.vue | 137 +++++--- pages/workSpace/opls/fire.vue | 23 +- pages/workSpace/visit/visitCreate.vue | 4 +- pages/workSpace/visit/vpeopleList.vue | 2 +- 10 files changed, 688 insertions(+), 373 deletions(-) create mode 100644 pages/workSpace/operation/gasList.vue diff --git a/common/http.api.js b/common/http.api.js index 521cbab..8234299 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -29,6 +29,9 @@ const install = (Vue, vm) => { let userList = (params = {}) => vm.$u.get('/system/user/', params); // let deptList = (params = {}) => vm.$u.get('/system/dept/', params); // + let userInfo = (params = {}) => vm.$u.get('/hrm/employee/info/', params); //用户信息 + let hrmCertificate = (params = {}) => vm.$u.get('/hrm/certificate/', params); //用户证书 + let getTickets = (params = {}) => vm.$u.get('/wf/ticket/', params); //工单查询/wf/ticket/{id}/ let ticketCreate = (data = {}) => vm.$u.post('/wf/ticket/', data); //工单 let getTicketItem = (id) => vm.$u.get(`/wf/ticket/${id}/`); //工单详情 @@ -51,7 +54,10 @@ const install = (Vue, vm) => { let oplCateItem = (id) => vm.$u.get(`/opm/opl_cate/${id}/`); //作业许可证类型详情 let oplCreate = (data = {}) => vm.$u.post('/opm/opl/', data); //添加新许可证 let oplUpdate = (id,data = {}) => vm.$u.put(`/opm/opl/${id}/`, data); //编辑许可证 - let oplWorker = (data = {}) => vm.$u.get('/opl_worker/', data); //作业许可证类型 + let oplWorker = (data = {}) => vm.$u.get('/opm/opl_worker/', data); //作业许可证类型 + let oplWorkerCreate = (data = {}) => vm.$u.post('/opm/opl_worker/', data); //作业许可证类型 + let oplGasList = (data = {}) => vm.$u.get('/opm/gas_check/', data); //气体检测记录 + let oplGasCreate = (data = {}) => vm.$u.post('/opm/gas_check/', data); //作业许可证类型 let rpjList = (data = {}) => vm.$u.get(`/rpm/rpj/`, data); //rpj查询 let rpjItem = (id) => vm.$u.get(`/rpm/rpj/${id}`); //rpj查询 @@ -70,7 +76,8 @@ const install = (Vue, vm) => { let vpeopleUpdate = (data = {}) => vm.$u.put(`vm/vpeople/${id}/`, data); //来访人员编辑 vm.$u.api = { - getUserInfo, + userInfo, + getCode, codeLogin, login, @@ -112,7 +119,12 @@ const install = (Vue, vm) => { oplCreate, oplUpdate, oplWorker, - + oplWorkerCreate, + oplGasList, + oplGasCreate, + + hrmCertificate, + areaLists }; } diff --git a/pages.json b/pages.json index 4b4bf36..689314b 100644 --- a/pages.json +++ b/pages.json @@ -156,6 +156,14 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/workSpace/operation/gasList", + "style": { + "navigationBarTitleText": "气体检测记录", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, { "path": "pages/workSpace/visit/visitList", "style": { diff --git a/pages/login/login_.vue b/pages/login/login_.vue index 2f03382..265d393 100644 --- a/pages/login/login_.vue +++ b/pages/login/login_.vue @@ -184,7 +184,7 @@ code: loginRes.code }).then(res => { this.$u.vuex('vuex_token', res.access) - this.$u.api.getUserInfo().then(res => { + this.$u.api.userInfo().then(res => { uni.hideLoading() uni.showToast({ title: "登录成功", @@ -307,7 +307,7 @@ that.$u.vuex('vuex_refresh', res.refresh) // let data = {openid: uni.getStorageSync('wxmp_openid')} // that.$u.api.bindmp(data).then(res=>{}) - that.$u.api.getUserInfo().then(res => { + that.$u.api.userInfo().then(res => { that.$u.vuex('vuex_user', res) // 修改资源请求地址 }) diff --git a/pages/my/my.vue b/pages/my/my.vue index 5f9c5ec..229221f 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -28,15 +28,9 @@ - + - 我的申请 - - - - - - 我的审批 + 我的证书 @@ -72,119 +66,21 @@ } }, onShow() { - // this.getUserInfo(); - //获取当前用户累计出差天数 - // this.getBusinessTripDayTimeFn(); - //获取当前用户累计调休天数 - // this.getLeaveTimeFn(); - // 获取当前用户累计请假天数(不包括调休的记录) - // this.getLeaveTimePaidLeaveFn(); - - //查询年假剩余天数 - // this._getSystemHomePageTabChart(); - - + this.getUserInfo(); }, methods: { - /* 查询年假剩余天数 */ - _getSystemHomePageTabChart() { - systemHomePageTabChart().then((res) => { - if (res.statusCode === 200) { - if (res.data.data !== undefined && res.data.data !== null && res.data.data !== "") { - - this.annualLeaveDay = res.data.data.annualLeaveDay || 0.00; - } else { - this.annualLeaveDay = 0.00; - } - } else { - this.annualLeaveDay = 0.00; - uni.showToast({ - title: res.data.message, - icon: 'none' - }) - } - }).catch(() => { - this.annualLeaveDay = 0.00 - uni.showToast({ - title: '网络异常, 请求失败', - icon: 'none' - }) - }) - }, - getLeaveTimePaidLeaveFn() { - getLeaveTimePaidLeave().then(res => { - if (res.statusCode === 200) { - this.getLeaveTimePaidLeaveCon = res.data.data.b_leave_days; - } else { - uni.showToast({ - title: '获取用户累计请假天数失败', - icon: 'none' - }) - } - }).catch(err => { - uni.showToast({ - title: '请求失败', - icon: 'none' - }) - }) - }, - getLeaveTimeFn() { - getLeaveTime().then(res => { - if (res.statusCode === 200) { - this.getLeaveTimeCon = res.data.data.b_leave_days; - } else { - uni.showToast({ - title: '获取用户累计调休天数失败', - icon: 'none' - }) - - } - }).catch(err => { - uni.showToast({ - title: '请求失败', - icon: 'none' - }) - }) - }, - - getBusinessTripDayTimeFn() { - getBusinessTripDayTime().then(res => { - if (res.statusCode === 200) { - this.getBusinessTripDayTimeCon = res.data.data.b_leave_days; - } else { - uni.showToast({ - title: '获取用户累计出差天数失败', - icon: 'none' - }) - } - }).catch(err => { - uni.showToast({ - title: '请求失败', - icon: 'none' - }) - }) - }, + goInto(type) { - if (type == "myApply") { + if (type == "certificate") { uni.navigateTo({ url: '/pages/profile/my_apply/my_apply' }) } - if (type == "daiban") { - uni.navigateTo({ - url: '/pages/index/daiban_management/daiban_management' - }) - } if (type == "myData") { uni.navigateTo({ url: '/pages/my/myInfo' }) } - if (type == "problem") { - uni.navigateTo({ - url: '/pages/profile/common_problem/common_problem' - }) - } }, getUserInfo() { var promise; diff --git a/pages/my/myInfo.vue b/pages/my/myInfo.vue index 22d9c47..2d992c5 100644 --- a/pages/my/myInfo.vue +++ b/pages/my/myInfo.vue @@ -1,233 +1,176 @@ diff --git a/pages/workSpace/operation/gasList.vue b/pages/workSpace/operation/gasList.vue new file mode 100644 index 0000000..34b39ee --- /dev/null +++ b/pages/workSpace/operation/gasList.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/pages/workSpace/operation/workerList.vue b/pages/workSpace/operation/workerList.vue index 609e7f9..e6ded6f 100644 --- a/pages/workSpace/operation/workerList.vue +++ b/pages/workSpace/operation/workerList.vue @@ -6,9 +6,9 @@ - 姓名：{{row.text}} - 手机号：{{row.visitor_.phone}} - 身份证号：{{row.visitor_.id_number}} + 姓名：{{row.worker_.name}} + 手机号：{{row.phone}} + 职责：{{row.duty}} @@ -22,24 +22,30 @@ - 选择来访人员 + 选择作业人员
作业人员 - + 工作职责 - + 证书 - - + + + + @@ -48,11 +54,11 @@ - - + + + - + @@ -66,12 +72,32 @@ opl: '', worker: '', duty: null, - certificates:[], + certificates: [], }, initform: {}, workerList: [], workerRange: [], - dutyRange: [], + dutyRange: [{ + value: '10', + text: "作业人员" + }, + { + value: '20', + text: "起重司机" + }, + { + value: '30', + text: "司索人员" + }, + { + value: '40', + text: "起重指挥" + }, + { + value: '40', + text: "电工" + }, + ], certificateRange: [], } }, @@ -79,15 +105,15 @@ this.oplId = params.oplId; }, onShow() { + this.workerList = []; this.getWorkerList(); this.getWorkerRange(); // this.getVpeopleList(); - this.getInit(); }, methods: { formSubmit(val) { let that = this; - that.formData.oplId = that.oplId; + that.formData.opl = that.oplId; that.$u.api.oplWorkerCreate(that.formData).then(res => { if (res.err_msg) {} else { that.getWorkerList(); @@ -101,38 +127,56 @@ that.$u.api.userList({ page: 0 }).then(res => { - that.userRange = []; - let user = []; + let workerRange = []; let obj = {}; res.forEach(item => { obj = item; obj.value = item.id; obj.text = item.name; - user.push(obj); + workerRange.push(obj); }) - that.userRange = user + that.workerRange = workerRange }) }, - //获取已有游客 + //获取该工作的工作人员 getWorkerList() { let that = this; + that.workerList = []; that.$u.api.oplWorker({ page: 0, opl: this.oplId }).then(res => { - that.workerList = []; - let user = []; - let obj = {}; - res.forEach(item => { - obj = item; - obj.value = item.id; - obj.text = item.visitor_.name; - user.push(obj); - }) - that.workerList = user + that.workerList = res }) }, + selectWorker(e) { + let that = this; + that.formData.worker = e; + if(e!==''){ + that.$u.api.hrmCertificate({ + employee__user:e, + page: 0 + }) + .then((res) => { + let certificateRange = []; + let obj = {}; + res.forEach(item => { + obj = item; + obj.chencked = false; + certificateRange.push(obj); + }) + that.certificateRange = certificateRange + console.log(res); + }); + + }else{} + }, + checkboxMeasuresChange(e) { + let values = e.detail.value; + this.formData.certificates = values; + }, checkPeople() { + this.certificateRange = []; this.limitedPeople = true; }, closeDialog() { @@ -151,22 +195,25 @@ }) }, edit(row) {}, - getInit() { - this.$u.api.workflowInit('Fire').then((res) => { - this.initform = res; - - }); + + nexStep(){ + let params = `?oplId=${this.oplId}`; + uni.navigateTo({ + url: '/pages/workSpace/operation/gasList'+params + }) }, + //提交工单 submitticket(id) { + let that = this; let ticket = {}; - ticket.workflow = this.initform.workflow; + ticket.workflow = that.initform.workflow; ticket.ticket_data = { - opl: this.oplId + opl: that.oplId }; ticket.transition = id; - this.$u.api.ticketCreate(ticket).then((res) => { - if(res.err_msg){}else{ + that.$u.api.ticketCreate(ticket).then((res) => { + if (res.err_msg) {} else { uni.reLaunch({ url: '/pages/workSpace/workSpace' }) @@ -293,4 +340,14 @@ background-repeat: no-repeat; background-size: cover; } + + .uni-label-pointer { + min-width: 50%; + display: inline-block; + margin-right: 0!important; + margin-bottom: 20upx; + } + .uni-form-item { + height:fit-content!important; + } diff --git a/pages/workSpace/opls/fire.vue b/pages/workSpace/opls/fire.vue index 364cecf..260e8f5 100644 --- a/pages/workSpace/opls/fire.vue +++ b/pages/workSpace/opls/fire.vue @@ -236,12 +236,28 @@ that.measurelist = []; that.oplCateName = res.name; that.oplcateCode = res.code; + let risklist =res.risk_options_; + let measurelist =res.measure_options_; if (that.oplId !== null) { - that.editCheckShow(res.risk_options_, res.measure_options_); + that.editCheckShow(risklist, measurelist); + }else{ + risklist.forEach(item => { + let obj = {}; + obj = item; + obj.checked = false; + that.risklist.push(obj) + }) + measurelist.forEach(item => { + let obj = {}; + obj = item; + obj.checked = false; + that.measurelist.push(obj) + }) } }); }, editCheckShow(risklist, measurelist) { + debugger; let that = this; that.$u.api.oplItem(that.oplId).then((res) => { that.formData = res; //作业开始时间 @@ -380,7 +396,10 @@ }) }else{ that.$u.api.oplCreate(that.formData).then(res=>{ - + params = `?oplId=${that.oplId}`; + uni.navigateTo({ + url:'/pages/workSpace/operation/workerList'+params + }) }) } diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue index 84f2979..3fa13c3 100644 --- a/pages/workSpace/visit/visitCreate.vue +++ b/pages/workSpace/visit/visitCreate.vue @@ -235,10 +235,10 @@ } else { that.$u.api.visitCreate(that.formData).then(res => { if (res.err_msg) { - } else { + let params = `?visit=${res.id}`; uni.navigateTo({ - url: '/pages/workSpace/visit/vpeopleList' + url: '/pages/workSpace/visit/vpeopleList'+params }) } }) diff --git a/pages/workSpace/visit/vpeopleList.vue b/pages/workSpace/visit/vpeopleList.vue index b5aeab5..8ee168b 100644 --- a/pages/workSpace/visit/vpeopleList.vue +++ b/pages/workSpace/visit/vpeopleList.vue @@ -110,7 +110,7 @@ let that = this; that.$u.api.vmVpeople({ page: 0, - visit: '1554721956950052864' + visit: that.visitId }).then(res => { that.vpeopleList = []; let user = [];