Commit 4c0814bb authored by 仇晓婷's avatar 仇晓婷

分类优化

parent e81703d7
......@@ -1745,5 +1745,18 @@ export default {
creator:'创建人',
remark:'',
url:'模板路径',
},
document_ref:{
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
documentId:'文档id',
refName:'引用的文档名称',
refId:'引用的文档id',
name:'文档名称',
}
}
......@@ -34,9 +34,9 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
<FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId" v-if="row.id">
<!-- <Checkbox v-model="entity.inheritCategoryId"></Checkbox> -->
<RadioGroup v-model="entity.inheritCategoryId">
<RadioGroup v-model="inherit">
<Radio label="1"></Radio>
<Radio label="0"></Radio>
</RadioGroup>
......@@ -136,28 +136,21 @@ export default {
return {
disabled: false,
entity: {
// creationTime: null,
creatorUserId: this.$store.state.userInfo.userId,
//creator: this.$store.state.userInfo.userName,
// lastModificationTime: null,
// lastModifierUserId: null,
// isDeleted: null,
// deletionTime: null,
// deleterUserId: null,
name: "",
upId: 0,
level: 1, //层级,顶级1,
totalDocument: 0,
// tenantId: null,
type: 0,
englishFullName: "",
englishName: "",
status: 0,
description: "",
inheritCategoryId: "0", //0否,1是
inheritCategoryId: "0", //0否,是,row的id值
template: "",
templateId: "",
},
inherit: "0",
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
},
......@@ -284,6 +277,7 @@ export default {
// if (this.eid > 0) {
// this.load(this.eid);
// }
console.log(this.row);
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
},
......@@ -334,13 +328,17 @@ export default {
// this.entity.filePath = "";
this.entity.templateId = "";
}
if (this.row.id) {
this.entity.upId = this.row.id;
this.entity.level = this.row.level;
this.entity.inheritCategoryId = this.row.id;
} else {
this.entity.upId = 0;
this.entity.level = 1;
this.entity.inheritCategoryId = 0;
}
alert(55);
let data = {
cat: this.entity,
pros: this.checkList,
......
......@@ -37,7 +37,7 @@
<Col :span="12">
<FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
<!-- <Checkbox v-model="entity.inheritCategoryId"></Checkbox> -->
<RadioGroup v-model="entity.inheritCategoryId">
<RadioGroup v-model="inherit">
<Radio label="1"></Radio>
<Radio label="0"></Radio>
</RadioGroup>
......@@ -140,6 +140,7 @@ export default {
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
},
inherit: null,
checkList: [
{
field: "code",
......@@ -267,8 +268,13 @@ export default {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.entity.inheritCategoryId = r.result.inheritCategoryId + "";
this.parms.eid = r.result.templateId;
if (r.result.inheritCategoryId == 0) {
this.inherit = "0";
} else {
this.inherit = "1";
}
let conditions = [
{
conditionalType: "Equal",
......@@ -331,9 +337,14 @@ export default {
if (this.$refs.refFile.nameList.length > 0) {
this.entity.templateId = this.parms.eid;
} else {
// this.entity.filePath = "";
this.entity.templateId = "";
}
if (this.inherit == 0) {
this.entity.inheritCategoryId = 0;
} else {
this.entity.inheritCategoryId = this.entity.id;
}
let data = {
cat: this.entity,
pros: this.checkList,
......
......@@ -4,7 +4,7 @@
<Input v-model.trim="searchValue" placeholder="请输入库位名称" clearable style="width: 240px" />
<Button type="primary" class @click="handleSearch">查询</Button>
<div class="fr">
<Button type="primary" @click="add()">新增库位</Button>
<Button type="primary" @click="add()">新增分类</Button>
</div>
</div>
<TreeGrid :columns="columns" :items="treeData"></TreeGrid>
......@@ -225,6 +225,7 @@ export default {
},
add() {
this.curId = 0;
this.row.id = '';
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
......
import Api from '@/plugins/request'
export default {
index:`${technologyUrl}documentref/paged`,
index:`${material}documentref/paged`,
paged(params){
return Api.post(`${technologyUrl}documentref/paged`,params);
return Api.post(`${material}documentref/paged`,params);
},
get(params){
return Api.get(`${technologyUrl}documentref/get`,params);
return Api.get(`${material}documentref/get`,params);
},
create(params){
return Api.post(`${technologyUrl}documentref/create`,params);
return Api.post(`${material}documentref/create`,params);
},
update(params){
return Api.post(`${technologyUrl}documentref/update`,params);
return Api.post(`${material}documentref/update`,params);
},
delete(id) {
return Api.delete(`${technologyUrl}documentref/delete`,{params:{id:id}});
return Api.delete(`${material}documentref/delete`,{params:{id:id}});
},
deletes(params) {
return Api.post(`${technologyUrl}documentref/batchdelete`,params);
return Api.post(`${material}documentref/batchdelete`,params);
}
}
\ No newline at end of file
This diff is collapsed.
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isDeleted')" prop="isDeleted"> <InputNumber v-model="entity.isDeleted"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('status')" prop="status"> <InputNumber v-model="entity.status"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('creator')" prop="creator"> <Input v-model="entity.creator"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('remark')" prop="remark"> <Input v-model="entity.remark"> </Input>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('url')" prop="url"> <InputFile v-model="entity.url"></InputFile>
</FormItem></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<!-- <Col :span="12">
<FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker type="date" v-model="entity.creationTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('creatorUserId')" prop="creatorUserId">
<InputNumber v-model="entity.creatorUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="date" v-model="entity.lastModificationTime"></DatePicker>
</FormItem>
</Col>-->
<!-- <Col :span="12">
<FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
<InputNumber v-model="entity.lastModifierUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<InputNumber v-model="entity.isDeleted"></InputNumber>
</FormItem>
</Col>-->
<!-- <Col :span="12">
<FormItem :label="l('deletionTime')" prop="deletionTime">
<DatePicker type="date" v-model="entity.deletionTime"></DatePicker>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber>
</FormItem>
</Col>-->
<Col :span="12">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="word_template_status" v-model="entity.status" type="radio"></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="12">
<FormItem :label="l('creator')" prop="creator">
<Input v-model="entity.creator"></Input>
</FormItem>
</Col>-->
<!-- <Col :span="12">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark"></Input>
</FormItem>
</Col>-->
<Col :span="24">
<FormItem :label="l('url')" prop="url">
<!-- <InputFile v-model="entity.url"></InputFile> -->
<files ref="refFile" :parms="parms" files />
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
disabled: false,
entity: {creationTime: null,
creatorUserId: null,
lastModificationTime: null,
lastModifierUserId: null,
isDeleted: null,
deletionTime: null,
deleterUserId: null,
name: "",
status: null,
creator: "",
remark: "",
url: ""},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
v: Object,
eid: Number
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.create(this.entity).then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
})
}
})
},
handleClose() {
this.$emit('on-close')
},
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.entity.id = 0;
});
},
l(key) {
key = "document_template" + "." + key;
return this.$t(key)
}
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
},
eid(v) {
if (v > 0) {
this.load(v);
}
}
import Api from "./api";
export default {
name: "Add",
data() {
return {
disabled: false,
entity: {
creationTime: null,
creatorUserId: null,
lastModificationTime: null,
lastModifierUserId: null,
isDeleted: null,
deletionTime: null,
deleterUserId: null,
name: "",
status: null,
creator: "",
remark: "",
url: "",
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
},
parms: {
app: "material",
eid: null,
name: "",
field: "",
},
};
},
props: {
v: Object,
eid: Number,
},
mounted() {
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
if (this.$refs.refFile.nameList.length > 0) {
this.entity.url = this.parms.eid;
} else {
// this.entity.filePath = "";
this.entity.url = "";
}
Api.create(this.entity)
.then((r) => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.$Message.error("保存失败");
console.warn(err);
});
}
}
</script>
\ No newline at end of file
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "document_template" + "." + key;
return this.$t(key);
},
},
watch: {},
};
</script>
\ No newline at end of file
import Api from '@/plugins/request'
export default {
index:`${technologyUrl}documenttemplate/paged`,
index:`${material}documenttemplate/paged`,
paged(params){
return Api.post(`${technologyUrl}documenttemplate/paged`,params);
return Api.post(`${material}documenttemplate/paged`,params);
},
get(params){
return Api.get(`${technologyUrl}documenttemplate/get`,params);
return Api.get(`${material}documenttemplate/get`,params);
},
create(params){
return Api.post(`${technologyUrl}documenttemplate/create`,params);
return Api.post(`${material}documenttemplate/create`,params);
},
update(params){
return Api.post(`${technologyUrl}documenttemplate/update`,params);
return Api.post(`${material}documenttemplate/update`,params);
},
delete(id) {
return Api.delete(`${technologyUrl}documenttemplate/delete`,{params:{id:id}});
return Api.delete(`${material}documenttemplate/delete`,{params:{id:id}});
},
deletes(params) {
return Api.post(`${technologyUrl}documenttemplate/batchdelete`,params);
return Api.post(`${material}documenttemplate/batchdelete`,params);
}
}
\ No newline at end of file
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 to comment