diff --git a/.gitignore b/.gitignore index 92fa10e..73d2583 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ node_modules/* deploy.sh package-lock.json -unpackage/* \ No newline at end of file +unpackage/* +.vscode/ +.vs/ +.idea/ +.hbuilderx/ \ No newline at end of file diff --git a/App.vue b/App.vue index 3d76c26..ff4d0fe 100644 --- a/App.vue +++ b/App.vue @@ -68,8 +68,10 @@ } }); // #endif + // #ifdef APP-PLUS uni.getSystemInfo({ success(res) { + console.log(res) that.$u.vuex('vuex_version', res.appVersion) if (res.platform == 'android') { that.$u.api.apkCheck().then(res1 => { @@ -95,6 +97,7 @@ } } }) + // #endif // #ifdef APP-PLUS uni.showLoading({ title: '自动登录中...', @@ -110,6 +113,7 @@ icon: "none" }) that.$u.api.loginSecret(JSON.parse(secret)).then(res => { + that.$u.vuex('vuex_token', res.access) that.$u.api.getUserInfo().then(res => { if(res.avatar){ res.avatar = this.vuex_host + res.avatar @@ -126,10 +130,23 @@ uni.reLaunch({ url: '/pages/home/home_' }) + }).catch(e=>{ + uni.reLaunch({ + url: '/pages/login/login_' + }) + }) + }else{ + uni.reLaunch({ + url: '/pages/login/login_' }) } }, + fail() { + uni.reLaunch({ + url: '/pages/login/login_' + }) + }, complete() { uni.hideLoading() } diff --git a/common/http.api.js b/common/http.api.js index 0e37775..b28db6b 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -50,23 +50,27 @@ const install = (Vue, vm) => { let addNodeEnd = (id, data = {}) => vm.$u.get(`/wf/ticket/${id}/add_node_end/`, data); //加签处理 let deliver = (id, data = {}) => vm.$u.get(`/wf/ticket/${id}/deliver/`, data); //转交工单 let ticketHandle = (id, data = {}) => vm.$u.post(`/wf/ticket/${id}/handle/`, data); //工单处理 + let ticketRetry = (id) => vm.$u.post(`/wf/ticket/${id}/retry_script/`, data); //工单重试 let ticketAccept = (id) => vm.$u.post(`/wf/ticket/${id}/accpet/`); //接单 let operationList = (data = {}) => vm.$u.get('/opm/operation/', data); //作业列表 let operationItem = (id) => vm.$u.get(`/opm/operation/${id}/`); //作业详情 let operationCreat = (data = {}) => vm.$u.post('/opm/operation/', data); //作业新建 let operationUpdate = (id, data = {}) => vm.$u.put(`/opm/operation/${id}/`, data); //作业编辑 + let operationDelete = (id) => vm.$u.delete(`/opm/operation/${id}/`); //作业编辑 let oplItem = (id) => vm.$u.get(`/opm/opl/${id}/`); //opl作业许可证查询 let oplLists = (data = {}) => vm.$u.get('/opm/opl/', data); //作业许可证 let oplCate = (data = {}) => vm.$u.get('/opm/opl_cate/', data); //作业许可证类型 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 oplDelete = (id) => vm.$u.delete(`/opm/opl/${id}/`); //删除许可证 let oplWorker = (data = {}) => vm.$u.get('/opm/opl_worker/', data); //作业许可证工作人员 let oplWorkerCreate = (data = {}) => vm.$u.post('/opm/opl_worker/', data); //作业许可证工作人员创建 let oplWorkerDelete = (id) => vm.$u.delete(`/opm/opl_worker/${id}/`); //作业许可证工作人员删除 let oplGasList = (data = {}) => vm.$u.get('/opm/gas_check/', data); //气体检测记录 - let oplGasCreate = (data = {}) => vm.$u.post('/opm/gas_check/', data); //作业许可证类型 + let oplGasCreate = (data = {}) => vm.$u.post('/opm/gas_check/', data); //气体监测记录创建 + let oplGasDelete = (id) => vm.$u.delete(`/opm/gas_check/${id}`); //气体监测记录删除 let oplMtartMtask = (id) => vm.$u.post(`/opm/opl/${id}/start_mtask/`); //作业开始监控 let oplStopMtask = (id) => vm.$u.post(`/opm/opl/${id}/stop_mtask/`); //作业结束监控 @@ -83,6 +87,7 @@ const install = (Vue, vm) => { let rpjMemberDelete = (id) => vm.$u.post(`/rpm/rpj_member/${id}/`); //入厂项目工作人员删除 let areaLists = (data = {}) => vm.$u.get('/am/area/', data); //作业区域 + let areaDetail = (id) => vm.$u.get(`/am/area/${id}/`); // 区域详情 let visitList = (data = {}) => vm.$u.get(`/vm/visit/`, data); //来访项目查询 let visitItem = (id) => vm.$u.get(`/vm/visit/${id}/`); //来访项目详情 @@ -105,6 +110,7 @@ const install = (Vue, vm) => { let eventtHandle = (id,data={}) => vm.$u.post(`/ecm/event/${id}/handle/`, data); //事件处理 let thirdBltBind = (data={}) => vm.$u.post(`/third/tdevice/blt_bind/`, data); //解绑卡 + let tdevice = (data={}) => vm.$u.get(`/third/tdevice/`, data); //设备列表 vm.$u.api = { getUserInfo , @@ -131,6 +137,7 @@ const install = (Vue, vm) => { workflowInit, getTicketTransitions, getTicketLog, + ticketRetry, visitList, visitItem, @@ -163,12 +170,14 @@ const install = (Vue, vm) => { operationItem, operationCreat, operationUpdate, + operationDelete, operationList, oplLists, oplItem, oplCate, oplCreate, oplUpdate, + oplDelete, oplWorker, oplWorkerCreate, oplGasList, @@ -176,12 +185,14 @@ const install = (Vue, vm) => { oplMtartMtask, oplStopMtask, oplWorkerDelete, + oplGasDelete, hrmUserInfo, hrmCertificate, hrmUpdateInfo, areaLists, + areaDetail, eventList, eventtItem, @@ -192,6 +203,7 @@ const install = (Vue, vm) => { permissions, thirdBltBind, + tdevice }; } diff --git a/manifest.json b/manifest.json index 20a904f..9352b5e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "曲阳金隅EHS", "appid" : "__UNI__B00D419", "description" : "曲阳金隅EHS", - "versionName" : "1.00.09", - "versionCode" : 10009, + "versionName" : "1.00.13", + "versionCode" : 10013, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/home/home_.vue b/pages/home/home_.vue index 25e4112..6732ab9 100644 --- a/pages/home/home_.vue +++ b/pages/home/home_.vue @@ -64,7 +64,7 @@ - 实时事件 + 最近发生 查看更多 @@ -151,14 +151,15 @@ }, getEvent() { let that = this; - let date = new Date(); - let years = date.getFullYear(); - let months = date.getMonth()+1; - let days = date.getDate(); - that.eventList = [] + // let date = new Date(); + // let years = date.getFullYear(); + // let months = date.getMonth() + 1; + // let days = date.getDate(); + // that.eventList = [] let params = { page: 1, - start_create: years+'-'+months+'-'+days + page_size: 2, + ordering: '-create_time' }; that.$u.api.eventList(params).then(res => { let eventList = res.results.filter(item => { diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue index de75554..17087c3 100644 --- a/pages/home/list/ticket.vue +++ b/pages/home/list/ticket.vue @@ -48,7 +48,7 @@ 关闭 + v-if="vuex_user.id===val.create_by&&val.state_.type!==1&&val.state_.enable_retreat"> 撤回 @@ -57,6 +57,10 @@ 查看 + + + 重试 + @@ -126,10 +130,18 @@ projectId = row.ticket_data.opl; cateType = 'opl' } - const params = `?ticketId=${row.id}&projectId=${projectId}&cateType=${cateType}&type=${type}`; - uni.navigateTo({ - url: '../detail/ticketHandle' + params, - }) + if(type=='retry'){ + that.$u.api.ticketRetry(row.id).then(res => { + uni.showToast({ + title: '重试下发成功' + }) + }) + }else{ + const params = `?ticketId=${row.id}&projectId=${projectId}&cateType=${cateType}&type=${type}`; + uni.navigateTo({ + url: '../detail/ticketHandle' + params, + }) + } }, //接单 diff --git a/pages/home/list/ticketAll.vue b/pages/home/list/ticketAll.vue index 1166795..fece287 100644 --- a/pages/home/list/ticketAll.vue +++ b/pages/home/list/ticketAll.vue @@ -236,7 +236,7 @@ } .search-body { - width: 710upx; + width: 720upx; height: 78rpx; background-color: #ffffff; border-radius: 39rpx; diff --git a/pages/workSpace/newWork/addUser.vue b/pages/workSpace/newWork/addUser.vue index feb1c42..1638783 100644 --- a/pages/workSpace/newWork/addUser.vue +++ b/pages/workSpace/newWork/addUser.vue @@ -61,11 +61,9 @@ }, saveVisitor(){ this.$u.api.visitorCreate(this.formData).then(res=>{ - if(res.err_msg){}else{ - uni.navigateTo({ - url: '/pages/workSpace/visit/vpeopleList' - }) - } + uni.navigateBack({ + delta: 1 + }) }) }, goBack() { diff --git a/pages/workSpace/newWork/userList.vue b/pages/workSpace/newWork/userList.vue index 81e3287..4e3c822 100644 --- a/pages/workSpace/newWork/userList.vue +++ b/pages/workSpace/newWork/userList.vue @@ -133,7 +133,7 @@ .apply-info { min-height: 70vh; - width: 710upx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 5px; diff --git a/pages/workSpace/operation/gasList.vue b/pages/workSpace/operation/gasList.vue index 34b39ee..b4f60f1 100644 --- a/pages/workSpace/operation/gasList.vue +++ b/pages/workSpace/operation/gasList.vue @@ -4,16 +4,22 @@ leftIcon="left" border backgroundColor="#2cade8" color="#fff" fixed statusBar shadow> - - + + 检测部位：{{row.check_place}} O₂(%)：{{row.o2}} CO：{{row.co}} 可燃气体(V%LEL)：{{row.lel}} - 检验结论：{{row.is_ok}} + 检验结论： + 正常 + 异常 + 检测人：{{row.checker_.name}} 检验时间：{{row.check_time}} + + + @@ -32,7 +38,7 @@
检测时间： - + @@ -99,7 +105,7 @@ limitedDialog: false, formData: { opl: '', - check_time: '选择日期', + check_time: null, check_place:'', o2:'', co:'', @@ -125,6 +131,11 @@ this.getInit(); }, methods: { + remove(row){ + this.$u.api.oplGasDelete(row.id).then(res => { + this.getGasCheckList() + }) + }, timeChange(e){ // debugger; console.log(e.detail.value) @@ -247,7 +258,7 @@ .apply-info { min-height: 70vh; - width: 710upx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 5px; @@ -309,12 +320,12 @@ } .dialogCont { - width: 80vw; + width: 92vw; position: absolute; top: 50%; margin: auto; background-color: #ffffff; - left: 10vw; + left: 4vw; transform: translateY(-50%); padding: 20rpx; border-radius: 20rpx; diff --git a/pages/workSpace/operation/operationCreate.vue b/pages/workSpace/operation/operationCreate.vue index 17ff522..6da8a55 100644 --- a/pages/workSpace/operation/operationCreate.vue +++ b/pages/workSpace/operation/operationCreate.vue @@ -13,7 +13,7 @@ - * + 具体地点 @@ -23,19 +23,17 @@ * - 开始时间 + 作业时间 - - - - - - * - 结束时间 - - - + + + @@ -55,7 +53,7 @@ 作业区域 - + @@ -68,6 +66,18 @@ + + + * + 属地部门 + + + + + + * @@ -131,8 +141,7 @@ start_time: '', //作业开始时间 end_time: '', //作业结束时间 state_work: '', //生产状态 - belong_dept: '', //所属部门 - area: '', //作业区域 + area: null, //作业区域 dept_ter: '', //属地部门 dept_bus: '', //业务部门 coordinator: '', //业务部门协调员 @@ -140,6 +149,7 @@ dept_bus_name:'请选择业务部门', dept_ter_name:'请选择属地部门', dcoordinator_name:'请选择部门协调员', + datetimerange: [], userRange: [], vchannelOptions: [], //作业区域 @@ -162,6 +172,12 @@ depRange: [], } }, + watch: { + datetimerange(newval) { + this.formData.start_time = this.datetimerange[0] + this.formData.end_time = this.datetimerange[1] + }, + }, onLoad(params) { if(params.operationId){ this.operationId = params.operationId; @@ -183,7 +199,6 @@ this.range = []; }, methods: { - // 显示选择器 showPicker() { this.$refs.treePicker._show(); }, @@ -210,6 +225,37 @@ select_dept_ter_Change(ids, names){ this.formData.dept_ter = ids[0]; this.dept_ter_name = names; + }, + areaChange(val) { + this.getVchannelOptions(val) + this.getAreaDept(val) + }, + getVchannelOptions(val) { + if(val==null || val==''){ + return + } + this.$u.api.tdevice({area: val, type: 60, page: 0}).then(res=>{ + let vchannelOptions = []; + let obj = {}; + res.forEach(item => { + obj = { + value: null, + text: '' + }; + obj.value = item.id; + obj.text = item.name; + vchannelOptions.push(obj); + }) + this.vchannelOptions = vchannelOptions + }) + }, + getAreaDept(val){ + if(val==null || val==''){ + return + } + this.$u.api.areaDetail(val).then(res=>{ + this.formData.dept_ter = res.belong_dept + }) }, //获取工作operation getOperation() { @@ -217,18 +263,22 @@ let that = this; that.$u.api.operationItem(that.operationId).then((res) => { that.formData.id = res.id; // + that.formData.state = res.state; that.formData.name = res.name; // that.formData.place = res.place; // that.formData.state_work = res.state_work; // that.formData.area = res.area; // + that.getVchannelOptions(res.area) that.formData.dept_bus = res.dept_bus; // that.formData.coordinator = res.coordinator; // that.formData.dept_ter = res.dept_ter; // that.formData.start_time = res.start_time; //作业开始时间 that.formData.end_time = res.end_time; //作业结束时间 + if(res.vchannels){ + that.formData.vchannel = res.vchannels[0] + } that.operationName = res.name; //作业 - console.log(res); - debugger; + that.datetimerange = [res.start_time, res.end_time] }); }, saveSubmit() { @@ -236,12 +286,16 @@ if (!that.paramsCheck()) { return; } else { + if(this.formData.vchannel){ + this.formData.vchannels = [this.formData.vchannel] + } if(this.formData.id){ if(this.formData.state!=10){ uni.navigateTo({ url: '/pages/workSpace/operation/oplCate?operationId='+this.formData.id }) }else{ + this.$u.api.operationUpdate(this.formData.id,this.formData).then(res => { let params = `?operationId=${res.id}`; uni.navigateTo({ @@ -411,7 +465,7 @@ } .form-info { - width: 710rpx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 10rpx; diff --git a/pages/workSpace/operation/operationDetail.vue b/pages/workSpace/operation/operationDetail.vue index 86b6f6f..3be6dda 100644 --- a/pages/workSpace/operation/operationDetail.vue +++ b/pages/workSpace/operation/operationDetail.vue @@ -10,6 +10,12 @@ {{formData.name}} + + 作业状态 + + {{stateOptions[formData.state]}} + + 具体地点 @@ -112,6 +118,13 @@ 4: "已完成", 5: "已关闭", }, + stateOptions: { + 10: "创建中", + 20: "审批中", + 30: "待作业", + 40: "作业中", + 50: "已关闭", + }, } }, onLoad(params) { diff --git a/pages/workSpace/operation/operationList.vue b/pages/workSpace/operation/operationList.vue index b46cb5c..fe252e6 100644 --- a/pages/workSpace/operation/operationList.vue +++ b/pages/workSpace/operation/operationList.vue @@ -55,7 +55,11 @@ 查看 - + + + 删除 + + 新增违规 @@ -114,7 +118,7 @@ //下拉刷新 onPullDownRefresh() { this.params.pageNum = 1; - this.ticketList = []; + this.lists = []; this.getLists(); }, methods: { @@ -126,11 +130,18 @@ }) }, operationHandle(val,type) { - let operation = val.id;//作业id - const params = `?operationId=${val.id}&type=${type}`; - uni.navigateTo({ - url: '/pages/workSpace/operation/operationCreate' + params, - }) + if (type=='delete'){ + this.$u.api.operationDelete(val.id).then(res => { + this.resetSearch() + }) + }else{ + let operation = val.id;//作业id + const params = `?operationId=${val.id}&type=${type}`; + uni.navigateTo({ + url: '/pages/workSpace/operation/operationCreate' + params, + }) + } + }, operationDetail(val){ let operation = val.id;//作业id diff --git a/pages/workSpace/operation/oplCate.vue b/pages/workSpace/operation/oplCate.vue index 06953ac..466ab44 100644 --- a/pages/workSpace/operation/oplCate.vue +++ b/pages/workSpace/operation/oplCate.vue @@ -4,14 +4,15 @@ leftIcon="left" border backgroundColor="#2cade8" color="#fff" fixed statusBar shadow> 已添加许可证： - + - {{item.name}} {{item.cate_name}} {{item.level}} + {{item.ticket_.state_.name }}-{{act_states[item.ticket_.act_state]}} - - + + + @@ -54,6 +55,14 @@ }, oplCateList: [], oplList: [], + act_states: { + 0: "草稿中", + 1: "进行中", + 2: "被退回", + 3: "被撤回", + 4: "已完成", + 5: "已关闭", + }, } }, onLoad(params) { @@ -91,15 +100,19 @@ if(type==='edit'){ oplCate = row.cate_name; params = `?oplId=${row.id}&oplcateId=${row.cate_.id}&operationId=${this.operationId}&type=${type}`; - }else{ + }else if(type=='add'){ oplCate = row.name; params = `?oplcateId=${row.id}&operationId=${this.operationId}&type=${type}`; + }else if(type=='delete'){ + this.$u.api.oplDelete(row.id).then(res => { + this.getOplLists() + }) } - if(oplCate==='动火'){ + if(oplCate==='动火'){ uni.navigateTo({ url: '../opls/fire' + params }) - } + } }, select(row) {}, @@ -172,6 +185,12 @@ background-size: cover; background-image: url('@/static/workSpace/new_apply/update.png'); } + .oplDeleteImg { + width: 40rpx; + height: 40upx; + background-size: cover; + background-image: url('@/static/workSpace/new_apply/del.png'); + } .oplAddImg { width: 40rpx; height: 40upx; diff --git a/pages/workSpace/operation/oplDetail.vue b/pages/workSpace/operation/oplDetail.vue index 17eaca6..435c20a 100644 --- a/pages/workSpace/operation/oplDetail.vue +++ b/pages/workSpace/operation/oplDetail.vue @@ -71,7 +71,7 @@ 监控状态 - {{msOptions[formData.mtask_status]}} + {{msOptions[formData.mtask_status]}} 开始 停止 @@ -82,12 +82,14 @@ 姓名 - 工作职责 + 职责 + 证书 操作 - {{item.worker_name}} + {{item.worker_name}} {{item.duty}} + {{item.certificates.length}}张 绑卡 解绑 @@ -107,7 +109,8 @@ {{item1.check_place}} - + 正常 + 异常 @@ -234,6 +237,12 @@ delta: 1 }) }, + viewWorker(item) { + uni.showToast({ + title: item.id, + icon: 'none' + }) + } } } diff --git a/pages/workSpace/operation/workerList.vue b/pages/workSpace/operation/workerList.vue index d4f4ad1..578d4c2 100644 --- a/pages/workSpace/operation/workerList.vue +++ b/pages/workSpace/operation/workerList.vue @@ -245,7 +245,7 @@ .apply-info { min-height: 70vh; - width: 710upx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 5px; diff --git a/pages/workSpace/opls/fire.vue b/pages/workSpace/opls/fire.vue index 0d2990e..816b7d3 100644 --- a/pages/workSpace/opls/fire.vue +++ b/pages/workSpace/opls/fire.vue @@ -172,9 +172,7 @@ risks_checked: [], measures_checked: [], }, - header: { - Authorization: "Bearer " + this.vuex_token - }, + header: {}, oplId: null, operationName: '', oplCateName: '', @@ -209,6 +207,9 @@ if (params.oplId) { this.oplId = params.oplId; this.formData.id = params.oplId; + }else{ + console.log('s', this.vuex_user.belong_dept) + this.formData.dept_do = this.vuex_user.belong_dept } this.formData.cate = this.oplcateId; this.formData.operation = this.operationId; @@ -223,6 +224,11 @@ this.getHeader(); }, methods: { + getHeader() { + this.header = { + Authorization: "Bearer " + this.vuex_token + } + }, //获取工作operation getOperation() { let that = this; @@ -415,7 +421,7 @@ } else { that.$u.api.oplCreate(that.formData).then(res => { uni.hideLoading(); - params = `?oplId=${res.oplId}`; + params = `?oplId=${res.id}`; uni.navigateTo({ url: '/pages/workSpace/operation/workerList' + params }) @@ -439,7 +445,7 @@ } .form-info { - width: 710upx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 5px; diff --git a/pages/workSpace/rpj/rpjDetail.vue b/pages/workSpace/rpj/rpjDetail.vue index 3ab4436..3301ba5 100644 --- a/pages/workSpace/rpj/rpjDetail.vue +++ b/pages/workSpace/rpj/rpjDetail.vue @@ -10,6 +10,12 @@ {{formData.name}} + + 项目状态 + + {{stateOptions[formData.state]}} + + 项目类型 @@ -48,13 +54,13 @@ - 证书： - + 资料： + 资质内容 文献资料 - + {{item1.file_cate_.name}} @@ -68,19 +74,21 @@ - 暂无相关证书 + 暂无相关资料 - 作业人员： + 项目人员： 姓名 工作职责 + 证书 操作 - {{item.remployee_.name}} + {{item.remployee_.name}} {{item.duty}} + {{item.rcertificates.length}}张 绑卡 解绑 @@ -107,7 +115,15 @@ rparty_name:'', }, workerList:[], - certificateList:[], + fileList:[], + stateOptions: { + 10: "创建中", + 20: "审批中", + 30: "待入厂", + 40: "进行中", + 50: "已完成", + 60: "已关闭", + }, act_states: { 0: "草稿中", 1: "进行中", @@ -130,7 +146,7 @@ }, onShow() { this.getworkerList();//工作人员 - this.getcertificateList();//证书 + this.getFileList();//证书 }, methods: { //获取工作operation @@ -149,11 +165,11 @@ }) }, - //获取证书 - getcertificateList(){ + //获取入厂资料 + getFileList(){ let that = this; that.$u.api.rpjFileList({rpj: that.rpjId, page: 0}).then(res => { - that.certificateList =res.filter(item=>{ + that.fileList =res.filter(item=>{ return item.files.length>0 }); }) @@ -194,6 +210,12 @@ delta: 1 }) }, + viewMember(item) { + uni.showToast({ + title: item.id, + icon: 'none' + }) + } } } diff --git a/pages/workSpace/rpj/rpjLisst.vue b/pages/workSpace/rpj/rpjLisst.vue index 73ba788..df5a126 100644 --- a/pages/workSpace/rpj/rpjLisst.vue +++ b/pages/workSpace/rpj/rpjLisst.vue @@ -40,16 +40,20 @@ 相关方：{{val.rparty_name}} 合同编号：{{val.contract_number}} + 状态：{{stateOptions[val.state]}} 作业类型：{{typeOptions[val.type]}} 所属部门：{{val.belong_dept_name}} - 入厂时间：{{val.come_time}} - 离厂时间：{{val.leave_time}} + 入厂时间：{{val.come_time}}-{{val.leave_time}} 编辑 + + + 删除 + @@ -78,9 +82,10 @@ stateOptions: { 10: "创建中", 20: "审批中", - 30: "待作业", - 40: "作业中", - 50: "已关闭", + 30: "待入厂", + 40: "进行中", + 50: "已完成", + 60: "已关闭", }, typeOptions: { 10: "建筑施工", @@ -120,7 +125,7 @@ //下拉刷新 onPullDownRefresh() { this.params.pageNum = 1; - this.ticketList = []; + this.lists = []; this.getLists(); }, methods: { @@ -132,10 +137,18 @@ }) }, rpjHandle(val, type) { - const params = `?rpj=${val.id}&type=${type}`; - uni.navigateTo({ - url: '/pages/workSpace/rpj/rpjCreate' + params, - }) + if(type=='delete'){ + this.$u.api.rpjDelete(val.id).then(res => { + this.resetSearch() + }) + }else{ + const params = `?rpj=${val.id}&type=${type}`; + uni.navigateTo({ + url: '/pages/workSpace/rpj/rpjCreate' + params, + }) + + } + }, rpjDetail(val){ const params = `?rpjId=${val.id}`; diff --git a/pages/workSpace/rpj/rpjWorkers.vue b/pages/workSpace/rpj/rpjWorkers.vue index daa53f4..bcafb9f 100644 --- a/pages/workSpace/rpj/rpjWorkers.vue +++ b/pages/workSpace/rpj/rpjWorkers.vue @@ -249,7 +249,7 @@ .apply-info { min-height: 70vh; - width: 710upx; + width: 720upx; margin: 0 auto; background-color: #FFFFFF; border-radius: 5px; diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue index 7975f80..7148d92 100644 --- a/pages/workSpace/visit/visitCreate.vue +++ b/pages/workSpace/visit/visitCreate.vue @@ -143,6 +143,9 @@ }, { text: "开会", value: 40 + }, { + text: "其他", + value: 60 }], levelRange: [{ text: "一般", diff --git a/pages/workSpace/visit/visitDetail.vue b/pages/workSpace/visit/visitDetail.vue index 3ec7473..d1dfe27 100644 --- a/pages/workSpace/visit/visitDetail.vue +++ b/pages/workSpace/visit/visitDetail.vue @@ -10,6 +10,12 @@ {{purposeOptions[formData.purpose]}} + + 来访状态 + + {{stateOptions[formData.state]}} + + 来访概述 @@ -37,7 +43,7 @@ 接待人 - {{formData.receptionist}} + {{formData.receptionist_.name}} @@ -64,12 +70,14 @@ 姓名 - 手机号 + 主访 操作 - {{item.visitor_.name}} - {{item.visitor_.phone}} + {{item.visitor_.name}} + + 是 + 绑卡 解绑 @@ -94,6 +102,14 @@ 40: "开会", 50: "拉送货" }, + stateOptions: { + 10: "创建中", + 20: "审批中", + 30: "待入厂", + 40: "进行中", + 50: "已完成", + 60: "已关闭", + }, levelOptions: { 10: "一般", 20: "重要", @@ -150,7 +166,12 @@ delta: 1 }) }, - + viewPeople(item) { + uni.showToast({ + title: item.id, + icon: 'none' + }) + } } } diff --git a/pages/workSpace/visit/visitList.vue b/pages/workSpace/visit/visitList.vue index 36d1571..206ac7e 100644 --- a/pages/workSpace/visit/visitList.vue +++ b/pages/workSpace/visit/visitList.vue @@ -38,6 +38,7 @@ {{val.name}} + 来访事由：{{purposeOptions[val.purpose]}} 状态：{{stateOptions[val.state]}} 创建时间：{{val.create_time}}