xuhaoyun 1 year ago
commit 33b4f54d86

@ -3,10 +3,10 @@
<div> <div>
<div class="backlog_body"> <div class="backlog_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data"></el-button> <el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button> <el-button @click="reset"></el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
@ -25,6 +25,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -147,13 +151,15 @@ export default {
}; };
get_backlog(param).then((res) => { get_backlog(param).then((res) => {
// //
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) 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.table_data = res.rows;
this.total = res.total; this.total = res.total;
}) });
}, },
reset() { reset() {
this.search.backlog_time = [this.get_today(), this.get_tomorrow()]; this.search.backlog_time = [this.get_today(), this.get_tomorrow()];
@ -229,12 +235,12 @@ export default {
}, },
// //
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -242,12 +248,12 @@ export default {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageNum = 1; this.pageNum = 1;
this.pageSize = val; this.pageSize = val;
this.search_data() this.search_data();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNum = val; this.pageNum = val;
this.search_data() this.search_data();
}, },
}, },
}; };
@ -334,7 +340,6 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;
@ -350,6 +355,20 @@ export default {
color: #fff; color: #fff;
background: #283436; 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 { /deep/.el-range-separator {

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

@ -88,7 +88,9 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="dispose_complete"></el-button> <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-item>
</el-form> </el-form>
</div> </div>
@ -109,7 +111,9 @@
</div> </div>
</el-image> </el-image>
<div class="backlog_idea_person_information"> <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 class="backlog_idea_person_team">{{ item.candidate }}</div>
</div> </div>
</div> </div>
@ -117,13 +121,15 @@
<!-- 第一行处理意见 --> <!-- 第一行处理意见 -->
<div class="dispose_idea"> <div class="dispose_idea">
<div class="backlog_text">处理意见:</div> <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>
<!-- 第二行附件 按需显示或者隐藏 --> <!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> <!-- <div v-if="attachment_show" class="attachment">
<div class="backlog_text">附件:</div> --> <div class="backlog_text">附件:</div> -->
<!-- 此处后面会改为下载图片链接 --> <!-- 此处后面会改为下载图片链接 -->
<!-- <div class="backlog_value">{{ item.attachment_value }}</div> <!-- <div class="backlog_value">{{ item.attachment_value }}</div>
</div> --> </div> -->
<!-- 第三行抄送人 --> <!-- 第三行抄送人 -->
<div class="send_person"> <div class="send_person">
@ -165,8 +171,7 @@ export default {
suggest: "", suggest: "",
section: "", section: "",
}, },
backlog_list: [ backlog_list: [],
],
status_list: [ status_list: [
{ label: "待审核", value: "1" }, { label: "待审核", value: "1" },
{ label: "通过", value: "2" }, { label: "通过", value: "2" },
@ -210,14 +215,14 @@ export default {
let param = { let param = {
procInsId: this.backlog_detail.procInsId, procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId, taskId: this.backlog_detail.taskId,
comment:this.form.suggest, comment: this.form.suggest,
approveType:'2', approveType: "2",
copyDeptIds: this.tags.map(item =>item.id) copyDeptIds: this.tags.map((item) => item.id),
}; };
get_backlog_approve(param).then(res=>{ get_backlog_approve(param).then((res) => {
console.log('res_approve',res); console.log("res_approve", res);
this.$message.success('处置通过') this.$message.success("处置通过");
this.$emit('back_home_page') // this.$emit("back_home_page"); //
}); });
}, },
// //
@ -225,16 +230,16 @@ export default {
let param = { let param = {
procInsId: this.backlog_detail.procInsId, procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId, taskId: this.backlog_detail.taskId,
comment:this.form.suggest, comment: this.form.suggest,
approveType:'3', approveType: "3",
copyDeptIds: this.tags.map(item =>item.id) copyDeptIds: this.tags.map((item) => item.id),
}; };
get_backlog_approve(param).then(res=>{ get_backlog_approve(param).then((res) => {
console.log('res_approve',res); console.log("res_approve", res);
this.$message.warning('处置失败') this.$message.warning("处置失败");
this.$emit('back_home_page') // this.$emit("back_home_page"); //
}); });
} },
}, },
}; };
</script> </script>

@ -3,10 +3,10 @@
<div> <div>
<div class="complete_body"> <div class="complete_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data"></el-button> <el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button> <el-button @click="reset"></el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select <el-select
@ -39,6 +39,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -65,8 +69,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="taskName" label="当前节点"> <el-table-column prop="taskName" label="当前节点"> </el-table-column>
</el-table-column>
<el-table-column prop="nextNodeUsers" label="未操作者" width="280"> <el-table-column prop="nextNodeUsers" label="未操作者" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="operation" label="操作"> <el-table-column prop="operation" label="操作">
@ -179,10 +182,12 @@ export default {
}; };
get_complete(param).then((res) => { get_complete(param).then((res) => {
// //
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) 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.table_data = res.rows;
this.total = res.total; this.total = res.total;
}); });
@ -264,12 +269,12 @@ export default {
}, },
// //
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -369,7 +374,6 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;
@ -385,6 +389,20 @@ export default {
color: #fff; color: #fff;
background: #283436; 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 { /deep/.el-range-separator {

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

@ -77,7 +77,9 @@
</div> </div>
</el-image> </el-image>
<div class="complete_idea_person_information"> <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 class="complete_idea_person_team">{{ item.candidate }}</div>
</div> </div>
</div> </div>
@ -85,13 +87,15 @@
<!-- 第一行处理意见 --> <!-- 第一行处理意见 -->
<div class="dispose_idea"> <div class="dispose_idea">
<div class="complete_text">处理意见:</div> <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>
<!-- 第二行附件 按需显示或者隐藏 --> <!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> --> <!-- <div v-if="attachment_show" class="attachment"> -->
<!-- <div class="complete_text">附件:</div> --> <!-- <div class="complete_text">附件:</div> -->
<!-- 此处后面会改为下载图片链接 --> <!-- 此处后面会改为下载图片链接 -->
<!-- <div class="complete_value">{{ item.attachment_value }}</div> --> <!-- <div class="complete_value">{{ item.attachment_value }}</div> -->
<!-- </div> --> <!-- </div> -->
<!-- 第三行抄送人 --> <!-- 第三行抄送人 -->
<div class="complete_person"> <div class="complete_person">
@ -139,7 +143,9 @@ export default {
}; };
get_my_course_record(param).then((res) => { get_my_course_record(param).then((res) => {
this.basic_message = res.data; 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; // this.opinion_list = res.data.doneTaskVoList; //
}); });
}, },

@ -3,16 +3,13 @@
<div> <div>
<div class="copy_body"> <div class="copy_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data"></el-button> <el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button> <el-button @click="reset"></el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select <el-select v-model="search.copy_status" @change="change_copy">
v-model="search.copy_status"
@change="change_copy"
>
<el-option <el-option
v-for="item in copy_list" v-for="item in copy_list"
:key="item.value" :key="item.value"
@ -39,6 +36,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -178,8 +179,10 @@ export default {
}; };
get_copy(param).then((res) => { get_copy(param).then((res) => {
// //
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
} }
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
@ -261,12 +264,12 @@ export default {
}, },
// //
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -367,7 +370,6 @@ export default {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436; background: #283436;
color: #fff; color: #fff;
} }
@ -381,6 +383,20 @@ export default {
color: #fff; color: #fff;
background: #283436; 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 { /deep/.el-range-separator {

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

@ -85,7 +85,9 @@
<!-- 第一行处理意见 --> <!-- 第一行处理意见 -->
<div class="dispose_idea"> <div class="dispose_idea">
<div class="course_text">处理意见:</div> <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>
<!-- 第二行附件 按需显示或者隐藏 --> <!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> --> <!-- <div v-if="attachment_show" class="attachment"> -->

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

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

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

Loading…
Cancel
Save