xignzi006 发布系统代码

73bcbd73 · ibizdev · 911bc20a · 73bcbd73 · 73bcbd73 · 73bcbd73
--- a/app_CRM/src/locale/lanres/entities/account/account_en_US.ts
+++ b/app_CRM/src/locale/lanres/entities/account/account_en_US.ts
@@ -653,6 +653,10 @@ export default {
 			caption: "激活",
 			tip: "激活",
 		},
+		tbitem17_addlist_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem17_addlist: {
 			caption: "添加到市场营销列表",
 			tip: "添加到市场营销列表",

--- a/app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts
+++ b/app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts
@@ -652,6 +652,10 @@ export default {
 			caption: "激活",
 			tip: "激活",
 		},
+		tbitem17_addlist_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem17_addlist: {
 			caption: "添加到市场营销列表",
 			tip: "添加到市场营销列表",

--- a/app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts
+++ b/app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts
@@ -640,6 +640,10 @@ export default {
 			caption: "激活",
 			tip: "激活",
 		},
+		tbitem17_addlist_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem17_addlist: {
 			caption: "添加到市场营销列表",
 			tip: "添加到市场营销列表",

--- a/app_CRM/src/locale/lanres/entities/contact/contact_zh_CN.ts
+++ b/app_CRM/src/locale/lanres/entities/contact/contact_zh_CN.ts
@@ -639,6 +639,10 @@ export default {
 			caption: "激活",
 			tip: "激活",
 		},
+		tbitem17_addlist_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem17_addlist: {
 			caption: "添加到市场营销列表",
 			tip: "添加到市场营销列表",

--- a/app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts
+++ b/app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts
@@ -653,14 +653,26 @@ export default {
 			caption: "丢单",
 			tip: "丢单",
 		},
+		tbitem14_unable_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_unable: {
 			caption: "无法联系",
 			tip: "无法联系",
 		},
+		tbitem14_nointerested_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_nointerested: {
 			caption: "不再感兴趣",
 			tip: "不再感兴趣",
 		},
+		tbitem14_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_cancel: {
 			caption: "取消",
 			tip: "取消",

--- a/app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts
+++ b/app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts
@@ -652,14 +652,26 @@ export default {
 			caption: "丢单",
 			tip: "丢单",
 		},
+		tbitem14_unable_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_unable: {
 			caption: "无法联系",
 			tip: "无法联系",
 		},
+		tbitem14_nointerested_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_nointerested: {
 			caption: "不再感兴趣",
 			tip: "不再感兴趣",
 		},
+		tbitem14_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
 		tbitem14_cancel: {
 			caption: "取消",
 			tip: "取消",

--- a/app_CRM/src/pages/base/account-info/account-info-base.tsx
+++ b/app_CRM/src/pages/base/account-info/account-info-base.tsx
@@ -73,6 +73,7 @@ export class AccountInfoBase extends TabExpViewBase {
        tbitem17_active_sep: {  name: 'tbitem17_active_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem17_active: { name: 'tbitem17_active', caption: '激活','isShowCaption':true,'isShowIcon':true, tooltip: '激活', iconcls: 'fa fa-play-circle-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Active', target: 'SINGLEKEY' }, class: '' },
+        tbitem17_addlist_sep: {  name: 'tbitem17_addlist_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem17_addlist: { name: 'tbitem17_addlist', caption: '添加到市场营销列表','isShowCaption':true,'isShowIcon':true, tooltip: '添加到市场营销列表', iconcls: 'fa fa-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'AddList', target: 'SINGLEKEY' }, class: '' },
        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },

--- a/app_CRM/src/pages/base/contact-info/contact-info-base.tsx
+++ b/app_CRM/src/pages/base/contact-info/contact-info-base.tsx
@@ -72,6 +72,7 @@ export class ContactInfoBase extends TabExpViewBase {
        tbitem17_active_sep: {  name: 'tbitem17_active_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem17_active: { name: 'tbitem17_active', caption: '激活','isShowCaption':true,'isShowIcon':true, tooltip: '激活', iconcls: 'fa fa-play-circle-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Active', target: 'SINGLEKEY' }, class: '' },
+        tbitem17_addlist_sep: {  name: 'tbitem17_addlist_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem17_addlist: { name: 'tbitem17_addlist', caption: '添加到市场营销列表','isShowCaption':true,'isShowIcon':true, tooltip: '添加到市场营销列表', iconcls: 'fa fa-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'AddList', target: 'SINGLEKEY' }, class: '' },
        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },

--- a/app_CRM/src/pages/sales/lead-on-grid-view/lead-on-grid-view-base.tsx
+++ b/app_CRM/src/pages/sales/lead-on-grid-view/lead-on-grid-view-base.tsx
@@ -84,10 +84,13 @@ export class LeadOnGridViewBase extends GridViewBase {
        tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem14_lostorder: { name: 'tbitem14_lostorder', caption: '丢单','isShowCaption':true,'isShowIcon':true, tooltip: '丢单', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'LostOrder', target: 'SINGLEKEY' }, class: '' },
+        tbitem14_unable_sep: {  name: 'tbitem14_unable_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem14_unable: { name: 'tbitem14_unable', caption: '无法联系','isShowCaption':true,'isShowIcon':true, tooltip: '无法联系', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Unable', target: 'SINGLEKEY' }, class: '' },
+        tbitem14_nointerested_sep: {  name: 'tbitem14_nointerested_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem14_nointerested: { name: 'tbitem14_nointerested', caption: '不再感兴趣','isShowCaption':true,'isShowIcon':true, tooltip: '不再感兴趣', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'NoInterested', target: 'SINGLEKEY' }, class: '' },
+        tbitem14_cancel_sep: {  name: 'tbitem14_cancel_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
        tbitem14_cancel: { name: 'tbitem14_cancel', caption: '取消','isShowCaption':true,'isShowIcon':true, tooltip: '取消', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Cancel', target: 'SINGLEKEY' }, class: '' },
        tbitem15: {  name: 'tbitem15', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },

--- a/app_CRM/src/service/contact/contact-service-base.ts
+++ b/app_CRM/src/service/contact/contact-service-base.ts
--- a/app_CRM/src/service/opportunity/opportunity-service-base.ts
+++ b/app_CRM/src/service/opportunity/opportunity-service-base.ts
--- a/app_CRM/src/service/product/product-service-base.ts
+++ b/app_CRM/src/service/product/product-service-base.ts
--- a/app_CRM/src/service/sales-literature/sales-literature-service-base.ts
+++ b/app_CRM/src/service/sales-literature/sales-literature-service-base.ts
--- a/businesscentral-core/src/main/resources/liquibase/h2_table.xml
+++ b/businesscentral-core/src/main/resources/liquibase/h2_table.xml
@@ -4,7 +4,7 @@
    <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-429-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-437-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-68-129">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-69-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-429-132">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-133">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-134">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-429-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-437-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-68-427">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-69-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-68-428">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-69-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]外键关系 -->