|
|
@@ -56,7 +56,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getDetail, create, deteleById } from "@/api/oa/universal"
|
|
|
+import { getDetail, create, save, deleteById } from "@/api/oa/universal"
|
|
|
import { getUserProfile } from "@/api/system/user";
|
|
|
import { listDept } from "@/api/system/dept";
|
|
|
import PeopleSelect from "@/components/PeopleSelect/index.vue";
|
|
|
@@ -79,14 +79,14 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
-
|
|
|
+ loading:false,
|
|
|
files: [],
|
|
|
// 设置上传的请求头部
|
|
|
headers: getBaseHeader(),
|
|
|
// 上传的地址
|
|
|
fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
|
|
|
// fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
|
|
|
- entryId: undefined, // 编号
|
|
|
+ codeId: undefined, // 编号
|
|
|
// 部门树选项
|
|
|
posOptions: [],
|
|
|
deptOptions: [],
|
|
|
@@ -106,7 +106,7 @@ export default {
|
|
|
{ required: true, message: '请输入申请的简要标题', trigger: 'blur' },
|
|
|
],
|
|
|
description: [
|
|
|
- { required: true, message: '请输入详细描述', trigger: 'change' }
|
|
|
+ { required: true, message: '请输入详细描述', trigger: 'blur' }
|
|
|
],
|
|
|
peopleList: [
|
|
|
{ required: true, message: '请选择审批人', }
|
|
|
@@ -126,22 +126,26 @@ export default {
|
|
|
},
|
|
|
|
|
|
created() {
|
|
|
- this.entryId = this.id || this.$route.query.id;
|
|
|
- console.log(this.entryId);
|
|
|
- if (this.entryId) {
|
|
|
- this.getDetail();
|
|
|
- }
|
|
|
- this.getUser();
|
|
|
+ // this.codeId = this.id || this.$route.query.id;
|
|
|
+ // console.log(this.codeId);
|
|
|
+ // if (this.codeId) {
|
|
|
+ // this.getDetail();
|
|
|
+ // }
|
|
|
+
|
|
|
this.getDeptList();
|
|
|
},
|
|
|
- // watch: {
|
|
|
- // id: {
|
|
|
- // immediate: true,
|
|
|
- // handler(val) {
|
|
|
- // this.getDetail();
|
|
|
- // }
|
|
|
- // }
|
|
|
- // },
|
|
|
+ watch: {
|
|
|
+ id: {
|
|
|
+ immediate: true,
|
|
|
+ handler(val) {
|
|
|
+ if(val){
|
|
|
+ this.getDetail(val);
|
|
|
+ }else{
|
|
|
+ this.getUser();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
getUser() {
|
|
|
getUserProfile().then(response => {
|
|
|
@@ -192,15 +196,15 @@ export default {
|
|
|
this.form.fileIdList = fileIds;
|
|
|
},
|
|
|
/** 获得表单信息 */
|
|
|
- getDetail() {
|
|
|
- getDetail(this.entryId).then(response => {
|
|
|
+ getDetail(val) {
|
|
|
+ getDetail(val).then(response => {
|
|
|
this.form = response.data;
|
|
|
- let files = response.data.files;
|
|
|
+ let files = response.data.fileList;
|
|
|
if (files) {
|
|
|
this.files = [];
|
|
|
for (let i in files) {
|
|
|
let url = files[i].url;
|
|
|
- let name = files[i].oldName;
|
|
|
+ let name = files[i].name;
|
|
|
let id = files[i].id;
|
|
|
|
|
|
this.files.push({
|
|
|
@@ -210,6 +214,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+ this.form.peopleList = undefined;
|
|
|
});
|
|
|
},
|
|
|
/** 查询部门列表 */
|
|
|
@@ -231,15 +236,21 @@ export default {
|
|
|
},
|
|
|
//提交
|
|
|
onSubmit() {
|
|
|
+ console.log(this.form);
|
|
|
this.$refs.form.validate(valid => {
|
|
|
if (valid) {
|
|
|
console.log(this.form);
|
|
|
this.form.startUserSelectAssignees = this.form.peopleList;
|
|
|
this.form.auditPass = true;
|
|
|
+ this.$parent.$parent.editLoading = true;
|
|
|
create(this.form).then(response => {
|
|
|
- // this.$message.success('提交成功')
|
|
|
+ this.$parent.$parent.editLoading = false;
|
|
|
this.$modal.msgSuccess("提交成功");
|
|
|
- this.$router.push({ path: '/' })
|
|
|
+ if(this.id){
|
|
|
+ this.$parent.$parent.closeEdit();
|
|
|
+ }else{
|
|
|
+ this.$parent.$parent.setStatus(2);
|
|
|
+ }
|
|
|
});
|
|
|
} else {
|
|
|
console.log('error submit!!');
|
|
|
@@ -251,19 +262,25 @@ export default {
|
|
|
onSave() {
|
|
|
this.form.startUserSelectAssignees = this.form.peopleList
|
|
|
this.form.auditPass = false;
|
|
|
- create(this.form).then(response => {
|
|
|
- // this.$message.success('提交成功')
|
|
|
+ this.$parent.$parent.editLoading = true;
|
|
|
+ save(this.form).then(response => {
|
|
|
+ this.$parent.$parent.editLoading = false;
|
|
|
this.$modal.msgSuccess("暂存成功");
|
|
|
- this.$router.push({ path: '/' })
|
|
|
+ if(this.id){
|
|
|
+ this.$parent.$parent.closeEdit();
|
|
|
+ }else{
|
|
|
+ this.$parent.$parent.setStatus(2);
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
//暂存删除
|
|
|
- onDelete(){
|
|
|
- this.$modal.confirm('是否确认删除?').then(function() {
|
|
|
- return deteleById(this.id);
|
|
|
- }).then(() => {
|
|
|
+ async onDelete() {
|
|
|
+ this.$modal.confirm('是否确认删除?').then(() => {
|
|
|
+ deleteById(this.id).then(response => {
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$parent.$parent.closeEdit();
|
|
|
+ })
|
|
|
+ }).catch(() => { });
|
|
|
},
|
|
|
// 关闭标签
|
|
|
handleClose(index) {
|
