Skip to content

I
iBiz商业中心
提交 3be99750 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_gzf 部署微服务应用 [Spring Boot，采购]

上级 2fed62cc
隐藏空白字符变更
内嵌 并排
正在显示 包含 3551 行增加 和 528 行删除
app_Purchase/public/assets/json/view-config.json
浏览文件 @ 3be99750
......@@ -329,6 +329,16 @@
"viewtag": "6a0c617ff14554d4fea25e8572ef67c9",
"memo": "系统自动添加"
},
"res_partnerpickupview": {
"title": "联系人数据选择视图",
"caption": "联系人",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "odoo_base",
"viewname": "res_partnerPickupView",
"viewfilename": "res-partner-pickup-view",
"viewtag": "6abc5f67274f993c9ecb116f94900e85",
"memo": "系统自动添加"
},
"purchase_requisition_linelineedit": {
"title": "行编辑表格视图",
"caption": "采购申请行",
......@@ -649,6 +659,16 @@
"viewtag": "b42a148563e92720dcbdc83b5d46117a",
"memo": "系统自动添加"
},
"res_partnerpickupgridview": {
"title": "联系人选择表格视图",
"caption": "联系人",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "odoo_base",
"viewname": "res_partnerPickupGridView",
"viewfilename": "res-partner-pickup-grid-view",
"viewtag": "b9c01aac6e18ec1eed1b74d47f275384",
"memo": "系统自动添加"
},
"purchase_ordermastersummaryview": {
"title": "概览",
"caption": "采购订单",
......
app_Purchase/src/components/app-picker/app-picker.vue
浏览文件 @ 3be99750
......@@ -344,6 +344,8 @@ export default class AppPicker extends Vue {
public onSelectOpen(flag: boolean): void {
this.open = flag;
if (this.open) {
// 清空旧数据
this.items = [];
//设置下拉列表的最大宽度
this.setDropdownWidth();
this.onSearch(this.curvalue, null, true);
......
app_Purchase/src/interface/entity/res-supplier.ts
浏览文件 @ 3be99750
......@@ -38,14 +38,6 @@ export interface Res_supplier {
*/
company_type?: any;
/**
* 城市
*
* @returns {*}
* @memberof Res_supplier
*/
city?: any;
/**
* 内部参考
*
......@@ -102,46 +94,6 @@ export interface Res_supplier {
*/
name?: any;
/**
* 街道 2
*
* @returns {*}
* @memberof Res_supplier
*/
street2?: any;
/**
* 街道
*
* @returns {*}
* @memberof Res_supplier
*/
street?: any;
/**
* 网站网址
*
* @returns {*}
* @memberof Res_supplier
*/
website_url?: any;
/**
* 公司
*
* @returns {*}
* @memberof Res_supplier
*/
is_company?: any;
/**
* 邮政编码
*
* @returns {*}
* @memberof Res_supplier
*/
zip?: any;
/**
* 税号
*
......@@ -389,4 +341,52 @@ export interface Res_supplier {
* @memberof Res_supplier
*/
property_product_pricelist?: any;
/**
* 街道
*
* @returns {*}
* @memberof Res_supplier
*/
street?: any;
/**
* 网站网址
*
* @returns {*}
* @memberof Res_supplier
*/
website_url?: any;
/**
* 城市
*
* @returns {*}
* @memberof Res_supplier
*/
city?: any;
/**
* 街道 2
*
* @returns {*}
* @memberof Res_supplier
*/
street2?: any;
/**
* 邮政编码
*
* @returns {*}
* @memberof Res_supplier
*/
zip?: any;
/**
* 公司
*
* @returns {*}
* @memberof Res_supplier
*/
is_company?: any;
}
\ No newline at end of file
app_Purchase/src/locale/lanres/entities/res-partner/res-partner_en_US.ts
浏览文件 @ 3be99750
......@@ -162,6 +162,29 @@ export default {
caption: "联系人",
title: "联系人卡片视图",
},
pickupview: {
caption: "联系人",
title: "联系人数据选择视图",
},
pickupgridview: {
caption: "联系人",
title: "联系人选择表格视图",
},
},
main_grid: {
nodata: "",
columns: {
name: "名称",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
cardviewtoolbar_toolbar: {
tbitem3: {
......
app_Purchase/src/locale/lanres/entities/res-partner/res-partner_zh_CN.ts
浏览文件 @ 3be99750
......@@ -162,6 +162,29 @@ export default {
caption: "联系人",
title: "联系人卡片视图",
},
pickupview: {
caption: "联系人",
title: "联系人数据选择视图",
},
pickupgridview: {
caption: "联系人",
title: "联系人选择表格视图",
},
},
main_grid: {
nodata: "",
columns: {
name: "名称",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
cardviewtoolbar_toolbar: {
tbitem3: {
......
app_Purchase/src/locale/lanres/entities/res-supplier/res-supplier_en_US.ts
浏览文件 @ 3be99750
......@@ -4,7 +4,6 @@ export default {
barcode: "条码",
phone: "电话",
company_type: "公司类别",
city: "城市",
ref: "内部参考",
email: "EMail",
type: "地址类型",
......@@ -12,11 +11,6 @@ export default {
category_id: "标签",
mobile: "手机",
name: "名称",
street2: "街道 2",
street: "街道",
website_url: "网站网址",
is_company: "公司",
zip: "邮政编码",
vat: "税号",
property_purchase_currency_name: "供应商货币",
company_id_text: "公司",
......@@ -48,6 +42,12 @@ export default {
property_stock_subcontractor: "分包商位置",
company_id: "ID",
property_product_pricelist: "价格表",
street: "街道",
website_url: "网站网址",
city: "城市",
street2: "街道 2",
zip: "邮政编码",
is_company: "公司",
},
views: {
mastertabinfoview: {
......@@ -103,9 +103,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
name: "名称",
is_company: "公司",
type: "地址类型",
vat: "税号",
is_company: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
title_text: "称谓",
......@@ -173,9 +173,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
name: "名称",
is_company: "公司",
type: "地址类型",
vat: "税号",
is_company: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
title_text: "称谓",
......@@ -236,14 +236,14 @@ export default {
srfsourcekey: "",
name: "名称",
is_company: "公司",
company_id_text: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
phone: "电话",
mobile: "手机",
title_text: "称谓",
id: "ID",
company_id: "ID",
title: "ID",
parent_id: "ID",
},
uiactions: {
},
......@@ -259,7 +259,6 @@ export default {
nodata: "",
columns: {
name: "名称",
is_company: "公司",
phone: "电话",
mobile: "手机",
},
......
app_Purchase/src/locale/lanres/entities/res-supplier/res-supplier_zh_CN.ts
浏览文件 @ 3be99750
......@@ -4,7 +4,6 @@ export default {
barcode: "条码",
phone: "电话",
company_type: "公司类别",
city: "城市",
ref: "内部参考",
email: "EMail",
type: "地址类型",
......@@ -12,11 +11,6 @@ export default {
category_id: "标签",
mobile: "手机",
name: "名称",
street2: "街道 2",
street: "街道",
website_url: "网站网址",
is_company: "公司",
zip: "邮政编码",
vat: "税号",
property_purchase_currency_name: "供应商货币",
company_id_text: "公司",
......@@ -48,6 +42,12 @@ export default {
property_stock_subcontractor: "分包商位置",
company_id: "ID",
property_product_pricelist: "价格表",
street: "街道",
website_url: "网站网址",
city: "城市",
street2: "街道 2",
zip: "邮政编码",
is_company: "公司",
},
views: {
mastertabinfoview: {
......@@ -103,9 +103,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
name: "名称",
is_company: "公司",
type: "地址类型",
vat: "税号",
is_company: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
title_text: "称谓",
......@@ -173,9 +173,9 @@ export default {
srfdeid: "",
srfsourcekey: "",
name: "名称",
is_company: "公司",
type: "地址类型",
vat: "税号",
is_company: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
title_text: "称谓",
......@@ -236,14 +236,14 @@ export default {
srfsourcekey: "",
name: "名称",
is_company: "公司",
company_id_text: "公司",
parent_name: "公司",
ibizfunction: "工作岗位",
phone: "电话",
mobile: "手机",
title_text: "称谓",
id: "ID",
company_id: "ID",
title: "ID",
parent_id: "ID",
},
uiactions: {
},
......@@ -259,7 +259,6 @@ export default {
nodata: "",
columns: {
name: "名称",
is_company: "公司",
phone: "电话",
mobile: "手机",
},
......
app_Purchase/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 3be99750
......@@ -271,6 +271,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "purchase_requisition_typePickupView",
"viewtag": "6a0c617ff14554d4fea25e8572ef67c9"
},
"res_partnerpickupview": {
"title": "联系人数据选择视图",
"caption": "联系人",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "odoo_base",
"viewname": "res_partnerPickupView",
"viewtag": "6abc5f67274f993c9ecb116f94900e85"
},
"purchase_requisition_linelineedit": {
"title": "行编辑表格视图",
"caption": "采购申请行",
......@@ -527,6 +535,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "res_supplierMasterSummaryView",
"viewtag": "b42a148563e92720dcbdc83b5d46117a"
},
"res_partnerpickupgridview": {
"title": "联系人选择表格视图",
"caption": "联系人",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "odoo_base",
"viewname": "res_partnerPickupGridView",
"viewtag": "b9c01aac6e18ec1eed1b74d47f275384"
},
"purchase_ordermastersummaryview": {
"title": "概览",
"caption": "采购订单",
......
app_Purchase/src/pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view-base.tsx 0 → 100644
浏览文件 @ 3be99750
import { Subject } from 'rxjs';
import { UIActionTool, ViewTool } from '@/utils';
import { PickupGridViewBase } from '@/studio-core';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import Res_partnerAuthService from '@/authservice/res-partner/res-partner-auth-service';
import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
import Res_partnerUIService from '@/uiservice/res-partner/res-partner-ui-service';
/**
* 联系人选择表格视图视图基类
*
* @export
* @class Res_partnerPickupGridViewBase
* @extends {PickupGridViewBase}
*/
export class Res_partnerPickupGridViewBase extends PickupGridViewBase {
/**
* 视图对应应用实体名称
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected appDeName: string = 'res_partner';
/**
* 应用实体主键
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected appDeKey: string = 'id';
/**
* 应用实体主信息
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected appDeMajor: string = 'name';
/**
* 数据部件名称
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected dataControl:string = "grid";
/**
* 实体服务对象
*
* @type {Res_partnerService}
* @memberof Res_partnerPickupGridViewBase
*/
protected appEntityService: Res_partnerService = new Res_partnerService;
/**
* 实体权限服务对象
*
* @type Res_partnerUIService
* @memberof Res_partnerPickupGridViewBase
*/
public appUIService: Res_partnerUIService = new Res_partnerUIService(this.$store);
/**
* 视图模型数据
*
* @protected
* @type {*}
* @memberof Res_partnerPickupGridViewBase
*/
protected model: any = {
srfCaption: 'entities.res_partner.views.pickupgridview.caption',
srfTitle: 'entities.res_partner.views.pickupgridview.title',
srfSubTitle: 'entities.res_partner.views.pickupgridview.subtitle',
dataInfo: ''
}
/**
* 容器模型
*
* @protected
* @type {*}
* @memberof Res_partnerPickupGridViewBase
*/
protected containerModel: any = {
view_grid: { name: 'grid', type: 'GRID' },
view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
};
/**
* 视图唯一标识
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected viewtag: string = 'b9c01aac6e18ec1eed1b74d47f275384';
/**
* 视图名称
*
* @protected
* @type {string}
* @memberof Res_partnerPickupGridViewBase
*/
protected viewName:string = "res_partnerPickupGridView";
/**
* 视图引擎
*
* @public
* @type {Engine}
* @memberof Res_partnerPickupGridViewBase
*/
public engine: PickupGridViewEngine = new PickupGridViewEngine();
/**
* 计数器服务对象集合
*
* @type {Array<*>}
* @memberof Res_partnerPickupGridViewBase
*/
public counterServiceArray:Array<any> = [];
/**
* 引擎初始化
*
* @public
* @memberof Res_partnerPickupGridViewBase
*/
public engineInit(): void {
this.engine.init({
view: this,
grid: this.$refs.grid,
searchform: this.$refs.searchform,
keyPSDEField: 'res_partner',
majorPSDEField: 'name',
isLoadDefault: true,
});
}
/**
* grid 部件 selectionchange 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public grid_selectionchange($event: any, $event2?: any): void {
this.engine.onCtrlEvent('grid', 'selectionchange', $event);
}
/**
* grid 部件 beforeload 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public grid_beforeload($event: any, $event2?: any): void {
this.engine.onCtrlEvent('grid', 'beforeload', $event);
}
/**
* grid 部件 rowdblclick 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public grid_rowdblclick($event: any, $event2?: any): void {
this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
}
/**
* grid 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public grid_load($event: any, $event2?: any): void {
this.engine.onCtrlEvent('grid', 'load', $event);
}
/**
* searchform 部件 save 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public searchform_save($event: any, $event2?: any): void {
this.engine.onCtrlEvent('searchform', 'save', $event);
}
/**
* searchform 部件 search 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public searchform_search($event: any, $event2?: any): void {
this.engine.onCtrlEvent('searchform', 'search', $event);
}
/**
* searchform 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupGridViewBase
*/
public searchform_load($event: any, $event2?: any): void {
this.engine.onCtrlEvent('searchform', 'load', $event);
}
/**
* 是否展开搜索表单
*
* @protected
* @type {boolean}
* @memberof Res_partnerPickupGridViewBase
*/
protected isExpandSearchForm: boolean = true;
}
\ No newline at end of file
app_Purchase/src/pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.html 0 → 100644
浏览文件 @ 3be99750
<studio-view-style2 viewName="res_partnerpickupgridview" viewTitle="联系人选择表格视图" class='depickupgridview res-partner-pickup-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:selectedData="selectedData"
:showBusyIndicator="true"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchDefault"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
app_Purchase/src/pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.vue 0 → 100644
浏览文件 @ 3be99750
<template src="./res-partner-pickup-grid-view.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { Res_partnerPickupGridViewBase } from './res-partner-pickup-grid-view-base';
import view_grid from '@widgets/res-partner/main-grid/main-grid.vue';
import view_searchform from '@widgets/res-partner/default-searchform/default-searchform.vue';
/**
* 联系人选择表格视图视图
*
* @export
* @class Res_partnerPickupGridView
* @extends {Res_partnerPickupGridViewBase}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class Res_partnerPickupGridView extends Res_partnerPickupGridViewBase { }
</script>
app_Purchase/src/pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view-base.tsx 0 → 100644
浏览文件 @ 3be99750
import { Subject } from 'rxjs';
import { UIActionTool, ViewTool } from '@/utils';
import { PickupViewBase } from '@/studio-core';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import Res_partnerAuthService from '@/authservice/res-partner/res-partner-auth-service';
import PickupViewEngine from '@engine/view/pickup-view-engine';
import Res_partnerUIService from '@/uiservice/res-partner/res-partner-ui-service';
/**
* 联系人数据选择视图视图基类
*
* @export
* @class Res_partnerPickupViewBase
* @extends {PickupViewBase}
*/
export class Res_partnerPickupViewBase extends PickupViewBase {
/**
* 视图对应应用实体名称
*
* @protected
* @type {string}
* @memberof Res_partnerPickupViewBase
*/
protected appDeName: string = 'res_partner';
/**
* 应用实体主键
*
* @protected
* @type {string}
* @memberof Res_partnerPickupViewBase
*/
protected appDeKey: string = 'id';
/**
* 应用实体主信息
*
* @protected
* @type {string}
* @memberof Res_partnerPickupViewBase
*/
protected appDeMajor: string = 'name';
/**
* 实体服务对象
*
* @type {Res_partnerService}
* @memberof Res_partnerPickupViewBase
*/
protected appEntityService: Res_partnerService = new Res_partnerService;
/**
* 实体权限服务对象
*
* @type Res_partnerUIService
* @memberof Res_partnerPickupViewBase
*/
public appUIService: Res_partnerUIService = new Res_partnerUIService(this.$store);
/**
* 视图模型数据
*
* @protected
* @type {*}
* @memberof Res_partnerPickupViewBase
*/
protected model: any = {
srfCaption: 'entities.res_partner.views.pickupview.caption',
srfTitle: 'entities.res_partner.views.pickupview.title',
srfSubTitle: 'entities.res_partner.views.pickupview.subtitle',
dataInfo: ''
}
/**
* 容器模型
*
* @protected
* @type {*}
* @memberof Res_partnerPickupViewBase
*/
protected containerModel: any = {
view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
};
/**
* 视图唯一标识
*
* @protected
* @type {string}
* @memberof Res_partnerPickupViewBase
*/
protected viewtag: string = '6abc5f67274f993c9ecb116f94900e85';
/**
* 视图名称
*
* @protected
* @type {string}
* @memberof Res_partnerPickupViewBase
*/
protected viewName:string = "res_partnerPickupView";
/**
* 视图引擎
*
* @public
* @type {Engine}
* @memberof Res_partnerPickupViewBase
*/
public engine: PickupViewEngine = new PickupViewEngine();
/**
* 计数器服务对象集合
*
* @type {Array<*>}
* @memberof Res_partnerPickupViewBase
*/
public counterServiceArray:Array<any> = [];
/**
* 引擎初始化
*
* @public
* @memberof Res_partnerPickupViewBase
*/
public engineInit(): void {
this.engine.init({
view: this,
pickupviewpanel: this.$refs.pickupviewpanel,
keyPSDEField: 'res_partner',
majorPSDEField: 'name',
isLoadDefault: true,
});
}
/**
* pickupviewpanel 部件 selectionchange 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupViewBase
*/
public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
}
/**
* pickupviewpanel 部件 activated 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupViewBase
*/
public pickupviewpanel_activated($event: any, $event2?: any): void {
this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
}
/**
* pickupviewpanel 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof Res_partnerPickupViewBase
*/
public pickupviewpanel_load($event: any, $event2?: any): void {
this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
}
}
\ No newline at end of file
app_Purchase/src/pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view.html 0 → 100644
浏览文件 @ 3be99750
<studio-view-style2 viewName="res_partnerpickupview" viewTitle="联系人数据选择视图" class='depickupview res-partner-pickup-view'>
<div class="content-container pickup-view">
<view_pickupviewpanel
:viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect"
:selectedData="selectedData"
:isShowButton="isShowButton"
name="pickupviewpanel"
ref='pickupviewpanel'
@selectionchange="pickupviewpanel_selectionchange($event)"
@activated="pickupviewpanel_activated($event)"
@load="pickupviewpanel_load($event)"
@closeview="closeView($event)">
</view_pickupviewpanel>
</div>
<template slot="footer">
<div v-if="isShowButton" :style="{ textAlign: 'right' }">
<i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
&nbsp;&nbsp;
<i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
</div>
</template>
</studio-view-style2>
\ No newline at end of file
app_Purchase/src/pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view.vue 0 → 100644
浏览文件 @ 3be99750
<template src="./res-partner-pickup-view.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { Res_partnerPickupViewBase } from './res-partner-pickup-view-base';
import view_pickupviewpanel from '@widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
/**
* 联系人数据选择视图视图
*
* @export
* @class Res_partnerPickupView
* @extends {Res_partnerPickupViewBase}
*/
@Component({
components: {
view_pickupviewpanel,
}
})
@VueLifeCycleProcessing()
export default class Res_partnerPickupView extends Res_partnerPickupViewBase { }
</script>
app_Purchase/src/pages/odoo-purchase/purchase-index-view/page-register.ts
浏览文件 @ 3be99750
......@@ -22,6 +22,7 @@ export const PageComponents = {
Vue.component('account-tax-purchase-mpickup-view', () => import('@pages/odoo-account/account-tax-purchase-mpickup-view/account-tax-purchase-mpickup-view.vue'));
Vue.component('product-template-pickup-view', () => import('@pages/odoo-product/product-template-pickup-view/product-template-pickup-view.vue'));
Vue.component('product-template-master-quick-view', () => import('@pages/odoo-product/product-template-master-quick-view/product-template-master-quick-view.vue'));
Vue.component('res-partner-pickup-grid-view', () => import('@pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.vue'));
Vue.component('uom-uom-basic-list-exp-view', () => import('@pages/odoo-uom/uom-uom-basic-list-exp-view/uom-uom-basic-list-exp-view.vue'));
Vue.component('purchase-order-line-line', () => import('@pages/odoo-purchase/purchase-order-line-line/purchase-order-line-line.vue'));
Vue.component('purchase-requisition-type-basic-quick-view', () => import('@pages/odoo-purchase/purchase-requisition-type-basic-quick-view/purchase-requisition-type-basic-quick-view.vue'));
......@@ -42,6 +43,7 @@ export const PageComponents = {
Vue.component('purchase-requisition-type-basic-edit-view', () => import('@pages/odoo-purchase/purchase-requisition-type-basic-edit-view/purchase-requisition-type-basic-edit-view.vue'));
Vue.component('purchase-order-line-edit-view', () => import('@pages/odoo-purchase/purchase-order-line-edit-view/purchase-order-line-edit-view.vue'));
Vue.component('product-product-master-info-view', () => import('@pages/odoo-product/product-product-master-info-view/product-product-master-info-view.vue'));
Vue.component('res-partner-pickup-view', () => import('@pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view.vue'));
Vue.component('res-supplier-master-tab-info-view', () => import('@pages/odoo-base/res-supplier-master-tab-info-view/res-supplier-master-tab-info-view.vue'));
Vue.component('res-supplier-master-summary-view', () => import('@pages/odoo-base/res-supplier-master-summary-view/res-supplier-master-summary-view.vue'));
Vue.component('purchase-requisition-line-edit-view', () => import('@pages/odoo-purchase/purchase-requisition-line-edit-view/purchase-requisition-line-edit-view.vue'));
......
app_Purchase/src/pages/odoo-purchase/purchase-index-view/router.ts
浏览文件 @ 3be99750
......@@ -612,6 +612,35 @@ const router = new Router({
},
component: () => import('@pages/odoo-product/product-template-master-quick-view/product-template-master-quick-view.vue'),
},
{
path: 'res_suppliers/:res_supplier?/res_partners/:res_partner?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.res_partner.views.pickupgridview.caption',
info:'',
parameters: [
{ pathName: 'purchaseindexview', parameterName: 'purchaseindexview' },
{ pathName: 'res_suppliers', parameterName: 'res_supplier' },
{ pathName: 'res_partners', parameterName: 'res_partner' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.vue'),
},
{
path: 'res_partners/:res_partner?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.res_partner.views.pickupgridview.caption',
info:'',
parameters: [
{ pathName: 'purchaseindexview', parameterName: 'purchaseindexview' },
{ pathName: 'res_partners', parameterName: 'res_partner' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-base/res-partner-pickup-grid-view/res-partner-pickup-grid-view.vue'),
},
{
path: 'uom_uoms/:uom_uom?/basiclistexpview/:basiclistexpview?',
meta: {
......@@ -1357,6 +1386,35 @@ const router = new Router({
},
component: () => import('@pages/odoo-product/product-product-master-info-view/product-product-master-info-view.vue'),
},
{
path: 'res_suppliers/:res_supplier?/res_partners/:res_partner?/pickupview/:pickupview?',
meta: {
caption: 'entities.res_partner.views.pickupview.caption',
info:'',
parameters: [
{ pathName: 'purchaseindexview', parameterName: 'purchaseindexview' },
{ pathName: 'res_suppliers', parameterName: 'res_supplier' },
{ pathName: 'res_partners', parameterName: 'res_partner' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view.vue'),
},
{
path: 'res_partners/:res_partner?/pickupview/:pickupview?',
meta: {
caption: 'entities.res_partner.views.pickupview.caption',
info:'',
parameters: [
{ pathName: 'purchaseindexview', parameterName: 'purchaseindexview' },
{ pathName: 'res_partners', parameterName: 'res_partner' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/odoo-base/res-partner-pickup-view/res-partner-pickup-view.vue'),
},
{
path: 'res_suppliers/:res_supplier?/mastertabinfoview/:mastertabinfoview?',
meta: {
......
app_Purchase/src/store/modules/view-action/state.ts
浏览文件 @ 3be99750
......@@ -257,6 +257,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'6abc5f67274f993c9ecb116f94900e85',
],
},
{
......@@ -298,6 +299,16 @@ export const viewstate: any = {
'77a2a70b11298000acab49c9de786dea',
],
},
{
viewtag: '6abc5f67274f993c9ecb116f94900e85',
viewmodule: 'odoo_base',
viewname: 'res_partnerPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'b9c01aac6e18ec1eed1b74d47f275384',
],
},
{
viewtag: '6c2ed7dbdc3e94cfd8dadb9915ac60d1',
viewmodule: 'odoo_purchase',
......@@ -584,6 +595,15 @@ export const viewstate: any = {
'273bd8803959ff9357b9c2479037352c',
],
},
{
viewtag: 'b9c01aac6e18ec1eed1b74d47f275384',
viewmodule: 'odoo_base',
viewname: 'res_partnerPickupGridView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: 'ba1e054173433d27d55d5ce19d746621',
viewmodule: 'odoo_purchase',
......
app_Purchase/src/studio-core/components/studio-view/studio-view-layout.less
浏览文件 @ 3be99750
......@@ -180,7 +180,7 @@
>.app-tree-exp-bar-left {
height: 100%;
overflow: auto;
>.tree-exp-bar-header {
height: 36px;
font-size: 16px;
......
app_Purchase/src/studio-core/widgets/FormControlBase.tsx
浏览文件 @ 3be99750
......@@ -601,6 +601,11 @@ export class FormControlBase extends MainControlBase {
for(let i=0;i<rule[name].length;i++){
let item:any = rule[name][i];
let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// 为空值时，属性值规则不做校验
if(dataValue === null || dataValue === undefined || dataValue === ""){
startOp(true);
return falg;
}
// 常规规则
if(item.type == 'SIMPLE'){
startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
......
app_Purchase/src/studio-core/widgets/GridControlBase.tsx
浏览文件 @ 3be99750
......@@ -1332,6 +1332,11 @@ export class GridControlBase extends MDControlBase {
for(let i=0;i<rule[name].length;i++){
let item:any = rule[name][i];
// let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// 为空值时，属性值规则不做校验
if(value === null || value === undefined || value === ""){
startOp(true);
return falg;
}
// 常规规则
if(item.type == 'SIMPLE'){
startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
......
app_Purchase/src/uiservice/res-partner/res-partner-ui-service-base.ts
浏览文件 @ 3be99750
......@@ -96,6 +96,15 @@ export default class Res_partnerUIServiceBase extends UIService {
* @memberof Res_partnerUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('PICKUPVIEW:', {
viewname: 'pickupview',
srfappde: 'res_partners',
component: 'res-partner-pickup-view',
openmode: '',
title: '联系人',
width: 0,
height: 0
});
}
/**
......
app_Purchase/src/widgets/control-service.ts
浏览文件 @ 3be99750
......@@ -319,6 +319,7 @@ export default class ControlService {
return false;
}
let dataItems: any[] = model.getDataItems();
prop = prop.replace(/([A-Z])/g,"_$1").toLowerCase();
let data: any = dataItems.find((item:any) => {
return Object.is(prop, item.prop);
});
......
app_Purchase/src/widgets/mail-message/remark-form/remark-form.html
浏览文件 @ 3be99750
......@@ -21,7 +21,6 @@
<i-col class="form-layout-container" v-show="detailsModel.button1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<i-button type="primary" @click="button1_click($event)"
style="">
<span >{{$t('entities.mail_message.remark_form.details.button1')}}</span>
</i-button>
......
app_Purchase/src/widgets/mail-message/send-form/send-form.html
浏览文件 @ 3be99750
......@@ -31,7 +31,6 @@
<i-col class="form-layout-container" v-show="detailsModel.button1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<i-button type="primary" @click="button1_click($event)"
style="">
<span >{{$t('entities.mail_message.send_form.details.button1')}}</span>
</i-button>
......
app_Purchase/src/widgets/res-partner/default-searchform/default-searchform-base.tsx 0 → 100644
浏览文件 @ 3be99750
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { UIActionTool,Util,ViewTool } from '@/utils';
import { Watch, SearchFormControlBase } from '@/studio-core';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import DefaultService from './default-searchform-service';
import Res_partnerUIService from '@/uiservice/res-partner/res-partner-ui-service';
import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* searchform部件基类
*
* @export
* @class SearchFormControlBase
* @extends {DefaultSearchFormBase}
*/
export class DefaultSearchFormBase extends SearchFormControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof DefaultSearchFormBase
*/
protected controlType: string = 'SEARCHFORM';
/**
* 建构部件服务对象
*
* @type {DefaultService}
* @memberof DefaultSearchFormBase
*/
public service: DefaultService = new DefaultService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {Res_partnerService}
* @memberof DefaultSearchFormBase
*/
public appEntityService: Res_partnerService = new Res_partnerService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof DefaultSearchFormBase
*/
protected appDeName: string = 'res_partner';
/**
* 应用实体中文名称
*
* @protected
* @type {string}
* @memberof DefaultSearchFormBase
*/
protected appDeLogicName: string = '联系人';
/**
* 界面UI服务对象
*
* @type {Res_partnerUIService}
* @memberof DefaultBase
*/
public appUIService:Res_partnerUIService = new Res_partnerUIService(this.$store);
/**
* 表单数据对象
*
* @type {*}
* @memberof DefaultSearchFormBase
*/
public data: any = {
};
/**
* 详情模型集合
*
* @type {*}
* @memberof DefaultSearchFormBase
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
};
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/default-searchform/default-searchform-model.ts 0 → 100644
浏览文件 @ 3be99750
/**
* Default 部件模型
*
* @export
* @class DefaultModel
*/
export default class DefaultModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof DefaultModel
*/
public getDataItems(): any[] {
return [
{
name: 'srfwfmemo',
prop: 'srfwfmemo',
dataType: 'TEXT',
},
// 前端新增修改标识，新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
]
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/default-searchform/default-searchform-service.ts 0 → 100644
浏览文件 @ 3be99750
import { Http } from '@/utils';
import { Util, Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import DefaultModel from './default-searchform-model';
/**
* Default 部件服务对象
*
* @export
* @class DefaultService
*/
export default class DefaultService extends ControlService {
/**
* 联系人服务对象
*
* @type {Res_partnerService}
* @memberof DefaultService
*/
public appEntityService: Res_partnerService = new Res_partnerService({ $store: this.getStore() });
/**
* 设置从数据模式
*
* @type {boolean}
* @memberof DefaultService
*/
public setTempMode(){
this.isTempMode = false;
}
/**
* Creates an instance of DefaultService.
*
* @param {*} [opts={}]
* @memberof DefaultService
*/
constructor(opts: any = {}) {
super(opts);
this.model = new DefaultModel();
}
/**
* 远端数据
*
* @type {*}
* @memberof DefaultService
*/
private remoteCopyData:any = {};
/**
* 处理数据
*
* @private
* @param {Promise<any>} promise
* @returns {Promise<any>}
* @memberof DefaultService
*/
private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
return new Promise((resolve, reject) => {
promise.then((response: any) => {
if (response && response.status === 200) {
const data = response.data;
data.forEach((item:any,index:number) =>{
item[deName] = item[deKeyField];
data[index] = item;
});
resolve(data);
} else {
reject([])
}
}).catch((response: any) => {
reject([])
});
});
}
/**
* 获取跨实体数据集合
*
* @param {string} serviceName 服务名称
* @param {string} interfaceName 接口名称
* @param {*} data
* @param {boolean} [isloading]
* @returns {Promise<any[]>}
* @memberof DefaultService
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
/**
* 启动工作流
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
data = this.handleWFData(data);
context = this.handleRequestData(action,context,data).context;
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading,localdata);
} else {
result = this.appEntityService.WFStart(context,data, isloading,localdata);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 提交工作流
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
data = this.handleWFData(data,true);
context = this.handleRequestData(action,context,data,true).context;
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](context,data, isloading,localdata);
} else {
result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 添加数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.Create(Context,Data, isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 删除数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.Remove(Context,Data, isloading);
}
result.then((response) => {
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 修改数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.Update(Context,Data, isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 查询数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public get(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.Get(Context,Data, isloading);
}
result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 加载草稿
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.GetDraft(Context,Data, isloading);
}
result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response, true);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 前台逻辑
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DefaultService
*/
@Errorlog
public frontLogic(action:string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
return new Promise((resolve: any, reject: any)=>{
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
return Promise.reject({ status: 500, data: { title: '失败', message: '系统异常' } });
}
result.then((response) => {
this.handleResponse(action, response,true);
resolve(response);
}).catch(response => {
reject(response);
});
})
}
/**
* 处理请求数据
*
* @param action 行为
* @param data 数据
* @memberof DefaultService
*/
public handleRequestData(action: string,context:any, data: any = {},isMerge:boolean = false){
let mode: any = this.getMode();
if (!mode && mode.getDataItems instanceof Function) {
return data;
}
let formItemItems: any[] = mode.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
formItemItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.prop){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
/**
* 通过属性名称获取表单项名称
*
* @param name 实体属性名称
* @memberof DefaultService
*/
public getItemNameByDeName(name:string) :string{
let itemName = name;
let mode: any = this.getMode();
if (!mode && mode.getDataItems instanceof Function) {
return name;
}
let formItemItems: any[] = mode.getDataItems();
formItemItems.forEach((item:any)=>{
if(item.prop === name){
itemName = item.name;
}
});
return itemName.trim();
}
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof DefaultService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof DefaultService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/default-searchform/default-searchform.html 0 → 100644
浏览文件 @ 3be99750
<i-form :model="this.data" class='app-search-form' ref='searchform' style="">
<input style="display:none;"/>
<div class="search-button">
<i-button size="small" type="primary" ghost @click="onSearch.apply(_self, arguments)">{{$t('app.searchButton.search')}}</i-button>
<i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
</div>
<div class="form-content">
</div>
</i-form>
app_Purchase/src/widgets/res-partner/default-searchform/default-searchform.vue 0 → 100644
浏览文件 @ 3be99750
<template src="./default-searchform.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { DefaultSearchFormBase } from './default-searchform-base';
/**
* searchform部件
*
* @export
* @class DefaultSearchForm
* @extends {DefaultSearchFormBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class DefaultSearchForm extends DefaultSearchFormBase { }
</script>
app_Purchase/src/widgets/res-partner/main-grid/main-grid-base.tsx 0 → 100644
浏览文件 @ 3be99750
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { UIActionTool,Util,ViewTool } from '@/utils';
import { Watch, GridControlBase } from '@/studio-core';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import MainService from './main-grid-service';
import Res_partnerUIService from '@/uiservice/res-partner/res-partner-ui-service';
import { FormItemModel } from '@/model/form-detail';
/**
* grid部件基类
*
* @export
* @class GridControlBase
* @extends {MainGridBase}
*/
export class MainGridBase extends GridControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof MainGridBase
*/
protected controlType: string = 'GRID';
/**
* 建构部件服务对象
*
* @type {MainService}
* @memberof MainGridBase
*/
public service: MainService = new MainService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {Res_partnerService}
* @memberof MainGridBase
*/
public appEntityService: Res_partnerService = new Res_partnerService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof MainGridBase
*/
protected appDeName: string = 'res_partner';
/**
* 应用实体中文名称
*
* @protected
* @type {string}
* @memberof MainGridBase
*/
protected appDeLogicName: string = '联系人';
/**
* 界面UI服务对象
*
* @type {Res_partnerUIService}
* @memberof MainBase
*/
public appUIService:Res_partnerUIService = new Res_partnerUIService(this.$store);
/**
* 界面行为模型
*
* @type {*}
* @memberof MainBase
*/
public ActionModel: any = {
};
/**
* 主信息表格列
*
* @type {string}
* @memberof MainBase
*/
public majorInfoColName:string = "name";
/**
* 本地缓存标识
*
* @protected
* @type {string}
* @memberof MainBase
*/
protected localStorageTag: string = 'res_partner_main_grid';
/**
* 所有列成员
*
* @type {any[]}
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'name',
label: '名称',
langtag: 'entities.res_partner.main_grid.columns.name',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
* 获取表格行模型
*
* @type {*}
* @memberof MainGridBase
*/
public getGridRowModel(){
return {
srfkey: new FormItemModel(),
}
}
/**
* 属性值规则
*
* @type {*}
* @memberof MainGridBase
*/
public rules: any = {
srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: 'ID 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: 'ID 值不能为空', trigger: 'blur' },
],
}
/**
* 属性值规则
*
* @type {*}
* @memberof MainBase
*/
public deRules:any = {
};
/**
* 获取对应列class
*
* @type {*}
* @memberof MainBase
*/
public hasRowEdit: any = {
'name':false,
};
/**
* 获取对应列class
*
* @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
* @returns {void}
* @memberof MainBase
*/
public getCellClassName(args: {row: any, column: any, rowIndex: number, columnIndex: number}): any {
return ( this.hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
}
/**
* 导出数据格式化
*
* @param {*} filterVal
* @param {*} jsonData
* @param {any[]} [codelistColumns=[]]
* @returns {Promise<any>}
* @memberof MainGridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
]);
}
/**
* 更新默认值
* @param {*} row 行数据
* @memberof MainBase
*/
public updateDefault(row: any){
}
/**
* 计算数据对象类型的默认值
* @param {string} action 行为
* @param {string} param 默认值参数
* @param {*} data 当前行数据
* @memberof MainBase
*/
public computeDefaultValueWithParam(action:string,param:string,data:any){
if(Object.is(action,"UPDATE")){
const nativeData:any = this.service.getCopynativeData();
if(nativeData && (nativeData instanceof Array) && nativeData.length >0){
let targetData:any = nativeData.find((item:any) =>{
return item.id === data.srfkey;
})
if(targetData){
return targetData[param]?targetData[param]:null;
}else{
return null;
}
}else{
return null;
}
}else{
return this.service.getRemoteCopyData()[param]?this.service.getRemoteCopyData()[param]:null;
}
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/main-grid/main-grid-model.ts 0 → 100644
浏览文件 @ 3be99750
/**
* Main 部件模型
*
* @export
* @class MainModel
*/
export default class MainModel {
/**
* 是否是实体数据导出
*
* @returns {any[]}
* @memberof MainGridMode
*/
public isDEExport: boolean = false;
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MainGridMode
*/
public getDataItems(): any[] {
if(this.isDEExport){
return [
]
}else{
return [
{
name: 'name',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'company_id',
prop: 'company_id',
dataType: 'PICKUP',
},
{
name: 'write_uid',
prop: 'write_uid',
dataType: 'PICKUP',
},
{
name: 'industry_id',
prop: 'industry_id',
dataType: 'PICKUP',
},
{
name: 'country_id',
prop: 'country_id',
dataType: 'PICKUP',
},
{
name: 'create_uid',
prop: 'create_uid',
dataType: 'PICKUP',
},
{
name: 'srfmajortext',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'ACID',
isEditable:true
},
{
name: 'srfdataaccaction',
prop: 'id',
dataType: 'ACID',
},
{
name: 'state_id',
prop: 'state_id',
dataType: 'PICKUP',
},
{
name: 'title',
prop: 'title',
dataType: 'PICKUP',
},
{
name: 'user_id',
prop: 'user_id',
dataType: 'PICKUP',
},
{
name: 'team_id',
prop: 'team_id',
dataType: 'PICKUP',
},
{
name: 'commercial_partner_id',
prop: 'commercial_partner_id',
dataType: 'PICKUP',
},
{
name: 'parent_id',
prop: 'parent_id',
dataType: 'PICKUP',
},
{
name: 'res_partner',
prop: 'id',
},
{
name:'size',
prop:'size'
},
{
name:'query',
prop:'query'
},
{
name:'filter',
prop:'filter'
},
{
name:'page',
prop:'page'
},
{
name:'sort',
prop:'sort'
},
{
name:'srfparentdata',
prop:'srfparentdata'
},
// 前端新增修改标识，新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
]
}
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/main-grid/main-grid-service.ts 0 → 100644
浏览文件 @ 3be99750
import { Http } from '@/utils';
import { Util, Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import MainModel from './main-grid-model';
/**
* Main 部件服务对象
*
* @export
* @class MainService
*/
export default class MainService extends ControlService {
/**
* 联系人服务对象
*
* @type {Res_partnerService}
* @memberof MainService
*/
public appEntityService: Res_partnerService = new Res_partnerService({ $store: this.getStore() });
/**
* 设置从数据模式
*
* @type {boolean}
* @memberof MainService
*/
public setTempMode(){
this.isTempMode = false;
}
/**
* Creates an instance of MainService.
*
* @param {*} [opts={}]
* @memberof MainService
*/
constructor(opts: any = {}) {
super(opts);
this.model = new MainModel();
}
/**
* 备份原生数据
*
* @type {*}
* @memberof MainService
*/
private copynativeData:any;
/**
* 远端数据
*
* @type {*}
* @memberof MainService
*/
private remoteCopyData:any = {};
/**
* 处理数据
*
* @public
* @param {Promise<any>} promise
* @returns {Promise<any>}
* @memberof MainService
*/
public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
return new Promise((resolve, reject) => {
promise.then((response: any) => {
if (response && response.status === 200) {
const data = response.data;
data.forEach((item:any,index:number) =>{
item[deName] = item[deKeyField];
data[index] = item;
});
resolve(data);
} else {
reject([])
}
}).catch((response: any) => {
reject([])
});
});
}
/**
* 获取跨实体数据集合
*
* @param {string} serviceName 服务名称
* @param {string} interfaceName 接口名称
* @param {*} data
* @param {boolean} [isloading]
* @returns {Promise<any[]>}
* @memberof MainService
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
/**
* 添加数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
}else{
result =_appEntityService.Create(Context,Data, isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 删除数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
}else{
result =_appEntityService.Remove(Context,Data, isloading);
}
result.then((response) => {
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 修改数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 获取数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public get(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.Get(Context,Data, isloading);
}
result.then((response) => {
//处理返回数据，补充判断标识
if(response.data){
Object.assign(response.data,{srfuf:0});
}
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 查询数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public search(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
}else{
result =_appEntityService.FetchDefault(Context,Data, isloading);
}
result.then((response) => {
this.setCopynativeData(response.data);
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 加载草稿
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public loadDraft(action: string, context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
result = this.appEntityService.GetDraft(Context,Data, isloading);
}
result.then((response) => {
//处理返回数据，补充判断标识
if(response.data){
Object.assign(response.data,{srfuf:'0'});
//仿真主键数据
response.data.id = Util.createUUID();
}
this.setRemoteCopyData(response);
this.handleResponse(action, response, true);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 前台逻辑
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof MainService
*/
@Errorlog
public frontLogic(action:string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any)=>{
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
} else {
return Promise.reject({ status: 500, data: { title: '失败', message: '系统异常' } });
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof MainService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof MainService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
/**
* 设置备份原生数据
*
* @param data 远端请求结果
* @memberof MainService
*/
public setCopynativeData(data:any){
this.copynativeData = Util.deepCopy(data);
}
/**
* 获取备份原生数据
*
* @memberof MainService
*/
public getCopynativeData(){
return this.copynativeData;
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/main-grid/main-grid.html 0 → 100644
浏览文件 @ 3be99750
<div :class="{ 'grid': true, 'show-paging-bar': isEnablePagingBar, 'hidden-paging-bar': !isEnablePagingBar }">
<i-form>
<el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
:border="isDragendCol"
:highlight-current-row ="isSingleSelect"
:row-class-name="getRowClassName.bind(_self)"
:cell-class-name="getCellClassName.bind(_self)"
size="mini"
stripe
:height="tableHeight"
@row-click="rowClick($event)"
@select-all="selectAll($event)"
@select="select($event)"
@row-class-name="onRowClassName($event)"
@row-dblclick="rowDBLClick($event)"
ref='multipleTable' :data="items" :show-header="!isHideHeader"
>
<template slot="empty">
{{$t('entities.res_partner.main_grid.nodata')}}
<span class="quick-toolbar">
</span>
</template>
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('name')">
<el-table-column show-overflow-tooltip :prop="'name'" :label="$t('entities.res_partner.main_grid.columns.name')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.res_partner.main_grid.columns.name')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.name}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
</el-table>
<row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)"
:total="totalRecord"
show-sizer :current="curPage" :page-size="limit"
:page-size-opts="[10, 20, 30, 40, 50, 60, 70, 80, 90, 100]" show-elevator show-total>
<span>
<span class="page-column">
<poptip transfer-class-name="grid-column" transfer placement="top-start">
<i-button icon="md-menu">{{$t('app.gridpage.choicecolumns')}}</i-button>
<div slot="content">
<template v-for="col in allColumns">
<div :key="col.name"><el-checkbox v-model="col.show" @change="onColChange()">{{$t(col.langtag)}}</el-checkbox></div>
</template>
</div>
</poptip>
</span>
<span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
<span>
{{$t('app.gridpage.show')}}&nbsp;
<span>
<template v-if="items.length === 1">
1
</template>
<template v-else>
<span>{{(curPage - 1) * limit + 1}}&nbsp;-&nbsp;{{totalRecord > curPage * limit ? curPage * limit : totalRecord}}</span>
</template>
</span>&nbsp;
{{$t('app.gridpage.records')}}，{{$t('app.gridpage.totle')}}&nbsp;{{totalRecord}}&nbsp;{{$t('app.gridpage.records')}}
</span>
</span>
</page>
</row>
</i-form>
</div>
\ No newline at end of file
app_Purchase/src/widgets/res-partner/main-grid/main-grid.vue 0 → 100644
浏览文件 @ 3be99750
<template src="./main-grid.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { MainGridBase } from './main-grid-base';
/**
* grid部件
*
* @export
* @class MainGrid
* @extends {MainGridBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class MainGrid extends MainGridBase { }
</script>
app_Purchase/src/widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.tsx 0 → 100644
浏览文件 @ 3be99750
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { UIActionTool,Util,ViewTool } from '@/utils';
import { Watch, MainControlBase } from '@/studio-core';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import PickupViewpickupviewpanelService from './pickup-viewpickupviewpanel-pickupviewpanel-service';
import Res_partnerUIService from '@/uiservice/res-partner/res-partner-ui-service';
import PickupViewpickupviewpanelModel from './pickup-viewpickupviewpanel-pickupviewpanel-model';
/**
* pickupviewpanel部件基类
*
* @export
* @class MainControlBase
* @extends {PickupViewpickupviewpanelPickupviewpanelBase}
*/
export class PickupViewpickupviewpanelPickupviewpanelBase extends MainControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof PickupViewpickupviewpanelPickupviewpanelBase
*/
protected controlType: string = 'PICKUPVIEWPANEL';
/**
* 建构部件服务对象
*
* @type {PickupViewpickupviewpanelService}
* @memberof PickupViewpickupviewpanelPickupviewpanelBase
*/
public service: PickupViewpickupviewpanelService = new PickupViewpickupviewpanelService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {Res_partnerService}
* @memberof PickupViewpickupviewpanelPickupviewpanelBase
*/
public appEntityService: Res_partnerService = new Res_partnerService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof PickupViewpickupviewpanelPickupviewpanelBase
*/
protected appDeName: string = 'res_partner';
/**
* 应用实体中文名称
*
* @protected
* @type {string}
* @memberof PickupViewpickupviewpanelPickupviewpanelBase
*/
protected appDeLogicName: string = '联系人';
/**
* 界面UI服务对象
*
* @type {Res_partnerUIService}
* @memberof PickupViewpickupviewpanelBase
*/
public appUIService:Res_partnerUIService = new Res_partnerUIService(this.$store);
/**
* 选中数据字符串
*
* @type {string}
* @memberof PickupViewpickupviewpanel
*/
@Prop() public selectedData?: string;
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof PickupViewpickupviewpanel
*/
public getDatas(): any[] {
return [];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof PickupViewpickupviewpanel
*/
public getData(): any {
return {};
}
/**
* 视图名称
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public view: any = {
viewname: 'res-partner-pickup-grid-view',
data: {},
}
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/**
* 视图数据
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public viewdata: string = JSON.stringify(this.context);
/**
* 视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public viewparam: string = JSON.stringify(this.viewparams);
/**
* 是否显示按钮
*
* @type {boolean}
* @memberof PickupViewpickupviewpanel
*/
@Prop({default: true}) public isShowButton!: boolean;
/**
* 是否单选
*
* @type {boolean}
* @memberof PickupViewpickupviewpanel
*/
@Prop() public isSingleSelect?: boolean;
/**
* 初始化完成
*
* @type {boolean}
* @memberof PickupViewpickupviewpanel
*/
public inited: boolean = false;
/**
* 视图数据变化
*
* @param {*} $event
* @memberof PickupViewpickupviewpanel
*/
public onViewDatasChange($event: any): void {
if($event.length>0){
$event.forEach((item:any,index:any) => {
let srfmajortext = item['name'];
if(srfmajortext){
Object.assign($event[index],{srfmajortext: srfmajortext});
}
});
}
this.$emit('selectionchange', $event);
}
/**
* 视图数据被激活
*
* @param {*} $event
* @memberof PickupViewpickupviewpanel
*/
public viewDatasActivated($event: any): void {
this.$emit('activated', $event);
}
/**
* 视图加载完成
*
* @param {*} $event
* @memberof PickupViewpickupviewpanel
*/
public onViewLoad($event: any): void {
this.$emit('load', $event);
}
/**
* vue 生命周期
*
* @memberof PickupViewpickupviewpanel
*/
public created() {
this.afterCreated();
}
/**
* 执行created后的逻辑
*
* @memberof PickupViewpickupviewpanel
*/
public afterCreated(){
this.initNavParam();
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
return;
}
if (Object.is('load', action)) {
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
this.inited = true;
}
});
}
}
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/**
* vue 生命周期
*
* @memberof PickupViewpickupviewpanel
*/
public destroyed() {
this.afterDestroy();
}
/**
* 执行destroyed后的逻辑
*
* @memberof PickupViewpickupviewpanel
*/
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts 0 → 100644
浏览文件 @ 3be99750
/**
* PickupViewpickupviewpanel 部件模型
*
* @export
* @class PickupViewpickupviewpanelModel
*/
export default class PickupViewpickupviewpanelModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof PickupViewpickupviewpanelModel
*/
public getDataItems(): any[] {
return [
{
name: 'image',
},
{
name: 'type',
},
{
name: 'color',
},
{
name: 'payment_token_ids',
},
{
name: 'invoice_ids',
},
{
name: 'meeting_count',
},
{
name: 'supplier_invoice_count',
},
{
name: 'company_name',
},
{
name: 'website_published',
},
{
name: 'last_time_entries_checked',
},
{
name: 'message_unread',
},
{
name: 'trust',
},
{
name: 'total_invoiced',
},
{
name: 'pos_order_count',
},
{
name: 'contact_address',
},
{
name: 'invoice_warn',
},
{
name: 'bank_ids',
},
{
name: 'signup_expiration',
},
{
name: 'purchase_order_count',
},
{
name: 'has_unreconciled_entries',
},
{
name: 'category_id',
},
{
name: 'customer_rank',
},
{
name: 'website_description',
},
{
name: 'message_main_attachment_id',
},
{
name: 'meeting_ids',
},
{
name: 'employee',
},
{
name: 'display_name',
},
{
name: 'child_ids',
},
{
name: 'website_meta_description',
},
{
name: 'is_blacklisted',
},
{
name: 'property_product_pricelist',
},
{
name: 'activity_date_deadline',
},
{
name: 'activity_type_id',
},
{
name: 'signup_token',
},
{
name: 'ref_company_ids',
},
{
name: 'is_company',
},
{
name: 'phone',
},
{
name: 'create_date',
},
{
name: 'tz',
},
{
name: 'event_count',
},
{
name: 'message_has_error',
},
{
name: 'calendar_last_notif_ack',
},
{
name: 'message_channel_ids',
},
{
name: 'signup_type',
},
{
name: 'email_formatted',
},
{
name: 'website_message_ids',
},
{
name: 'partner_share',
},
{
name: 'street2',
},
{
name: 'function',
},
{
name: 'debit',
},
{
name: 'payment_token_count',
},
{
name: 'ref',
},
{
name: 'partner_gid',
},
{
name: 'signup_valid',
},
{
name: 'website_meta_og_img',
},
{
name: 'image_small',
},
{
name: 'bank_account_count',
},
{
name: 'street',
},
{
name: 'sale_warn',
},
{
name: 'message_bounce',
},
{
name: 'message_needaction_counter',
},
{
name: 'message_follower_ids',
},
{
name: 'opportunity_count',
},
{
name: 'date',
},
{
name: '__last_update',
},
{
name: 'message_partner_ids',
},
{
name: 'self',
},
{
name: 'im_status',
},
{
name: 'write_date',
},
{
name: 'message_has_error_counter',
},
{
name: 'invoice_warn_msg',
},
{
name: 'message_needaction',
},
{
name: 'picking_warn',
},
{
name: 'contract_ids',
},
{
name: 'currency_id',
},
{
name: 'website',
},
{
name: 'mobile',
},
{
name: 'message_attachment_count',
},
{
name: 'city',
},
{
name: 'property_payment_term_id',
},
{
name: 'user_ids',
},
{
name: 'website_meta_keywords',
},
{
name: 'channel_ids',
},
{
name: 'purchase_warn',
},
{
name: 'journal_item_count',
},
{
name: 'property_stock_supplier',
},
{
name: 'property_account_payable_id',
},
{
name: 'website_short_description',
},
{
name: 'sale_warn_msg',
},
{
name: 'credit',
},
{
name: 'activity_state',
},
{
name: 'activity_ids',
},
{
name: 'message_is_follower',
},
{
name: 'name',
},
{
name: 'vat',
},
{
name: 'property_supplier_payment_term_id',
},
{
name: 'supplier_rank',
},
{
name: 'property_stock_customer',
},
{
name: 'comment',
},
{
name: 'task_ids',
},
{
name: 'message_unread_counter',
},
{
name: 'email',
},
{
name: 'purchase_warn_msg',
},
{
name: 'website_meta_title',
},
{
name: 'zip',
},
{
name: 'tz_offset',
},
{
name: 'company_type',
},
{
name: 'activity_summary',
},
{
name: 'task_count',
},
{
name: 'credit_limit',
},
{
name: 'property_account_receivable_id',
},
{
name: 'property_purchase_currency_id',
},
{
name: 'picking_warn_msg',
},
{
name: 'res_partner',
prop: 'id',
},
{
name: 'signup_url',
},
{
name: 'lang',
},
{
name: 'message_ids',
},
{
name: 'property_account_position_id',
},
{
name: 'website_id',
},
{
name: 'active',
},
{
name: 'barcode',
},
{
name: 'is_published',
},
{
name: 'activity_user_id',
},
{
name: 'sale_order_count',
},
{
name: 'image_medium',
},
{
name: 'additional_info',
},
{
name: 'opportunity_ids',
},
{
name: 'contracts_count',
},
{
name: 'debit_limit',
},
{
name: 'website_url',
},
{
name: 'sale_order_ids',
},
{
name: 'last_website_so_id',
},
{
name: 'is_seo_optimized',
},
{
name: 'commercial_company_name',
},
{
name: 'write_uid_text',
},
{
name: 'title_text',
},
{
name: 'company_id_text',
},
{
name: 'country_id_text',
},
{
name: 'state_id_text',
},
{
name: 'commercial_partner_id_text',
},
{
name: 'parent_name',
},
{
name: 'user_id_text',
},
{
name: 'create_uid_text',
},
{
name: 'industry_id_text',
},
{
name: 'team_id_text',
},
{
name: 'team_id',
},
{
name: 'state_id',
},
{
name: 'user_id',
},
{
name: 'create_uid',
},
{
name: 'parent_id',
},
{
name: 'title',
},
{
name: 'write_uid',
},
{
name: 'commercial_partner_id',
},
{
name: 'industry_id',
},
{
name: 'company_id',
},
{
name: 'country_id',
},
]
}
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts 0 → 100644
浏览文件 @ 3be99750
import { Http } from '@/utils';
import ControlService from '@/widgets/control-service';
/**
* PickupViewpickupviewpanel 部件服务对象
*
* @export
* @class PickupViewpickupviewpanelService
*/
export default class PickupViewpickupviewpanelService extends ControlService {
}
\ No newline at end of file
app_Purchase/src/widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.html 0 → 100644
浏览文件 @ 3be99750
<div class='pickupviewpanel'>
<component
v-if="inited && view.viewname && !Object.is(view.viewname, '')"
:is="view.viewname"
class="viewcontainer3"
:viewdata="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false"
:isSingleSelect="isSingleSelect"
:selectedData="selectedData"
:isShowButton="isShowButton"
@viewdataschange="onViewDatasChange.apply(_self, arguments)"
@viewdatasactivated="viewDatasActivated.apply(_self, arguments)"
@viewload="onViewLoad.apply(_self, arguments)">
</component>
</div>
\ No newline at end of file
app_Purchase/src/widgets/res-partner/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue 0 → 100644
浏览文件 @ 3be99750
<template src="./pickup-viewpickupviewpanel-pickupviewpanel.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { PickupViewpickupviewpanelPickupviewpanelBase } from './pickup-viewpickupviewpanel-pickupviewpanel-base';
/**
* pickupviewpanel部件
*
* @export
* @class PickupViewpickupviewpanelPickupviewpanel
* @extends {PickupViewpickupviewpanelPickupviewpanelBase}
*/
@Component({
components: {
}
})
@VueLifeCycleProcessing()
export default class PickupViewpickupviewpanelPickupviewpanel extends PickupViewpickupviewpanelPickupviewpanelBase { }
</script>
app_Purchase/src/widgets/res-supplier/ef-master-form/ef-master-form-base.tsx
浏览文件 @ 3be99750
......@@ -92,9 +92,9 @@ export class EF_MasterEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
name: null,
is_company: null,
type: null,
vat: null,
is_company: null,
parent_name: null,
ibizfunction: null,
title_text: null,
......@@ -216,12 +216,12 @@ export class EF_MasterEditFormBase extends EditFormControlBase {
name: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'name', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
is_company: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'is_company', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
type: new FormItemModel({ caption: '地址类型', detailType: 'FORMITEM', name: 'type', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:true, disabled: false, enableCond: 3 }),
vat: new FormItemModel({ caption: '税号', detailType: 'FORMITEM', name: 'vat', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
is_company: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'is_company', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
parent_name: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'parent_name', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
ibizfunction: new FormItemModel({ caption: '工作岗位', detailType: 'FORMITEM', name: 'ibizfunction', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
......
app_Purchase/src/widgets/res-supplier/ef-master-form/ef-master-form-model.ts
浏览文件 @ 3be99750
......@@ -55,11 +55,6 @@ export default class EF_MasterModel {
prop: 'name',
dataType: 'TEXT',
},
{
name: 'is_company',
prop: 'is_company',
dataType: 'TRUEFALSE',
},
{
name: 'type',
prop: 'type',
......@@ -70,6 +65,11 @@ export default class EF_MasterModel {
prop: 'vat',
dataType: 'TEXT',
},
{
name: 'is_company',
prop: 'is_company',
dataType: 'TRUEFALSE',
},
{
name: 'parent_name',
prop: 'parent_name',
......
app_Purchase/src/widgets/res-supplier/ef-master-form/ef-master-form.html
浏览文件 @ 3be99750
......@@ -14,26 +14,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.is_company.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='is_company' :itemRules="this.rules().is_company" class='' :caption="$t('entities.res_supplier.ef_master_form.details.is_company')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.is_company.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.is_company"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.is_company.disabled"
style="width:100px;width: 100px;"
valueType="string"
tag='Odoo_truefalse'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.type.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='type' :itemRules="this.rules().type" class='' :caption="$t('entities.res_supplier.ef_master_form.details.type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.type.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -68,6 +48,15 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.is_company.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='is_company' :itemRules="this.rules().is_company" class='' :caption="$t('entities.res_supplier.ef_master_form.details.is_company')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.is_company.error" :isEmptyCaption="false" labelPos="LEFT">
<div style="">
<app-checkbox :value="this.data.is_company" @change="($event)=>{this.data.is_company = $event} " :disabled="detailsModel.is_company.disabled"></app-checkbox>
</div>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel2.visible" :style="{}" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.res_supplier.ef_master_form.details.grouppanel2')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
......
app_Purchase/src/widgets/res-supplier/ef-master-quick-form/ef-master-quick-form-base.tsx
浏览文件 @ 3be99750
......@@ -84,14 +84,14 @@ export class EF_MasterQuickEditFormBase extends EditFormControlBase {
srfsourcekey: null,
name: null,
is_company: null,
company_id_text: null,
parent_name: null,
ibizfunction: null,
phone: null,
mobile: null,
title_text: null,
id: null,
company_id: null,
title: null,
parent_id: null,
res_supplier:null,
};
......@@ -156,7 +156,7 @@ export class EF_MasterQuickEditFormBase extends EditFormControlBase {
is_company: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'is_company', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:true, disabled: false, enableCond: 3 }),
company_id_text: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'company_id_text', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
parent_name: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'parent_name', visible: false, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
ibizfunction: new FormItemModel({ caption: '工作岗位', detailType: 'FORMITEM', name: 'ibizfunction', visible: false, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
......@@ -168,10 +168,10 @@ export class EF_MasterQuickEditFormBase extends EditFormControlBase {
id: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 0 }),
company_id: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'company_id', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
title: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'title', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
parent_id: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'parent_id', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
};
/**
......@@ -194,6 +194,14 @@ export class EF_MasterQuickEditFormBase extends EditFormControlBase {
if (Object.is(name, '') || Object.is(name, 'is_company')) {
let ret = false;
const _is_company = this.data.is_company;
if (this.$verify.testCond(_is_company, 'EQ', 'false')) {
ret = true;
}
this.detailsModel.parent_name.setVisible(ret);
}
if (Object.is(name, '') || Object.is(name, 'is_company')) {
let ret = false;
......
app_Purchase/src/widgets/res-supplier/ef-master-quick-form/ef-master-quick-form-model.ts
浏览文件 @ 3be99750
......@@ -61,8 +61,8 @@ export default class EF_MasterQuickModel {
dataType: 'TRUEFALSE',
},
{
name: 'company_id_text',
prop: 'company_id_text',
name: 'parent_name',
prop: 'parent_name',
dataType: 'PICKUPTEXT',
},
{
......@@ -91,13 +91,13 @@ export default class EF_MasterQuickModel {
dataType: 'ACID',
},
{
name: 'company_id',
prop: 'company_id',
name: 'title',
prop: 'title',
dataType: 'PICKUP',
},
{
name: 'title',
prop: 'title',
name: 'parent_id',
prop: 'parent_id',
dataType: 'PICKUP',
},
{
......
app_Purchase/src/widgets/res-supplier/ef-master-quick-form/ef-master-quick-form-service.ts
浏览文件 @ 3be99750
......@@ -3,7 +3,7 @@ import { Util, Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import Res_supplierService from '@/service/res-supplier/res-supplier-service';
import EF_MasterQuickModel from './ef-master-quick-form-model';
import Res_companyService from '@/service/res-company/res-company-service';
import Res_partnerService from '@/service/res-partner/res-partner-service';
import Res_partner_titleService from '@/service/res-partner-title/res-partner-title-service';
......@@ -45,12 +45,12 @@ export default class EF_MasterQuickService extends ControlService {
}
/**
* 公司服务对象
* 联系人服务对象
*
* @type {Res_companyService}
* @type {Res_partnerService}
* @memberof EF_MasterQuickService
*/
public res_companyService: Res_companyService = new Res_companyService();
public res_partnerService: Res_partnerService = new Res_partnerService();
/**
* 业务伙伴称谓服务对象
......@@ -109,8 +109,8 @@ export default class EF_MasterQuickService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'Res_companyService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.res_companyService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'res_company');
if (Object.is(serviceName, 'Res_partnerService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.res_partnerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'res_partner');
}
if (Object.is(serviceName, 'Res_partner_titleService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.res_partner_titleService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'res_partner_title');
......
app_Purchase/src/widgets/res-supplier/ef-master-quick-form/ef-master-quick-form.html
浏览文件 @ 3be99750
......@@ -35,28 +35,29 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.company_id_text.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='company_id_text' :itemRules="this.rules().company_id_text" class='' :caption="$t('entities.res_supplier.ef_masterquick_form.details.company_id_text')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.company_id_text.error" :isEmptyCaption="false" labelPos="LEFT">
<i-col class="form-layout-container" v-show="detailsModel.parent_name.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='parent_name' :itemRules="this.rules().parent_name" class='' :caption="$t('entities.res_supplier.ef_masterquick_form.details.parent_name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parent_name.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.company_id_text.disabled"
name='company_id_text'
deMajorField='name'
deKeyField='res_company'
:service="service"
:acParams="{ serviceName: 'Res_companyService', interfaceName: 'FetchDefault'}"
valueitem='company_id'
:value="data.company_id_text"
editortype="dropdown"
style=""
@formitemvaluechange="onFormItemValueChange($event)">
</app-picker>
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.parent_name.disabled"
name='parent_name'
deMajorField='name'
deKeyField='res_partner'
:service="service"
:acParams="{ serviceName: 'Res_partnerService', interfaceName: 'FetchDefault'}"
valueitem='parent_id'
:value="data.parent_name"
:pickupView="{ viewname: 'res-partner-pickup-view', title: $t('entities.res_partner.views.pickupview.title'), deResParameters: [{ pathName: 'res_suppliers', parameterName: 'res_supplier' }, ], parameters: [{ pathName: 'res_partners', parameterName: 'res_partner' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange($event)">
</app-picker>
</app-form-item>
</i-col>
......
app_Purchase/src/widgets/res-supplier/if-master-form/if-master-form-base.tsx
浏览文件 @ 3be99750
......@@ -92,9 +92,9 @@ export class IF_MasterEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
name: null,
is_company: null,
type: null,
vat: null,
is_company: null,
parent_name: null,
ibizfunction: null,
title_text: null,
......@@ -196,12 +196,12 @@ export class IF_MasterEditFormBase extends EditFormControlBase {
name: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'name', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
is_company: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'is_company', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
type: new FormItemModel({ caption: '地址类型', detailType: 'FORMITEM', name: 'type', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
vat: new FormItemModel({ caption: '税号', detailType: 'FORMITEM', name: 'vat', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
is_company: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'is_company', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
parent_name: new FormItemModel({ caption: '公司', detailType: 'FORMITEM', name: 'parent_name', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
ibizfunction: new FormItemModel({ caption: '工作岗位', detailType: 'FORMITEM', name: 'ibizfunction', visible: true, isShowCaption: true, form: this, showMoreMode: 0, required:false, disabled: false, enableCond: 3 }),
......
app_Purchase/src/widgets/res-supplier/if-master-form/if-master-form-model.ts
浏览文件 @ 3be99750
......@@ -55,11 +55,6 @@ export default class IF_MasterModel {
prop: 'name',
dataType: 'TEXT',
},
{
name: 'is_company',
prop: 'is_company',
dataType: 'TRUEFALSE',
},
{
name: 'type',
prop: 'type',
......@@ -70,6 +65,11 @@ export default class IF_MasterModel {
prop: 'vat',
dataType: 'TEXT',
},
{
name: 'is_company',
prop: 'is_company',
dataType: 'TRUEFALSE',
},
{
name: 'parent_name',
prop: 'parent_name',
......
app_Purchase/src/widgets/res-supplier/if-master-form/if-master-form.html
浏览文件 @ 3be99750
......@@ -14,16 +14,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.is_company.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='is_company' :itemRules="this.rules().is_company" class='' :caption="$t('entities.res_supplier.if_master_form.details.is_company')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.is_company.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='is_company' :value="data.is_company" dataType="TRUEFALSE" :precision="0"
tag='Odoo_truefalse' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.type.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='type' :itemRules="this.rules().type" class='' :caption="$t('entities.res_supplier.if_master_form.details.type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.type.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -44,6 +34,16 @@ tag='RES_PARTNER__TYPE' codelistType='STATIC' :data="data" :context="context" :v
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.is_company.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='is_company' :itemRules="this.rules().is_company" class='' :caption="$t('entities.res_supplier.if_master_form.details.is_company')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.is_company.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='is_company' :value="data.is_company" dataType="TRUEFALSE" :precision="0"
tag='Odoo_truefalse' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel2.visible" :style="{}" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.res_supplier.if_master_form.details.grouppanel2')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >
......
app_Purchase/src/widgets/res-supplier/master-grid/master-grid-base.tsx
浏览文件 @ 3be99750
......@@ -112,15 +112,6 @@ export class MasterGridBase extends GridControlBase {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'is_company',
label: '公司',
langtag: 'entities.res_supplier.master_grid.columns.is_company',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'phone',
label: '电话',
......@@ -183,7 +174,6 @@ export class MasterGridBase extends GridControlBase {
*/
public hasRowEdit: any = {
'name':false,
'is_company':false,
'phone':false,
'mobile':false,
};
......@@ -211,14 +201,6 @@ export class MasterGridBase extends GridControlBase {
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'is_company',
srfkey: 'Odoo_truefalse',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]);
}
......
app_Purchase/src/widgets/res-supplier/master-grid/master-grid-model.ts
浏览文件 @ 3be99750
......@@ -31,11 +31,6 @@ export default class MasterModel {
prop: 'name',
dataType: 'TEXT',
},
{
name: 'is_company',
prop: 'is_company',
dataType: 'TRUEFALSE',
},
{
name: 'phone',
prop: 'phone',
......@@ -108,13 +103,13 @@ export default class MasterModel {
dataType: 'PICKUP',
},
{
name: 'property_delivery_carrier_id',
prop: 'property_delivery_carrier_id',
name: 'property_supplier_payment_term_id',
prop: 'property_supplier_payment_term_id',
dataType: 'PICKUP',
},
{
name: 'property_supplier_payment_term_id',
prop: 'property_supplier_payment_term_id',
name: 'property_delivery_carrier_id',
prop: 'property_delivery_carrier_id',
dataType: 'PICKUP',
},
{
......
app_Purchase/src/widgets/res-supplier/master-grid/master-grid.html
浏览文件 @ 3be99750
......@@ -37,20 +37,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('is_company')">
<el-table-column show-overflow-tooltip :prop="'is_company'" :label="$t('entities.res_supplier.master_grid.columns.is_company')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.res_supplier.master_grid.columns.is_company')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.is_company" tag='Odoo_truefalse' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('phone')">
<el-table-column show-overflow-tooltip :prop="'phone'" :label="$t('entities.res_supplier.master_grid.columns.phone')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......
app_Purchase/src/widgets/res-supplier/master-summary-dashboard/master-summary-dashboard-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterSummaryModel {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterSummaryModel {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterSummaryModel {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-summary-portlet/master-summary-portlet-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterSummaryModel {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterSummaryModel {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterSummaryModel {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-tab-info-viewtabexppanel-tabexppanel/master-tab-info-viewtabexppanel-tabexppanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterTabInfoViewtabexppanelModel {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterTabInfoViewtabexppanelModel {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterTabInfoViewtabexppanelModel {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-tab-info-viewtabviewpanel21-tabviewpanel/master-tab-info-viewtabviewpanel21-tabviewpanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterTabInfoViewtabviewpanel21Model {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterTabInfoViewtabviewpanel21Model {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterTabInfoViewtabviewpanel21Model {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-tab-info-viewtabviewpanel22-tabviewpanel/master-tab-info-viewtabviewpanel22-tabviewpanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterTabInfoViewtabviewpanel22Model {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterTabInfoViewtabviewpanel22Model {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterTabInfoViewtabviewpanel22Model {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-tab-info-viewtabviewpanel23-tabviewpanel/master-tab-info-viewtabviewpanel23-tabviewpanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterTabInfoViewtabviewpanel23Model {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterTabInfoViewtabviewpanel23Model {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterTabInfoViewtabviewpanel23Model {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/master-tab-info-viewtabviewpanel24-tabviewpanel/master-tab-info-viewtabviewpanel24-tabviewpanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class MasterTabInfoViewtabviewpanel24Model {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class MasterTabInfoViewtabviewpanel24Model {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class MasterTabInfoViewtabviewpanel24Model {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/res-supplier/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 3be99750
......@@ -27,9 +27,6 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'company_type',
},
{
name: 'city',
},
{
name: 'ref',
},
......@@ -51,21 +48,6 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'name',
},
{
name: 'street2',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'is_company',
},
{
name: 'zip',
},
{
name: 'vat',
},
......@@ -159,6 +141,24 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'property_product_pricelist',
},
{
name: 'street',
},
{
name: 'website_url',
},
{
name: 'city',
},
{
name: 'street2',
},
{
name: 'zip',
},
{
name: 'is_company',
},
]
}
......
app_Purchase/src/widgets/uom-uom/ef-basic-form/ef-basic-form.html
浏览文件 @ 3be99750
......@@ -115,7 +115,7 @@
contentStyle=""
sizeStyle=""
contentType="RAW"
:htmlContent="``"
:htmlContent='``'
>
例如：1 *（此单位）=比率*（参考单位）
</app-rawitem>
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_supplier.java
浏览文件 @ 3be99750
......@@ -73,13 +73,6 @@ public class Res_supplier extends EntityMP implements Serializable {
@JSONField(name = "company_type")
@JsonProperty("company_type")
private String companyType;
/**
* 城市
*/
@TableField(exist = false)
@JSONField(name = "city")
@JsonProperty("city")
private String city;
/**
* 内部参考
*/
......@@ -130,41 +123,6 @@ public class Res_supplier extends EntityMP implements Serializable {
@JSONField(name = "name")
@JsonProperty("name")
private String name;
/**
* 街道 2
*/
@TableField(exist = false)
@JSONField(name = "street2")
@JsonProperty("street2")
private String street2;
/**
* 街道
*/
@TableField(exist = false)
@JSONField(name = "street")
@JsonProperty("street")
private String street;
/**
* 网站网址
*/
@TableField(exist = false)
@JSONField(name = "website_url")
@JsonProperty("website_url")
private String websiteUrl;
/**
* 公司
*/
@TableField(exist = false)
@JSONField(name = "is_company")
@JsonProperty("is_company")
private Boolean isCompany;
/**
* 邮政编码
*/
@TableField(exist = false)
@JSONField(name = "zip")
@JsonProperty("zip")
private String zip;
/**
* 税号
*/
......@@ -396,6 +354,49 @@ public class Res_supplier extends EntityMP implements Serializable {
@JsonProperty("property_product_pricelist")
@DynaProperty(res_model="res.partner",reference=cn.ibizlab.businesscentral.core.odoo_product.service.IProduct_pricelistService.class,pickup_text = "property_product_pricelist_name",reference_field = "name")
private Long propertyProductPricelist;
/**
* 街道
*/
@TableField(value = "street")
@JSONField(name = "street")
@JsonProperty("street")
private String street;
/**
* 网站网址
*/
@TableField(exist = false)
@JSONField(name = "website_url")
@JsonProperty("website_url")
private String websiteUrl;
/**
* 城市
*/
@TableField(value = "city")
@JSONField(name = "city")
@JsonProperty("city")
private String city;
/**
* 街道 2
*/
@TableField(value = "street2")
@JSONField(name = "street2")
@JsonProperty("street2")
private String street2;
/**
* 邮政编码
*/
@TableField(value = "zip")
@JSONField(name = "zip")
@JsonProperty("zip")
private String zip;
/**
* 公司
*/
@DEField(name = "is_company")
@TableField(value = "is_company")
@JSONField(name = "is_company")
@JsonProperty("is_company")
private Boolean isCompany;
/**
*
......@@ -639,6 +640,46 @@ public class Res_supplier extends EntityMP implements Serializable {
this.modify("user_id",userId);
}
/**
* 设置 [街道]
*/
public void setStreet(String street){
this.street = street ;
this.modify("street",street);
}
/**
* 设置 [城市]
*/
public void setCity(String city){
this.city = city ;
this.modify("city",city);
}
/**
* 设置 [街道 2]
*/
public void setStreet2(String street2){
this.street2 = street2 ;
this.modify("street2",street2);
}
/**
* 设置 [邮政编码]
*/
public void setZip(String zip){
this.zip = zip ;
this.modify("zip",zip);
}
/**
* 设置 [公司]
*/
public void setIsCompany(Boolean isCompany){
this.isCompany = isCompany ;
this.modify("is_company",isCompany);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
businesscentral-core/src/main/resources/mapper/odoo_base/res_supplier/Res_supplierMapper.xml
浏览文件 @ 3be99750
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`BARCODE`, t1.`CITY`, t1.`COMPANY_ID`, t41.`NAME` AS `COMPANY_ID_TEXT`, t1.`COUNTRY_ID`, t11.`NAME` AS `COUNTRY_ID_TEXT`, t1.`EMAIL`, t1.`FUNCTION`, t1.`ID`, t1.`IS_COMPANY`, t1.`MOBILE`, t1.`NAME`, t1.`PARENT_ID`, t91.`NAME` AS `PARENT_NAME`, t1.`PHONE`, t1.`PROPERTY_SUPPLIER_PAYMENT_TERM_ID`, t61.`NAME` AS `PROPERTY_SUPPLIER_PAYMENT_TERM_NAME`, t1.`REF`, t1.`STATE_ID`, t21.`NAME` AS `STATE_ID_TEXT`, t1.`STREET`, t1.`STREET2`, t1.`TITLE`, t51.`NAME` AS `TITLE_TEXT`, t1.`TYPE`, t1.`USER_ID`, t81.`NAME` AS `USER_NAME`, t1.`VAT`, t1.`ZIP` FROM `RES_PARTNER` t1 LEFT JOIN RES_COUNTRY t11 ON t1.COUNTRY_ID = t11.ID LEFT JOIN RES_COUNTRY_STATE t21 ON t1.STATE_ID = t21.ID LEFT JOIN RES_COMPANY t31 ON t1.COMPANY_ID = t31.ID LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID LEFT JOIN RES_PARTNER_TITLE t51 ON t1.TITLE = t51.ID LEFT JOIN ACCOUNT_PAYMENT_TERM t61 ON t1.PROPERTY_SUPPLIER_PAYMENT_TERM_ID = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t1.PARENT_ID = t91.ID ) t1 where id=#{id}]]>
</select>
<select id="selectById" resultMap="Res_supplierResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.BARCODE, (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1 LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.BARCODE, (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1 LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.CITY, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.IS_COMPANY, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -16,8 +16,6 @@
<id property="id" column="id" /><!--主键字段映射-->
<result property="companyType" column="company_type" />
<result property="categoryId" column="category_id" />
<result property="websiteUrl" column="website_url" />
<result property="isCompany" column="is_company" />
<result property="propertyPurchaseCurrencyName" column="property_purchase_currency_name" />
<result property="companyIdText" column="company_id_text" />
<result property="propertyStockSubcontractorName" column="property_stock_subcontractor_name" />
......@@ -48,6 +46,8 @@
<result property="propertyStockSubcontractor" column="property_stock_subcontractor" />
<result property="companyId" column="company_id" />
<result property="propertyProductPricelist" column="property_product_pricelist" />
<result property="websiteUrl" column="website_url" />
<result property="isCompany" column="is_company" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
......@@ -213,7 +213,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.BARCODE, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
<![CDATA[ SELECT t1.BARCODE, t1.CITY, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.IS_COMPANY, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
]]>
</sql>
<!--数据查询[Master]-->
......@@ -223,7 +223,7 @@
</sql>
<!--数据查询[Master]-->
<sql id="Master" databaseId="postgresql">
<![CDATA[ SELECT t1.BARCODE, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
<![CDATA[ SELECT t1.BARCODE, t1.CITY, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.IS_COMPANY, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
]]>
</sql>
<!--数据查询[View]-->
......@@ -233,7 +233,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.BARCODE, (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1 LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
<![CDATA[ SELECT t1.BARCODE, (SELECT ARRAY_TO_JSON(ARRAY_AGG(T.*)) FROM (SELECT M2.ID AS SRFKEY, M2.NAME AS SRFMAJORTEXT FROM RES_PARTNER_RES_PARTNER_CATEGORY_REL M1 LEFT JOIN RES_PARTNER_CATEGORY M2 ON M1.CATEGORY_ID = M2.ID WHERE M1.PARTNER_ID =T1.ID ) T) AS CATEGORY_ID, t1.CITY, t1.COMPANY_ID, t21.NAME AS COMPANY_ID_TEXT, t1.COUNTRY_ID, t41.NAME AS COUNTRY_ID_TEXT, t1.EMAIL, t1.FUNCTION, t1.ID, t1.IS_COMPANY, t1.MOBILE, t1.NAME, t1.PARENT_ID, t31.NAME AS PARENT_NAME, t1.PHONE, t1.REF, t1.STATE_ID, t51.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TITLE, t61.NAME AS TITLE_TEXT, t1.TYPE, t1.USER_ID, t81.NAME AS USER_NAME, t1.VAT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_COMPANY t11 ON t1.COMPANY_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER t31 ON t1.PARENT_ID = t31.ID LEFT JOIN RES_COUNTRY t41 ON t1.COUNTRY_ID = t41.ID LEFT JOIN RES_COUNTRY_STATE t51 ON t1.STATE_ID = t51.ID LEFT JOIN RES_PARTNER_TITLE t61 ON t1.TITLE = t61.ID LEFT JOIN RES_USERS t71 ON t1.USER_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t71.PARTNER_ID = t81.ID
]]>
</sql>
......
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @ 3be99750
......@@ -153624,20 +153624,6 @@
"major_field":0
},
{
"fieldname":"CITY" ,
"codename":"City",
"field_logic_name":"城市",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"REF" ,
"codename":"Ref",
"field_logic_name":"内部参考",
......@@ -153738,76 +153724,6 @@
"major_field":1
},
{
"fieldname":"STREET2" ,
"codename":"Street2",
"field_logic_name":"街道 2",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"STREET" ,
"codename":"Street",
"field_logic_name":"街道",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"WEBSITE_URL" ,
"codename":"Website_url",
"field_logic_name":"网站网址",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"IS_COMPANY" ,
"codename":"Is_company",
"field_logic_name":"公司",
"entity_name":"Res_supplier",
"field_type":"TRUEFALSE",
"dict":"Odoo_truefalse",
"nullable":1,
"physical_field":0,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"ZIP" ,
"codename":"Zip",
"field_logic_name":"邮政编码",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"VAT" ,
"codename":"Vat",
"field_logic_name":"税号",
......@@ -154347,6 +154263,90 @@
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"STREET" ,
"codename":"Street",
"field_logic_name":"街道",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"WEBSITE_URL" ,
"codename":"Website_url",
"field_logic_name":"网站网址",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"CITY" ,
"codename":"City",
"field_logic_name":"城市",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"STREET2" ,
"codename":"Street2",
"field_logic_name":"街道 2",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"ZIP" ,
"codename":"Zip",
"field_logic_name":"邮政编码",
"entity_name":"Res_supplier",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"IS_COMPANY" ,
"codename":"Is_company",
"field_logic_name":"公司",
"entity_name":"Res_supplier",
"field_type":"TRUEFALSE",
"dict":"Odoo_truefalse",
"nullable":1,
"physical_field":1,
"data_type":"BIT",
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java
浏览文件 @ 3be99750
......@@ -65,15 +65,6 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
private String companyType;
/**
* 属性 [CITY]
*
*/
@JSONField(name = "city")
@JsonProperty("city")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String city;
/**
* 属性 [REF]
*
......@@ -135,50 +126,6 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String name;
/**
* 属性 [STREET2]
*
*/
@JSONField(name = "street2")
@JsonProperty("street2")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String street2;
/**
* 属性 [STREET]
*
*/
@JSONField(name = "street")
@JsonProperty("street")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String street;
/**
* 属性 [WEBSITE_URL]
*
*/
@JSONField(name = "website_url")
@JsonProperty("website_url")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String websiteUrl;
/**
* 属性 [IS_COMPANY]
*
*/
@JSONField(name = "is_company")
@JsonProperty("is_company")
private Boolean isCompany;
/**
* 属性 [ZIP]
*
*/
@JSONField(name = "zip")
@JsonProperty("zip")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String zip;
/**
* 属性 [VAT]
*
......@@ -458,6 +405,59 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long propertyProductPricelist;
/**
* 属性 [STREET]
*
*/
@JSONField(name = "street")
@JsonProperty("street")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String street;
/**
* 属性 [WEBSITE_URL]
*
*/
@JSONField(name = "website_url")
@JsonProperty("website_url")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String websiteUrl;
/**
* 属性 [CITY]
*
*/
@JSONField(name = "city")
@JsonProperty("city")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String city;
/**
* 属性 [STREET2]
*
*/
@JSONField(name = "street2")
@JsonProperty("street2")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String street2;
/**
* 属性 [ZIP]
*
*/
@JSONField(name = "zip")
@JsonProperty("zip")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String zip;
/**
* 属性 [IS_COMPANY]
*
*/
@JSONField(name = "is_company")
@JsonProperty("is_company")
private Boolean isCompany;
/**
* 设置 [BARCODE]
......@@ -651,6 +651,46 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
this.modify("property_product_pricelist",propertyProductPricelist);
}
/**
* 设置 [STREET]
*/
public void setStreet(String street){
this.street = street ;
this.modify("street",street);
}
/**
* 设置 [CITY]
*/
public void setCity(String city){
this.city = city ;
this.modify("city",city);
}
/**
* 设置 [STREET2]
*/
public void setStreet2(String street2){
this.street2 = street2 ;
this.modify("street2",street2);
}
/**
* 设置 [ZIP]
*/
public void setZip(String zip){
this.zip = zip ;
this.modify("zip",zip);
}
/**
* 设置 [IS_COMPANY]
*/
public void setIsCompany(Boolean isCompany){
this.isCompany = isCompany ;
this.modify("is_company",isCompany);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或