ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb

Browse Source
pull/106/head
xuhaoyun 1 year ago
parent 6e37251a45 47830a7d97
commit 33b4f54d86
12 changed files with 155 additions and 87 deletions
Show Stats Download Patch File Download Diff File

45
src/views/closeLoopDispose/components/backlog.vue
Unescape View File

@ -3,10 +3,10 @@
<div>
<div class="backlog_body">
<div class="search_top">
<div class="btn">
<!-- <div class="btn">
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</div>
</div> -->
<el-form :model="search" class="search_top_form">
<el-form-item label="创建时间">
<el-date-picker
@ -25,6 +25,10 @@
placeholder="请选择关键词"
></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="search_table">
@ -147,13 +151,15 @@ export default {
};
get_backlog(param).then((res) => {
// 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
}
console.log('res.rows',res.rows);
console.log("res.rows", res.rows);
this.table_data = res.rows;
this.total = res.total;
})
});
},
reset() {
this.search.backlog_time = [this.get_today(), this.get_tomorrow()];
@ -229,12 +235,12 @@ export default {
},
// 根据返回码值判断流程状态
process_change(val) {
switch(val) {
case 1 :
switch (val) {
case 1:
return "审核中";
case 2 :
case 2:
return "审核完成";
case 3 :
case 3:
return "驳回";
}
},
@ -242,12 +248,12 @@ export default {
console.log(`每页 ${val} 条`);
this.pageNum = 1;
this.pageSize = val;
this.search_data()
this.search_data();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNum = val;
this.search_data()
this.search_data();
},
},
};
@ -334,7 +340,6 @@ export default {
.el-input__inner {
// width: 300px;
border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436;
@ -350,6 +355,20 @@ export default {
color: #fff;
background: #283436;
}
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
}
}
/deep/.el-range-separator {

8
src/views/closeLoopDispose/components/backlogDetail.vue
Unescape View File

@ -9,9 +9,9 @@
@back_home_page="back_home_page"
></BacklogDetailForm>
</el-tab-pane>
<el-tab-pane label="流程图" name="second">
<!-- <el-tab-pane label="流程图" name="second">
<BacklogDetailPicture ref="backlogDetailPicture"></BacklogDetailPicture>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="流转记录" name="third">
<BacklogDetailRecords
ref="backlogDetailRecords"
@ -23,13 +23,13 @@
</template>
<script>
import BacklogDetailForm from "./backlogDetailForm";
import BacklogDetailPicture from "./backlogDetailPicture";
// import BacklogDetailPicture from "./backlogDetailPicture";
import BacklogDetailRecords from "./backlogDetailRecords";
export default {
name: "BacklogDetail",
components: {
BacklogDetailForm,
BacklogDetailPicture,
// BacklogDetailPicture,
BacklogDetailRecords,
},
props: {

45
src/views/closeLoopDispose/components/backlogDetailForm.vue
Unescape View File

@ -88,7 +88,9 @@
</el-form-item>
<el-form-item>
<el-button @click="dispose_complete">处置完成</el-button>
<el-button class="dispose_lose" @click="dispose_fail">处置失败</el-button>
<el-button class="dispose_lose" @click="dispose_fail"
>处置失败</el-button
>
</el-form-item>
</el-form>
</div>
@ -109,7 +111,9 @@
</div>
</el-image>
<div class="backlog_idea_person_information">
<div class="backlog_idea_person_name">{{ item.assigneeName }}</div>
<div class="backlog_idea_person_name">
{{ item.assigneeName }}
</div>
<div class="backlog_idea_person_team">{{ item.candidate }}</div>
</div>
</div>
@ -117,7 +121,9 @@
<!-- 第一行，处理意见 -->
<div class="dispose_idea">
<div class="backlog_text">处理意见:</div>
<div class="backlog_value">{{ item.comment.comment }}</div>
<div class="backlog_value">
{{ item.comment == null ? "" : item.comment.comment }}
</div>
</div>
<!-- 第二行，附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment">
@ -165,8 +171,7 @@ export default {
suggest: "",
section: "",
},
backlog_list: [
],
backlog_list: [],
status_list: [
{ label: "待审核", value: "1" },
{ label: "通过", value: "2" },
@ -210,14 +215,14 @@ export default {
let param = {
procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId,
comment:this.form.suggest,
approveType:'2',
copyDeptIds: this.tags.map(item =>item.id)
comment: this.form.suggest,
approveType: "2",
copyDeptIds: this.tags.map((item) => item.id),
};
get_backlog_approve(param).then(res=>{
console.log('res_approve',res);
this.$message.success('处置通过')
this.$emit('back_home_page') // 回归首页
get_backlog_approve(param).then((res) => {
console.log("res_approve", res);
this.$message.success("处置通过");
this.$emit("back_home_page"); // 回归首页
});
},
// 处置失败
@ -225,16 +230,16 @@ export default {
let param = {
procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId,
comment:this.form.suggest,
approveType:'3',
copyDeptIds: this.tags.map(item =>item.id)
comment: this.form.suggest,
approveType: "3",
copyDeptIds: this.tags.map((item) => item.id),
};
get_backlog_approve(param).then(res=>{
console.log('res_approve',res);
this.$message.warning('处置失败')
this.$emit('back_home_page') // 回归首页
get_backlog_approve(param).then((res) => {
console.log("res_approve", res);
this.$message.warning("处置失败");
this.$emit("back_home_page"); // 回归首页
});
}
},
},
};
</script>

42
src/views/closeLoopDispose/components/complete.vue
Unescape View File

@ -3,10 +3,10 @@
<div>
<div class="complete_body">
<div class="search_top">
<div class="btn">
<!-- <div class="btn">
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</div>
</div> -->
<el-form :model="search" class="search_top_form">
<el-form-item label="流程状态">
<el-select
@ -39,6 +39,10 @@
placeholder="请选择关键词"
></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="search_table">
@ -65,8 +69,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="taskName" label="当前节点">
</el-table-column>
<el-table-column prop="taskName" label="当前节点"> </el-table-column>
<el-table-column prop="nextNodeUsers" label="未操作者" width="280">
</el-table-column>
<el-table-column prop="operation" label="操作">
@ -179,10 +182,12 @@ export default {
};
get_complete(param).then((res) => {
// 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
}
console.log('res.rows',res.rows);
console.log("res.rows", res.rows);
this.table_data = res.rows;
this.total = res.total;
});
@ -264,12 +269,12 @@ export default {
},
// 根据返回码值判断流程状态
process_change(val) {
switch(val) {
case 1 :
switch (val) {
case 1:
return "审核中";
case 2 :
case 2:
return "审核完成";
case 3 :
case 3:
return "驳回";
}
},
@ -369,7 +374,6 @@ export default {
.el-input__inner {
// width: 300px;
border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436;
@ -385,6 +389,20 @@ export default {
color: #fff;
background: #283436;
}
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
}
}
/deep/.el-range-separator {

8
src/views/closeLoopDispose/components/completeDetail.vue
Unescape View File

@ -8,9 +8,9 @@
ref="completeDetailForm"
></CompleteDetailForm>
</el-tab-pane>
<el-tab-pane label="流程图" name="second">
<!-- <el-tab-pane label="流程图" name="second">
<CompleteDetailPicture ref="copyDetailPicture"></CompleteDetailPicture>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="流转记录" name="third">
<CompleteDetailRecords
:complete_detail="complete_detail"
@ -22,13 +22,13 @@
</template>
<script>
import CompleteDetailForm from "./completeDetailForm";
import CompleteDetailPicture from "./completeDetailPicture";
// import CompleteDetailPicture from "./completeDetailPicture";
import CompleteDetailRecords from "./completeDetailRecords";
export default {
name: "CompleteDetail",
components: {
CompleteDetailForm,
CompleteDetailPicture,
// CompleteDetailPicture,
CompleteDetailRecords,
},
props: {

12
src/views/closeLoopDispose/components/completeDetailForm.vue
Unescape View File

@ -77,7 +77,9 @@
</div>
</el-image>
<div class="complete_idea_person_information">
<div class="complete_idea_person_name">{{ item.assigneeName }}</div>
<div class="complete_idea_person_name">
{{ item.assigneeName }}
</div>
<div class="complete_idea_person_team">{{ item.candidate }}</div>
</div>
</div>
@ -85,7 +87,9 @@
<!-- 第一行，处理意见 -->
<div class="dispose_idea">
<div class="complete_text">处理意见:</div>
<div class="complete_value">{{ item.comment.comment }}</div>
<div class="complete_value">
{{ item.comment == null ? "" : item.comment.comment }}
</div>
</div>
<!-- 第二行，附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->
@ -139,7 +143,9 @@ export default {
};
get_my_course_record(param).then((res) => {
this.basic_message = res.data;
this.process_status = this.status_list.find(item=>item.value == this.basic_message.alarmStatus).label
this.process_status = this.status_list.find(
(item) => item.value == this.basic_message.alarmStatus
).label;
this.opinion_list = res.data.doneTaskVoList; // 流转意见
});
},

42
src/views/closeLoopDispose/components/copy.vue
Unescape View File

@ -3,16 +3,13 @@
<div>
<div class="copy_body">
<div class="search_top">
<div class="btn">
<!-- <div class="btn">
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</div>
</div> -->
<el-form :model="search" class="search_top_form">
<el-form-item label="流程状态">
<el-select
v-model="search.copy_status"
@change="change_copy"
>
<el-select v-model="search.copy_status" @change="change_copy">
<el-option
v-for="item in copy_list"
:key="item.value"
@ -39,6 +36,10 @@
placeholder="请选择关键词"
></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
<div class="search_table">
@ -178,8 +179,10 @@ export default {
};
get_copy(param).then((res) => {
// 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
}
this.table_data = res.rows;
this.total = res.total;
@ -261,12 +264,12 @@ export default {
},
// 根据返回码值判断流程状态
process_change(val) {
switch(val) {
case 1 :
switch (val) {
case 1:
return "审核中";
case 2 :
case 2:
return "审核完成";
case 3 :
case 3:
return "驳回";
}
},
@ -367,7 +370,6 @@ export default {
// width: 300px;
border-radius: 0px;
border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436;
color: #fff;
}
@ -381,6 +383,20 @@ export default {
color: #fff;
background: #283436;
}
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
}
}
/deep/.el-range-separator {

8
src/views/closeLoopDispose/components/copyDetail.vue
Unescape View File

@ -8,9 +8,9 @@
:copy_detail="copy_detail"
></CopyDetailForm>
</el-tab-pane>
<el-tab-pane label="流程图" name="second">
<!-- <el-tab-pane label="流程图" name="second">
<CopyDetailPicture ref="copyDetailPicture"></CopyDetailPicture>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="流转记录" name="third">
<CopyDetailRecords
ref="copyDetailRecords"
@ -22,13 +22,13 @@
</template>
<script>
import CopyDetailForm from "./copyDetailForm";
import CopyDetailPicture from "./copyDetailPicture";
// import CopyDetailPicture from "./copyDetailPicture";
import CopyDetailRecords from "./copyDetailRecords";
export default {
name: "copyDetail",
components: {
CopyDetailForm,
CopyDetailPicture,
// CopyDetailPicture,
CopyDetailRecords,
},
props: {

4
src/views/closeLoopDispose/components/copyDetailForm.vue
Unescape View File

@ -85,7 +85,9 @@
<!-- 第一行，处理意见 -->
<div class="dispose_idea">
<div class="course_text">处理意见:</div>
<div class="course_value">{{ item.comment.comment }}</div>
<div class="course_value">
{{ item.comment == null ? "" : item.comment.comment }}
</div>
</div>
<!-- 第二行，附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->

5
src/views/closeLoopDispose/components/myCourse.vue
Unescape View File

@ -375,7 +375,7 @@ export default {
.el-input__inner {
// width: 300px;
border-radius: 0px;
height: 3.7vh;
// height: 3.7vh;
border: 1px solid #3d505e;
background: #283436;
color: #fff;
@ -393,8 +393,7 @@ export default {
}
.el-button {
width: 70px;
height: 3.7vh !important;
border: 1px solid #4a6072;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;

8
src/views/closeLoopDispose/components/myCourseDetail.vue
Unescape View File

@ -5,9 +5,9 @@
<el-tab-pane label="表单信息" name="first">
<MyCourseDetailForm ref="myCourseDetailForm" :send_detail="send_detail"></MyCourseDetailForm>
</el-tab-pane>
<el-tab-pane label="流程图" name="second">
<!-- <el-tab-pane label="流程图" name="second">
<MyCourseDetailPicture ref="myCourseDetailPicture"></MyCourseDetailPicture>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="流转记录" name="third">
<MyCourseDetailRecords ref="myCourseDetailRecords" :send_detail="send_detail"></MyCourseDetailRecords>
</el-tab-pane>
@ -16,13 +16,13 @@
</template>
<script>
import MyCourseDetailForm from "./myCourseDetailForm";
import MyCourseDetailPicture from "./myCourseDetailPicture";
// import MyCourseDetailPicture from "./myCourseDetailPicture";
import MyCourseDetailRecords from './myCourseDetailRecords'
export default {
name: "MyCourseDetail",
components:{
MyCourseDetailForm,
MyCourseDetailPicture,
// MyCourseDetailPicture,
MyCourseDetailRecords
},
props:{

5
src/views/closeLoopDispose/components/myCourseDetailForm.vue
Unescape View File

@ -85,7 +85,9 @@
<!-- 第一行，处理意见 -->
<div class="dispose_idea">
<div class="course_text">处理意见:</div>
<div class="course_value">{{ item.comment.comment }}</div>
<div class="course_value">
{{ item.comment == null ? "" : item.comment.comment }}
</div>
</div>
<!-- 第二行，附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->
@ -179,6 +181,7 @@ export default {
taskId: this.send_detail.taskId,
};
get_my_course_record(param).then((res) => {
console.log("bbbb", res);
this.basic_message = res.data;
this.process_status = this.status_list.find(
(item) => item.value == this.basic_message.alarmStatus

Write Preview
Loading…
Cancel
Save