Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit 26f63c43 by lanyulei Committed by GitHub
Options

Merge pull request #51 from lanyulei/dev 

fix: 同步处理流程节点。
parents 6fd38b9c 62190916
Inline Side-by-side
Showing with 37 additions and 32 deletions
src/components/wfd/components/DetailPanel/HandleNodeDetail.vue
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
:placeholder="i18n['handleNode.assignType.placeholder']" :placeholder="i18n['handleNode.assignType.placeholder']"
:value="model.assignType" :value="model.assignType"
:disabled="readOnly" :disabled="readOnly"
@change="(e) => { onChange('assignValue', []);onChange('assignType', e) }" @change="(e) => { onChange('assignValue', []); onChange('assignType', e); assignmentType() }"
> >
<el-option key="person" value="person" :label="i18n['handleNode.assignType.person']" /> <el-option key="person" value="person" :label="i18n['handleNode.assignType.person']" />
<el-option key="role" value="role" :label="i18n['userTask.assignType.role']" /> <el-option key="role" value="role" :label="i18n['userTask.assignType.role']" />
<!-- <el-option key="persongroup" value="persongroup" :label="i18n['handleNode.assignType.persongroup']"/> <!-- <el-option key="persongroup" value="persongroup" :label="i18n['handleNode.assignType.persongroup']"/> -->
<el-option key="department" value="department" :label="i18n['handleNode.assignType.department']"/> --> <el-option key="department" value="department" :label="i18n['handleNode.assignType.department']" />
<el-option key="variable" value="variable" :label="i18n['handleNode.assignType.variable']" /> <el-option key="variable" value="variable" :label="i18n['handleNode.assignType.variable']" />
</el-select> </el-select>
</div> </div>
...@@ -75,22 +75,17 @@ ...@@ -75,22 +75,17 @@
</el-select> </el-select>
</div> --> </div> -->
<div v-else-if="model.assignType === 'department'" class="panelRow"> <div v-else-if="model.assignType === 'department'" class="panelRow">
<div><span style="color: red">*</span> {{ i18n['handleNode.assignType.department.title'] }}：</div> <div><span style="color: red">*</span> {{ i18n['userTask.assignType.department.title'] }}：</div>
<el-select <el-select
style="width:90%; font-size:12px" style="width:90%; font-size:12px"
:placeholder="i18n['handleNode.assignType.department.placeholder']" :placeholder="i18n['userTask.assignType.department.placeholder']"
:value="model.assignValue" :value="model.assignValue"
:disabled="readOnly" :disabled="readOnly"
:multiple="true" :multiple="true"
:filterable="true" :filterable="true"
@change="(e) => { onChange('assignValue', e); getPersons(e) }" @change="(e) => { onChange('assignValue', e); getPersons(e) }"
> >
<el-option <el-option v-for="department in departments" :key="department.deptId" :label="department.deptName" :value="department.deptId" />
v-for="department in departments"
:key="department.id"
:label="department.name===''?department.nickname:department.name"
:value="department.id"
/>
</el-select> </el-select>
</div> </div>
<div v-else-if="model.assignType === 'variable'" class="panelRow"> <div v-else-if="model.assignType === 'variable'" class="panelRow">
...@@ -109,14 +104,14 @@ ...@@ -109,14 +104,14 @@
</div> </div>
<div class="panelRow"> <div class="panelRow">
<el-checkbox <el-checkbox
:disabled=" :disabled="model.assignType !== 'role' && model.assignType !== 'department' && (
model.assignValue===undefined|| model.assignValue===undefined ||
model.assignValue===null|| model.assignValue===null ||
model.assignValue.length <= 1|| model.assignValue.length <= 1 ||
model.activeOrder|| model.activeOrder ||
readOnly" readOnly)"
:value="!!model.isCounterSign" :value="model.isCounterSign"
@change="(value) => onChange('isCounterSign', value)" @change="(e) => { onChange('isCounterSign', e); initCounterSign(e) }"
>{{ i18n['handleNode.counterSign'] }}</el-checkbox> >{{ i18n['handleNode.counterSign'] }}</el-checkbox>
<el-checkbox <el-checkbox
:disabled=" :disabled="
...@@ -125,15 +120,18 @@ ...@@ -125,15 +120,18 @@
model.assignValue.length <= 1|| model.assignValue.length <= 1||
model.isCounterSign|| model.isCounterSign||
readOnly" readOnly"
:value="!!model.activeOrder" :value="model.activeOrder"
@change="(value) => onChange('activeOrder', value)" @change="(value) => onChange('activeOrder', value)"
>{{ i18n['handleNode.activeOrder'] }}</el-checkbox> >{{ i18n['handleNode.activeOrder'] }}</el-checkbox>
<!-- <el-checkbox @change="(value) => onChange('isEndorsement', value)" <el-checkbox
:disabled="readOnly" v-if="(model.assignType === 'role' || model.assignType === 'department') &&
:value="!!model.isEndorsement">{{i18n['handleNode.endorsement']}}</el-checkbox> model.assignValue!==undefined &&
<el-checkbox @change="(value) => onChange('isTaskOrder', value)" model.assignValue!==null &&
:disabled="readOnly" model.assignValue.length >= 1 &&
:value="!!model.isTaskOrder">{{i18n['handleNode.taskOrder']}}</el-checkbox> --> model.isCounterSign"
:value="model.fullHandle"
@change="(value) => onChange('fullHandle', value)"
>{{ i18n['userTask.fullHandle'] }}</el-checkbox>
</div> </div>
<NodeDetail <NodeDetail
:model="model" :model="model"
...@@ -205,7 +203,8 @@ export default { ...@@ -205,7 +203,8 @@ export default {
}, { }, {
value: 2, value: 2,
label: '创建者负责人' label: '创建者负责人'
}] }],
roleList: []
} }
}, },
methods: { methods: {
...@@ -214,6 +213,14 @@ export default { ...@@ -214,6 +213,14 @@ export default {
this.onChange('activeOrder', false) this.onChange('activeOrder', false)
this.onChange('isCounterSign', false) this.onChange('isCounterSign', false)
} }
},
initCounterSign(e) {
if (!e) {
this.onChange('fullHandle', false)
}
},
assignmentType() {
this.onChange('isCounterSign', false)
} }
} }
} }
......
src/components/wfd/components/DetailPanel/UserTaskDetail.vue
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
:placeholder="i18n['userTask.assignType.variable.placeholder']" :placeholder="i18n['userTask.assignType.variable.placeholder']"
:disabled="readOnly" :disabled="readOnly"
:multiple="true" :multiple="true"
:filterable="true"
@change="(e) => { onChange('assignValue', e); getPersons(e) }" @change="(e) => { onChange('assignValue', e); getPersons(e) }"
> >
<el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" /> <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
</div> </div>
<div class="panelRow"> <div class="panelRow">
<el-checkbox <el-checkbox
:disabled="model.assignType !== 'role' && ( :disabled="model.assignType !== 'role' && model.assignType !== 'department' && (
model.assignValue===undefined || model.assignValue===undefined ||
model.assignValue===null || model.assignValue===null ||
model.assignValue.length <= 1 || model.assignValue.length <= 1 ||
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
@change="(value) => onChange('activeOrder', value)" @change="(value) => onChange('activeOrder', value)"
>{{ i18n['userTask.activeOrder'] }}</el-checkbox> >{{ i18n['userTask.activeOrder'] }}</el-checkbox>
<el-checkbox <el-checkbox
v-if="model.assignType === 'role' && v-if="(model.assignType === 'role' || model.assignType === 'department') &&
model.assignValue!==undefined && model.assignValue!==undefined &&
model.assignValue!==null && model.assignValue!==null &&
model.assignValue.length >= 1 && model.assignValue.length >= 1 &&
...@@ -131,9 +132,6 @@ ...@@ -131,9 +132,6 @@
:value="model.fullHandle" :value="model.fullHandle"
@change="(value) => onChange('fullHandle', value)" @change="(value) => onChange('fullHandle', value)"
>{{ i18n['userTask.fullHandle'] }}</el-checkbox> >{{ i18n['userTask.fullHandle'] }}</el-checkbox>
<!-- <el-checkbox @change="(value) => onChange('isEndorsement', value)"
:disabled="readOnly"
:value="!!model.isEndorsement">{{i18n['userTask.endorsement']}}</el-checkbox> -->
</div> </div>
<NodeDetail <NodeDetail
:model="model" :model="model"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment