Skip to content

M
mes-ui
Commit 1ad73ab7 authored by 骆瑛's avatar 骆瑛
Browse files
Options

修改项目管理字段

parent 16b2f89a
Show whitespace changes
Inline Side-by-side
Showing with 551 additions and 539 deletions
i18n/locale/zh-CN.js
View file @ 1ad73ab7
......@@ -1229,17 +1229,17 @@ export default {
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
name: '分类名称',
name: '名称',
upId: '上级id',
level: '层级',
tenantId: '租户id',
type: '类别',
englishFullName: '英文全称',
englishName: '英文简称',
englishFullName: '命名空间',
englishName: '实体名',
status: '状态',
description: '描述',
inheritCategoryId: '继承分类id',
code: '编码',
code: '表名',
module: '模块',
},
project_atom: {
......@@ -1265,5 +1265,6 @@ export default {
module: '模块',
version: '版本',
projectId: '项目id',
systemName: "系统业务"
}
}
\ No newline at end of file
pages/system/project/atom/add.vue
View file @ 1ad73ab7
......@@ -57,7 +57,51 @@
<Icon :type="iconType" />{{ textUp }}
</div>
</Row>
<Divider orientation="left">扩展属性</Divider>
<Row style="margin-top: 10px">
<Tabs>
<TabPane label="实体定义" name="base"> </TabPane>
<TabPane
v-for="tab in content.dtos"
:key="tab.code"
:label="tab.name"
>
</TabPane>
<Button @click="modal1 = true" size="small" slot="extra"
>增加</Button
>
<Modal
v-model="modal1"
title="增加"
@on-ok="okModal('formline')"
@on-cancel="cancelModal('formline')"
>
<Form
:model="formline"
ref="formline"
:rules="ruleInline"
:label-width="80"
>
<p>
<FormItem label="名称：" prop="name">
<Input
v-model="formline.name"
placeholder="请输入名称"
></Input>
</FormItem>
</p>
<p>
<FormItem label="编码：" prop="code">
<Input
v-model="formline.code"
placeholder="请输入编码"
></Input>
</FormItem>
</p>
</Form>
</Modal>
</Tabs>
</Row>
<Row>
<Row style="margin-bottom: 10px" :gutter="10">
<Col :span="6">
<AutoComplete
......@@ -71,7 +115,9 @@
:value="option.name"
:key="option.id"
>
<span class="demo-auto-complete-title">{{ option.name }}</span>
<span class="demo-auto-complete-title">{{
option.name
}}</span>
<span class="demo-auto-complete-count" style="float: right">{{
option.code
}}</span>
......@@ -82,34 +128,20 @@
<Button type="primary" @click="importColumns">导入</Button>
</Col>
</Row>
<Table :columns="columns" :data="checkList" border>
<template slot-scope="{ row, index }" slot="title">
<div v-if="row.fieldType == 1 || row.fieldType == 2">
{{ row.title }}
</div>
<Table
:columns="columns1"
:data="checkList"
border
:draggable="true"
@on-drag-drop="onDragDrop"
>
<template slot-scope="{ row, index }" slot="columnDescription">
<Input
v-model="row.title"
placeholder="请输入名称"
@on-blur="setRow(row, index)"
v-if="row.fieldType == 3"
/>
</template>
<template slot-scope="{ row, index }" slot="note">
<Select
v-if="row.dataType == 3"
v-model="row.note"
clearable
transfer
v-on:input='onIpnt(row, index)'
v-model="row.columnDescription"
@on-change="setRow(row, index)"
>
<Option
v-for="item in codeList"
:value="item.code"
:key="item.code"
>{{ item.name }}</Option
>
</Select>
<span v-else>{{ row.note }}</span>
placeholder="请输入"
/>
</template>
<template slot-scope="{ row, index }" slot="dataType">
<Dictionary
......@@ -121,31 +153,85 @@
:key="row.dataType"
></Dictionary>
</template>
<template slot-scope="{ row, index }" slot="unitName">
<template slot-scope="{ row, index }" slot="propertyName">
<Input
v-on:input='onIpnt(row, index)'
v-model="row.propertyName"
@on-change="setRow(row, index)"
placeholder="请输入"
/>
</template>
<template slot-scope="{ row, index }" slot="code">
<Input
@on-change="setRow(row, index)"
v-model="row.code"
:disabled="row.dataType != 3 && row.dataType != 10"
placeholder="请输入"
/>
</template>
<template slot-scope="{ row, index }" slot="isNullable">
<Checkbox
v-model="row.isNullable"
@on-change="setRow(row, index)"
></Checkbox>
</template>
<template slot-scope="{ row, index }" slot="unit">
<Dictionary
v-if="row.dataType == 1 || row.dataType == 2"
:disabled="row.dataType != 1 && row.dataType != 2"
@on-change="setRow(row, index)"
v-model="row.unitName"
code="material.main.unitName"
v-model="row.unit"
code="materail.category.dataType"
type="select"
placeholder="请选择单位"
:value="row.unitName"
:key="row.unitName"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</template>
<template slot-scope="{ row, index }" slot="required">
<Checkbox
v-model="row.required"
<template slot-scope="{ row, index }" slot="length">
<Input
v-model="row.length"
@on-change="setRow(row, index)"
></Checkbox>
placeholder="请输入"
/>
</template>
<template slot-scope="{ row, index }" slot="link">
<Input
v-model="row.link"
@on-change="setRow(row, index)"
placeholder="请输入"
number
/>
</template>
<template slot-scope="{ row, index }" slot="systemName">
<div>
{{ row.systemName }}
</div>
<!-- <Dictionary
@on-change="setRow(row, index)"
v-model="row.systemName"
code="project.main.systemName"
type="select"
:value="row.systemName"
:key="row.systemName"
></Dictionary> -->
</template>
<template slot-scope="{ row, index }" slot="isUnique">
<template slot-scope="{ row, index }" slot="list">
<Checkbox v-model="row.list" @on-change="setRow(row, index)">
</Checkbox>
</template>
<template slot-scope="{ row, index }" slot="add">
<Checkbox v-model="row.add" @on-change="setRow(row, index)">
</Checkbox>
</template>
<template slot-scope="{ row, index }" slot="uniqueness">
<Checkbox
v-model="row.isUnique"
v-model="row.uniqueness"
@on-change="setRow(row, index)"
></Checkbox>
</template>
<template slot-scope="{ row, index }" slot="defaultValue">
<Input v-model="row.defaultValue" placeholder="请输入" />
</template>
<template slot-scope="{ row, index }" slot="action">
<a
@click="remove(index, row)"
......@@ -155,14 +241,16 @@
>
</template>
</Table>
<Button type="dashed" long @click="addNew('{}')" class="mt10"
<Button type="dashed" long @click="addNew(0, '{}')" class="mt10"
>新增属性</Button
>
</Row>
</Col>
<Col :span="24" class="tr mt10">
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button >
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Col>
......@@ -175,6 +263,15 @@ export default {
name: "Add",
data() {
return {
formline: {
name: "",
code: "",
},
ruleInline: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
code: [{ required: true, message: "请输入编码", trigger: "blur" }],
},
modal1: false,
iconType: "ios-arrow-up",
textUp: "收起",
upDrop: true,
......@@ -182,118 +279,148 @@ export default {
completeList: [],
codeList: [],
checkList: [
// {
// // mid: maxId + 1,
// // field: "c" + maxId,
// systemName: 0,
// columnDescription: "", // 中文名称
// dbColumnName: "", // 字段名称
// dataType: 0, // 数据库中字段类型
// propertyName: "", //程序中的字段名称
// propertyType: "", // 程序中的字段类型
// code: "", // 数据字典编码
// isNullable: false, // 是否可空
// isKey: false, // 是否主键
// unit: 0, // 单位
// length: 0, //
// decimalDigits: 0, // 精度
// link: 0, //外键 表的
// defaultValue: "", // 默认值
// control: 0,
// add: 0,
// uniqueness: 0, // 唯一性 0 不限制 1 表内唯一 2 表内某条件下唯一
// ruleType: "", // 邮箱 ，电话，等,
// busType: 0, // 0 系统字段 1 业务字段 2 自定义字段
// fieldType: 3,
// action: 1,
// add: 0 //新增标识
// }
],
columns1: [
{
field: "code",
title: "编号",
note: "",
dataType: 0,
unitName: "",
required: false,
isunique: false,
fieldType: 1,
categoryId: 0,
action: 1,
add: 0, //新增标识
title: "序号",
type: "index",
width: 70,
align: "center",
},
{
field: "version",
title: "版本",
note: "",
dataType: 0,
unitName: "",
required: true,
isunique: false,
fieldType: 1,
categoryId: 0,
action: 1,
add: 0, //新增标识
title: "名称(*)",
align: "center",
key: "columnDescription",
slot: "columnDescription",
width: 150,
renderHeader: (h, params) => {
return h("div", [
h("span", "名称("),
h("span", { style: { color: "red" } }, "*"),
h("span", ")"),
]);
},
},
{
field: "secret",
title: "密级",
note: "",
dataType: 3,
unitName: "",
required: true,
isunique: false,
fieldType: 1,
categoryId: 0,
action: 1,
add: 0, //新增标识
title: "类型",
key: "dataType",
align: "center",
slot: "dataType",
width: 150,
high: true,
},
{
field: "name",
title: "标题",
note: "",
dataType: 0,
unitName: "",
required: true,
isunique: false,
fieldType: 1, //共有属性(不能删除)
categoryId: 0,
action: 1,
add: 0, //新增标识
title: "属性(*)",
align: "center",
key: "propertyName",
slot: "propertyName",
high: false,
renderHeader: (h, params) => {
return h("div", [
h("span", "属性("),
h("span", { style: { color: "red" } }, "*"),
h("span", ")"),
]);
},
},
{
field: "description",
title: "文档详细说明",
note: "",
dataType: 8,
unitName: "",
required: true,
isunique: false,
fieldType: 1, //共有属性(不能删除)
categoryId: 0,
action: 1,
add: 0, //新增标识
title: "关联",
key: "code",
align: "center",
slot: "code",
},
],
columns: [
{
title: "序号",
type: "index",
width: 80,
title: "单位",
key: "unit",
align: "center",
slot: "unit",
},
{
title: "属性名称",
key: "title",
slot: "title",
title: "长度",
key: "length",
align: "center",
slot: "length",
},
{
title: "属性类型",
key: "dataType",
title: "业务类型",
key: "systemName",
align: "center",
slot: "dataType",
width: 200,
slot: "systemName",
width: 190,
render: (h, params) => {
return h("div", [
h("span", {}, this.sysDist(params.row.systemName)),
]);
},
},
{
title: "设置",
key: "note",
title: "是否可空",
key: "isNullable",
align: "center",
slot: "note",
slot: "isNullable",
width: 100,
},
{
title: "单位",
key: "unitName",
title: "业务设置",
align: "center",
children: [
{
title: "列表",
key: "list",
align: "center",
slot: "unitName",
width: "150",
slot: "list",
width: 70,
},
{
title: "必填",
key: "required",
title: "新增",
key: "add",
align: "center",
slot: "required",
width: 80,
slot: "add",
width: 70,
},
{
title: "唯一",
key: "isUnique",
key: "uniqueness",
align: "center",
slot: "isUnique",
width: 80,
slot: "uniqueness",
width: 70,
},
{
title: "默认值",
key: "defaultValue",
align: "center",
slot: "defaultValue",
},
],
},
{
width: 80,
title: "操作",
......@@ -312,7 +439,6 @@ export default {
englishName: "",
status: null,
description: "",
content: [],
inheritCategoryId: null,
code: "",
module: "",
......@@ -323,6 +449,10 @@ export default {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
},
content: {
base: [],
dtos: [],
},
};
},
props: {
......@@ -330,12 +460,43 @@ export default {
eid: Number,
},
mounted() {
this.seachChange();
if (this.eid > 0) {
this.load(this.eid);
this.seachChange();
}
},
methods: {
sysDist(value) {
if (value == 0) {
return "系统";
} else if (value == 1) {
return "业务";
} else if (value == 2) {
return "扩展";
}
},
okModal(name) {
this.$refs[name].validate((valid) => {
if (valid) {
let obj = {
name: this.formline.name,
code: this.formline.code,
list: [],
};
this.content.dtos.push(obj);
console.log(this.content.dtos);
this.$refs[name].resetFields();
this.modal1 = false;
}
});
},
cancelModal(name) {
this.$refs[name].resetFields();
this.modal1 = false;
},
onDragDrop(a, b) {
this.checkList.splice(b, 0, ...this.checkList.splice(a, 1));
},
importColumns() {
//导入
let changeId = {};
......@@ -347,7 +508,7 @@ export default {
this.completeValue = "";
}
});
this.addNew(changeId);
this.addNew(1, changeId);
}
},
upClick(value) {
......@@ -377,7 +538,7 @@ export default {
//新增的删除，直接删
this.checkList.splice(index, 1);
let objArr = {
name: row.title,
name: row.columnDescription,
code: row.code,
id: row.id,
};
......@@ -389,71 +550,107 @@ export default {
this.checkList.splice(index, 1);
}
},
onIpnt(a,b){
console.log(a,b)
},
setRow(row, index) {
// if (index >= 1) {
// console.log(this.checkList.length)
// for(var i=1;i<this.checkList.length;i++){
// if (this.checkList[0].columnDescription == this.checkList[i].columnDescription) {
// this.$Message.error("表格名称重复!");
// row.columnDescription = "";
// return;
// }
// if (this.checkList[0].propertyName == this.checkList[i].propertyName) {
// this.$Message.error("表格属性重复!");
// row.propertyName = "";
// return;
// }
// }
// }
if (row.dataType == 0 || row.dataType == 8) {
row.length = 50;
} else {
row.length = 0;
}
this.$set(this.checkList, index, row);
},
addNew(e) {
addNew(index, e) {
let id = "",
code = "",
name = "";
if (e == "{}") {
id = "";
code = "";
name = "";
} else {
name = "",
flag = false;
if (index == 0 && e == "{}") {
this.checkList.forEach((s, index) => {
if (s.columnDescription == "") {
this.$Message.warning("请填写表格名称!");
return (flag = true);
}
if (s.propertyName == "") {
this.$Message.warning("请填写表格属性！");
return (flag = true);
}
});
if (flag == true) {
return;
}
} else if (index == 1 && JSON.stringify(e) != "{}") {
id = e.id;
code = e.code;
name = e.name;
} else {
this.$Message.warning("请选择导入字段！");
return;
}
let maxId = 0;
this.checkList.map((u) => {
if (u.mid > maxId) {
maxId = u.mid;
}
});
// let maxId = 0;
// this.checkList.map((u) => {
// if (u.mid > maxId) {
// maxId = u.mid;
// }
// });
let obj = {
id: id,
code: code,
mid: maxId + 1,
field: "c" + maxId,
title: name,
note: "",
unitName: "",
// mid: maxId + 1,
// field: "c" + maxId,
systemName: 0,
columnDescription: name,
defaultValue: "",
isNullable: false,
unit: 0,
link: 0,
dataType: 0,
required: false,
isunique: false,
isKey: false, // 是否主键
length: 50,
propertyName: "", //程序中的字段名称
propertyType: "", // 程序中的字段类型
fieldType: 3,
categoryId: 0,
// categoryId: 0,
action: 1,
add: 0, //新增标识
};
this.checkList.push(obj);
},
handleSubmit() {
let keys = false;
let name = "";
this.checkList.forEach((s, index) => {
if (s.columnDescription == "") {
this.$Message.warning("请填写表格名称！");
return (keys = true);
}
if (s.propertyName == "") {
this.$Message.warning("请填写表格属性！");
return (keys = true);
}
});
if (keys == true) {
return;
}
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
var data={
base:this.checkList,
dtos:[
{
name:"新增",
code:"Create",
list:[]
},
{
name:"编辑",
code:"Eidt",
list:[]
},
{
name:"列表",
code:"List",
list:[]
},
]
}
this.entity.content = JSON.stringify(this.checkList);
Api.create(this.entity)
.then((r) => {
......@@ -478,6 +675,7 @@ export default {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.content.base = this.checkList;
this.entity.id = 0;
});
},
......@@ -511,4 +709,5 @@ export default {
.textIcon:hover {
opacity: 0.7;
}
</style>>
</style
>>
pages/system/project/atom/edit.vue
View file @ 1ad73ab7
......@@ -156,7 +156,7 @@
>删除</a>
</template>
</Table>
<Button type="dashed" long @click="addNew('{}')" class="mt10"
<Button type="dashed" long @click="addNew(0,'{}')" class="mt10"
>新增属性</Button
>
</Col>
......@@ -266,7 +266,7 @@ export default {
this.completeValue = "";
}
});
this.addNew(changeId);
this.addNew(1,changeId);
}
},
upClick(value) {
......@@ -314,18 +314,21 @@ export default {
setRow(row, index) {
this.$set(this.checkList, index, row);
},
addNew(e) {
addNew(index,e) {
let id = "",
code = "",
name = "";
if (e == "{}") {
if (index == 0 && e=='{}') {
id = "";
code = "";
name = "";
} else {
} else if(index == 1 && JSON.stringify(e)!='{}'){
id = e.id;
code = e.code;
name = e.name;
}else{
this.$Message.warning("请选择导入字段！");
return;
}
let maxId = 0;
this.checkList.map((u) => {
......
pages/system/project/atom/index.vue
View file @ 1ad73ab7
......@@ -21,7 +21,8 @@
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<!-- fullscreen -->
<Modal v-model="modal" :title="title" width="1200" footer-hide fullscreen >
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
......
pages/system/project/project/add.vue
View file @ 1ad73ab7
<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('code')" prop="code">
<Input v-model="entity.code"> </Input> </FormItem
>
<Input v-model="entity.code"> </Input> </FormItem>
</Col>
<Col :span="12">
<!-- <FormItem :label="l('type')" prop="type">
<Input v-model="entity.type"> </Input> </FormItem
> -->
<FormItem :label="l('type')" prop="type">
<Dictionary code="base.project.type" v-model="entity.type" ></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="12"
><FormItem :label="l('level')" prop="level">
<Input v-model="entity.level"> </Input> </FormItem
></Col> -->
<Col :span="12"
><FormItem :label="l('englishFullName')" prop="englishFullName">
<Input v-model="entity.englishFullName"> </Input> </FormItem
......@@ -74,9 +23,6 @@
<Input v-model="entity.englishName"> </Input> </FormItem
></Col>
<Col :span="12">
<!-- <FormItem :label="l('status')" prop="status">
<Input v-model="entity.status"> </Input> </FormItem
> -->
<FormItem :label="l('status')" prop="status">
<Dictionary code="base.project.status" v-model="entity.status" ></Dictionary>
</FormItem>
......@@ -85,22 +31,6 @@
><FormItem :label="l('module')" prop="module">
<Input v-model="entity.module"> </Input> </FormItem
></Col>
<!-- <Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> </FormItem
></Col> -->
<!--
<Col :span="12"
><FormItem :label="l('tenantId')" prop="tenantId">
<InputNumber v-model="entity.tenantId"></InputNumber> </FormItem
></Col> -->
<!-- <Col :span="12"
><FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
<InputNumber
v-model="entity.inheritCategoryId"
></InputNumber> </FormItem
></Col> -->
<Col :span="24"
><FormItem :label="l('description')" prop="description">
<Input
......@@ -111,9 +41,7 @@
></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button type="primary" @click="handleSubmit" :disabled="disabled" >保存</Button >
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -126,13 +54,6 @@ export default {
return {
disabled: false,
entity: {
// creationTime: null,
// creatorUserId: null,
// lastModificationTime: null,
// lastModifierUserId: null,
// isDeleted: null,
// deletionTime: null,
// deleterUserId: null,
name: "",
upId: this.eid,
level: null,
......
pages/system/project/project/detail.vue
View file @ 1ad73ab7
<template>
<div class="detail">
<Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('upId')">{{entity.upId}}</Filed>
<Filed :span="12" :name="l('level')">{{entity.level}}</Filed>
<Filed :span="12" :name="l('tenantId')">{{entity.tenantId}}</Filed>
<Filed :span="12" :name="l('type')">{{entity.type}}</Filed>
<Filed :span="12" :name="l('englishFullName')">{{entity.englishFullName}}</Filed>
<Filed :span="12" :name="l('englishName')">{{entity.englishName}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
<Filed :span="12" :name="l('inheritCategoryId')">{{entity.inheritCategoryId}}</Filed>
<Filed :span="12" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="12" :name="l('module')">{{entity.module}}</Filed>
</Row>
<Filed :span="12" :name="l('name')">{{ entity.name }}</Filed>
<Filed :span="12" :name="l('type')"><state code="base.project.type" :value="entity.type" /></Filed>
<Filed :span="12" :name="l('englishFullName')">{{
entity.englishFullName
}}</Filed>
<Filed :span="12" :name="l('englishName')">{{
entity.englishName
}}</Filed>
<Filed :span="12" :name="l('status')"><state code="base.project.status" :value="entity.status" /></Filed>
<Filed :span="12" :name="l('code')"> {{ entity.code }}</Filed>
<Filed :span="12" :name="l('module')">{{ entity.module }}</Filed>
<Filed :span="24" :name="l('description')">{{ entity.description }}</Filed>
</Row>
</div>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
import Api from "./api";
export default {
name: "Add",
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
eid: Number
eid: Number,
},
mounted() {
if (this.eid > 0) {
......@@ -48,25 +40,25 @@
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.$emit('on-load')
})
this.$emit("on-load");
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = "project" + "." + key;
return this.$t(key)
}
return this.$t(key);
},
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
}
},
},
};
</script>
\ No newline at end of file
pages/system/project/project/edit.vue
View file @ 1ad73ab7
<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
......@@ -53,13 +11,12 @@
></Col>
<Col :span="12">
<FormItem :label="l('type')" prop="type">
<Dictionary code="base.project.type" v-model="entity.type" ></Dictionary>
<Dictionary
code="base.project.type"
v-model="entity.type"
></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="12"
><FormItem :label="l('level')" prop="level">
<Input v-model="entity.level"> </Input> </FormItem
></Col> -->
<Col :span="12"
><FormItem :label="l('englishFullName')" prop="englishFullName">
<Input v-model="entity.englishFullName"> </Input> </FormItem
......@@ -68,32 +25,18 @@
><FormItem :label="l('englishName')" prop="englishName">
<Input v-model="entity.englishName"> </Input> </FormItem
></Col>
<Col :span="12"
>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="base.project.status" v-model="entity.status" ></Dictionary>
<Dictionary
code="base.project.status"
v-model="entity.status"
></Dictionary>
</FormItem>
</Col>
<Col :span="12"
><FormItem :label="l('module')" prop="module">
<Input v-model="entity.module"> </Input> </FormItem
></Col>
<!-- <Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('tenantId')" prop="tenantId">
<InputNumber v-model="entity.tenantId"></InputNumber> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('inheritCategoryId')" prop="inheritCategoryId">
<InputNumber
v-model="entity.inheritCategoryId"
></InputNumber> </FormItem
></Col> -->
<Col :span="24"
><FormItem :label="l('description')" prop="description">
<Input
......@@ -142,9 +85,14 @@ export default {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
let datas={
let datas = {
creationTime: this.entity.creationTime,
creatorUserId: this.entity.creatorUserId,
description: this.entity.description,
code: this.entity.code,
id: this.entity.id,
englishFullName: this.entity.englishFullName,
englishName: this.entity.englishName,
inheritCategoryId: this.entity.inheritCategoryId,
lastModificationTime: this.entity.lastModificationTime,
lastModifierUserId: this.entity.lastModifierUserId,
......@@ -153,9 +101,9 @@ export default {
name: this.entity.name,
status: this.entity.status,
tenantId: this.entity.tenantId,
type:this.entity.type,
upId: this.entity.upId
}
type: this.entity.type,
upId: this.entity.upId,
};
Api.update(datas)
.then((r) => {
this.disabled = false;
......
pages/system/project/project/index.vue
View file @ 1ad73ab7
<template>
<div style="padding-top: 10px">
<TreeGrid :columns="columns" :items="treeData" ref="grid">
<!-- <DataGrid :columns="columns" :action="action" > -->
<template slot="easySearch"
><Form ref="formInline" :model="easySearch" inline
><FormItem prop="keys"
......@@ -22,7 +21,6 @@
<Button type="primary" @click="add">新增</Button>
</template>
</TreeGrid>
<!-- </DataGrid> -->
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
......@@ -54,55 +52,6 @@ export default {
detail: null,
curId: 0,
columns: [
// {
// key: "id",
// title: this.$t("id"),
// hide: false,
// align: "left",
// high: true,
// },
// {
// key: "creationTime",
// title: this.l("creationTime"),
// align: "left",
// high: true,
// },
// {
// key: "creatorUserId",
// title: this.l("creatorUserId"),
// align: "left",
// high: true,
// },
// {
// key: "lastModificationTime",
// title: this.l("lastModificationTime"),
// align: "left",
// high: true,
// },
// {
// key: "lastModifierUserId",
// title: this.l("lastModifierUserId"),
// align: "left",
// high: true,
// },
// {
// key: "isDeleted",
// title: this.l("isDeleted"),
// align: "left",
// high: true,
// },
// {
// key: "deletionTime",
// title: this.l("deletionTime"),
// align: "left",
// high: true,
// },
// {
// key: "deleterUserId",
// title: this.l("deleterUserId"),
// align: "left",
// high: true,
// },
{
key: "label",
title: "分类名称",
......@@ -116,25 +65,29 @@ export default {
easy: true,
high: true,
},
// { key: "upId", title: this.l("upId"), align: "left", high: true },
// { key: "level", title: this.l("level"), align: "left", high: true },
// {
// key: "tenantId",
// title: this.l("tenantId"),
// align: "left",
// high: true,
// },
{
key: "code",
title: this.l("code"),
align: "left",
code: "project.base.code",
easy: true,
high: true,
},
{ key: "type", title: this.l("type"), align: "left", high: true ,code: "base.project.type"},
{
key: "type",
title: this.l("type"),
align: "left",
high: true,
code: "base.project.type",
},
{ key: "status", title: this.l("status"), align: "left", high: true ,code: "base.project.status"},
{
key: "status",
title: this.l("status"),
align: "left",
high: true,
code: "base.project.status",
},
{
key: "englishFullName",
title: this.l("englishFullName"),
......@@ -149,13 +102,6 @@ export default {
easy: true,
high: true,
},
// {
// key: "inheritCategoryId",
// title: this.l("inheritCategoryId"),
// align: "left",
// high: true,
// },
{ key: "module", title: this.l("module"), align: "left", high: true },
{
title: "操作",
......@@ -224,7 +170,6 @@ export default {
},
"upId"
);
console.log(this.treeData);
});
},
ok() {
......@@ -233,7 +178,10 @@ export default {
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch);
console.log(this.easySearch);
console.log(this.$refs.grid);
// this.init();
// this.$refs.grid.reload(this.easySearch);
},
add() {
this.curId = 0;
......@@ -301,5 +249,4 @@ export default {
},
};
</script>
<style lang="less">
</style>
\ No newline at end of file
<style lang="less"></style>
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