workflowstate&rpj

This commit is contained in:
shijing 2022-07-15 12:44:01 +08:00
parent 3f939338bd
commit af4a575139
11 changed files with 1182 additions and 982 deletions

View File

@ -133,6 +133,14 @@ export default {
); );
} }
}, },
item: {
name: "获取",
req: async function (id) {
return await http.get(
`${config.API_URL}/rpm/rpj/${id}/`,
);
}
},
read:{ read:{
name: "详情", name: "详情",
req: async function (id) { req: async function (id) {

View File

@ -233,12 +233,13 @@
param.onProgress({percent: complete}) param.onProgress({percent: complete})
} }
}).then(res => { }).then(res => {
var response = config.parseData(res); config.parseData(res);
if(response.code == config.successCode){ param.onSuccess(res)
param.onSuccess(res) // if(response.code == config.successCode){
}else{ // param.onSuccess(res)
param.onError(response.msg || "未知错误") // }else{
} // param.onError(response.msg || "")
// }
}).catch(err => { }).catch(err => {
param.onError(err) param.onError(err)
}) })

View File

@ -11,11 +11,12 @@
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow @row-click="rowClick"> <scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow @row-click="rowClick">
<el-table-column label="#" type="index" width="50"></el-table-column> <el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="method" prop="method" min-width="80"></el-table-column> <el-table-column label="日志id" prop="id" min-width="200"></el-table-column>
<el-table-column label="id" prop="id" min-width="200"></el-table-column>
<el-table-column label="路径" prop="path" min-width="150"></el-table-column> <el-table-column label="路径" prop="path" min-width="150"></el-table-column>
<el-table-column label="view" prop="view" min-width="150"></el-table-column> <el-table-column label="method" prop="method" min-width="80">
</el-table-column>
<el-table-column label="view" prop="view" min-width="150"></el-table-column>
<el-table-column label="状态码" prop="status_code" min-width="80"> <el-table-column label="状态码" prop="status_code" min-width="80">
<template #default="scope"> <template #default="scope">
<el-tag class="ml-2" type="success" v-if="scope.row.status_code>=200&&scope.row.status_code<300">{{scope.row.status_code}}</el-tag> <el-tag class="ml-2" type="success" v-if="scope.row.status_code>=200&&scope.row.status_code<300">{{scope.row.status_code}}</el-tag>

View File

@ -1,228 +1,251 @@
<template> <template>
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button> <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
<!-- <el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button> <!-- <el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button> --> <el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button> -->
</div> </div>
<div class="right-panel"> <div class="right-panel">
<div class="right-panel-search"> <div class="right-panel-search">
<el-input <el-input
v-model="search.keyword" v-model="search.keyword"
placeholder="名称" placeholder="名称"
clearable clearable
></el-input> ></el-input>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
></el-button> ></el-button>
</div> </div>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable <scTable
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"
row-key="id" row-key="id"
stripe stripe
@resetQuery="resetQuery" @resetQuery="resetQuery"
> >
<el-table-column label="#" type="index" fixed="left" width="50"></el-table-column> <el-table-column label="#" type="index" fixed="left" width="50"></el-table-column>
<el-table-column label="名称" prop="name" fixed="left" width="180"></el-table-column> <el-table-column label="名称" prop="name" fixed="left" width="180"></el-table-column>
<el-table-column label="项目类型" prop="type" width="180" <el-table-column label="项目类型" prop="type" width="180"
><template #default="scope" >
>{{ type_[scope.row.type] }} <template #default="scope"
</template></el-table-column >{{ type_[scope.row.type] }}
> </template>
<el-table-column </el-table-column
label="合同编号" >
prop="contract_number" <el-table-column
width="180" label="合同编号"
></el-table-column> prop="contract_number"
<el-table-column width="180"
label="进场时间" ></el-table-column>
prop="come_time" <el-table-column
width="180" label="进场时间"
></el-table-column> prop="come_time"
<el-table-column width="180"
label="离场时间" ></el-table-column>
prop="leave_time" <el-table-column
width="180" label="离场时间"
></el-table-column> prop="leave_time"
<el-table-column label="状态" prop="state" width="180" width="180"
><template #default="scope" ></el-table-column>
>{{ state_[scope.row.state] }} <el-table-column label="状态" prop="state" width="180">
</template></el-table-column <template #default="scope">{{ state_[scope.row.state] }}</template>
> </el-table-column>
<el-table-column <el-table-column label="审批状态" width="180">
label="所属部门" <template #default="scope">
prop="belong_dept_name" <span v-if="scope.row.ticket_&&scope.row.ticket_.state_" style="margin-right: 5px;">{{scope.row.ticket_.state_.name }}</span>
width="180" <el-tag
></el-table-column> v-if="scope.row.ticket_&&scope.row.ticket_.act_state"
<el-table-column class="mx-1"
label="相关方" size="small"
prop="rparty_name" :type="scope.row.ticket_.act_state===0?'':scope.row.ticket_.act_state===1?'':scope.row.ticket_.act_state===2?'danger':scope.row.ticket_.act_state===3?'danger':scope.row.ticket_.act_state===5?'danger':scope.row.ticket_.act_state===4?'success':''"
width="180" >{{act_states[scope.row.ticket_.act_state]}}
></el-table-column> </el-tag>
<el-table-column </template>
label="创建人" </el-table-column>
prop="create_by" <el-table-column
width="180" label="所属部门"
></el-table-column> prop="belong_dept_name"
<el-table-column width="180"
label="创建时间" ></el-table-column>
prop="create_time" <el-table-column
width="180" label="相关方"
></el-table-column> prop="rparty_name"
<el-table-column label="操作" fixed="right" align="left" width="170"> width="180"
<template #default="scope"> ></el-table-column>
<el-button-group> <el-table-column
<el-button label="创建人"
text prop="create_by"
type="primary" width="180"
size="small" ></el-table-column>
@click="next_add(scope.row, scope.$index)" <el-table-column
>继续编辑</el-button> label="创建时间"
prop="create_time"
width="180"
></el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="170">
<template #default="scope">
<el-button-group>
<el-button
text
type="primary"
size="small"
@click="next_add(scope.row, scope.$index)"
>继续编辑
</el-button>
<el-button <el-button
text text
type="primary" type="primary"
size="small" size="small"
@click="table_show(scope.row, scope.$index)" @click="table_show(scope.row, scope.$index)"
>查看</el-button> >查看
<el-button </el-button>
text <el-button
type="warning" text
size="small" type="warning"
@click="table_edit(scope.row, scope.$index)" size="small"
>编辑</el-button> @click="table_edit(scope.row, scope.$index)"
<el-popconfirm >编辑
title="确定删除吗?" </el-button>
@confirm="table_del(scope.row, scope.$index)" <el-popconfirm
> title="确定删除吗?"
<template #reference> @confirm="table_del(scope.row, scope.$index)"
<el-button text type="danger" size="small">删除</el-button> >
</template> <template #reference>
</el-popconfirm> <el-button text type="danger" size="small">删除</el-button>
</el-button-group> </template>
</template> </el-popconfirm>
</el-table-column> </el-button-group>
</scTable> </template>
</el-main> </el-table-column>
</el-container> </scTable>
</el-main>
</el-container>
<save-dialog <save-dialog
v-if="dialog.save" v-if="dialog.save"
ref="saveDialog" ref="saveDialog"
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
></save-dialog> ></save-dialog>
<show-dialog
v-if="dialog.show"
ref="showDialog"
:rpjId="rpjId"
@closed="dialog.show = false"
></show-dialog>
</template> </template>
<script> <script>
import saveDialog from "./rpj_form.vue"; import saveDialog from "./rpj_form.vue";
export default { import showDialog from "./rpj_show.vue";
name: "remployee",
components: {
saveDialog,
},
data() {
return {
dialog: {
save: false,
permission: false,
},
adminform: {
username: "",
},
apiObj: this.$API.rpm.rpj.list,
query: {},
selection: [],
search: {
keyword: null,
},
type_: {
10: "建筑施工",
20: "设备设施检维修",
30: "保安保洁服务",
40: "其他",
},
state_: {
10: "创建中",
20: "审批中",
30: "待入厂",
40: "进行中",
40: "已完成",
},
};
},
methods: {
//
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
//
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
//
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show").setData(row);
});
},
// export default {
permission() { name: "remployee",
this.dialog.permission = true; components: {
this.$nextTick(() => { saveDialog,
this.$refs.permissionDialog.open(); showDialog,
}); },
}, data() {
// return {
async table_del(row) { dialog: {
this.$API.rpm.rpj.delete save: false,
.req(row.id) show: false,
.then((res) => { permission: false,
this.$message.success("删除成功"); },
adminform: {
username: "",
},
apiObj: this.$API.rpm.rpj.list,
query: {},
selection: [],
search: {
keyword: null,
},
type_: {
10: "建筑施工",
20: "设备设施检维修",
30: "保安保洁服务",
40: "其他",
},
state_: {
10: "创建中",
20: "审批中",
30: "待入厂",
40: "进行中",
50: "已完成",
},
rpjId:''
};
},
methods: {
//
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
//
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
//
table_show(row) {
this.rpjId = row.id;
this.dialog.show = true;
},
return res; //
}) permission() {
.catch((err) => { this.dialog.permission = true;
return err; this.$nextTick(() => {
}); this.$refs.permissionDialog.open();
}, });
next_add(row) },
{ //
this.$router.push({ async table_del(row) {
name: "rpjadd", this.$API.rpm.rpj.delete
query: { .req(row.id)
rpjid: row.id, //id .then((res) => {
}, this.$message.success("删除成功");
});
},
// return res;
handleSaveSuccess(data, mode) { })
if (mode == "add") { .catch((err) => {
this.$refs.table.refresh(); return err;
} else if (mode == "edit") { });
this.$refs.table.refresh(); },
} next_add(row) {
}, this.$router.push({
resetQuery() { name: "rpjadd",
this.query = {}; query: {
}, rpjid: row.id, //id
}, },
}; });
},
//
handleSaveSuccess(data, mode) {
if (mode == "add") {
this.$refs.table.refresh();
} else if (mode == "edit") {
this.$refs.table.refresh();
}
},
resetQuery() {
this.query = {};
},
},
};
</script> </script>

View File

@ -1,215 +1,213 @@
<template> <template>
<el-drawer <el-drawer
:title="titleMap[mode]" :title="titleMap[mode]"
v-model="visible" v-model="visible"
:size="1000" :size="1000"
destroy-on-close destroy-on-close
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px"> <el-main style="padding: 0 20px 20px 20px">
<el-form <el-form
ref="dialogForm" ref="dialogForm"
:model="form" :model="form"
:rules="rules" :rules="rules"
:disabled="mode == 'show'" :disabled="mode == 'show'"
label-width="80px" label-width="80px"
> >
<el-row> <el-row>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="名称"> <el-form-item label="名称">
<el-input <el-input
v-model="form.name" v-model="form.name"
type="text" type="text"
clearable clearable
:disabled="mode != 'add'" :disabled="mode != 'add'"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="项目类型"> <el-form-item label="项目类型">
<el-select v-model="form.type" style="width: 100%"> <el-select v-model="form.type" style="width: 100%">
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="合同编号"> <el-form-item label="合同编号">
<el-input <el-input
v-model="form.contract_number" v-model="form.contract_number"
type="text" type="text"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="进场时间"> <el-form-item label="进场时间">
<el-date-picker
v-model="form.come_time"
type="datetime"
placeholder="选择进场时间"
/>
</el-form-item>
</el-col>
<el-col :md="24" :sm="12" :xs="24">
<el-form-item label="离场时间">
<el-date-picker
v-model="form.leave_time"
type="datetime"
placeholder="选择离场时间"
/>
</el-form-item>
</el-col>
<el-col :md="24" :sm="12" :xs="24">
<el-form-item label="所属部门">
<el-date-picker <el-cascader
v-model="form.come_time"
type="datetime"
placeholder="选择结束时间"
/>
</el-form-item>
</el-col>
<el-col :md="24" :sm="12" :xs="24">
<el-form-item label="离场时间">
<el-date-picker
v-model="form.leave_time"
type="datetime"
placeholder="选择结束时间"
/>
</el-form-item>
</el-col>
<el-col :md="24" :sm="12" :xs="24">
<el-form-item label="所属部门">
<el-cascader
v-model="form.belong_dept" v-model="form.belong_dept"
:options="deptoptions" :options="deptoptions"
:props="{ :props="{
expandTrigger: 'hover', // expandTrigger: 'hover', //
label: 'label', // label: 'label', //
value: 'value', // value: 'value', //
emitPath: false, // false emitPath: false, // false
}" }"
clearable clearable
style="width: 100%;"> style="width: 100%;">
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="相关方"> <el-form-item label="相关方">
<el-select v-model="form.rparty" style="width: 100%"> <el-select v-model="form.rparty" style="width: 100%">
<el-option <el-option
v-for="item in rpartyOptions" v-for="item in rpartyOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
</el-form>
</el-row> </el-main>
</el-form> <el-footer>
</el-main> <el-button type="primary" :loading="isSaveing" @click="submit"
<el-footer> >保存
<el-button type="primary" :loading="isSaveing" @click="submit" </el-button
>保存</el-button >
> <el-button @click="visible = false">取消</el-button>
<el-button @click="visible = false">取消</el-button> </el-footer>
</el-footer> </el-container>
</el-container> </el-drawer>
</el-drawer>
</template> </template>
<script> <script>
import { genTree } from "@/utils/verificate"; import {genTree} from "@/utils/verificate";
export default {
emits: ["success", "closed"],
data() {
return {
loading: false,
mode: "add",
titleMap: {
add: "新增",
edit: "编辑",
show: "查看",
},
form: {},
rules: {},
visible: false,
isSaveing: false,
selectionFilters: [],
setFiltersVisible: false,
rpartyOptions: [],
deptoptions:[],
typeOptions: [
{ id: 10, name: "建筑施工" },
{ id: 20, name: "设备设施检维修" },
{ id: 30, name: "保安保洁服务" },
{ id: 40, name: "其他" },
],
};
},
mounted() {
this.getRpartyOptions();
this.getDept();
},
methods: {
//
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
//
getDept() {
this.$API.system.dept.list.req({ page: 0 }).then((res) => {
this.deptoptions = genTree(res);
});
},
// export default {
getRpartyOptions() { emits: ["success", "closed"],
this.$API.rpm.rparty.list.req({ page: 0 }).then((res) => { data() {
this.rpartyOptions = res; return {
}); loading: false,
}, mode: "add",
// titleMap: {
submit() { add: "新增",
this.$refs.dialogForm.validate(async (valid) => { edit: "编辑",
if (valid) { show: "查看",
this.isSaveing = true; },
try { form: {},
var res; rules: {},
if (this.mode == "add") { visible: false,
res = await this.$API.rpm.rpj.create.req(this.form); isSaveing: false,
} else if (this.mode == "edit") { selectionFilters: [],
res = await this.$API.rpm.rpj.update.req(this.form.id, this.form); setFiltersVisible: false,
} rpartyOptions: [],
this.isSaveing = false; deptoptions: [],
this.$emit("success", this.form, this.mode); typeOptions: [
this.visible = false; {id: 10, name: "建筑施工"},
this.$message.success("操作成功"); {id: 20, name: "设备设施检维修"},
return res; {id: 30, name: "保安保洁服务"},
} catch (err) { {id: 40, name: "其他"},
// ],
this.isSaveing = false; };
return err; },
} mounted() {
} this.getRpartyOptions();
}); this.getDept();
}, },
// methods: {
setData(data) { //
// this.loading = true open(mode = "add") {
// const params = { this.mode = mode;
// id: data.id this.visible = true;
// } return this;
// setTimeout(async ()=>{ },
// var res = await this.$API.system.table.info.get(params) //
// this.loading = false getDept() {
// this.form = res.data this.$API.system.dept.list.req({page: 0}).then((res) => {
// },400) this.deptoptions = genTree(res);
Object.assign(this.form, data); });
}, },
//
setFilters(filters) { //
this.selectionFilters = filters; getRpartyOptions() {
this.setFiltersVisible = true; this.$API.rpm.rparty.list.req({page: 0}).then((res) => {
}, this.rpartyOptions = res;
}, });
}; },
//
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
try {
var res;
if (this.mode == "add") {
res = await this.$API.rpm.rpj.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.rpm.rpj.update.req(this.form.id, this.form);
}
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
this.visible = false;
this.$message.success("操作成功");
return res;
} catch (err) {
//
this.isSaveing = false;
return err;
}
}
});
},
//
setData(data) {
// this.loading = true
// const params = {
// id: data.id
// }
// setTimeout(async ()=>{
// var res = await this.$API.system.table.info.get(params)
// this.loading = false
// this.form = res.data
// },400)
Object.assign(this.form, data);
},
//
setFilters(filters) {
this.selectionFilters = filters;
this.setFiltersVisible = true;
},
},
};
</script> </script>
<style> <style>

114
src/views/rpm/rpj_show.vue Normal file
View File

@ -0,0 +1,114 @@
<template>
<el-drawer
:title="form.name"
v-model="visible"
:size="1000"
destroy-on-close
>
<el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px">
<el-descriptions direction="vertical" :column="3" border>
<!--<el-descriptions-item label="入厂项目:">{{form.name }}</el-descriptions-item>-->
<el-descriptions-item label="项目类型:">{{types_[form.type]}}</el-descriptions-item>
<el-descriptions-item label="合同编号:">{{form.contract_number}}</el-descriptions-item>
<el-descriptions-item label="状态:">{{state_[form.state]}}</el-descriptions-item>
<el-descriptions-item label="进厂时间:">{{form.come_time}}</el-descriptions-item>
<el-descriptions-item label="离厂时间:">{{form.leave_time}}</el-descriptions-item>
<el-descriptions-item label="所属部门:">{{form.belong_dept_name}}</el-descriptions-item>
<!--<el-descriptions-item label="相关方:">{{form.rparty_name}}</el-descriptions-item>-->
</el-descriptions>
<!--<el-card style="margin-top:20px">
<scTable
ref="table"
:data="peoplelist"
row-key="id"
height='auto'
stripe
hideDo
hidePagination
>
<el-table-column
label="#"
fixed="left"
type="index"
width="50"
></el-table-column>
<el-table-column
label="访客姓名"
prop="visitor_.name"
></el-table-column>
<el-table-column
label="访客手机号"
prop="visitor_.phone"
></el-table-column>
<el-table-column
label="访客身份证号"
prop="visitor_.id_number"
></el-table-column>
<el-table-column label="是否重要访客" prop="is_main">
<template #default="scope"
>
<el-space v-if="scope.row.is_main == true"></el-space>
<el-space v-else></el-space>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="create_time"></el-table-column>
</scTable>
</el-card>-->
</el-main>
</el-container>
</el-drawer>
</template>
<script>
import {genTree} from "@/utils/verificate";
import selectUser from "@/layout/components/userselect";
export default {
emits: ["success", "closed"],
components: {
selectUser,
},
props:{rpjId: { type: String, default: "" }},
data() {
return {
loading: false,
visible: false,
isSaveing: false,
state_: {
10: "创建中",
20: "审批中",
30: "待入厂",
40: "进行中",
50: "已完成",
},
types_: {
10: "建筑施工",
20: "设备设施检维修",
30: "保安保洁服务",
40: "其他",
},
receptionistoptions: [],
peoplelist: [],
};
},
mounted() {
this.getFormData();
},
methods: {
getFormData(){
this.$API.rpm.rpj.item.req(this.rpjId).then((res) => {
this.form = res;
this.visible = true;
});
},
},
};
</script>
<style scoped>
.el-transfer {
--el-transfer-panel-width: 345px !important;
}
</style>

File diff suppressed because it is too large Load Diff

View File

@ -136,6 +136,15 @@
}, },
}); });
break; break;
case 'rparty':
this.$router.push({
name: "visitdetail",
query: {
id: row.id,
visitID:row.ticket_data.visit
},
});
break;
} }
}, },
handleLogs(row) { handleLogs(row) {

View File

@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="create_time"></el-table-column> <el-table-column label="创建时间" prop="create_time"></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="120"> <el-table-column label="操作" fixed="right" align="center" width="160">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="small" @click="handleShow(scope.row)">查看详情</el-button> <el-button type="text" size="small" @click="handleShow(scope.row)">查看详情</el-button>
<!--创建人在初始状态--> <!--创建人在初始状态-->

View File

@ -180,6 +180,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="参与者"
prop="participant"
v-if="addForm.participant_type == 6"
>
<el-input v-model="addForm.participant" placeholder="方法名" />
</el-form-item>
<el-form-item <el-form-item
label="分配方式" label="分配方式"
prop="participant" prop="participant"
@ -229,7 +236,7 @@
placeholder="请选择岗位" placeholder="请选择岗位"
> >
<el-option <el-option
v-for="item in roles" v-for="item in posts"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
@ -241,7 +248,7 @@
label="过滤策略" label="过滤策略"
prop="participant" prop="participant"
v-if=" v-if="
addForm.participant_type == 4 || addForm.participant_type == 0 addForm.participant_type == 4 || addForm.participant_type == 0|| addForm.participant_type == 10
" "
> >
<el-select <el-select
@ -370,6 +377,7 @@ export default {
participant: "", participant: "",
participants: [], participants: [],
roles: [], roles: [],
posts: [],
staffs: [], staffs: [],
stateChange: [], stateChange: [],
fieldList: [], fieldList: [],
@ -382,7 +390,7 @@ export default {
participant_cc: [], participant_cc: [],
enable_retreat: false, enable_retreat: false,
participant_type: 0, participant_type: 0,
filter_policy: 0, filter_policy: '0',
distribute_type: 2, // distribute_type: 2, //
state_fields: {}, // state_fields: {}, //
}, },
@ -499,6 +507,7 @@ export default {
this.getList(); this.getList();
this.getUsers(); this.getUsers();
this.getRole(); this.getRole();
this.getPost();
this.getField(); this.getField();
}, },
methods: { methods: {
@ -519,6 +528,11 @@ export default {
async getRole() { async getRole() {
let roles = await this.$API.system.role.list.req({ page: 0 }); let roles = await this.$API.system.role.list.req({ page: 0 });
this.roles = roles; this.roles = roles;
},
//
async getPost() {
let posts = await this.$API.system.post.list.req({ page: 0 });
this.posts = posts;
}, },
// //
async getField() { async getField() {

View File

@ -205,7 +205,7 @@
} }
if(res.err_msg){}else{ if(res.err_msg){}else{
this.limitedAdd = false; this.limitedAdd = false;
this.$router.push("/dutywork"); this.$router.push("dutywork");
} }
}, },
@ -223,7 +223,7 @@
this.$API.wf.ticket.ticketDeliver.req(this.ticketId,this.deliverForm).then(res=>{ this.$API.wf.ticket.ticketDeliver.req(this.ticketId,this.deliverForm).then(res=>{
if(res.err_msg){}else{ if(res.err_msg){}else{
this.limitedDeliver = false; this.limitedDeliver = false;
this.$router.push("/dutywork"); this.$router.push("dutywork");
} }
}) })
}, },
@ -234,7 +234,7 @@
params.suggestion = this.form.suggestion; params.suggestion = this.form.suggestion;
this.$API.wf.ticket.ticketHandle.req(this.ticketId,params).then(res=>{ this.$API.wf.ticket.ticketHandle.req(this.ticketId,params).then(res=>{
if(res.err_msg){}else{ if(res.err_msg){}else{
this.$router.push("/dutywork"); this.$router.push("dutywork");
} }
}) })
}, },