Skip to content

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

chitanda 发布系统代码

上级 f9100c70
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 878 行增加 和 909 行删除
app_CRM/src/components/app-mpicker/app-mpicker.vue
浏览文件 @ ea405e32
......@@ -94,6 +94,14 @@ export default class AppMpicker extends Vue {
*/
@Prop({default: () => {}}) public acParams?: any;
/**
* 编辑器额外填充参数
*
* @type {string}
* @memberof AppMpicker
*/
@Prop() public extraFillParams?: any;
/**
* 应用实体主信息属性名称
*
......@@ -231,13 +239,24 @@ export default class AppMpicker extends Vue {
* @memberof AppMpicker
*/
public onSelect(selects: any) {
let val: Array<any> = [];
const val: Array<any> = [];
if (selects.length > 0) {
selects.forEach((select: any) => {
let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select));
if (index >= 0) {
let item = this.items[index];
val.push({ [this.deKeyField]: item[this.deKeyField], [this.deMajorField]: item[this.deMajorField] });
const item = this.items[index];
const params = { [this.deKeyField]: item[this.deKeyField], [this.deMajorField]: item[this.deMajorField] };
if (isExist(this.extraFillParams)) {
for (const key in this.extraFillParams) {
if (this.extraFillParams.hasOwnProperty(key)) {
const self = this.extraFillParams[key];
if (isExist(item[self.key])) {
Object.assign(params, { name: self.value, value: item[self.key]});
}
}
}
}
val.push(params);
} else {
index = this.selectItems.findIndex((item: any) => Object.is(item[this.deKeyField], select));
if (index >= 0) {
......@@ -246,7 +265,7 @@ export default class AppMpicker extends Vue {
}
}
});
let value = val.length > 0 ? JSON.stringify(this.formatValue(val)) : '';
const value = val.length > 0 ? JSON.stringify(this.formatValue(val)) : '';
this.$emit('formitemvaluechange', { name: this.name, value: value });
}
}
......@@ -335,7 +354,18 @@ export default class AppMpicker extends Vue {
selects.push({ [this.deKeyField]: select[this.deKeyField], [this.deMajorField]: select[this.deMajorField] });
let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select[this.deKeyField]));
if (index < 0) {
this.items.push({ [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] });
const params = { [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] }
if (isExist(this.extraFillParams)) {
for (const key in this.extraFillParams) {
if (this.extraFillParams.hasOwnProperty(key)) {
const self = this.extraFillParams[key];
if (isExist(select[self.key])) {
Object.assign(params, { name: self.value, value: select[self.key]});
}
}
}
}
this.items.push(params);
}
});
}
......
app_CRM/src/pages/base/central/page-register.ts
浏览文件 @ ea405e32
......@@ -208,7 +208,6 @@ export const PageComponents = {
Vue.component('list-account-edit-view', () => import('@pages/marketing/list-account-edit-view/list-account-edit-view.vue'));
Vue.component('entitlement-pickup-grid-view', () => import('@pages/service/entitlement-pickup-grid-view/entitlement-pickup-grid-view.vue'));
Vue.component('contact-grid-view', () => import('@pages/base/contact-grid-view/contact-grid-view.vue'));
Vue.component('incident-customer-mpickup-view', () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'));
Vue.component('campaign-activity-by-parent-key', () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'));
Vue.component('price-level-pickup-grid-view', () => import('@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'));
Vue.component('ibiz-list-effective-grid-view', () => import('@pages/marketing/ibiz-list-effective-grid-view/ibiz-list-effective-grid-view.vue'));
......@@ -226,8 +225,8 @@ export const PageComponents = {
Vue.component('sales-order-by-parent-key', () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'));
Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'));
Vue.component('list-lead-quick-create-by-list', () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'));
Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
Vue.component('connection-role-grid-view', () => import('@pages/runtime/connection-role-grid-view/connection-role-grid-view.vue'));
Vue.component('incident-pickup-view', () => import('@pages/service/incident-pickup-view/incident-pickup-view.vue'));
Vue.component('contact-edit-data-panel-view', () => import('@pages/base/contact-edit-data-panel-view/contact-edit-data-panel-view.vue'));
......
app_CRM/src/pages/base/central/router.ts
浏览文件 @ ea405e32
......@@ -8744,20 +8744,6 @@ const router = new Router({
},
component: () => import('@pages/base/contact-grid-view/contact-grid-view.vue'),
},
{
path: 'incidentcustomers/:incidentcustomer?/mpickupview/:mpickupview?',
meta: {
caption: 'entities.incidentcustomer.views.mpickupview.title',
info:'',
parameters: [
{ pathName: 'central', parameterName: 'central' },
{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' },
{ pathName: 'mpickupview', parameterName: 'mpickupview' },
],
requireAuth: true,
},
component: () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'),
},
{
path: 'campaignactivities/:campaignactivity?/byparentkey/:byparentkey?',
meta: {
......@@ -9538,32 +9524,32 @@ const router = new Router({
component: () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'),
},
{
path: 'goals/:goal?/summaryview/:summaryview?',
path: 'accounts/:account?/info/:info?',
meta: {
caption: 'entities.goal.views.summaryview.title',
caption: 'entities.account.views.info.title',
info:'',
parameters: [
{ pathName: 'central', parameterName: 'central' },
{ pathName: 'goals', parameterName: 'goal' },
{ pathName: 'summaryview', parameterName: 'summaryview' },
{ pathName: 'accounts', parameterName: 'account' },
{ pathName: 'info', parameterName: 'info' },
],
requireAuth: true,
},
component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
component: () => import('@pages/base/account-info/account-info.vue'),
},
{
path: 'accounts/:account?/info/:info?',
path: 'goals/:goal?/summaryview/:summaryview?',
meta: {
caption: 'entities.account.views.info.title',
caption: 'entities.goal.views.summaryview.title',
info:'',
parameters: [
{ pathName: 'central', parameterName: 'central' },
{ pathName: 'accounts', parameterName: 'account' },
{ pathName: 'info', parameterName: 'info' },
{ pathName: 'goals', parameterName: 'goal' },
{ pathName: 'summaryview', parameterName: 'summaryview' },
],
requireAuth: true,
},
component: () => import('@pages/base/account-info/account-info.vue'),
component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
},
{
path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/pickupgridview/:pickupgridview?',
......
app_CRM/src/store/modules/view-action/state.ts
浏览文件 @ ea405e32
......@@ -1102,7 +1102,6 @@ export const viewstate: any = {
'05d66c9ecb6eeb18a00a23cca19bf042',
'e52af970c14fd89546ac8ccaecab460c',
'ba34ee36c1d0de288403607e17e7eb3e',
'5f31eceb2d615687c16eab39b11af0b9',
'0dff48c04927315f77dd70a9a2767b59',
],
},
......@@ -1155,16 +1154,6 @@ export const viewstate: any = {
'c420212fae385872d6ae89e3d237350a',
],
},
{
viewtag: '5f31eceb2d615687c16eab39b11af0b9',
viewmodule: 'Service',
viewname: 'IncidentCustomerMPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'8dca8823a924f513bf8c52bc3d321cff',
],
},
{
viewtag: '5f8f689d5dccc3db6d2b74a24a8b24ef',
viewmodule: 'Sales',
......@@ -1302,7 +1291,6 @@ export const viewstate: any = {
'05d66c9ecb6eeb18a00a23cca19bf042',
'e52af970c14fd89546ac8ccaecab460c',
'ba34ee36c1d0de288403607e17e7eb3e',
'5f31eceb2d615687c16eab39b11af0b9',
'0dff48c04927315f77dd70a9a2767b59',
],
},
......
app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html
浏览文件 @ ea405e32
......@@ -151,24 +151,7 @@
<i-col v-show="detailsModel.description.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.byparentkey_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
<app-mpicker
:activeData="data"
:disabled="detailsModel.description.disabled"
:curvalue="data.description"
name="description"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:service="service"
valueitem=''
deMajorField='customername'
deKeyField='incidentcustomer'
:acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
:pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
@formitemvaluechange="onFormItemValueChange($event)"
style="">
</app-mpicker>
// description多项选择编辑器未配置选择视图
</app-form-item>
......
app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html
浏览文件 @ ea405e32
......@@ -140,24 +140,7 @@
<i-col v-show="detailsModel.description.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.quickcreate_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
<app-mpicker
:activeData="data"
:disabled="detailsModel.description.disabled"
:curvalue="data.description"
name="description"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:service="service"
valueitem=''
deMajorField='customername'
deKeyField='incidentcustomer'
:acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
:pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
@formitemvaluechange="onFormItemValueChange($event)"
style="">
</app-mpicker>
// description多项选择编辑器未配置选择视图
</app-form-item>
......
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ea405e32
......@@ -4769,7 +4769,7 @@
<!--输出实体[INCIDENT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-incident-110-59">
<changeSet author="a_LAB01_e85d8801c" id="tab-incident-114-59">
<createTable tableName="INCIDENT">
<column name="LASTONHOLDTIME" remarks="" type="DATETIME">
</column>
......@@ -11357,43 +11357,43 @@
<addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="SERVICE" constraintName="DER1N_SERVICE__RESOURCESPEC__R" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
</changeSet>
<!--输出实体[INCIDENT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-260">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-260">
<addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__PRIMA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-261">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-261">
<addForeignKeyConstraint baseColumnNames="RESPONSIBLECONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__RESPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-262">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-262">
<addForeignKeyConstraint baseColumnNames="CONTRACTDETAILID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACTDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTDETAILID" referencedTableName="CONTRACTDETAIL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-263">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-263">
<addForeignKeyConstraint baseColumnNames="CONTRACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACT__CONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTID" referencedTableName="CONTRACT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-264">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-264">
<addForeignKeyConstraint baseColumnNames="ENTITLEMENTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__ENTITLEMENT__E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITLEMENTID" referencedTableName="ENTITLEMENT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-265">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-265">
<addForeignKeyConstraint baseColumnNames="EXISTINGCASE" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__EXIS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-266">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-266">
<addForeignKeyConstraint baseColumnNames="MASTERID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__MAST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-267">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-267">
<addForeignKeyConstraint baseColumnNames="PARENTCASEID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__PARE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-268">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-268">
<addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__PRODUCT__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-269">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-269">
<addForeignKeyConstraint baseColumnNames="FIRSTRESPONSEBYKPIID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLAKPIINSTANCE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAKPIINSTANCEID" referencedTableName="SLAKPIINSTANCE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-271">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-271">
<addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-272">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-272">
<addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SUBJECT__SUBJE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-110-273">
<changeSet author="a_LAB01_e85d8801c" id="fk-incident-114-273">
<addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
</changeSet>
<!--输出实体[INCIDENTCUSTOMER]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或