BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 3321d6d4005ffc242d73edac050d78cb0f233d92

Authored by 296988245
Committed by Gogs
2 parents a0d574ad 4d420294

Merge branch 'yezhaocheng' of kmk/cloud_approval into master

Inline Side-by-side
Showing 2 changed files with 15 additions and 15 deletions
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
  View file @3321d6d
... ... @@ -15,7 +15,7 @@
15 15 </el-select>
16 16 </el-form-item>
17 17 <el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express">
18   - <el-input v-model="flowConditionForm.body" clearable @change="updateFlowCondition" />
  18 + <el-input v-model="flowConditionForm.body" style="width:192px;" clearable @change="updateFlowCondition" />
19 19 </el-form-item>
20 20 <template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'">
21 21 <el-form-item label="脚本语言" key="language">
... ...
yudao-ui-admin/src/views/bpm/processInstance/detail.vue
  View file @3321d6d
... ... @@ -60,7 +60,7 @@
60 60 审批人：{{ item.assigneeUser.nickname }}
61 61 <el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag>
62 62 </label>
63   - <label style="font-weight: normal">创建时间：</label>
  63 + <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
64 64 <label style="color:#8a909c; font-weight: normal">{{ parseTime(item.createTime) }}</label>
65 65 <label v-if="item.endTime" style="margin-left: 30px;font-weight: normal">审批时间：</label>
66 66 <label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{ parseTime(item.endTime) }}</label>
... ... @@ -234,19 +234,19 @@ export default {
234 234 // 审批记录
235 235 this.tasks = response.data;
236 236 // 排序，将未完成的排在前面，已完成的排在后面；
237   - this.tasks.sort((a, b) => {
238   - // 有已完成的情况，按照完成时间倒序
239   - if (a.endTime && b.endTime) {
240   - return b.endTime - a.endTime;
241   - } else if (a.endTime) {
242   - return 1;
243   - } else if (b.endTime) {
244   - return -1;
245   - // 都是未完成，按照创建时间倒序
246   - } else {
247   - return b.createTime - a.createTime;
248   - }
249   - });
  237 + // this.tasks.sort((a, b) => {
  238 + // // 有已完成的情况，按照完成时间倒序
  239 + // if (a.endTime && b.endTime) {
  240 + // return b.endTime - a.endTime;
  241 + // } else if (a.endTime) {
  242 + // return 1;
  243 + // } else if (b.endTime) {
  244 + // return -1;
  245 + // // 都是未完成，按照创建时间倒序
  246 + // } else {
  247 + // return b.createTime - a.createTime;
  248 + // }
  249 + // });
250 250  
251 251 // 需要审核的记录
252 252 const userId = store.getters.userId;
... ...