zcdsj
/
factory_mp_old
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coding修改

This commit is contained in:
shijing 2023-03-14 17:01:31 +08:00
parent 925e4e00a9
commit feab95bc8f
18 changed files with 96 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
"versionName" : "1.01.23",
"versionCode" : 101023,
"versionName" : "1.01.25",
"versionCode" : 101025,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

12
pages/home/detail/ticketHandle.vue
View File

@ -27,6 +27,14 @@
<view v-if="ticketDetail.state">{{ticketDetail.state_.name}}</view>
</view>
</view>
<view class="form-item" v-if="ticketDetail.participant_&&ticketDetail.participant_.length>0">
<view class="form-left">
<text class="form-left-text">可处理人</text>
</view>
<view class="form-right">
<text v-for="(item,index) in ticketDetail.participant_">{{item.name}} <text v-if="index!==ticketDetail.participant_.length-1">、</text></text>
</view>
</view>
</view>
<block v-if="cateType==='visit'">
<view class="ticket-info">
@ -341,10 +349,6 @@
<uni-data-select v-model="form.close_note" :localdata="noteOption" label="选择关闭原因"></uni-data-select>
</view>
<view class="form-item" v-if="ticketDetail.state_&&ticketDetail.state_.key==='opl_close'">
<!-- <view class="form-left-text">
<text class="star">*</text>
<text>关闭处理</text>
</view> -->
<uni-data-select v-model="form.close_dos" :localdata="dosOption" label="关闭处理"></uni-data-select>
</view>
<view class="form-item" style="height: 300rpx;">

5
pages/home/home_.vue
View File

@ -45,6 +45,11 @@
<view class="info-details">工单状态：{{item.state_.name}}</view>
<view class="info-details">提交时间：{{item.create_time}} </view>
<view class="info-details">更新时间：{{item.update_time}} </view>
<!-- <view class="info-details">可处理人：{{item.update_time}} </view> -->
<view class="info-details" v-if="item.participant_&&item.participant_.length>0">
可处理人：
<text v-for="(val,index) in item.participant_">{{val.name}} <text v-if="index!==item.participant_.length-1">、</text></text>
</view>
</view>
<view class="bottom-btns">
<view class="shenhezhong bottom-btn" @click="ticketHandle(item,'handle')"

3
pages/home/list/ticket.vue
View File

@ -30,6 +30,9 @@
<view class="center-info">
<view class="info-details">所属工作流：{{val.workflow_.name}}</view>
<view class="info-details">工单状态：{{val.state_.name}}</view>
<view class="info-details" v-if="val.participant_&&val.participant_.length>0">可处理人：
<text v-for="(item,index) in val.participant_">{{item.name}} <text v-if="index!==val.participant_.length-1">、</text></text>
</view>
<view class="info-details">提交时间：{{val.create_time}} </view>
<view class="info-details">更新时间：{{val.update_time}} </view>
</view>

3
pages/workSpace/operation/operationCreate.vue
View File

@ -197,8 +197,7 @@
this.$refs.dept_ter_Picker._show();
},
showDcoordinatorPicker(){
// this.$refs.dcoordinator_Picker._show();
let params='?type=receptionist&typeName=dcoordinator_name'
let params='?type=coordinator&typeName=dcoordinator_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

13
pages/workSpace/operation/oplDetail.vue
View File

@ -3,14 +3,14 @@
<uni-nav-bar @clickLeft="goBack()" class="nav-bar" height="110rpx" leftWidth="200rpx" leftText="许可证详情"
leftIcon="left" border backgroundColor="#2cade8" color="#fff" fixed statusBar shadow></uni-nav-bar>
<view class="wrap-view wrap-top">
<view class="item title"> <text class="blueLine"></text>许可证信息：</view>
<view class="item title"> <text class="blueLine"></text>{{formData.cate_name}}作业许可证信息：</view>
<view class="item">
<view class="title">编号</view>
<view class="content">
<text>{{formData.number}}</text>
</view>
</view>
<view class="item">
<view class="item" v-if="formData.level">
<view class="title">作业级别</view>
<view class="content">
<text>{{formData.level}}</text>
@ -31,7 +31,7 @@
<view class="item">
<view class="title">状态</view>
<view class="content">
<!-- <text v-if="formData.ticket_">{{formData.ticket_.state_.name}}</text> -->
<text v-if="formData.ticket_">{{formData.ticket_.state_.name}}</text>
</view>
</view>
<view class="item">
@ -52,6 +52,12 @@
<text>{{formData.monitor_.name}}</text>
</view>
</view>
<!-- <view class="item" v-if="formData.participant_&&formData.participant_.length>0">
<view class="title">可处理人</view>
<view class="content">
<text v-for="(val,index) in formData.participant_">{{val.name}} <text v-if="index!==formData.participant_.length-1">、</text></text>
</view>
</view> -->
<view class="item">
<view class="title">风险分析</view>
<view class="content">
@ -364,6 +370,7 @@
color: #ffffff;
font-size: 25upx;
text-align: center;
margin-right: 20upx;
}
.bindBtn2{
width: 80upx;

4
pages/workSpace/opls/clear.vue
View File

@ -226,13 +226,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/cooler.vue
View File

@ -237,13 +237,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/fire.vue
View File

@ -249,13 +249,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/high.vue
View File

@ -253,13 +253,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/hoisting.vue
View File

@ -247,13 +247,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/normal.vue
View File

@ -226,13 +226,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/preheat.vue
View File

@ -237,13 +237,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/soil.vue
View File

@ -245,13 +245,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/space.vue
View File

@ -248,13 +248,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

4
pages/workSpace/opls/usecl.vue
View File

@ -355,13 +355,13 @@
this.$refs.deptDoPicker._show();
},
showChargerPicker() {
let params='?type=receptionist&typeName=charger_name'
let params='?type=charger&typeName=charger_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})
},
showMonitorPicker() {
let params='?type=receptionist&typeName=monitor_name'
let params='?type=monitor&typeName=monitor_name'
uni.navigateTo({
url:"../../comm/userSelect/index"+params
})

37
pages/workSpace/visit/visitCreate.vue
View File

@ -62,8 +62,6 @@
<text class="form-left-text">接待人</text>
</view>
<view class="form-right">
<!-- <ba-tree-picker ref="dcoordinator_Picker" :multiple='false' @select-change="select_coordinator_Change" title="选择接待人"
:localdata="vuex_userRange2" valueKey="id" textKey="name" childrenKey="children" :selectParent='false'/> -->
<view @click="showDcoordinatorPicker" style="position: relative;display: flex;">
<text type="text" >{{receptionist_name}}</text>
<uni-icons style="position: absolute; right: 0;" type="arrowright" color="#999999"/>
@ -88,6 +86,7 @@
</uni-data-select>
</view>
</view>
<view class="form-item border-bottom">
<view class="form-left">
<text class="form-left-text">来访人数</text>
@ -96,6 +95,14 @@
<input type="number" v-model="formData.count_people" maxlength="50" placeholder="来访人数(整数)" />
</view>
</view>
<view class="form-item" style="height: fit-content;" >
<view class="form-left">
<text class="form-left-text">车辆照片</text>
</view>
<view class="form-right">
<u-upload :action="vuex_apifile" :header="header" ref="uUpload" :file-list="fileList" max-count="9" @on-success="imgUpSuccess" @on-remove="imgRemove"></u-upload>
</view>
</view>
<view class="btn" v-if="showBtns">
<button type="primary" class="save-btn" @click="nextHandle">下一步</button>
</view>
@ -121,7 +128,9 @@
company: '', //来访单位
level: 10, //来访级别
count_people: 1, //来访人数
vehicle_photos:[],
},
fileList:[],
datetimerange: [],
depRange: [],
publishRangeCon: '',
@ -183,12 +192,22 @@
}
},
onShow() {
// uni.$once('Selection',function(e){
// debugger;
// console.log(e)
// })
this.getHeader();
},
methods: {
getHeader() {
this.header = {
Authorization: "Bearer " + this.vuex_token
}
},
imgUpSuccess(data,index,list){
this.formData.vehicle_photos.push(data.id);
},
imgRemove(index,list,inde){
this.formData.vehicle_photos.splice(index,1);
console.log(this.formData.imgs)
},
showDcoordinatorPicker(){
//type:对应的id字段，typeName对应的姓名的文字显示
let params='?type=receptionist&typeName=receptionist_name'
@ -199,6 +218,12 @@
getVisitItem() {
this.$u.api.visitItem(this.visitId).then(res => {
this.formData = res;
if(res.vehicle_photos_){
for(let i = 0; i<res.vehicle_photos_.length;i++){
this.fileList.push(this.vuex_host+res.vehicle_photos_[i].path)
}
// this.fileList=res.vehicle_photos_;
}
this.datetimerange = [res.visit_time, res.leave_time]
})
},

16
pages/workSpace/visit/visitDetail.vue
View File

@ -64,6 +64,12 @@
<text>{{formData.count_people}}</text>
</view>
</view>
<view class="item">
<view class="title">车辆照片</view>
<view class="content">
<image v-for="item in formData.vehicle_photos_" :src="item.path" @click="preView(item.path)"></image>
</view>
</view>
</view>
<view class="wrap-view wrap-top">
<view class="item title"> <text class="blueLine"></text>人员列表：</view>
@ -187,6 +193,10 @@
this.getVpeopleList();
},
methods: {
preView(srcImg){
this.preImgSrc = srcImg;
this.$refs.imgPreView.open();
},
//获取已有游客
getVpeopleList() {
let that = this;
@ -198,8 +208,14 @@
})
},
getVisitItem() {
let that = this;
this.$u.api.visitItem(this.visitId).then(res => {
this.formData = res;
let photos = res.vehicle_photos_;
photos.forEach(item=>{
item.path = that.vuex_host+item.path;
})
that.formData.vehicle_photos_ = photos;
})
},
bindBtl(row,type){