Skip to content

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

xignzi006 发布系统代码

上级 ba7fba53
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 646 行增加 和 531 行删除
app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex-model.ts
浏览文件 @ b5581d93
......@@ -52,6 +52,26 @@ export default class GradationModel {
name: 'id',
prop: 'accountid'
},
{
name: 'emailaddress1',
prop: 'emailaddress1'
},
{
name: 'parentaccountname',
prop: 'parentaccountname'
},
{
name: 'primarycontactname',
prop: 'primarycontactname'
},
{
name: 'address1_city',
prop: 'address1_city'
},
{
name: 'telephone1',
prop: 'telephone1'
},
{
name: 'accountname',
prop: 'accountname'
......@@ -64,10 +84,30 @@ export default class GradationModel {
name: 'id',
prop: 'accountid'
},
{
name: 'parentaccountname',
prop: 'parentaccountname'
},
{
name: 'accountname',
prop: 'accountname'
},
{
name: 'telephone1',
prop: 'telephone1'
},
{
name: 'primarycontactname',
prop: 'primarycontactname'
},
{
name: 'address1_city',
prop: 'address1_city'
},
{
name: 'emailaddress1',
prop: 'emailaddress1'
},
];
break;
}
......
app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex-service.ts
浏览文件 @ b5581d93
......@@ -100,16 +100,56 @@ export default class GradationService extends ControlService {
ROOT: {
},
RootAccount: {
emailaddress1: {
prop: 'emailaddress1',
default: null
},
parentaccountname: {
prop: 'parentaccountname',
default: null
},
primarycontactname: {
prop: 'primarycontactname',
default: null
},
address1_city: {
prop: 'address1_city',
default: null
},
telephone1: {
prop: 'telephone1',
default: null
},
accountname: {
prop: 'accountname',
default: null
},
},
ChildAccount: {
parentaccountname: {
prop: 'parentaccountname',
default: null
},
accountname: {
prop: 'accountname',
default: null
},
telephone1: {
prop: 'telephone1',
default: null
},
primarycontactname: {
prop: 'primarycontactname',
default: null
},
address1_city: {
prop: 'address1_city',
default: null
},
emailaddress1: {
prop: 'emailaddress1',
default: null
},
},
}
......@@ -319,7 +359,7 @@ export default class GradationService extends ControlService {
strNodeId += strId;
Object.assign(treeNode, { id: strNodeId + '_#_' + filter.srfnodeid });
Object.assign(treeNode, { collapsed: true });
Object.assign(treeNode, { leaf: false });
Object.assign(treeNode, { leaf: true });
Object.assign(treeNode, { navparams: '{}' });
Object.assign(treeNode, { nodeid: treeNode.srfkey });
Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
......@@ -425,7 +465,17 @@ export default class GradationService extends ControlService {
@Errorlog
public async fillRootaccountNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
// 填充ChildAccount
let ChildaccountRsNavContext:any = {};
let ChildaccountRsNavParams:any = {};
let ChildaccountRsParams:any = {};
await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
} else {
// 填充ChildAccount
let ChildaccountRsNavContext:any = {};
let ChildaccountRsNavParams:any = {};
let ChildaccountRsParams:any = {};
await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
}
}
......
app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex.html
浏览文件 @ b5581d93
......@@ -10,9 +10,34 @@
:select-on-indeterminate="isSingleSelect"
@current-change="select.apply(_self, arguments)"
>
<el-table-column show-overflow-tooltip prop="accountname" label="" :width="50" :align="''">
<el-table-column show-overflow-tooltip prop="accountname" label="客户名称" :width="250" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'accountname') }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="telephone1" label="主要电话" :width="100" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'telephone1') }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="address1_city" label="地址 1: 市/县" :width="120" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'address1_city') }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="primarycontactname" label="主要联系人" :width="120" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'primarycontactname') }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="emailaddress1" label="电子邮件" :width="120" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'emailaddress1') }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="parentaccountname" label="上级客户" :width="200" :align="''">
<template v-slot="{ row }">
<span>{{ getColumnValue(row, 'parentaccountname') }}</span>
</template>
</el-table-column>
</el-table>
\ No newline at end of file
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ b5581d93
......@@ -4,7 +4,7 @@
<!--输出实体[ACCOUNT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-account-477-1">
<changeSet author="a_LAB01_e85d8801c" id="tab-account-500-1">
<createTable tableName="ACCOUNT">
<column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
</column>
......@@ -10879,7 +10879,7 @@
<!--输出实体[WEBSITECHANNEL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-69-129">
<changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-73-129">
<createTable tableName="WEBSITECHANNEL">
<column name="WEBSITECHANNELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WEBSITECHANNEL_WEBSITECHANN"/>
......@@ -10978,31 +10978,31 @@
</changeSet>
<!--输出实体[ACCOUNT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-132">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-132">
<addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-133">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-133">
<addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-134">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-134">
<addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-135">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-135">
<addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-136">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-136">
<addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-137">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-137">
<addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-138">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-138">
<addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-139">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-139">
<addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-account-477-140">
<changeSet author="a_LAB01_e85d8801c" id="fk-account-500-140">
<addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
</changeSet>
<!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
......@@ -11904,10 +11904,10 @@
<!--输出实体[UOMSCHEDULE]外键关系 -->
<!--输出实体[WEBSITE]外键关系 -->
<!--输出实体[WEBSITECHANNEL]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-69-427">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-73-427">
<addForeignKeyConstraint baseColumnNames="PWEBSITECHANNELID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITECH" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITECHANNELID" referencedTableName="WEBSITECHANNEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-69-428">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-73-428">
<addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
</changeSet>
<!--输出实体[WEBSITECONTENT]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或