Skip to content

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

xignzi006 发布系统代码

上级 c2eda770
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1670 行增加 和 1799 行删除
app_CRM/src/interface/entity/incident.ts
浏览文件 @ 4c544833
......@@ -22,14 +22,6 @@ export interface Incident {
*/
versionnumber?: any;
/**
* 客户类型
*
* @returns {*}
* @memberof Incident
*/
customertype?: any;
/**
* 第一个响应 SLA 状态
*
......@@ -54,14 +46,6 @@ export interface Incident {
*/
influencescore?: any;
/**
* 客户
*
* @returns {*}
* @memberof Incident
*/
customerid?: any;
/**
* 社交个人资料
*
......@@ -206,14 +190,6 @@ export interface Incident {
*/
entityimage?: any;
/**
* 客户
*
* @returns {*}
* @memberof Incident
*/
customername?: any;
/**
* 暂候时间(分钟)
*
......@@ -773,4 +749,28 @@ export interface Incident {
* @memberof Incident
*/
slaname?: any;
/**
* 客户
*
* @returns {*}
* @memberof Incident
*/
customerid?: any;
/**
* 客户
*
* @returns {*}
* @memberof Incident
*/
customername?: any;
/**
* 客户类型
*
* @returns {*}
* @memberof Incident
*/
customertype?: any;
}
\ No newline at end of file
app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts
浏览文件 @ 4c544833
......@@ -3,11 +3,9 @@ export default {
fields: {
lastonholdtime: "上一暂候时间",
versionnumber: "Version Number",
customertype: "客户类型",
firstresponseslastatus: "第一个响应 SLA 状态",
incidentstagecode: "案例阶段",
influencescore: "影响分数",
customerid: "客户",
socialprofileid: "社交个人资料",
ticketnumber: "案例号",
merged: "仅供内部使用",
......@@ -26,7 +24,6 @@ export default {
billedserviceunits: "记帐服务计价单位",
prioritycode: "优先级",
entityimage: "实体图像",
customername: "客户",
onholdtime: "暂候时间(分钟)",
createman: "建立人",
kbarticleid: "知识库文章",
......@@ -97,6 +94,9 @@ export default {
subjectname: "主题",
transactioncurrencyname: "货币",
slaname: "SLA",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
},
views: {
editview: {
......@@ -185,10 +185,6 @@ export default {
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
description: "说明",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
......@@ -212,7 +208,6 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
accountname: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
......@@ -241,7 +236,6 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
customerid: "客户",
subjectname: "主题",
casetypecode: "案例类型",
primarycontactname: "联系人",
......@@ -340,13 +334,13 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
description: "说明",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
description: "说明",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
......@@ -361,7 +355,6 @@ export default {
ticketnumber: "案例号",
prioritycode: "优先级",
caseorigincode: "起源",
customername: "客户",
statecode: "状态",
},
uiactions: {
......
app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts
浏览文件 @ 4c544833
......@@ -2,11 +2,9 @@ export default {
fields: {
lastonholdtime: "上一暂候时间",
versionnumber: "Version Number",
customertype: "客户类型",
firstresponseslastatus: "第一个响应 SLA 状态",
incidentstagecode: "案例阶段",
influencescore: "影响分数",
customerid: "客户",
socialprofileid: "社交个人资料",
ticketnumber: "案例号",
merged: "仅供内部使用",
......@@ -25,7 +23,6 @@ export default {
billedserviceunits: "记帐服务计价单位",
prioritycode: "优先级",
entityimage: "实体图像",
customername: "客户",
onholdtime: "暂候时间(分钟)",
createman: "建立人",
kbarticleid: "知识库文章",
......@@ -96,6 +93,9 @@ export default {
subjectname: "主题",
transactioncurrencyname: "货币",
slaname: "SLA",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
},
views: {
editview: {
......@@ -184,10 +184,6 @@ export default {
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
description: "说明",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
......@@ -211,7 +207,6 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
accountname: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
......@@ -240,7 +235,6 @@ export default {
srfdeid: "",
srfsourcekey: "",
title: "案例标题",
customerid: "客户",
subjectname: "主题",
casetypecode: "案例类型",
primarycontactname: "联系人",
......@@ -339,13 +333,13 @@ export default {
srfsourcekey: "",
title: "案例标题",
subjectname: "主题",
customername: "客户",
caseorigincode: "起源",
productname: "产品",
entitlementname: "权利",
description: "说明",
customerid: "客户",
customername: "客户",
customertype: "客户类型",
description: "说明",
productid: "产品",
incidentid: "案例",
subjectid: "主题",
......@@ -360,7 +354,6 @@ export default {
ticketnumber: "案例号",
prioritycode: "优先级",
caseorigincode: "起源",
customername: "客户",
statecode: "状态",
},
uiactions: {
......
app_CRM/src/store/modules/view-action/state.ts
浏览文件 @ 4c544833
......@@ -1398,10 +1398,8 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'05d66c9ecb6eeb18a00a23cca19bf042',
'e52af970c14fd89546ac8ccaecab460c',
'ba34ee36c1d0de288403607e17e7eb3e',
'5f31eceb2d615687c16eab39b11af0b9',
'0dff48c04927315f77dd70a9a2767b59',
],
},
......
app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form-base.tsx
浏览文件 @ 4c544833
......@@ -79,10 +79,6 @@ export class ByParentKeyEditFormBase extends EditFormControlBase {
caseorigincode: null,
productname: null,
entitlementname: null,
customerid: null,
customername: null,
customertype: null,
description: null,
productid: null,
incidentid: null,
subjectid: null,
......@@ -101,18 +97,6 @@ export class ByParentKeyEditFormBase extends EditFormControlBase {
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'blur' },
],
customerid: [
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
],
customername: [
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
],
customertype: [
{ required: true, type: 'string', message: '客户类型 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户类型 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -152,14 +136,6 @@ export class ByParentKeyEditFormBase extends EditFormControlBase {
entitlementname: new FormItemModel({ caption: '权利', detailType: 'FORMITEM', name: 'entitlementname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customerid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customerid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customername: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customertype: new FormItemModel({ caption: '客户类型', detailType: 'FORMITEM', name: 'customertype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
productid: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
incidentid: new FormItemModel({ caption: '案例', detailType: 'FORMITEM', name: 'incidentid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......@@ -169,20 +145,4 @@ export class ByParentKeyEditFormBase extends EditFormControlBase {
entitlementid: new FormItemModel({ caption: '权利', detailType: 'FORMITEM', name: 'entitlementid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
};
/**
* 新建默认值
* @memberof ByParentKeyEditFormBase
*/
public createDefault(){
if (this.data.hasOwnProperty('customerid')) {
this.data['customerid'] = this.viewparams['customerid'];
}
if (this.data.hasOwnProperty('customername')) {
this.data['customername'] = this.viewparams['customername'];
}
if (this.data.hasOwnProperty('customertype')) {
this.data['customertype'] = this.viewparams['customertype'];
}
}
}
\ No newline at end of file
app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form-model.ts
浏览文件 @ 4c544833
......@@ -80,26 +80,6 @@ export default class ByParentKeyModel {
prop: 'entitlementname',
dataType: 'PICKUPTEXT',
},
{
name: 'customerid',
prop: 'customerid',
dataType: 'TEXT',
},
{
name: 'customername',
prop: 'customername',
dataType: 'TEXT',
},
{
name: 'customertype',
prop: 'customertype',
dataType: 'TEXT',
},
{
name: 'description',
prop: 'description',
dataType: 'TEXT',
},
{
name: 'productid',
prop: 'productid',
......
app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form-service.ts
浏览文件 @ 4c544833
......@@ -5,7 +5,6 @@ import ByParentKeyModel from './by-parent-key-form-model';
import SubjectService from '@/service/subject/subject-service';
import ProductService from '@/service/product/product-service';
import EntitlementService from '@/service/entitlement/entitlement-service';
import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
/**
......@@ -69,14 +68,6 @@ export default class ByParentKeyService extends ControlService {
*/
public entitlementService: EntitlementService = new EntitlementService();
/**
* 案例客户服务对象
*
* @type {IncidentCustomerService}
* @memberof ByParentKeyService
*/
public incidentcustomerService: IncidentCustomerService = new IncidentCustomerService();
/**
* 处理数据
*
......@@ -125,9 +116,6 @@ export default class ByParentKeyService extends ControlService {
if (Object.is(serviceName, 'EntitlementService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.entitlementService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'entitlementid', 'entitlement');
}
if (Object.is(serviceName, 'IncidentCustomerService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.incidentcustomerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'customerid', 'incidentcustomer');
}
return Promise.reject([])
}
......
app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html
浏览文件 @ 4c544833
......@@ -109,69 +109,6 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.customerid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='customerid' :itemRules="this.rules.customerid" class='' :caption="$t('entities.incident.byparentkey_form.details.customerid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customerid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.customerid" @enter="onEnter($event)" unit="" :disabled="detailsModel.customerid.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.customername.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.incident.byparentkey_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.customername.disabled"
name='customername'
deMajorField='customername'
deKeyField='incidentcustomer'
:service="service"
:acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
valueitem='customerid'
:value="data.customername"
:pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 800, placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange($event)">
</app-picker>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.customertype.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='customertype' :itemRules="this.rules.customertype" class='' :caption="$t('entities.incident.byparentkey_form.details.customertype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customertype.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.customertype" @enter="onEnter($event)" unit="" :disabled="detailsModel.customertype.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<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>
</app-form-item>
</i-col>
</row>
......
app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form-base.tsx
浏览文件 @ 4c544833
......@@ -75,7 +75,6 @@ export class Edit_ChildIncidentEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
title: null,
customerid: null,
subjectname: null,
casetypecode: null,
primarycontactname: null,
......@@ -101,10 +100,6 @@ export class Edit_ChildIncidentEditFormBase extends EditFormControlBase {
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'blur' },
],
customerid: [
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -136,8 +131,6 @@ export class Edit_ChildIncidentEditFormBase extends EditFormControlBase {
title: new FormItemModel({ caption: '案例标题', detailType: 'FORMITEM', name: 'title', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customerid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customerid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
subjectname: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
casetypecode: new FormItemModel({ caption: '案例类型', detailType: 'FORMITEM', name: 'casetypecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form-model.ts
浏览文件 @ 4c544833
......@@ -60,11 +60,6 @@ export default class Edit_ChildIncidentModel {
prop: 'title',
dataType: 'TEXT',
},
{
name: 'customerid',
prop: 'customerid',
dataType: 'TEXT',
},
{
name: 'subjectname',
prop: 'subjectname',
......
app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form.html
浏览文件 @ 4c544833
......@@ -11,12 +11,6 @@
<input-box v-model="data.title" @enter="onEnter($event)" unit="" :disabled="detailsModel.title.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.customerid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='customerid' :itemRules="this.rules.customerid" class='' :caption="$t('entities.incident.edit_childincident_form.details.customerid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customerid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.customerid" @enter="onEnter($event)" unit="" :disabled="detailsModel.customerid.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.subjectname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.incident.edit_childincident_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
......
app_CRM/src/widgets/incident/incident-info-dashboard/incident-info-dashboard-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class IncidentInfoModel {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class IncidentInfoModel {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class IncidentInfoModel {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class IncidentInfoModel {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
app_CRM/src/widgets/incident/info-incident-form/info-incident-form-base.tsx
浏览文件 @ 4c544833
......@@ -76,7 +76,6 @@ export class Info_IncidentEditFormBase extends EditFormControlBase {
srfsourcekey: null,
title: null,
subjectname: null,
accountname: null,
caseorigincode: null,
productname: null,
entitlementname: null,
......@@ -133,8 +132,6 @@ export class Info_IncidentEditFormBase extends EditFormControlBase {
subjectname: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
accountname: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'accountname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
caseorigincode: new FormItemModel({ caption: '起源', detailType: 'FORMITEM', name: 'caseorigincode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
productname: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_CRM/src/widgets/incident/info-incident-form/info-incident-form-model.ts
浏览文件 @ 4c544833
......@@ -65,11 +65,6 @@ export default class Info_IncidentModel {
prop: 'subjectname',
dataType: 'PICKUPTEXT',
},
{
name: 'accountname',
prop: 'accountname',
dataType: 'TEXT',
},
{
name: 'caseorigincode',
prop: 'caseorigincode',
......
app_CRM/src/widgets/incident/info-incident-form/info-incident-form.html
浏览文件 @ 4c544833
......@@ -19,13 +19,6 @@
<app-span name='subjectname' :value="data.subjectname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.accountname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='accountname' :itemRules="this.rules.accountname" class='' :caption="$t('entities.incident.info_incident_form.details.accountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.accountname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='accountname' :value="data.accountname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.caseorigincode.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='caseorigincode' :itemRules="this.rules.caseorigincode" class='' :caption="$t('entities.incident.info_incident_form.details.caseorigincode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.caseorigincode.error" :isEmptyCaption="false" labelPos="LEFT">
......
app_CRM/src/widgets/incident/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class InfoViewtabexppanelModel {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class InfoViewtabexppanelModel {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class InfoViewtabexppanelModel {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class InfoViewtabexppanelModel {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
app_CRM/src/widgets/incident/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class InfoViewtabviewpanelModel {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class InfoViewtabviewpanelModel {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class InfoViewtabviewpanelModel {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class InfoViewtabviewpanelModel {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
app_CRM/src/widgets/incident/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class InfoViewtabviewpanel2Model {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class InfoViewtabviewpanel2Model {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class InfoViewtabviewpanel2Model {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class InfoViewtabviewpanel2Model {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
app_CRM/src/widgets/incident/main-grid/main-grid-base.tsx
浏览文件 @ 4c544833
......@@ -115,14 +115,6 @@ export class MainGridBase extends GridControllerBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'customername',
label: '客户',
langtag: 'entities.incident.main_grid.columns.customername',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'statecode',
label: '状态',
......@@ -169,7 +161,6 @@ export class MainGridBase extends GridControllerBase {
'ticketnumber':false,
'prioritycode':false,
'caseorigincode':false,
'customername':false,
'statecode':false,
};
......
app_CRM/src/widgets/incident/main-grid/main-grid-model.ts
浏览文件 @ 4c544833
......@@ -106,6 +106,11 @@ export default class MainModel {
prop: 'title',
dataType: 'TEXT',
},
{
name: 'customerid',
prop: 'customerid',
dataType: 'PICKUP',
},
{
name: 'productid',
prop: 'productid',
......@@ -136,11 +141,6 @@ export default class MainModel {
prop: 'entitlementid',
dataType: 'PICKUP',
},
{
name: 'customername',
prop: 'customername',
dataType: 'TEXT',
},
{
name: 'incident',
prop: 'incidentid',
......
app_CRM/src/widgets/incident/main-grid/main-grid.html
浏览文件 @ 4c544833
......@@ -75,18 +75,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('customername')">
<el-table-column show-overflow-tooltip :prop="'customername'" :label="$t('entities.incident.main_grid.columns.customername')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.incident.main_grid.columns.customername')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.customername}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('statecode')">
<el-table-column show-overflow-tooltip :prop="'statecode'" :label="$t('entities.incident.main_grid.columns.statecode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......
app_CRM/src/widgets/incident/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
app_CRM/src/widgets/incident/quick-create-form/quick-create-form-base.tsx
浏览文件 @ 4c544833
......@@ -76,13 +76,13 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
srfsourcekey: null,
title: null,
subjectname: null,
customername: null,
caseorigincode: null,
productname: null,
entitlementname: null,
description: null,
customerid: null,
customername: null,
customertype: null,
description: null,
productid: null,
incidentid: null,
subjectid: null,
......@@ -101,14 +101,6 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '案例标题 值不能为空', trigger: 'blur' },
],
customername: [
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
],
customerid: [
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -142,19 +134,19 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
subjectname: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customername: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
caseorigincode: new FormItemModel({ caption: '起源', detailType: 'FORMITEM', name: 'caseorigincode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
productname: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
entitlementname: new FormItemModel({ caption: '权利', detailType: 'FORMITEM', name: 'entitlementname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customerid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customerid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customertype: new FormItemModel({ caption: '客户类型', detailType: 'FORMITEM', name: 'customertype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customername: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
customertype: new FormItemModel({ caption: '客户类型', detailType: 'FORMITEM', name: 'customertype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
productid: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_CRM/src/widgets/incident/quick-create-form/quick-create-form-model.ts
浏览文件 @ 4c544833
......@@ -65,11 +65,6 @@ export default class QuickCreateModel {
prop: 'subjectname',
dataType: 'PICKUPTEXT',
},
{
name: 'customername',
prop: 'customername',
dataType: 'TEXT',
},
{
name: 'caseorigincode',
prop: 'caseorigincode',
......@@ -85,20 +80,25 @@ export default class QuickCreateModel {
prop: 'entitlementname',
dataType: 'PICKUPTEXT',
},
{
name: 'description',
prop: 'description',
dataType: 'TEXT',
},
{
name: 'customerid',
prop: 'customerid',
dataType: 'TEXT',
dataType: 'PICKUP',
},
{
name: 'customertype',
prop: 'customertype',
dataType: 'TEXT',
name: 'customername',
prop: 'customername',
dataType: 'PICKUPTEXT',
},
{
name: 'description',
prop: 'description',
dataType: 'TEXT',
name: 'customertype',
prop: 'customertype',
dataType: 'PICKUPDATA',
},
{
name: 'productid',
......
app_CRM/src/widgets/incident/quick-create-form/quick-create-form-service.ts
浏览文件 @ 4c544833
......@@ -3,9 +3,9 @@ import ControlService from '@/widgets/control-service';
import IncidentService from '@/service/incident/incident-service';
import QuickCreateModel from './quick-create-form-model';
import SubjectService from '@/service/subject/subject-service';
import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
import ProductService from '@/service/product/product-service';
import EntitlementService from '@/service/entitlement/entitlement-service';
import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
/**
......@@ -53,14 +53,6 @@ export default class QuickCreateService extends ControlService {
*/
public subjectService: SubjectService = new SubjectService();
/**
* 案例客户服务对象
*
* @type {IncidentCustomerService}
* @memberof QuickCreateService
*/
public incidentcustomerService: IncidentCustomerService = new IncidentCustomerService();
/**
* product服务对象
*
......@@ -77,6 +69,14 @@ export default class QuickCreateService extends ControlService {
*/
public entitlementService: EntitlementService = new EntitlementService();
/**
* 案例客户服务对象
*
* @type {IncidentCustomerService}
* @memberof QuickCreateService
*/
public incidentcustomerService: IncidentCustomerService = new IncidentCustomerService();
/**
* 处理数据
*
......@@ -119,15 +119,15 @@ export default class QuickCreateService extends ControlService {
if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
}
if (Object.is(serviceName, 'IncidentCustomerService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.incidentcustomerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'customerid', 'incidentcustomer');
}
if (Object.is(serviceName, 'ProductService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.productService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'productid', 'product');
}
if (Object.is(serviceName, 'EntitlementService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.entitlementService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'entitlementid', 'entitlement');
}
if (Object.is(serviceName, 'IncidentCustomerService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.incidentcustomerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'customerid', 'incidentcustomer');
}
return Promise.reject([])
}
......
app_CRM/src/widgets/incident/state-tab-viewtabexppanel-tabexppanel/state-tab-viewtabexppanel-tabexppanel-model.ts
浏览文件 @ 4c544833
......@@ -20,9 +20,6 @@ export default class StateTabViewtabexppanelModel {
{
name: 'versionnumber',
},
{
name: 'customertype',
},
{
name: 'firstresponseslastatus',
},
......@@ -32,9 +29,6 @@ export default class StateTabViewtabexppanelModel {
{
name: 'influencescore',
},
{
name: 'customerid',
},
{
name: 'socialprofileid',
},
......@@ -89,9 +83,6 @@ export default class StateTabViewtabexppanelModel {
{
name: 'entityimage',
},
{
name: 'customername',
},
{
name: 'onholdtime',
},
......@@ -303,6 +294,15 @@ export default class StateTabViewtabexppanelModel {
{
name: 'slaname',
},
{
name: 'customerid',
},
{
name: 'customername',
},
{
name: 'customertype',
},
]
}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/mapper/IncidentMapper.java
浏览文件 @ 4c544833
......@@ -66,6 +66,8 @@ public interface IncidentMapper extends BaseMapper<Incident>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Incident> selectByCustomerid(@Param("customerid") Serializable customerid) ;
List<Incident> selectByPrimarycontactid(@Param("contactid") Serializable contactid) ;
List<Incident> selectByResponsiblecontactid(@Param("contactid") Serializable contactid) ;
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/IIncidentService.java
浏览文件 @ 4c544833
......@@ -44,6 +44,8 @@ public interface IIncidentService extends IService<Incident>{
Page<Incident> searchDefault(IncidentSearchContext context) ;
Page<Incident> searchEffective(IncidentSearchContext context) ;
Page<Incident> searchResolved(IncidentSearchContext context) ;
List<Incident> selectByCustomerid(String customerid) ;
void removeByCustomerid(String customerid) ;
List<Incident> selectByPrimarycontactid(String contactid) ;
void removeByPrimarycontactid(String contactid) ;
List<Incident> selectByResponsiblecontactid(String contactid) ;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或