Skip to content

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

xignzi006 发布系统代码

上级 99ea5d49
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 888 行增加 和 618 行删除
app_CRM/public/assets/json/data-dictionary.json
浏览文件 @ 3b0dea44
......@@ -4418,6 +4418,53 @@
}
]
},
{
"srfkey": "Activitypointer__StatusCode",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "3",
"label": "已取消",
"text": "已取消",
"data":"",
"codename":"Item_3",
"value": "3",
"disabled": false
}
, {
"id": "2",
"label": "已完成",
"text": "已完成",
"data":"",
"codename":"Item_2",
"value": "2",
"disabled": false
}
, {
"id": "1",
"label": "已开启",
"text": "已开启",
"data":"",
"codename":"Item_1",
"value": "1",
"disabled": false
}
, {
"id": "4",
"label": "已计划",
"text": "已计划",
"data":"",
"codename":"Item_4",
"value": "4",
"disabled": false
}
]
},
{
"srfkey": "Knowledgearticleincident__StateCode",
"emptytext": "未定义",
......
app_CRM/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 3b0dea44
......@@ -567,6 +567,13 @@ export default {
"2": "难题",
"empty": ""
},
Activitypointer__StatusCode: {
"3": "已取消",
"2": "已完成",
"1": "已开启",
"4": "已计划",
"empty": ""
},
Knowledgearticleincident__StateCode: {
"1": "停用",
"0": "有效",
......
app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 3b0dea44
......@@ -567,6 +567,13 @@ export default {
"2": "难题",
"empty": "",
},
Activitypointer__StatusCode: {
"3": "已取消",
"2": "已完成",
"1": "已开启",
"4": "已计划",
"empty": "",
},
Knowledgearticleincident__StateCode: {
"1": "停用",
"0": "有效",
......
app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_en_US.ts
浏览文件 @ 3b0dea44
......@@ -117,6 +117,11 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_subject_like: "主题(%)",
n_activitytypecode_eq: "活动类型(等于(=))",
n_prioritycode_eq: "优先级(等于(=))",
n_statuscode_eq: "状态描述(等于(=))",
n_statecode_eq: "活动状态(等于(=))",
},
uiactions: {
},
......
app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_zh_CN.ts
浏览文件 @ 3b0dea44
......@@ -116,6 +116,11 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_subject_like: "主题(%)",
n_activitytypecode_eq: "活动类型(等于(=))",
n_prioritycode_eq: "优先级(等于(=))",
n_statuscode_eq: "状态描述(等于(=))",
n_statecode_eq: "活动状态(等于(=))",
},
uiactions: {
},
......
app_CRM/src/mock/codelist/codelist.ts
浏览文件 @ 3b0dea44
......@@ -4426,6 +4426,53 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
},
]
},
{
srfkey: "Activitypointer__StatusCode",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "3",
label: "已取消",
text: "已取消",
"data":"",
"codename":"Item_3",
value: "3",
disabled: false,
},
{
id: "2",
label: "已完成",
text: "已完成",
"data":"",
"codename":"Item_2",
value: "2",
disabled: false,
},
{
id: "1",
label: "已开启",
text: "已开启",
"data":"",
"codename":"Item_1",
value: "1",
disabled: false,
},
{
id: "4",
label: "已计划",
text: "已计划",
"data":"",
"codename":"Item_4",
value: "4",
disabled: false,
},
]
},
{
srfkey: "Knowledgearticleincident__StateCode",
emptytext: "未定义",
......
app_CRM/src/widgets/activity-pointer/default-searchform/default-searchform-base.tsx
浏览文件 @ 3b0dea44
......@@ -58,6 +58,11 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
* @memberof DefaultSearchFormBase
*/
public data: any = {
n_subject_like: null,
n_activitytypecode_eq: null,
n_prioritycode_eq: null,
n_statuscode_eq: null,
n_statecode_eq: null,
};
/**
......@@ -68,6 +73,16 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_subject_like: new FormItemModel({ caption: '主题(%)', detailType: 'FORMITEM', name: 'n_subject_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_activitytypecode_eq: new FormItemModel({ caption: '活动类型(等于(=))', detailType: 'FORMITEM', name: 'n_activitytypecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_prioritycode_eq: new FormItemModel({ caption: '优先级(等于(=))', detailType: 'FORMITEM', name: 'n_prioritycode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_statuscode_eq: new FormItemModel({ caption: '状态描述(等于(=))', detailType: 'FORMITEM', name: 'n_statuscode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_statecode_eq: new FormItemModel({ caption: '活动状态(等于(=))', detailType: 'FORMITEM', name: 'n_statecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
}
\ No newline at end of file
app_CRM/src/widgets/activity-pointer/default-searchform/default-searchform-model.ts
浏览文件 @ 3b0dea44
......@@ -25,6 +25,31 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_subject_like',
prop: 'subject',
dataType: 'TEXT',
},
{
name: 'n_activitytypecode_eq',
prop: 'activitytypecode',
dataType: 'SSCODELIST',
},
{
name: 'n_prioritycode_eq',
prop: 'prioritycode',
dataType: 'SSCODELIST',
},
{
name: 'n_statuscode_eq',
prop: 'statuscode',
dataType: 'NSCODELIST',
},
{
name: 'n_statecode_eq',
prop: 'statecode',
dataType: 'NSCODELIST',
},
]
}
......
app_CRM/src/widgets/activity-pointer/default-searchform/default-searchform.html
浏览文件 @ 3b0dea44
......@@ -5,5 +5,92 @@
<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-col v-show="detailsModel.n_subject_like.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_subject_like' :itemRules="this.rules.n_subject_like" class='' :caption="$t('entities.activitypointer.default_searchform.details.n_subject_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_subject_like.error" :isEmptyCaption="false" labelPos="TOP">
<input-box v-model="data.n_subject_like" @enter="onEnter($event)" :disabled="detailsModel.n_subject_like.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_activitytypecode_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_activitytypecode_eq' :itemRules="this.rules.n_activitytypecode_eq" class='' :caption="$t('entities.activitypointer.default_searchform.details.n_activitytypecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_activitytypecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
<dropdown-list
v-model="data.n_activitytypecode_eq"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_activitytypecode_eq.disabled"
valueType="string"
tag='ActivityTypeCode'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_prioritycode_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_prioritycode_eq' :itemRules="this.rules.n_prioritycode_eq" class='' :caption="$t('entities.activitypointer.default_searchform.details.n_prioritycode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_prioritycode_eq.error" :isEmptyCaption="false" labelPos="TOP">
<dropdown-list
v-model="data.n_prioritycode_eq"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_prioritycode_eq.disabled"
valueType="string"
tag='Activitypointer__PriorityCode'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_statuscode_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_statuscode_eq' :itemRules="this.rules.n_statuscode_eq" class='' :caption="$t('entities.activitypointer.default_searchform.details.n_statuscode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statuscode_eq.error" :isEmptyCaption="false" labelPos="TOP">
<dropdown-list
v-model="data.n_statuscode_eq"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_statuscode_eq.disabled"
valueType="number"
tag='Activitypointer__StatusCode'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_statecode_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_statecode_eq' :itemRules="this.rules.n_statecode_eq" class='' :caption="$t('entities.activitypointer.default_searchform.details.n_statecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
<dropdown-list
v-model="data.n_statecode_eq"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_statecode_eq.disabled"
valueType="number"
tag='Activitypointer__StateCode'
codelistType='STATIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
</div>
</i-form>
\ No newline at end of file
app_CRM/src/widgets/activity-pointer/main-grid/main-grid-model.ts
浏览文件 @ 3b0dea44
......@@ -100,6 +100,31 @@ export default class MainModel {
name: 'activitypointer',
prop: 'activityid',
},
{
name: 'n_subject_like',
prop: 'n_subject_like',
dataType: 'TEXT',
},
{
name: 'n_activitytypecode_eq',
prop: 'n_activitytypecode_eq',
dataType: 'SSCODELIST',
},
{
name: 'n_prioritycode_eq',
prop: 'n_prioritycode_eq',
dataType: 'SSCODELIST',
},
{
name: 'n_statuscode_eq',
prop: 'n_statuscode_eq',
dataType: 'NSCODELIST',
},
{
name: 'n_statecode_eq',
prop: 'n_statecode_eq',
dataType: 'NSCODELIST',
},
{
name:'size',
......
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 3b0dea44
......@@ -466,7 +466,7 @@
<!--输出实体[ACTIVITYPOINTER]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-activitypointer-89-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-activitypointer-91-4">
<createTable tableName="ACTIVITYPOINTER">
<column name="SERIESID" remarks="" type="VARCHAR(60)">
</column>
......@@ -11016,13 +11016,13 @@
<addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="ACTIVITYPARTY" constraintName="DER1N_ACTIVITYPARTY__RESOURCES" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
</changeSet>
<!--输出实体[ACTIVITYPOINTER]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-89-146">
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-91-146">
<addForeignKeyConstraint baseColumnNames="SERVICEID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__SERVICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-89-147">
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-91-147">
<addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__SLA__SL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-89-148">
<changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-91-148">
<addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__TRANSAC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
</changeSet>
<!--输出实体[ANNOTATION]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或