企业端相关方端代码功能同步
parent
8ac1c0d027
commit
8703190849
|
@ -64,4 +64,5 @@ export const setTaskFile = (params) => upload("/app/util/uploadFile", params) //
|
|||
export const setTaskSign = (params) => post("/app/Task/sign", params) //审批意见签字提交
|
||||
export const setSecurityMeasuresSave = (params) => post("/app/Task/setQues", params) //安全措施提交
|
||||
export const setOtherSecurityMeasuresSave = (params) => post("/app/Task/setOtherQues", params) //其它安全措施提交
|
||||
export const getHistoricalApprovalRecords = (params) => post("/app/Task/getHis", params); // 历史审批记录
|
||||
// 结束
|
||||
|
|
18
pages.json
18
pages.json
|
@ -241,17 +241,7 @@
|
|||
{
|
||||
"path": "pages/eight_assignments/hot_work/gas/list",
|
||||
"style": {
|
||||
"navigationBarTitleText": "动火作业气体分析",
|
||||
"app-plus": {
|
||||
"titleNView": {
|
||||
"buttons": [{
|
||||
"text": "新建",
|
||||
"fontSize": "15",
|
||||
"float": "right",
|
||||
"width": "40px"
|
||||
}]
|
||||
}
|
||||
}
|
||||
"navigationBarTitleText": "动火作业气体分析"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -308,6 +298,12 @@
|
|||
"navigationBarTitleText": "待办"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/eight_assignments/historical_approval_records",
|
||||
"style": {
|
||||
"navigationBarTitleText": "待办"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/eight_assignments/completed_list",
|
||||
"style": {
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
<template>
|
||||
<view class="container">
|
||||
<view class="card">
|
||||
<u-cell-group>
|
||||
<view v-for="(item, index) in list" :key="index">
|
||||
<u-cell :title="item.JOB_TYPE_DESCRIBE">
|
||||
<template #label>
|
||||
<view class="mt-10">
|
||||
<view>部门:{{ item.JOB_DEPARTMENT_NAME }}</view>
|
||||
<view>人员:{{ item.JOB_NAME }}</view>
|
||||
<view>
|
||||
审批结果:{{ item.PASS_FLAG === 0 ? "不通过" : "通过" }}
|
||||
</view>
|
||||
<view v-if="item.SIGN_PICTURE">
|
||||
<u-image
|
||||
width="400rpx"
|
||||
height="200rpx"
|
||||
:src="$filePath + item.SIGN_PICTURE"
|
||||
mode="widthFix"
|
||||
/>
|
||||
<view>审批意见:{{ item.APPROVAL_OPINIONS }}</view>
|
||||
<view>时间:{{ item.CREATE_TIME }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</u-cell>
|
||||
</view>
|
||||
</u-cell-group>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {getHistoricalApprovalRecords} from "@/api";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
EW_RU_TASK_ID: '',
|
||||
EW_RU_JOB_ID: ''
|
||||
}
|
||||
},
|
||||
onLoad(query) {
|
||||
this.EW_RU_TASK_ID = query.taskId;
|
||||
this.EW_RU_JOB_ID = query.EW_RU_JOB_ID;
|
||||
this.fnGetData();
|
||||
},
|
||||
methods: {
|
||||
async fnGetData() {
|
||||
let resData = await getHistoricalApprovalRecords({
|
||||
EW_RU_TASK_ID: this.EW_RU_TASK_ID,
|
||||
EW_RU_JOB_ID: this.EW_RU_JOB_ID,
|
||||
});
|
||||
this.list = resData.list;
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss"></style>
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="flex-end padding">
|
||||
<view v-if="isView !== '1'" class="flex-end padding">
|
||||
<u-button type="primary" text="添加" size="mini" class="bth-mini" @click="goToAdd"/>
|
||||
<u-button type="primary" text="任务转发" size="mini" class="bth-mini ml-10" @click="goToTaskForword"/>
|
||||
</view>
|
||||
|
@ -20,9 +20,8 @@
|
|||
<view><u-button size="mini" type="primary" text="查看图片" @click="ViewImage1(item.FILE_PATH)" /></view>
|
||||
</view>
|
||||
</view>
|
||||
<view style="margin-top: 30upx;" v-show="list.length !== 0">
|
||||
<u-button class="bg-green" style="max-width: 50%;" v-if="STATE !== '11'"
|
||||
@click="$u.debounce(goSubmit, 1000, true)">完成延时监火</u-button>
|
||||
<view style="margin-top: 30upx;" v-show="list.length !== 0 && isView !== '1'">
|
||||
<u-button class="bg-green" style="max-width: 50%;" @click="$u.debounce(goSubmit, 1000, true)">完成延时监火</u-button>
|
||||
</view>
|
||||
</view>
|
||||
<empty v-else></empty>
|
||||
|
@ -40,7 +39,8 @@ export default {
|
|||
STATE: '',
|
||||
EW_RU_TASK_ID: '',
|
||||
EW_RU_JOB_ID: '',
|
||||
TYPE: ''
|
||||
TYPE: '',
|
||||
isView: '1'
|
||||
}
|
||||
},
|
||||
onLoad(event) {
|
||||
|
|
|
@ -67,7 +67,6 @@ export default {
|
|||
this.form.EW_RU_TASK_ID = query.EW_RU_TASK_ID
|
||||
this.TYPE = query.TYPE
|
||||
this.form.EW_RU_JOB_ID = query.EW_RU_JOB_ID
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
fnDateTimePickerClick(event) {
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view v-if="isView !== '1'" class="flex-end padding" style="padding: 20upx;">
|
||||
<u-button type="primary" text="添加" size="mini" class="bth-mini" @click="goToAdd"/>
|
||||
</view>
|
||||
<u-list v-if="list.length > 0">
|
||||
<u-list-item v-for="(item, index) in list" :key="index">
|
||||
<view class="flex-between main-title">
|
||||
|
@ -14,7 +17,7 @@
|
|||
<view class="flex-between main-title">
|
||||
<text>分析人:{{ item.ANALYZE_USER_NAME }}</text>
|
||||
</view>
|
||||
<view class="flex-between mt-10 subtitle">
|
||||
<view v-if="isView !== '1'" class="flex-between mt-10 subtitle">
|
||||
<view></view>
|
||||
<view class="flex-between">
|
||||
<u-button type="error" text="删除" size="mini" class="bth-mini" @click="fnDelete(item)"/>
|
||||
|
@ -36,25 +39,15 @@ export default {
|
|||
list: [],
|
||||
EW_RU_TASK_ID: '',
|
||||
EW_RU_JOB_ID: '',
|
||||
TYPE: ''
|
||||
TYPE: '',
|
||||
isView: '0'
|
||||
}
|
||||
},
|
||||
onLoad(query) {
|
||||
this.EW_RU_TASK_ID = query.taskId
|
||||
this.TYPE = query.type
|
||||
this.EW_RU_JOB_ID = query.EW_RU_JOB_ID
|
||||
},
|
||||
onNavigationBarButtonTap(e) {
|
||||
if (e.index === 0) {
|
||||
uni.$u.route({
|
||||
url: '/pages/eight_assignments/hot_work/gas/add',
|
||||
params: {
|
||||
EW_RU_TASK_ID: this.EW_RU_TASK_ID,
|
||||
EW_RU_JOB_ID: this.EW_RU_JOB_ID,
|
||||
TYPE: this.TYPE
|
||||
}
|
||||
})
|
||||
}
|
||||
this.isView = query.isView
|
||||
},
|
||||
onShow() {
|
||||
this.resetList()
|
||||
|
@ -85,6 +78,16 @@ export default {
|
|||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
goToAdd() {
|
||||
uni.$u.route({
|
||||
url: '/pages/eight_assignments/hot_work/gas/add',
|
||||
params: {
|
||||
EW_RU_TASK_ID: this.EW_RU_TASK_ID,
|
||||
EW_RU_JOB_ID: this.EW_RU_JOB_ID,
|
||||
TYPE: this.TYPE
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
<view class="flex-between main-title">
|
||||
<text>当前步骤:{{ item.taskName }}</text>
|
||||
</view>
|
||||
<view class="flex-between mt-10 subtitle">
|
||||
<view></view>
|
||||
<view class="flex-between">
|
||||
<view class=" mt-10 flex_btn">
|
||||
|
||||
<view class="flex_btn">
|
||||
<u-button type="primary" text="修改" size="mini" class="bth-mini" v-if="item.canEditFlag === '1'" @click="handleEditTask(item)" />
|
||||
<u-button v-if="false" type="primary" text="流程" size="mini" class="bth-mini ml-10"
|
||||
<u-button type="primary" text="流程" size="mini" class="bth-mini ml-10"
|
||||
@click="$u.route({
|
||||
url: '/pages/eight_assignments/technological_process',
|
||||
params: {taskId:item.taskId,type,title}
|
||||
|
@ -32,8 +32,8 @@
|
|||
params: {taskId:item.taskId,jobId:item.jobId,type,title}
|
||||
})"/>
|
||||
</view>
|
||||
<view class="ml-10" v-for="(item1, index1) in item.buttons" :key="index1">
|
||||
<up-button type="primary" size="mini" shape="circle" :text="item1.name"
|
||||
<view v-for="(item1, index1) in item.buttons" :key="index1" class="flex_btn">
|
||||
<u-button type="primary" size="mini" shape="circle" :text="item1.name" class="bth-mini ml-10"
|
||||
@click="$u.route({
|
||||
url: item1.route,
|
||||
params: {taskId: item.taskId,EW_RU_JOB_ID: item.jobId, isView: '1'},
|
||||
|
@ -77,7 +77,8 @@ export default {
|
|||
showCount: this.pageSize,
|
||||
currentPage: this.currentPage,
|
||||
TYPE: this.type,
|
||||
vectors: '0'
|
||||
vectors: '0',
|
||||
REQUEST_SOURCE: '2'
|
||||
});
|
||||
this.list = [...this.list, ...resData.list.list];
|
||||
this.totalPage = resData.list.totalPage;
|
||||
|
@ -104,5 +105,10 @@ export default {
|
|||
</script>
|
||||
|
||||
<style scoped>
|
||||
.flex_btn{
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue