lab_gzf 发布系统代码

app_CRM/public/assets/json/view-config.json

@@ -669,6 +669,16 @@
         "viewtag": "35728a12ceecb647982051842853547c",
         "memo": ""
     },
+    "quoteeffectivegridview": {
+        "title": "报价单信息",
+        "caption": "报价单",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "QuoteEffectiveGridView",
+        "viewfilename": "quote-effective-grid-view",
+        "viewtag": "37891b1dd5782b30f30e3253298ba0f2",
+        "memo": "系统自动添加"
+    },
     "incidentgridview": {
         "title": "服务案例信息",
         "caption": "案例",
@@ -2559,6 +2569,16 @@
         "viewtag": "ef9fea872a6a21e7566033fafcc0ccb5",
         "memo": "系统自动添加"
     },
+    "quotestatetabview": {
+        "title": "报价单状态分页视图",
+        "caption": "报价单",
+        "viewtype": "DETABEXPVIEW",
+        "viewmodule": "Sales",
+        "viewname": "QuoteStateTabView",
+        "viewfilename": "quote-state-tab-view",
+        "viewtag": "efe82dc0a6991dd88da8c33cee6bf451",
+        "memo": ""
+    },
     "incidentinfoview": {
         "title": "服务案例信息",
         "caption": "案例",

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -106,6 +106,10 @@ export default {
 			caption: "报价单",
       		title: "报价单数据看板视图",
 		},
+		effectivegridview: {
+			caption: "报价单",
+      		title: "报价单信息",
+		},
 		infoabstract: {
 			caption: "报价单",
       		title: "报价单编辑视图",
@@ -130,6 +134,10 @@ export default {
 			caption: "报价单信息",
       		title: "报价单信息",
 		},
+		statetabview: {
+			caption: "报价单",
+      		title: "报价单状态分页视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -429,4 +437,62 @@ export default {
 			tip: "Filter",
 		},
 	},
+	effectivegridviewtoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_win: {
+			caption: "赢单",
+			tip: "赢单",
+		},
+		tbitem14_close_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem14_close: {
+			caption: "结束报价单",
+			tip: "结束报价单",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -105,6 +105,10 @@ export default {
 			caption: "报价单",
       		title: "报价单数据看板视图",
 		},
+		effectivegridview: {
+			caption: "报价单",
+      		title: "报价单信息",
+		},
 		infoabstract: {
 			caption: "报价单",
       		title: "报价单编辑视图",
@@ -129,6 +133,10 @@ export default {
 			caption: "报价单信息",
       		title: "报价单信息",
 		},
+		statetabview: {
+			caption: "报价单",
+      		title: "报价单状态分页视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -428,4 +436,62 @@ export default {
 			tip: "过滤",
 		},
 	},
+	effectivegridviewtoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_win: {
+			caption: "赢单",
+			tip: "赢单",
+		},
+		tbitem14_close_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem14_close: {
+			caption: "结束报价单",
+			tip: "结束报价单",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -543,6 +543,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "LeadInfo",
             "viewtag": "35728a12ceecb647982051842853547c"
         },
+        "quoteeffectivegridview": {
+            "title": "报价单信息",
+            "caption": "报价单",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "QuoteEffectiveGridView",
+            "viewtag": "37891b1dd5782b30f30e3253298ba0f2"
+        },
         "incidentgridview": {
             "title": "服务案例信息",
             "caption": "案例",
@@ -2055,6 +2063,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountPickupGridView",
             "viewtag": "ef9fea872a6a21e7566033fafcc0ccb5"
         },
+        "quotestatetabview": {
+            "title": "报价单状态分页视图",
+            "caption": "报价单",
+            "viewtype": "DETABEXPVIEW",
+            "viewmodule": "Sales",
+            "viewname": "QuoteStateTabView",
+            "viewtag": "efe82dc0a6991dd88da8c33cee6bf451"
+        },
         "incidentinfoview": {
             "title": "服务案例信息",
             "caption": "案例",

app_CRM/src/uiservice/quote/quote-ui-service-base.ts

@@ -81,12 +81,14 @@ export default class QuoteUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'summary',srfappde:'quotes'});
+        this.allViewMap.set(':',{viewname:'effectivegridview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'infoabstract',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'oppquagridview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'optionview',srfappde:'quotes'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'quotes'});
         this.allViewMap.set(':',{viewname:'info',srfappde:'quotes'});
+        this.allViewMap.set(':',{viewname:'statetabview',srfappde:'quotes'});
     }
 
     /**

app_CRM/src/widgets/appointment/quick-create-form/quick-create-form-base.tsx

@@ -89,29 +89,101 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
      * @memberof QuickCreateEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: 'appointment基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.appointment.quickcreate_form', extractMode: 'ITEM', details: [] } }),
-
-        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this }),
-
-        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 }),
-
-        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srfkey: new FormItemModel({ caption: '约会', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srfmajortext: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        subject: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subject', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        activityid: new FormItemModel({ caption: '约会', detailType: 'FORMITEM', name: 'activityid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
+        group1: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        formpage1: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfupdatedate: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srforikey: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfkey: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfmajortext: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srftempmode: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfuf: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfdeid: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        srfsourcekey: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        subject: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
+        activityid: !!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${controlled}  [in template "TEMPLCODE_zh_CN" at line 2, column 290]
+----
     };
 }
\ No newline at end of file

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -8527,7 +8527,7 @@
 
 
     <!--输出实体[QUOTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-87-98">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-108-98">
         <createTable tableName="QUOTE">
                 <column name="BILLTO_COUNTRY" remarks="" type="VARCHAR(80)">
                 </column>
@@ -11735,19 +11735,19 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="QUEUEITEM" constraintName="DER1N_QUEUEITEM__TRANSACTIONCU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[QUOTE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-87-369">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-108-369">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__CAMPAIGN__CAMPAIG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-87-370">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-108-370">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__OPPORTUNITY__OPPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-87-371">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-108-371">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__PRICELEVEL__PRICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-87-372">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-108-372">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-87-373">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-108-373">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__TRANSACTIONCURREN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[QUOTECLOSE]外键关系 -->