wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业

pull/5/head
chenxinying 2024-01-25 17:39:35 +08:00
parent 2a84c69ea0
commit 7288ed869b
6 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
colorui/unit.css
View File

@ -1087,6 +1087,7 @@
font-weight: bold;
color: #000000;
font-size: 28upx;
height: auto;
/* white-space: nowrap; */
}

7
pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
View File

@ -11,10 +11,11 @@
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">完工验收</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
<view class="cu-form-group ">
</view>
<view style="border-bottom: 1px dashed #eee;">
<view class="cu-form-group">
<view class="title">验收时间</view>
<ruiDatePicker
fields="minute"
<ruiDatePicker fields="minute"
:value="pd.ACCEPT_TIME?pd.ACCEPT_TIME:''"
@change="changeStartDate"
></ruiDatePicker>

2
pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
View File

@ -8,7 +8,7 @@
<view class="form">
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view style="border-bottom: 1px dashed #eee;">
<view class="cu-form-group">
<view class="title">作业结束时间</view>
<ruiDatePicker fields="minute"

21
pages/application/hotwork/hotwork-list/index.vue
View File

@ -70,7 +70,7 @@
</view>
<view class="dy-subtitle-flex">
<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
@click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图</button></text>
@click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图</button></text>
</view>
</view>
</view>
@ -139,7 +139,7 @@
stepList:[],
sindex:-1,
STEP_ID:'',
flowList:[],
flowList:[],
}
},
onReady() {
@ -167,7 +167,7 @@
_this.list = [];
_this.isEnd = false;
_this.getData();
_this.getSetps();
_this.getSetps();
// _this.getDept();
loginSession();
},
@ -194,10 +194,10 @@
url: '/pages/application/hotwork/hotwork-measures/hotwork-measures-detail?HOTWORK_ID='+e
});
}else if(this.flow === '安全措施确认'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e
});
}else if(this.flow === '监护人签字'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e
});
}else if(this.flow === '监护人签字'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail?HOTWORK_ID='+e
});
@ -314,9 +314,10 @@
},
data: {
CREATOR:_this.flow === '提交申请'?loginUser.USER_ID : '',
GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '',
STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow,
STEP_ID: _this.STEP_ID,
GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '',
STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow,
measures: _this.flow === '安全措施确认'?1 : '', // 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业
STEP_ID: _this.STEP_ID,
KEYWORDS : _this.KEYWORDS, //关键字模糊查询
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,

1
pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
View File

@ -256,6 +256,7 @@
this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS
formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = _this.pd.DESCR
formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID
formData.MEASURES = JSON.stringify(this.measuresList)

11
pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue
View File

@ -2,12 +2,21 @@
<view >
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
<block slot="backText">返回</block>
<block slot="content">完工验收</block>
<block slot="content">作业开始时间选择</block>
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
<view class="wui-form-list">
<view style="border-bottom: 1px dashed #eee;">
<view class="cu-form-group">
<view class="title">作业开始时间</view>
<ruiDatePicker fields="minute"
:value="pd.WORK_START_DATE?pd.WORK_START_DATE:''"
@change="changeStartDate"
></ruiDatePicker>
</view>
</view>
<view class="wui-sign">
<view class="title">填写作业开始时间负责人</view>
<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button>