1. 样式修改 2.任务父类之类改造

main
赵培友 3 years ago
parent 32de1932cf
commit 4d3aa32de8
  1. 2
      src/const/workflow/workorder.js
  2. 7
      src/styles/custom/custom.scss
  3. 27
      src/views/plugin/workflow/process/components/detail.vue
  4. 81
      src/views/plugin/workflow/process/components/form.vue
  5. 2
      src/views/plugin/workflow/process/workorder.vue

@ -7,7 +7,7 @@ export const tableOption = {
gutter: 60, //设置input的大小 gutter: 60, //设置input的大小
headerAlign: "left", headerAlign: "left",
align: "left", align: "left",
menuAlign:'center', menuAlign:'left',
menuHeaderAlign:'center', menuHeaderAlign:'center',
menuBtn: true, menuBtn: true,
editBtn: false, editBtn: false,

@ -141,3 +141,10 @@
color: #000; color: #000;
} }
.el-upload-dragger {
height: 120px;
}
.el-upload-dragger .el-icon-upload {
margin: 0;
margin-top: 14px;
}

@ -300,16 +300,16 @@ export default {
const guanlibumen = this.findObject(option.column, "guanlibumen"); const guanlibumen = this.findObject(option.column, "guanlibumen");
guanlibumen.dicData = deptDate.data.data; guanlibumen.dicData = deptDate.data.data;
// //
const taskParent = await getTaskParent(); // const taskParent = await getTaskParent();
const rwfl = this.findObject(option.column, "renwufulei"); // const rwfl = this.findObject(option.column, "renwufulei");
rwfl.dicData = taskParent.data.data; // rwfl.dicData = taskParent.data.data;
// //
const taskTypeData = await getTaskTypeData({ parentId: renwufulei }); // const taskTypeData = await getTaskTypeData({ parentId: renwufulei });
const renwuzhonglei = this.findObject( // const renwuzhonglei = this.findObject(
this.option.column, // this.option.column,
"renwuzhonglei" // "renwuzhonglei"
); // );
renwuzhonglei.dicData = taskTypeData.data.data; // renwuzhonglei.dicData = taskTypeData.data.data;
// //
const taskAndDataBaseData = await getTaskAndDataBase({ const taskAndDataBaseData = await getTaskAndDataBase({
id: yunweigongsi, id: yunweigongsi,
@ -457,4 +457,13 @@ export default {
justify-content: space-between; justify-content: space-between;
padding: 0 10px 10px 0; padding: 0 10px 10px 0;
} }
/deep/ .el-textarea.is-disabled .el-textarea__inner {
color: #333;
}
/deep/ .el-table tr {
color: #333;
}
/deep/ .el-table td {
color: #333;
}
</style> </style>

@ -37,7 +37,7 @@
</el-select> </el-select>
</template> </template>
<template slot="renwufulei"> <!-- <template slot="renwufulei">
<el-select <el-select
v-model="form.renwufulei" v-model="form.renwufulei"
placeholder="请选择任务父类" placeholder="请选择任务父类"
@ -51,7 +51,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</template> </template> -->
<template slot="xitongmingchengshujuku"> <template slot="xitongmingchengshujuku">
<el-select <el-select
filterable filterable
@ -164,7 +164,7 @@ import {
downloadFile, downloadFile,
getCompany, getCompany,
getDepts, getDepts,
getTaskParent, // getTaskParent,
// getTaskLevel, // getTaskLevel,
getTaskTypeData, getTaskTypeData,
getTaskAndDataBase, getTaskAndDataBase,
@ -174,7 +174,7 @@ import WfExamineForm from "./examForm.vue";
import WfUserSelect from "./user-select"; import WfUserSelect from "./user-select";
import exForm from "../../mixins/ex-form"; import exForm from "../../mixins/ex-form";
import draft from "../../mixins/draft"; import draft from "../../mixins/draft";
import { dateFormat } from "@/util/date" // import { dateFormat } from "@/util/date";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
components: { components: {
@ -362,27 +362,28 @@ export default {
this.form.yunweigongsi = id; this.form.yunweigongsi = id;
this.companyChange(id); this.companyChange(id);
} }
const taskParentData = await getTaskParent(); // const taskParentData = await getTaskParent();
this.taskParentList = taskParentData.data.data; // this.taskParentList = taskParentData.data.data;
if (this.$route.query.parent) { // if (this.$route.query.parent) {
const id = this.$route.query.parent; // const id = this.$route.query.parent;
this.form.renwufulei = id; // this.form.renwufulei = id;
this.taskParentChange(id); // this.taskParentChange(id);
} // }
const time = this.findObject( this.form.renwufulei = this.$route.query.parent;
this.option.column, // const time = this.findObject(
"qiwangwanchengshijian" // this.option.column,
); // "qiwangwanchengshijian"
// );
// //
time.pickerOptions = { // time.pickerOptions = {
disabledDate(time) { // disabledDate(time) {
return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; // return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
}, // },
}; // };
// //
let addHour = new Date().setHours(new Date().getHours() + 48); // let addHour = new Date().setHours(new Date().getHours() + 48);
time.value = dateFormat(new Date(addHour)); // time.value = dateFormat(new Date(addHour));
this.form.chongfumoshi = "1627589799957266433"; // this.form.chongfumoshi = "1627589799957266433";
if (this.permission.wf_process_draft) { if (this.permission.wf_process_draft) {
// 稿 // 稿
this.initDraft(process.id).then((data) => { this.initDraft(process.id).then((data) => {
@ -400,10 +401,36 @@ export default {
this.waiting = false; this.waiting = false;
}); });
}, },
// //
gradeChange() { // gradeChange() {
console.log(this.examineForm); // axios.get("/api/blade-user/maintenanceCompany").then((res) => {
}, // let companyList = res.data.data;
// if (companyList.length > 0) {
// this.form.yunweigongsi = value ? value : companyList[0].id;
// }
// if (companyList.length === 1) {
// this.option.column.find(
// (item) => item.prop == "yunweigongsi"
// ).disabled = true;
// }
// let obj = companyList.find(function (i) {
// return i.id === value ? value : companyList[0].id;
// });
// axios
// .get("/api/blade-system/dept/getDepts?id=" + obj.deptId)
// .then((res) => {
// let deptList = res.data.data;
// this.option.column.find(
// (item) => item.prop == "guanlibumen"
// ).dicData = deptList;
// if (deptList.length === 1) {
// this.form.guanlibumen = deptList[0].id;
// }
// });
// });
// },
}, },
}; };
</script> </script>

@ -143,7 +143,7 @@
> >
<template slot-scope="{ row }" slot="menu"> <template slot-scope="{ row }" slot="menu">
<el-button @click="dynamicRoute(row, 'detail')" >详情</el-button> <el-button @click="dynamicRoute(row, 'detail')" >详情</el-button>
<el-button @click="effect(row)" style="margin-left:8px;">实施详情</el-button> <el-button @click="effect(row)" style="margin-left:8px;" v-if="row.status == '已完成'">实施详情</el-button>
</template> </template>
<template slot-scope="scope" slot="status"> <template slot-scope="scope" slot="status">
<span <span

Loading…
Cancel
Save