1. 新建工单的bug

main
赵培友 3 years ago
parent a68939b182
commit 00104e3ece
  1. 5
      src/option/user/info.js
  2. 2
      src/views/plugin/workflow/mixins/ex-form.js
  3. 2
      src/views/plugin/workflow/process/components/detail.vue
  4. 3
      src/views/plugin/workflow/process/components/form.vue
  5. 2
      src/views/system/userinfo.vue

@ -7,12 +7,11 @@ export const userInfoOption = {
type: 'upload', type: 'upload',
listType: 'picture-img', listType: 'picture-img',
propsHttp: { propsHttp: {
res: 'data', url: 'data',
url: 'link',
}, },
fileType: 'img',//img/video/audio, fileType: 'img',//img/video/audio,
accept: 'image/png, image/jpeg', accept: 'image/png, image/jpeg',
action: '/api/blade-resource/oss/endpoint/put-file', action: '/api/blade-user/resultPicture',
tip: '只能上传jpg/png用户头像,且不超过500kb', tip: '只能上传jpg/png用户头像,且不超过500kb',
span: 12, span: 12,
row: true, row: true,

@ -96,7 +96,7 @@ export default {
}); });
} else { } else {
this.$router.push( this.$router.push(
`/workflow/process/${type}/${param}?parent=${parent}?status=${row.status}` `/workflow/process/${type}/${param}?parent=${parent}`
); );
} }
} }

@ -63,7 +63,7 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
v-if="(userInfo.real_name === scope.row.createUser) && $route.query.status!=='作废'" v-if="userInfo.real_name === scope.row.createUser"
class="el-icon-delete" class="el-icon-delete"
style="cursor: pointer;" style="cursor: pointer;"
@click="deleteFile(scope.$index)" @click="deleteFile(scope.$index)"

@ -254,6 +254,9 @@ export default {
// const guanlibumen = this.findObject(this.option.column, "guanlibumen"); // const guanlibumen = this.findObject(this.option.column, "guanlibumen");
const guanlibumen = this.option.column[1]; const guanlibumen = this.option.column[1];
guanlibumen.dicData = res.data.data; guanlibumen.dicData = res.data.data;
if(res.data.data.length === 1) {
this.form.guanlibumen = guanlibumen.dicData[0].id
}
}); });
getTaskAndDataBase({ id }).then((res) => { getTaskAndDataBase({ id }).then((res) => {
this.taskAndDataBaseList = res.data.data; this.taskAndDataBaseList = res.data.data;

@ -188,8 +188,10 @@ export default {
email: user.email, email: user.email,
}; };
this.$store.commit("SET_USER_INFO", { this.$store.commit("SET_USER_INFO", {
...user,
avatar: user.avatar, avatar: user.avatar,
real_name: user.realName, real_name: user.realName,
role_name:user.roleName
}); });
}); });
} }

Loading…
Cancel
Save