diff --git a/src/components/scUpload/file.vue b/src/components/scUpload/file.vue index ab03b745..46fd9ea0 100644 --- a/src/components/scUpload/file.vue +++ b/src/components/scUpload/file.vue @@ -79,7 +79,7 @@ //默认值转换为数组 toArr(str){ var _arr = []; - var arr = str.split(","); + var arr = (str+"").split(","); arr.forEach(item => { if(item){ var urlArr = item.split('/'); diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue index b7ce9d1f..3b8b9867 100644 --- a/src/views/home/widgets/components/ticket.vue +++ b/src/views/home/widgets/components/ticket.vue @@ -8,37 +8,37 @@
-
- - - -
危险作业
-
-
- - - -
相关方项目
-
-
- - - -
来访项目
-
+
+ + + +
危险作业
+
+ + + +
相关方项目
+
+
+ + + +
来访项目
+
+
@@ -46,12 +46,10 @@
@@ -101,7 +99,7 @@ export default { return { dutyAgg: [], //数据统计 - ep_count_type: true, + ep_count_type: "2", userCount: { total: 0, count_employee: 0, //内部员工 @@ -150,7 +148,6 @@ export default { this.countIndex = index; this.getManCount(); }, - //作业 getOperation() { this.$API.opm.operation.list @@ -476,12 +473,12 @@ export default { display: flex; justify-content: space-between; align-items: center; - height:24px; + height: 24px; } .card-body { display: flex; justify-content: space-around; align-items: center; - height:80px; + height: 80px; } diff --git a/src/views/opm/fire.vue b/src/views/opm/fire.vue index b1373a33..c4fedc2f 100644 --- a/src/views/opm/fire.vue +++ b/src/views/opm/fire.vue @@ -203,7 +203,7 @@ hidePagination stripe hideDo - style="height: calc(100% - 60px);" + style="height: 200px;" > 确 定 - + 上一步 - 下一步 +
@@ -336,6 +338,7 @@ row-key="id" hidePagination stripe + style="height: 200px;" > 确 定 - 上一步 +
+ 上一步 {{item.name}} - 退出 + 退出 +
@@ -814,7 +820,7 @@ //渲染工单提交按钮 getInit() { - this.$API.wf.workflow.initkey.req('Fire').then((res) => { + this.$API.wf.workflow.initkey.req('opl_fire').then((res) => { this.initForm = res; }); }, diff --git a/src/views/rpm/rpj_form.vue b/src/views/rpm/rpj_form.vue index 3d051d0f..e6b8ad1d 100644 --- a/src/views/rpm/rpj_form.vue +++ b/src/views/rpm/rpj_form.vue @@ -83,7 +83,7 @@ - + - - + + + {{form.name }} {{types_[form.type]}} {{form.contract_number}} @@ -18,7 +19,8 @@ {{form.belong_dept_name}} {{form.rparty_name}} - + + - + @@ -136,12 +138,14 @@ }, //表单注入数据 setData(data) { + this.loading = true this.$API.rpm.rpj.item.req(data.id).then((res) => { + this.loading = false this.form = res; this.getRpjfileList(); this.getMemberList(); this.visible = true; - }); + }).catch(e=>{this.loading=false}); }, //文件列表加载 getRpjfileList() { diff --git a/src/views/rpm/rpjadd.vue b/src/views/rpm/rpjadd.vue index 8a0b087a..27cc6bf1 100644 --- a/src/views/rpm/rpjadd.vue +++ b/src/views/rpm/rpjadd.vue @@ -88,7 +88,7 @@ - + - 下一步 @@ -122,7 +122,9 @@ :data="rpjfileList" row-key="id" hidePagination + hideDo stripe + style="height:300px" > - + 上一步 - 下一步 - + + @@ -184,10 +187,10 @@ :on-success="success" :multiple="true" :limit="10" - tip="最多上传10个文件,单个文件不要超过10M,请上传xlsx/docx格式文件" + tip="最多上传10个文件,单个文件不要超过10M" > 上传附件 + > @@ -199,7 +202,7 @@ 取 消 确 定 - + @@ -215,7 +218,9 @@ :data="apiworkerObj" row-key="id" hidePagination + hideDo stripe + style="height:300px" > + - + @@ -327,15 +334,18 @@ 取 消 确 定 - - 上一步 + +
+ 上一步 {{item.name}} - 退出 + 退出 +
@@ -406,16 +416,24 @@ apiworkerObj: [], workerdialog: false, initForm: {}, + rparty_show: false }; }, mounted() { this.rpjId = this.$route.query.rpjid; //作业ID + this.rpartyShow() this.getRpj(); - this.getRpartyOptions(); this.getDept(); this.getInit(); }, methods: { + rpartyShow(){ + var userInfo = this.$TOOL.data.get("USER_INFO"); + if(userInfo.type=='employee'){ + this.rparty_show = true + this.getRpartyOptions(); + } + }, //入场项目基本信息 getRpj() { console.log(this.$route.query.rpjid); @@ -430,8 +448,8 @@ }); }, //文件列表加载 - getRpjfileList(id) { - this.$API.rpm.rpjfile.list.req({page: 0, rpj: id}).then((res) => { + getRpjfileList() { + this.$API.rpm.rpjfile.list.req({page: 0, rpj: this.rpjId}).then((res) => { this.rpjfileList = res; }); }, @@ -512,7 +530,8 @@ .then((res) => { this.$message.success("提交成功!"); this.dialogupload = false; - + this.rpjfileList = [] + this.getRpjfileList(); return res; }) .catch((err) => { @@ -536,8 +555,8 @@ }, //作业人员列表 - getmemberList(id) { - this.$API.rpm.member.list.req({rpj: id, page: 0}).then((res) => { + getmemberList() { + this.$API.rpm.member.list.req({rpj: this.rpjId, page: 0}).then((res) => { this.apiworkerObj = res; console.log(res); }); @@ -551,11 +570,11 @@ //删除作业人员 delWorker(row) { - this.$API.opm.worker.delete + this.$API.rpm.member.delete .req(row.id) .then((res) => { this.$message.success("作业人员删除成功"); - + this.getmemberList() return res; }) .catch((err) => { @@ -569,6 +588,7 @@ this.$API.rpm.member.create.req(this.formworker).then((res) => { this.$message.success("创建项目人员成功"); this.workerdialog = false; + this.getmemberList() }) .catch((err) => { return err; @@ -578,7 +598,7 @@ //渲染工单提交按钮 getInit(){ - this.$API.wf.workflow.initkey.req('rparty').then((res) => { + this.$API.wf.workflow.initkey.req('rpj').then((res) => { this.initForm = res; }); }, diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue index 19d68613..313b0a09 100644 --- a/src/views/wf/allwork.vue +++ b/src/views/wf/allwork.vue @@ -76,14 +76,15 @@ methods: { handleShow(row) { let cateType = row.workflow_.key; - let projectId = '', operation = null; + let projectId = null; if (cateType === 'visit') { projectId = row.ticket_data.visit; - } else if (cateType === 'rparty') { + } else if (cateType === 'rpj') { projectId = row.ticket_data.rpj; - } else { - operation = row.ticket_data.operation ? row.ticket_data.operation : null; + } else if(cateType.indexOf('opl_')!=-1){ + // operation = row.ticket_data.operation ? row.ticket_data.operation : null; projectId = row.ticket_data.opl; + cateType = 'opl' } this.$router.push({ name: "ticketdetail", @@ -92,7 +93,7 @@ type: 'show', projectId: projectId, catetype: cateType, - operation: operation + // operation: operation }, }); }, diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue index 83eba153..69d6d0b5 100644 --- a/src/views/wf/ccwork.vue +++ b/src/views/wf/ccwork.vue @@ -74,14 +74,14 @@ methods: { handleShow(row) { let cateType = row.workflow_.key; - let projectId = '', operation = null; + let projectId = null; if (cateType === 'visit') { projectId = row.ticket_data.visit; - } else if (cateType === 'rparty') { + } else if (cateType === 'rpj') { projectId = row.ticket_data.rpj; - } else { - operation = row.ticket_data.operation ? row.ticket_data.operation : null; + } else if(cateType.indexOf('opl_')!=-1){ projectId = row.ticket_data.opl; + cateType = 'opl' } this.$router.push({ name: "ticketdetail", @@ -90,7 +90,6 @@ type: 'show', projectId: projectId, catetype: cateType, - operation: operation }, }); }, diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue index a7996de8..d487f670 100644 --- a/src/views/wf/dutywork.vue +++ b/src/views/wf/dutywork.vue @@ -105,21 +105,22 @@ methods: { //处理 handleDetail(row) { - let projectId = '', operation = null; - let catetype = row.workflow_.key; - if (catetype === 'visit') { + let cateType = row.workflow_.key; + let projectId = null; + if (cateType === 'visit') { projectId = row.ticket_data.visit; - } else if (catetype === 'Fire') { + } else if (cateType === 'rpj') { + projectId = row.ticket_data.rpj; + } else if(cateType.indexOf('opl_')!=-1){ projectId = row.ticket_data.opl; - operation = row.ticket_data.operation ? row.ticket_data.operation : null; + cateType = 'opl' } this.$router.push({ name: "ticketdetail", query: { id: row.id, projectId: projectId, - catetype: row.workflow_.key, - operation: operation + catetype: cateType, }, }); }, diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue index f9c466e9..8b1a671a 100644 --- a/src/views/wf/ownerwork.vue +++ b/src/views/wf/ownerwork.vue @@ -113,23 +113,22 @@ methods: { handleShow(row) { let cateType = row.workflow_.key; - let projectId = '', operation = null; + let projectId = null; if (cateType === 'visit') { projectId = row.ticket_data.visit; - } else if (cateType === 'rparty') { + } else if (cateType === 'rpj') { projectId = row.ticket_data.rpj; - } else { - operation = row.ticket_data.operation ? row.ticket_data.operation : null; + } else if(cateType.indexOf('opl_')!=-1){ projectId = row.ticket_data.opl; + cateType = 'opl' } this.$router.push({ name: "ticketdetail", query: { id: row.id, - type: 'show', + type: "show", projectId: projectId, catetype: cateType, - operation: operation }, }); }, diff --git a/src/views/wf/steps.vue b/src/views/wf/steps.vue index 62519451..a15e729c 100644 --- a/src/views/wf/steps.vue +++ b/src/views/wf/steps.vue @@ -16,6 +16,9 @@