Skip to content

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

xignzi006 发布系统代码

上级 7800151f
隐藏空白字符变更
内嵌 并排
正在显示 包含 210 行增加 和 53 行删除
app_BusinessCentral/public/assets/json/view-config.json
浏览文件 @ 85139300
......@@ -299,6 +299,16 @@
"viewtag": "a62e766e54ec0b259071463523c98493",
"memo": "系统自动添加"
},
"accountoptionview": {
"title": "客户选项操作视图",
"caption": "客户",
"viewtype": "DEOPTVIEW",
"viewmodule": "Base",
"viewname": "AccountOptionView",
"viewfilename": "account-option-view",
"viewtag": "a69ba7dd2f8bdac8a3c733dcc79c0ee5",
"memo": ""
},
"quoteeditview": {
"title": "quote编辑视图",
"caption": "报价单",
......
app_BusinessCentral/src/components/app-form-item/app-form-item.less
浏览文件 @ 85139300
.app-form-item-wrapper {
height: 100%;
}
.app-form-item {
height: 100%;
>.ivu-form-item-label {
.app-form-item-label {
text-decoration: none;
display: block;
overflow: hidden;
white-space: nowrap;
.required {
vertical-align: -2px;
color: var(--app-color-danger);
}
}
>.ivu-form-item-content {
height: 100%;
min-height: 36px;
>.editor {
>.editor-wrapper {
height: 100%;
display: flex;
.editor-content {
flex-grow: 1;
}
.editor-error-tip {
flex-shrink: 0;
width: 20px;
font-size: 20px;
color: var(--app-color-danger);
.ivu-tooltip-popper[x-placement^=left] .ivu-tooltip-arrow {
border-left-color: var(--view-background-color-bright);
}
.ivu-tooltip-inner {
background-color: var(--view-background-color-bright);
}
.editor-error-tip-content {
color: var(--app-color-danger);
font-weight: 500;
}
}
}
.ivu-form-item-error-tip {
display: none;
}
}
}
......@@ -28,14 +58,14 @@
height: 16px;
}
.editor {
.editor-wrapper {
height: calc(100% - 16px);
}
}
.app-form-item.label-left, .app-form-item.label-right {
.app-form-item-label, .editor {
.app-form-item-label, .editor-wrapper {
height: 100%;
}
}
......@@ -64,7 +94,7 @@
display: none !important;
}
.editor {
.editor-wrapper {
height: 100%;
}
}
\ No newline at end of file
app_BusinessCentral/src/components/app-form-item/app-form-item.vue
浏览文件 @ 85139300
......@@ -16,26 +16,47 @@
</app-form-item2>
</template>
<template v-if="this.uiStyle !== 'STYLE2'">
<form-item :prop="name" :error="error" :required="required" :rules="rules" :class="classes">
<form-item :ref="name" :prop="name" :error="error" :rules="rules" :class="classes">
<div
v-if="Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos"
class="editor"
class="editor-wrapper"
:style="slotstyle"
>
<slot></slot>
<div class="editor-content">
<slot></slot>
</div>
<div v-if="itemRef && itemRef.validateState === 'error'" class="editor-error-tip">
<Tooltip :content="itemRef.validateMessage" placement="left" :transfer="true">
<Icon type="ios-alert-outline" />
</Tooltip>
</div>
</div>
<span
v-if="!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0"
:style="labelstyle"
:class="labelclasses"
>
{{this.isEmptyCaption ? '' : this.caption}}</span>
<span v-if="required" class="required">*</span>
{{this.isEmptyCaption ? '' : this.caption}}
</span>
<div
v-if="Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
class="editor"
class="editor-wrapper"
:style="slotstyle"
>
<slot></slot>
<div class="editor-content">
<slot></slot>
</div>
<div v-if="itemRef && itemRef.validateState === 'error'" class="editor-error-tip">
<Tooltip placement="left">
<Icon type="ios-alert-outline" />
<template slot="content">
<span class="editor-error-tip-content">
{{itemRef.validateMessage}}
</span>
</template>
</Tooltip>
</div>
</div>
</form-item>
</template>
......@@ -148,6 +169,14 @@ export default class AppFormItem extends Vue {
*/
public required: boolean = false;
/**
* 表单项实例
*
* @type {*}
* @memberof AppFormItem
*/
public itemRef: any = null;
/**
* 表单项值规则监控
*
......@@ -249,6 +278,7 @@ export default class AppFormItem extends Vue {
* @memberof AppFormItem
*/
public mounted() {
this.itemRef = this.$refs[this.name];
if (this.itemRules) {
try {
const _rules: any[] = this.itemRules;
......
app_BusinessCentral/src/interface/entity/account.ts
浏览文件 @ 85139300
......@@ -1263,7 +1263,7 @@ export interface Account {
territoryname?: any;
/**
* 上级客户
* 上级单位
*
* @returns {*}
* @memberof Account
......
app_BusinessCentral/src/locale/lanres/entities/account/account_en_US.ts
浏览文件 @ 85139300
......@@ -158,7 +158,7 @@ export default {
originatingleadname: '原始潜在顾客',
defaultpricelevelname: '价目表',
territoryname: '区域',
parentaccountname: '上级客户',
parentaccountname: '上级单位',
preferredequipmentname: '首选设施/设备',
preferredservicename: '首选服务',
primarycontactname: '主要联系人',
......@@ -196,6 +196,10 @@ export default {
address: {
caption: "客户",
title: 'account编辑视图',
},
optionview: {
caption: "客户",
title: '客户选项操作视图',
},
distribution: {
caption: "客户",
......@@ -230,7 +234,7 @@ export default {
telephone1: "主要电话",
fax: "传真",
websiteurl: "网站",
parentaccountname: "上级客户",
parentaccountname: "上级单位",
tickersymbol: "股票代号",
customertypecode: "关系类型",
defaultpricelevelname: "价目表",
......@@ -386,6 +390,33 @@ export default {
uiactions: {
},
},
quickcreate_form: {
details: {
group1: "客户基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "客户",
srfmajortext: "客户名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
accountname: "客户名称",
telephone1: "主要电话",
fax: "传真",
websiteurl: "网站",
parentaccountname: "上级单位",
tickersymbol: "股票代号",
customertypecode: "关系类型",
defaultpricelevelname: "价目表",
defaultpricelevelid: "价目表",
parentaccountid: "上级单位",
accountid: "客户",
},
uiactions: {
},
},
main_grid: {
columns: {
accountname: "客户名称",
......
app_BusinessCentral/src/locale/lanres/entities/account/account_zh_CN.ts
浏览文件 @ 85139300
......@@ -157,7 +157,7 @@ export default {
originatingleadname: '原始潜在顾客',
defaultpricelevelname: '价目表',
territoryname: '区域',
parentaccountname: '上级客户',
parentaccountname: '上级单位',
preferredequipmentname: '首选设施/设备',
preferredservicename: '首选服务',
primarycontactname: '主要联系人',
......@@ -195,6 +195,10 @@ export default {
address: {
caption: '客户',
title: 'account编辑视图',
},
optionview: {
caption: '客户',
title: '客户选项操作视图',
},
distribution: {
caption: '客户',
......@@ -229,7 +233,7 @@ export default {
telephone1: '主要电话',
fax: '传真',
websiteurl: '网站',
parentaccountname: '上级客户',
parentaccountname: '上级单位',
tickersymbol: '股票代号',
customertypecode: '关系类型',
defaultpricelevelname: '价目表',
......@@ -385,6 +389,33 @@ export default {
uiactions: {
},
},
quickcreate_form: {
details: {
group1: '客户基本信息',
formpage1: '基本信息',
srfupdatedate: '更新时间',
srforikey: '',
srfkey: '客户',
srfmajortext: '客户名称',
srftempmode: '',
srfuf: '',
srfdeid: '',
srfsourcekey: '',
accountname: '客户名称',
telephone1: '主要电话',
fax: '传真',
websiteurl: '网站',
parentaccountname: '上级单位',
tickersymbol: '股票代号',
customertypecode: '关系类型',
defaultpricelevelname: '价目表',
defaultpricelevelid: '价目表',
parentaccountid: '上级单位',
accountid: '客户',
},
uiactions: {
},
},
main_grid: {
columns: {
accountname: '客户名称',
......
app_BusinessCentral/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 85139300
......@@ -247,6 +247,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "IBizListEditView",
"viewtag": "a62e766e54ec0b259071463523c98493"
},
"accountoptionview": {
"title": "客户选项操作视图",
"caption": "客户",
"viewtype": "DEOPTVIEW",
"viewmodule": "Base",
"viewname": "AccountOptionView",
"viewtag": "a69ba7dd2f8bdac8a3c733dcc79c0ee5"
},
"quoteeditview": {
"title": "quote编辑视图",
"caption": "报价单",
......
app_BusinessCentral/src/pages/base/account-info/account-info-base.vue
浏览文件 @ 85139300
......@@ -471,7 +471,9 @@ export default class AccountInfoBase extends Vue {
const { data: _data } = response;
if (_data.accountname) {
Object.assign(this.model, { dataInfo: _data.accountname });
this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
if (this.$tabPageExp) {
this.$tabPageExp.setCurPageCaption(this.model.srfTitle, this.model.srfTitle, this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
......
app_BusinessCentral/src/uiservice/account/account-ui-service-base.ts
浏览文件 @ 85139300
......@@ -87,6 +87,7 @@ export default class AccountUIServiceBase extends UIService {
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'introduction',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'address',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'optionview',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'distribution',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'contactsetting',srfappde:'accounts'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'accounts'});
......
app_BusinessCentral/src/widgets/account/accountinfo-form/accountinfo-form-base.vue
浏览文件 @ 85139300
......@@ -545,10 +545,10 @@ export default class AccountinfoBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '网站 值不能为空', trigger: 'blur' },
],
parentaccountname: [
{ type: 'string', message: '上级客户 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级客户 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '上级客户 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级客户 值不能为空', trigger: 'blur' },
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级单位 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位 值不能为空', trigger: 'blur' },
],
tickersymbol: [
{ type: 'string', message: '股票代号 值必须为字符串类型', trigger: 'change' },
......@@ -623,7 +623,7 @@ export default class AccountinfoBase extends Vue implements ControlInterface {
,
websiteurl: new FormItemModel({ caption: '网站', detailType: 'FORMITEM', name: 'websiteurl', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
parentaccountname: new FormItemModel({ caption: '上级客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
parentaccountname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
tickersymbol: new FormItemModel({ caption: '股票代号', detailType: 'FORMITEM', name: 'tickersymbol', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......
app_BusinessCentral/src/widgets/account/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -750,7 +750,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/activity-pointer/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/competitor/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/contact/by-account-panel/by-account-panel-base.vue
浏览文件 @ 85139300
......@@ -158,14 +158,6 @@ export default class ByAccountBase extends Vue implements ControlInterface {
}
/**
* 面板数据
*
* @type {*}
* @memberof ByAccount
*/
public panelData: any;
/**
* 接口实现
*
......@@ -255,6 +247,28 @@ export default class ByAccountBase extends Vue implements ControlInterface {
*/
public data:any = {};
/**
* 面板数据对象
*
* @type {*}
* @memberof Mob
*/
public panelData:any = null;
/**
* 监听数据对象
*
* @memberof ByAccount
*/
@Watch('inputData',{immediate:true})
async onInputDataChange(newVal: any, oldVal: any){
if(newVal){
await this.computedUIData(newVal);
this.panelLogic({ name: '', newVal: null, oldVal: null });
this.$forceUpdate();
}
}
/**
* 计算UI展示数据
*
......
app_BusinessCentral/src/widgets/contact/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -745,7 +745,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/goal/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/ibiz-list/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/incident/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/invoice/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/lead/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/opportunity/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/price-level/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -714,7 +714,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/product/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/quote/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/sales-literature/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
app_BusinessCentral/src/widgets/sales-order/main-grid/main-grid-base.vue
浏览文件 @ 85139300
......@@ -728,7 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
let _datas:any[] = [];
datas.forEach((record: any, index: number) => {
if (!record.srfkey) {
if (Object.is(record.srfuf, "0")) {
this.items.some((val: any, num: number) =>{
if(JSON.stringify(val) == JSON.stringify(record)){
this.items.splice(num,1);
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Account.java
浏览文件 @ 85139300
......@@ -1225,7 +1225,7 @@ public class Account extends EntityMP implements Serializable {
@JsonProperty("territoryname")
private String territoryname;
/**
* 上级客户
* 上级单位
*/
@TableField(value = "parentaccountname")
@JSONField(name = "parentaccountname")
......@@ -2601,7 +2601,7 @@ public class Account extends EntityMP implements Serializable {
}
/**
* 设置 [上级客户]
* 设置 [上级单位]
*/
public void setParentaccountname(String parentaccountname){
this.parentaccountname = parentaccountname ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/filter/AccountSearchContext.java
浏览文件 @ 85139300
......@@ -293,14 +293,14 @@ public class AccountSearchContext extends QueryWrapperContext<Account> {
this.getSearchCond().like("territoryname", n_territoryname_like);
}
}
private String n_parentaccountname_eq;//[上级客户]
private String n_parentaccountname_eq;//[上级单位]
public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
this.n_parentaccountname_eq = n_parentaccountname_eq;
if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
}
}
private String n_parentaccountname_like;//[上级客户]
private String n_parentaccountname_like;//[上级单位]
public void setN_parentaccountname_like(String n_parentaccountname_like) {
this.n_parentaccountname_like = n_parentaccountname_like;
if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或