提交 00f29075 编写于 作者: ibizdev's avatar ibizdev

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

上级 3eb28934
...@@ -53,10 +53,8 @@ ...@@ -53,10 +53,8 @@
"@types/mockjs": "^1.0.2", "@types/mockjs": "^1.0.2",
"@types/qs": "^6.9.0", "@types/qs": "^6.9.0",
"@vue/cli-plugin-babel": "^4.1.0", "@vue/cli-plugin-babel": "^4.1.0",
"@vue/cli-plugin-e2e-cypress": "^4.1.0",
"@vue/cli-plugin-router": "^4.1.0", "@vue/cli-plugin-router": "^4.1.0",
"@vue/cli-plugin-typescript": "^4.1.0", "@vue/cli-plugin-typescript": "^4.1.0",
"@vue/cli-plugin-unit-jest": "^4.1.0",
"@vue/cli-plugin-vuex": "^4.1.0", "@vue/cli-plugin-vuex": "^4.1.0",
"@vue/cli-service": "^4.1.0", "@vue/cli-service": "^4.1.0",
"@vue/test-utils": "1.0.0-beta.29", "@vue/test-utils": "1.0.0-beta.29",
......
...@@ -170,10 +170,20 @@ export default class DropDownList extends Vue { ...@@ -170,10 +170,20 @@ export default class DropDownList extends Vue {
/** /**
* 属性类型 * 属性类型
* @type {string} *
* @type {'string' | 'number'}
* @memberof DropDownList
*/
@Prop({ default: 'string' })
public valueType!: 'string' | 'number';
/**
* 选择实际值
*
* @type {*}
* @memberof DropDownList * @memberof DropDownList
*/ */
@Prop() public valueType?: string; public value: any = null;
/** /**
* 计算属性(当前值) * 计算属性(当前值)
...@@ -204,7 +214,7 @@ export default class DropDownList extends Vue { ...@@ -204,7 +214,7 @@ export default class DropDownList extends Vue {
}) })
return JSON.stringify([result]); return JSON.stringify([result]);
} }
return this.itemValue; return this.value;
} }
/** /**
...@@ -263,10 +273,12 @@ export default class DropDownList extends Vue { ...@@ -263,10 +273,12 @@ export default class DropDownList extends Vue {
this.formStateEvent = this.formState.subscribe(({ type, data }) => { this.formStateEvent = this.formState.subscribe(({ type, data }) => {
if (Object.is('load', type)) { if (Object.is('load', type)) {
this.loadData(); this.loadData();
this.readyValue();
} }
}); });
} }
this.loadData(); this.loadData();
this.readyValue();
} }
/** /**
...@@ -298,6 +310,29 @@ export default class DropDownList extends Vue { ...@@ -298,6 +310,29 @@ export default class DropDownList extends Vue {
}); });
} }
} }
/**
* 准备值
*
* @memberof DropDownList
*/
public readyValue() {
if (this.itemValue == null) {
this.value = null;
return;
}
if (this.$util.typeOf(this.itemValue) === this.valueType) {
this.value = this.itemValue;
} else if (this.valueType === 'number') {
if (this.itemValue.indexOf('.') === -1) {
this.value = parseInt(this.itemValue);
} else {
this.value = parseFloat(this.itemValue);
}
} else {
this.value = this.itemValue.toString();
}
}
/** /**
* 下拉点击事件 * 下拉点击事件
...@@ -331,32 +366,29 @@ export default class DropDownList extends Vue { ...@@ -331,32 +366,29 @@ export default class DropDownList extends Vue {
* @memberof DropDownList * @memberof DropDownList
*/ */
public formatCodeList(items: Array<any>){ public formatCodeList(items: Array<any>){
let matching: boolean = true; let matching: boolean = false;
this.items = []; this.items = [];
try{ try{
if(this.valueType){ items.forEach((item: any)=>{
items.forEach((item: any)=>{ const type = this.$util.typeOf(item.value);
const type = this.$util.typeOf(item.value); if(type != this.valueType){
if(type != this.valueType){ matching = true;
matching = false; if(type === 'number'){
if(type == 'number'){ item.value = item.value.toString();
item.value = item.value.toString(); }else{
if(item.value.indexOf('.') == -1){
item.value = parseInt(item.value);
}else{ }else{
if(item.value.indexOf('.') == -1){ item.value = parseFloat(item.value);
item.value = parseInt(item.value);
}else{
item.value = parseFloat(item.value);
}
} }
} }
this.items.push(item);
});
if(!matching){
console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配,已自动强制转换,请修正代码表值类型和属性类型匹配`);
} }
}else{ this.items.push(item);
this.items = items; });
if(matching){
console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配,已自动强制转换,请修正代码表值类型和属性类型匹配`);
} }
}catch(error){ }catch(error){
console.warn('代码表值类型和属性类型不匹配,自动强制转换异常,请修正代码表值类型和属性类型匹配'); console.warn('代码表值类型和属性类型不匹配,自动强制转换异常,请修正代码表值类型和属性类型匹配');
} }
......
...@@ -847,7 +847,7 @@ export default class AutoGroupListBase extends Vue implements ControlInterface { ...@@ -847,7 +847,7 @@ export default class AutoGroupListBase extends Vue implements ControlInterface {
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
...@@ -876,7 +876,7 @@ export default class GroupByCodelistListBase extends Vue implements ControlInter ...@@ -876,7 +876,7 @@ export default class GroupByCodelistListBase extends Vue implements ControlInter
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
...@@ -745,7 +745,7 @@ export default class HasPanelListBase extends Vue implements ControlInterface { ...@@ -745,7 +745,7 @@ export default class HasPanelListBase extends Vue implements ControlInterface {
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
...@@ -78,7 +78,7 @@ export default class InterFuncForm_2Model { ...@@ -78,7 +78,7 @@ export default class InterFuncForm_2Model {
{ {
name: 'borrower1', name: 'borrower1',
prop: 'borrower1', prop: 'borrower1',
dataType: 'LONGTEXT_1000', dataType: 'LONGTEXT',
}, },
{ {
name: 'borrower2', name: 'borrower2',
...@@ -88,7 +88,7 @@ export default class InterFuncForm_2Model { ...@@ -88,7 +88,7 @@ export default class InterFuncForm_2Model {
{ {
name: 'borrower3', name: 'borrower3',
prop: 'borrower3', prop: 'borrower3',
dataType: 'LONGTEXT_1000', dataType: 'LONGTEXT',
}, },
{ {
name: 'borrower2_id', name: 'borrower2_id',
......
...@@ -1199,17 +1199,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface { ...@@ -1199,17 +1199,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -997,7 +997,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac ...@@ -997,7 +997,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
...@@ -1044,9 +1044,6 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac ...@@ -1044,9 +1044,6 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
* @memberof LnternalFuncListBase * @memberof LnternalFuncListBase
*/ */
public ActionModel:any ={ public ActionModel:any ={
"New":{name:"New",icon:"fa fa-file-text-o",caption:"新建",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: ""},
"Edit":{name:"Edit",icon:"fa fa-edit",caption:"编辑",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
"Remove":{name:"Remove",icon:"fa fa-remove",caption:"删除",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "MULTIKEY"}
}; };
/** /**
......
...@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface { ...@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface { ...@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface { ...@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface { ...@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface { ...@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
serviceName:'ibizbook', serviceName:'ibizbook',
appDeLogicName:'图书', appDeLogicName:'图书',
importData:{ importData:{
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
"AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000}, "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}, "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}, "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
"UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}, "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
"UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}, "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}, "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
"PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -583,9 +583,6 @@ export default class UsrBase extends Vue implements ControlInterface { ...@@ -583,9 +583,6 @@ export default class UsrBase extends Vue implements ControlInterface {
* @memberof UsrBase * @memberof UsrBase
*/ */
public ActionModel:any ={ public ActionModel:any ={
"New":{name:"New",icon:"fa fa-file-text-o",caption:"新建",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: ""},
"Edit":{name:"Edit",icon:"fa fa-edit",caption:"编辑",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
"Remove":{name:"Remove",icon:"fa fa-remove",caption:"删除",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "MULTIKEY"}
}; };
/** /**
......
...@@ -762,7 +762,7 @@ export default class OrderDetailsListBase extends Vue implements ControlInterfac ...@@ -762,7 +762,7 @@ export default class OrderDetailsListBase extends Vue implements ControlInterfac
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
<template> <template>
<div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]"> <div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]">
<div v-if="items.length > 0">
<div> <div>
<p style="font-size: 23px;color: #fff;">订单明细合计金额</p> <p style="font-size: 23px;color: #fff;">订单明细合计金额</p>
<div style="text-align: center;font-size: 41px;color: #fff;"> <div style="text-align: center;font-size: 41px;color: #fff;">
<span>{{ calculation() }}</span> <span>{{ calculation() }}</span>
</div> </div>
</div> </div>
<template v-if="isScrollBar">
<div v-if="totalRecord>items.length" class="loadmore">{{ this.$t('app.commonWords.loadmore') }}</div>
<div v-else class="loadmore">{{ this.$t('app.commonWords.nomore') }}</div>
</template>
</div>
<div v-else>
{{ $t('entities.ibizorderdetail.orderdetailsmoney_list.nodata') }}
</div>
<el-backtop target=".content-container .app-list"></el-backtop>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
...@@ -736,7 +726,7 @@ export default class OrderDetailsMoneyBase extends Vue implements ControlInterfa ...@@ -736,7 +726,7 @@ export default class OrderDetailsMoneyBase extends Vue implements ControlInterfa
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
<template> <template>
<div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]"> <div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]">
<div v-if="items.length > 0">
<div> <div>
<p style="font-size: 23px;color: #fff;">订单明细总数</p> <p style="font-size: 23px;color: #fff;">订单明细总数</p>
<div style="text-align: center;font-size: 41px;color: #fff;"> <div style="text-align: center;font-size: 41px;color: #fff;">
<span>{{ calculation() }}</span> <span>{{ calculation() }}</span>
</div> </div>
</div> </div>
<template v-if="isScrollBar">
<div v-if="totalRecord>items.length" class="loadmore">{{ this.$t('app.commonWords.loadmore') }}</div>
<div v-else class="loadmore">{{ this.$t('app.commonWords.nomore') }}</div>
</template>
</div>
<div v-else>
{{ $t('entities.ibizorderdetail.orderdetailstotal_list.nodata') }}
</div>
<el-backtop target=".content-container .app-list"></el-backtop>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
...@@ -736,7 +726,7 @@ export default class OrderDetailsTotalBase extends Vue implements ControlInterfa ...@@ -736,7 +726,7 @@ export default class OrderDetailsTotalBase extends Vue implements ControlInterfa
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
<template> <template>
<div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]"> <div :class="['app-list',this.items.length > 0 ? '' : 'app-list-empty' ]">
<div v-if="items.length > 0">
<div> <div>
<p style="font-size: 23px;color: #fff;">产品类型</p> <p style="font-size: 23px;color: #fff;">产品类型</p>
<div style="text-align: center;font-size: 41px;color: #fff;"> <div style="text-align: center;font-size: 41px;color: #fff;">
<span>{{ calculation() }}</span> <span>{{ calculation() }}</span>
</div> </div>
</div> </div>
<template v-if="isScrollBar">
<div v-if="totalRecord>items.length" class="loadmore">{{ this.$t('app.commonWords.loadmore') }}</div>
<div v-else class="loadmore">{{ this.$t('app.commonWords.nomore') }}</div>
</template>
</div>
<div v-else>
{{ $t('entities.ibizorderdetail.orderdetailstype_list.nodata') }}
</div>
<el-backtop target=".content-container .app-list"></el-backtop>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
...@@ -737,7 +727,7 @@ export default class OrderDetailsTypeBase extends Vue implements ControlInterfac ...@@ -737,7 +727,7 @@ export default class OrderDetailsTypeBase extends Vue implements ControlInterfac
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
...@@ -762,7 +762,7 @@ export default class ListExpBase extends Vue implements ControlInterface { ...@@ -762,7 +762,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
* *
*/ */
public handleClick(args: any) { public handleClick(args: any) {
this.clearSelection(); // this.clearSelection();
args.isselected = !args.isselected; args.isselected = !args.isselected;
this.selectchange(); this.selectchange();
} }
......
...@@ -1114,10 +1114,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1114,10 +1114,10 @@ export default class MainBase extends Vue implements ControlInterface {
serviceName:'ibizorder', serviceName:'ibizorder',
appDeLogicName:'订单', appDeLogicName:'订单',
importData:{ importData:{
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","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}, "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}, "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1030,10 +1030,10 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1030,10 +1030,10 @@ export default class Main2Base extends Vue implements ControlInterface {
serviceName:'ibizorder', serviceName:'ibizorder',
appDeLogicName:'订单', appDeLogicName:'订单',
importData:{ importData:{
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","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}, "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}, "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1066,10 +1066,10 @@ export default class UIPART_0015Base extends Vue implements ControlInterface { ...@@ -1066,10 +1066,10 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
serviceName:'ibizorder', serviceName:'ibizorder',
appDeLogicName:'订单', appDeLogicName:'订单',
importData:{ importData:{
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","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}, "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}, "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1189,10 +1189,10 @@ export default class UIPART_0017Base extends Vue implements ControlInterface { ...@@ -1189,10 +1189,10 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
serviceName:'ibizorder', serviceName:'ibizorder',
appDeLogicName:'订单', appDeLogicName:'订单',
importData:{ importData:{
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","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}, "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}, "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
...@@ -1121,10 +1121,10 @@ export default class UIPART_0018Base extends Vue implements ControlInterface { ...@@ -1121,10 +1121,10 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
serviceName:'ibizorder', serviceName:'ibizorder',
appDeLogicName:'订单', appDeLogicName:'订单',
importData:{ importData:{
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
"ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","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}, "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
"ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}, "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
"IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
......
此差异已折叠。
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -11,8 +11,8 @@ public interface IBIZBOOKDataImport { ...@@ -11,8 +11,8 @@ public interface IBIZBOOKDataImport {
@Mapping(target = "press", source = "press"), @Mapping(target = "press", source = "press"),
@Mapping(target = "author", source = "author"), @Mapping(target = "author", source = "author"),
@Mapping(target = "price", source = "price"), @Mapping(target = "price", source = "price"),
@Mapping(target = "booknumber", source = "booknumber"),
@Mapping(target = "createdate", source = "createdate"), @Mapping(target = "createdate", source = "createdate"),
@Mapping(target = "booknumber", source = "booknumber"),
@Mapping(target = "ibizbookname", source = "ibizbookname"), @Mapping(target = "ibizbookname", source = "ibizbookname"),
@Mapping(target = "createman", source = "createman"), @Mapping(target = "createman", source = "createman"),
@Mapping(target = "updateman", source = "updateman"), @Mapping(target = "updateman", source = "updateman"),
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<!--输出实体[IBIZBOOK]数据结构 --> <!--输出实体[IBIZBOOK]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-777-4"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-778-4">
<createTable tableName="T_IBIZBOOK"> <createTable tableName="T_IBIZBOOK">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
......
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar 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 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
...@@ -3,24 +3,9 @@ services: ...@@ -3,24 +3,9 @@ services:
demo-provider-demoapi: demo-provider-demoapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports: ports:
- "51000:51000" - "8081:8081"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册