zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcdsj:33094c8161cdc4d1508b4c5f8a46bbd11bcd2afb
Branches Tags
zcdsj:master
zcdsj:base
zcdsj:gzerp
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
..
compare: zcdsj:69c63eea06542dad325530d127c848dd6b365055
Branches Tags
zcdsj:master
zcdsj:base
zcdsj:gzerp
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

No commits in common. "33094c8161cdc4d1508b4c5f8a46bbd11bcd2afb" and "69c63eea06542dad325530d127c848dd6b365055" have entirely different histories.
33094c8161 ... 69c63eea06

3 changed files with 52 additions and 83 deletions
Show Stats Expand all files Collapse all files

8
src/api/model/wf.js
View File

@ -85,14 +85,6 @@ export default {
}
}
},
state: {
item: {
name: "节点详情",
req: async function(id){
return await http.get(`${config.API_URL}/wf/state/${id}/`);
}
},
},
ticket: {
list: {
url: `${config.API_URL}/wf/ticket/`,

95
src/views/wf/state.vue
View File

@ -9,7 +9,7 @@
></el-button>
</div>
</el-header>
<el-main class="nopadding">
<el-main class="nopadding" style="height: 100%">
<scTable
ref="table"
v-loading="listLoading"
@ -18,6 +18,7 @@
stripe
highlightCurrentRow
hidePagination
hideDo
>
<el-table-column label="#" type="index"></el-table-column>
<el-table-column label="ID" prop="id" width="160"></el-table-column>
@ -31,14 +32,14 @@
<el-table-column label="顺序ID" prop="sort" width="80"></el-table-column>
<el-table-column label="类型" width="100">
<template #default="scope">
<el-tag type="info" v-if="scope.row.type == 0">
普通
<el-tag effect="plain" v-if="scope.row.type == 0">
普通类型
</el-tag>
<el-tag type="primary" v-if="scope.row.type == 1">
初始
<el-tag effect="plain" v-if="scope.row.type == 1">
初始状态
</el-tag>
<el-tag type="success" v-if="scope.row.type == 2">
结束
<el-tag effect="plain" v-if="scope.row.type == 2">
结束状态
</el-tag>
</template>
</el-table-column>
@ -52,7 +53,7 @@
{{ options2_[scope.row.distribute_type] }}</template
>
</el-table-column>
<el-table-column label="到达调用" :show-overflow-tooltip="true">
<el-table-column label="到达调用">
<template #default="scope">
{{ scope.row.on_reach_func }}
</template>
@ -135,17 +136,7 @@
prop="participant"
v-if="addForm.participant_type == 1"
>
<xtSelect
v-model="addForm.participant"
v-model:obj = "addForm.participant_"
style="width:100%"
:apiObj="$API.system.user.list"
>
<el-table-column prop="name" label="姓名" />
<el-table-column prop="phone" label="手机号" />
<el-table-column prop="belong_dept_name" label="部门" />
</xtSelect>
<!-- <el-select
<el-select
style="width: 100%"
v-model="addForm.participant"
placeholder="请选择参与者"
@ -167,25 +158,14 @@
>{{ item.phone }}</span
>
</el-option>
</el-select> -->
</el-select>
</el-form-item>
<el-form-item
label="参与者"
prop="participant"
v-if="addForm.participant_type == 2"
>
<xtSelect
v-model="addForm.participant"
v-model:obj = "addForm.participant_"
style="width:100%"
:apiObj="$API.system.user.list"
:multiple="true"
>
<el-table-column prop="name" label="姓名" />
<el-table-column prop="phone" label="手机号" />
<el-table-column prop="belong_dept_name" label="部门" />
</xtSelect>
<!-- <el-select
<el-select
style="width: 100%"
v-model="addForm.participant"
multiple
@ -208,7 +188,7 @@
>{{ item.phone }}</span
>
</el-option>
</el-select> -->
</el-select>
</el-form-item>
<el-form-item
label="参与者"
@ -256,31 +236,40 @@
prop="participant"
v-if="addForm.participant_type == 4"
>
<xtSelect
<el-select
style="width: 100%"
v-model="addForm.participant"
v-model:obj = "addForm.participant_"
style="width:100%"
:apiObj="$API.system.role.list"
:multiple="true"
multiple
placeholder="请选择角色"
>
<el-table-column prop="name" label="名称" />
</xtSelect>
<el-option
v-for="item in roles"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="岗位"
prop="participant"
v-if="addForm.participant_type == 10"
>
<xtSelect
<el-select
style="width: 100%"
v-model="addForm.participant"
v-model:obj = "addForm.participant_"
style="width:100%"
:apiObj="$API.system.post.list"
:multiple="true"
multiple
placeholder="请选择岗位"
>
<el-table-column prop="name" label="名称" />
<el-table-column prop="code" label="标识" />
</xtSelect>
<el-option
v-for="item in posts"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="部门过滤"
@ -535,6 +524,10 @@ export default {
mounted() {
this.id = sessionStorage.getItem("jinYuWorkflowId");
this.getList();
this.getUsers();
this.getRole();
this.getPost();
this.getField();
},
methods: {
//添加字段选项
@ -566,7 +559,6 @@ export default {
this.fieldList = fieldList;
},
handleAdd() {
this.getField();
this.type = "add";
this.dialogVisible = true;
// if(this.dialogInitNum === 0){
@ -624,13 +616,10 @@ export default {
// })
},
handleEdit(row) {
this.getField();
this.$API.wf.state.item.req(row.id).then(res=>{
this.type = "edit";
this.editId = row.id;
this.dialogVisible = true;
this.addForm = Object.assign({}, res);
})
this.addForm = Object.assign({}, row);
},
handleDelete(row) {
this.$API.wf.state.delete.req(row.id).then((res) => {

22
src/views/wf/transform.vue
View File

@ -9,24 +9,12 @@
<scTable
:data="list" ref="table"
row-key="id" stripe highlightCurrentRow hidePagination
row-key="id" stripe highlightCurrentRow hidePagination hideDo
>
<el-table-column label="#" type="index"></el-table-column>
<el-table-column label="ID" prop="id" width="160"></el-table-column>
<el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="属性" width="100">
<template #default="scope">
<el-tag type="primary" v-if="scope.row.attribute_type == 1">
同意
</el-tag>
<el-tag type="danger" v-if="scope.row.attribute_type == 2">
拒绝
</el-tag>
<el-tag type="info" v-if="scope.row.attribute_type == 3">
其他
</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="定时器(s)" prop="timer" width="100"></el-table-column> -->
<el-table-column label="源状态">
<template #default="scope">
<span v-if="scope.row.source_state_">{{scope.row.source_state_.name}}</span>
@ -37,7 +25,7 @@
<span v-if="scope.row.destination_state_">{{scope.row.destination_state_.name}}</span>
</template>
</el-table-column>
<el-table-column label="提交时调用" :show-overflow-tooltip="true">
<el-table-column label="提交时调用">
<template #default="scope">
{{ scope.row.on_submit_func }}
</template>
@ -179,6 +167,7 @@
},
mounted() {
this.getList();
this.getStateList();
},
methods: {
onJsonChange (value) {
@ -198,12 +187,10 @@
}
},
handleAdd() {
this.getStateList();
this.type = 'add';
this.dialogVisible = true;
},
handleEdit(row) {
this.getStateList();
this.type = 'edit';
this.editId = row.id;
this.dialogVisible = true;
@ -221,6 +208,7 @@
},
async getStateList() {
let res = await this.$API.wf.workflow.states.req(this.id);
console.log(res);
this.stateList = res;
},
async submitHandle(){