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

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
曹前明 2022-07-18 14:46:49 +08:00
parent be62ebc37a 10d8beadcb
commit a5dac1fff9
7 changed files with 873 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1672
src/views/opm/fire.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/opm/oplcate_form.vue
View File

@ -134,7 +134,7 @@ export default {
//工作流
getWorkflow() {
this.$API.system.dept.list.req({ page: 0 }).then((res) => {
this.$API.wf.workflow.list.req({ page: 0 }).then((res) => {
this.workflowoptions = res;
});
},

12
src/views/wf/allwork.vue
View File

@ -83,19 +83,21 @@
},
handleShow(row) {
let workflowKey = row.workflow_.key;
let catetype = '';
let cateType = '',projectId='';
if(workflowKey==='visit'){
catetype = row.workflow_.key
cateType = row.workflow_.key;
projectId = row.ticket_data.visit;
}else if(workflowKey==='rparty'){
catetype = row.workflow_.key
cateType = row.workflow_.key;
projectId = row.ticket_data.rpj;
}else{}
this.$router.push({
name: "visitdetail",
query: {
id: row.id,
type: 'show',
projectId: row.ticket_data.visit,
catetype:catetype
projectId: projectId,
catetype:cateType
},
});
},

15
src/views/wf/details.vue
View File

@ -16,18 +16,13 @@
</el-table-column>
<el-table-column label="进行状态" min-width="100">
<template #default="scope">
<span v-if="scope.row.state_.type == 0"
>{{ scope.row.state_.name }}中</span
>
<span v-else>已{{ scope.row.state_.name }}</span>
<span>{{ scope.row.state_.name }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" min-width="100">
<template #default="scope">
<el-span v-if="scope.row.participant_">{{
scope.row.participant_.name
}}
</el-span>
<el-span v-if="scope.row.participant_">{{scope.row.participant_.name }}</el-span>
<el-span v-if="scope.row.participant_str">{{scope.row.participant_str }}</el-span>
</template>
</el-table-column>
<el-table-column
@ -68,9 +63,9 @@
this.getFlowlogss();
},
methods: {
getFlowlogss() {
getFlowlogss() {
let that = this;
this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then(res => {
this.$API.wf.ticket.ticketFlowlogs.req(that.ticketId).then(res => {
if (res.err_msg) {
} else {
that.logs = res;

3
src/views/wf/state.vue
View File

@ -9,7 +9,7 @@
></el-button>
</div>
</el-header>
<el-main class="nopadding">
<el-main class="nopadding" style="height: 100%;">
<scTable
ref="table"
:data="list"
@ -18,6 +18,7 @@
highlightCurrentRow
hidePagination
>
<el-table-column label="#" type="index"></el-table-column>
<el-table-column label="ID" prop="id"></el-table-column>
<el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="是否隐藏">

57
src/views/wf/visitdetail.vue
View File

@ -44,37 +44,39 @@
</el-descriptions>
</el-card>
<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="cateType==='rparty'">
<el-descriptions title="来访信息" :column="3">
<el-descriptions title="入厂项目" :column="3">
<el-descriptions-item label="工单流水号:">
{{ticketDetail.sn }}
</el-descriptions-item>
<el-descriptions-item label="相关方:">
{{rpjDetail.name }}
{{rpjDetail.rparty_name}}
</el-descriptions-item>
<el-descriptions-item label="入厂项目:">
<!--{{rpjDetail.company }}-->
{{rpjDetail.name }}
</el-descriptions-item>
<el-descriptions-item label="项目类型:">
<!--<el-tag size="small">{{ rpjDetail.count_people }}人</el-tag>-->
<el-tag size="small">{{rpjType_[rpjDetail.type]}}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="合同编号:">
<!--<el-tag v-for="item in rpjDetail.visitors_" :key='item.id' size="small">
&lt;!&ndash;{{ item.visitor_.name }}&ndash;&gt;
</el-tag>-->
{{rpjDetail.contract_number }}
</el-descriptions-item>
<el-descriptions-item label="状态:">
<!--{{state_[rpjDetail.state] }}-->
{{state_[rpjDetail.state] }}
</el-descriptions-item>
<el-descriptions-item label="进厂时间:">
<!--{{rpjDetail.visit_time }}-->
{{rpjDetail.come_time }}
</el-descriptions-item>
<el-descriptions-item label="离厂时间:">
<!--{{rpjDetail.leave_time }}-->
{{rpjDetail.leave_time }}
</el-descriptions-item>
<el-descriptions-item label="所属部门:">
<!--{{purpose_[rpjDetail.purpose] }}-->
{{rpjDetail.belong_dept_name }}
</el-descriptions-item>
</el-descriptions>
<div style="text-align: center">
<el-link type="primary" @click="showMore"> 更多信息 </el-link>
</div>
<show-dialog v-if="rpjShow" ref="showDialog"></show-dialog>
</el-card>
<el-card style="margin-left: 10px; margin-bottom: 10px" v-if="type!=='show'">
<scTitle title="处理"></scTitle>
@ -137,13 +139,15 @@
<script>
import workDetails from "./details.vue";
import workStep from "./steps.vue";
import showDialog from "./../rpm/rpj_show.vue";
import selectUser from '@/layout/components/userselect'
export default {
components: {
workDetails,
workStep,
selectUser
selectUser,
showDialog
},
name: "visitdetail",
data() {
@ -167,6 +171,7 @@
suggestion:'',
target_user:'',
},
rpjShow:false,
limitedAdd:false,
limitedDeliver:false,
limitedUserSelect:false,
@ -176,6 +181,12 @@
30: "面试",
40: "开会"
},
rpjType_: {
10: "建筑施工",
20: "设备设施检维修",
30: "保安保洁服务",
40: "其他",
},
state_: {
10: "创建中",
20: "审批中",
@ -186,27 +197,28 @@
};
},
created(){
this.ticketId = this.$route.query.id;
this.type = this.$route.query.type;
this.cateType = this.$route.query.catetype;
},
mounted() {
this.ticketId = this.$route.query.id;
this.type = this.$route.query.type;
this.projectId = this.$route.query.projectId;
this.cateType = this.$route.query.catetype;
},
mounted() {
if(this.cateType==='visit'){
this.getVisit();
}else if(this.cateType==='rparty'){
this.getVisit();
this.getRpj();
}
this.getticketItem();
this.getBtns();
this.getRpj();
},
methods: {
showMore(){
this.rpjShow = true;
this.$nextTick(()=>{
this.$refs.showDialog.open().setData({id:this.projectId});
})
},
//工单详情
getticketItem() {
this.$API.wf.ticket.ticketItem.req(this.ticketId).then((res) => {
@ -229,7 +241,8 @@
//入厂项目详情
getRpj(){
this.$API.rpmrpj.item.req(this.projectId).then((res) => {
this.$API.rpm.rpj.item.req(this.projectId).then((res) => {
debugger;
this.rpjDetail = res;
});
},

6
src/views/wf/workflow.vue
View File

@ -28,13 +28,13 @@
<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="220">
<template #default="scope">
<el-button link size="small" @click="workflowShow(scope.row)">配置</el-button>
<el-button link size="small" type="primary" @click="workflowShow(scope.row)">配置</el-button>
<el-divider direction="vertical"></el-divider>
<el-button link size="small" @click="workflowEdit(scope.row)">编辑</el-button>
<el-button link size="small" type="primary" @click="workflowEdit(scope.row)">编辑</el-button>
<el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗？" @confirm="workflowDel(scope.row)">
<template #reference>
<el-button link size="small">删除</el-button>
<el-button link size="small" type="danger">删除</el-button>
</template>
</el-popconfirm>
</template>