提交 7165be28 编写于 作者: ibizdev's avatar ibizdev

ShineKOT 发布系统代码 [后台服务,演示应用]

上级 9eba746c
......@@ -13,6 +13,8 @@ export default {
type: "图书类型",
booknumber: "图书数量",
subtext: "图书描述",
lendouttime: "借出日期",
returntime: "归还日期",
},
views: {
autogrouplistview: {
......@@ -128,13 +130,14 @@ export default {
},
rowedit_grid: {
columns: {
ibizbookid: "图书标识",
ibizbookname: "图书名称",
author: "图书作者",
type: "图书类型",
press: "图书出版社",
price: "图书价格",
booknumber: "图书数量",
lendouttime: "借出日期",
returntime: "归还日期",
},
nodata:"",
uiactions: {
......
......@@ -12,6 +12,8 @@ export default {
type: "图书类型",
booknumber: "图书数量",
subtext: "图书描述",
lendouttime: "借出日期",
returntime: "归还日期",
},
views: {
autogrouplistview: {
......@@ -127,13 +129,14 @@ export default {
},
rowedit_grid: {
columns: {
ibizbookid: "图书标识",
ibizbookname: "图书名称",
author: "图书作者",
type: "图书类型",
press: "图书出版社",
price: "图书价格",
booknumber: "图书数量",
lendouttime: "借出日期",
returntime: "归还日期",
},
nodata:"",
uiactions: {
......
......@@ -1068,17 +1068,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -21,18 +21,6 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('ibizbookid')">
<el-table-column show-overflow-tooltip :prop="'ibizbookid'" :label="$t('entities.ibizbook.rowedit_grid.columns.ibizbookid')" :width="240" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.rowedit_grid.columns.ibizbookid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.ibizbookid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('ibizbookname')">
<el-table-column show-overflow-tooltip :prop="'ibizbookname'" :label="$t('entities.ibizbook.rowedit_grid.columns.ibizbookname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -199,6 +187,46 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('lendouttime')">
<el-table-column show-overflow-tooltip :prop="'lendouttime'" :label="$t('entities.ibizbook.rowedit_grid.columns.lendouttime')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.rowedit_grid.columns.lendouttime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit && !row.children">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<date-picker type="date" :transfer="true" format="yyyy-MM-dd" :disabled="getColumnDisabled(row,column.property)" :value="row[column.property]" style="" @on-change="(val1, val2) => { row[column.property] = val1; gridEditItemChange(row, column.property, val1, $index)}"></date-picker>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='lendouttime' editorType="DATEPICKER" :value="row.lendouttime" dataType="DATE" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('returntime')">
<el-table-column show-overflow-tooltip :prop="'returntime'" :label="$t('entities.ibizbook.rowedit_grid.columns.returntime')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.rowedit_grid.columns.returntime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit && !row.children">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<date-picker type="date" :transfer="true" format="yyyy-MM-dd" :disabled="getColumnDisabled(row,column.property)" :value="row[column.property]" style="" @on-change="(val1, val2) => { row[column.property] = val1; gridEditItemChange(row, column.property, val1, $index)}"></date-picker>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='returntime' editorType="DATEPICKER" :value="row.returntime" dataType="DATE" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -678,7 +706,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
*
* @memberof RowEditBase
*/
public defaultUpdateItems:Array<any> =[,,,,,,];
public defaultUpdateItems:Array<any> =[,,,,,,,,];
/**
* 选中行数据
......@@ -756,15 +784,6 @@ export default class RowEditBase extends Vue implements ControlInterface {
* @memberof RowEditBase
*/
public allColumns: any[] = [
{
name: 'ibizbookid',
label: '图书标识',
langtag: 'entities.ibizbook.rowedit_grid.columns.ibizbookid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'ibizbookname',
label: '图书名称',
......@@ -819,6 +838,24 @@ export default class RowEditBase extends Vue implements ControlInterface {
isEnableRowEdit: true,
enableCond: 3 ,
},
{
name: 'lendouttime',
label: '借出日期',
langtag: 'entities.ibizbook.rowedit_grid.columns.lendouttime',
show: true,
unit: 'PX',
isEnableRowEdit: true,
enableCond: 3 ,
},
{
name: 'returntime',
label: '归还日期',
langtag: 'entities.ibizbook.rowedit_grid.columns.returntime',
show: true,
unit: 'PX',
isEnableRowEdit: true,
enableCond: 3 ,
},
]
/**
......@@ -905,11 +942,13 @@ export default class RowEditBase extends Vue implements ControlInterface {
*/
public getGridRowModel(){
return {
lendouttime: new FormItemModel(),
author: new FormItemModel(),
press: new FormItemModel(),
ibizbookname: new FormItemModel(),
price: new FormItemModel(),
booknumber: new FormItemModel(),
returntime: new FormItemModel(),
type: new FormItemModel(),
srfkey: new FormItemModel(),
}
......@@ -931,6 +970,10 @@ export default class RowEditBase extends Vue implements ControlInterface {
* @memberof RowEditBase
*/
public rules: any = {
lendouttime: [
{ required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '借出日期 值不能为空', trigger: 'change' },
{ required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '借出日期 值不能为空', trigger: 'blur' },
],
author: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书作者 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书作者 值不能为空', trigger: 'blur' },
......@@ -951,6 +994,10 @@ export default class RowEditBase extends Vue implements ControlInterface {
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书数量 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书数量 值不能为空', trigger: 'blur' },
],
returntime: [
{ required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '归还日期 值不能为空', trigger: 'change' },
{ required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '归还日期 值不能为空', trigger: 'blur' },
],
type: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书类型 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书类型 值不能为空', trigger: 'blur' },
......@@ -1234,17 +1281,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......@@ -1551,7 +1598,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
* @memberof RowEditBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['ibizbookid','ibizbookname','author','type','press','price','booknumber'];
let allColumns:Array<any> = ['ibizbookname','author','type','press','price','booknumber','lendouttime','returntime'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1631,13 +1678,14 @@ export default class RowEditBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
ibizbookid:'',
ibizbookname:'',
author:'',
type:'',
press:'',
price:'',
booknumber:'',
lendouttime:'',
returntime:'',
children: children
}
groupTree.push(tree);
......@@ -1665,13 +1713,14 @@ export default class RowEditBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
ibizbookid:'',
ibizbookname:'',
author:'',
type:'',
press:'',
price:'',
booknumber:'',
lendouttime:'',
returntime:'',
children: child
}
if(child && child.length > 0){
......@@ -1732,13 +1781,14 @@ export default class RowEditBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
ibizbookid:'',
ibizbookname:'',
author:'',
type:'',
press:'',
price:'',
booknumber:'',
lendouttime:'',
returntime:'',
children: children,
}
groupTree.push(tree);
......@@ -2156,16 +2206,10 @@ export default class RowEditBase extends Vue implements ControlInterface {
});
}
} else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
let name: string = this.service.getNameByProp("ibizbookid");
if(name){
let desc: any = this.allColumns.find((column: any) =>{
return Object.is(column.name, name);
});
this.$Notice.error({
title: (this.$t('app.commonWords.createFailed') as string),
desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
title: (this.$t('app.commonWords.saveFailed') as string),
desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
});
}
}else {
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
......@@ -2275,7 +2319,6 @@ export default class RowEditBase extends Vue implements ControlInterface {
return;
}
let tempContext: any = this.$util.deepCopy(this.context);
Object.is(tempContext, { ibizbook: data.ibizbookid });
const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
......
......@@ -26,6 +26,12 @@ export default class RowEditModel {
]
}else{
return [
{
name: 'lendouttime',
prop: 'lendouttime',
dataType: 'DATE',
isEditable:true
},
{
name: 'author',
prop: 'author',
......@@ -61,6 +67,12 @@ export default class RowEditModel {
prop: 'ibizbookid',
dataType: 'GUID',
},
{
name: 'returntime',
prop: 'returntime',
dataType: 'DATE',
isEditable:true
},
{
name: 'type',
prop: 'type',
......
......@@ -1236,17 +1236,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
serviceName:'ibizbook',
appDeLogicName:'图书',
importData:{
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1070,10 +1070,10 @@ export default class MainBase extends Vue implements ControlInterface {
serviceName:'ibizorder',
appDeLogicName:'订单',
importData:{
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1066,10 +1066,10 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
serviceName:'ibizorder',
appDeLogicName:'订单',
importData:{
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1189,10 +1189,10 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
serviceName:'ibizorder',
appDeLogicName:'订单',
importData:{
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -1121,10 +1121,10 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
serviceName:'ibizorder',
appDeLogicName:'订单',
importData:{
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
"ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
}
}
if(Object.keys(importDataModel).length == 0){
......
......@@ -37,11 +37,6 @@
git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/
mvn clean package -Pdemoapi
cd demo-provider/demo-provider-demoapi
mvn -Pdemoapi docker:build
mvn -Pdemoapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
EXPOSE 51000
EXPOSE 8081
ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
......@@ -3,24 +3,9 @@ services:
demo-provider-demoapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports:
- "51000:51000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=51000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
- SPRING_DATASOURCE_PASSWORD=3d6@460A
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册