lab_gzf 发布系统代码

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

@@ -29,6 +29,16 @@
         "viewtag": "00e76d9dd6b3065c8231e9dc15334d05",
         "memo": ""
     },
+    "salesorderstatetabview": {
+        "title": "订单状态分页视图",
+        "caption": "订单",
+        "viewtype": "DETABEXPVIEW",
+        "viewmodule": "Sales",
+        "viewname": "SalesOrderStateTabView",
+        "viewfilename": "sales-order-state-tab-view",
+        "viewtag": "00e8e9d547a2367a0e13e232ea85b920",
+        "memo": ""
+    },
     "contacteditabstract": {
         "title": "联系人选项操作视图",
         "caption": "摘要信息",
@@ -389,6 +399,16 @@
         "viewtag": "2100f4eccfde24bb1307d636c396d51f",
         "memo": ""
     },
+    "salesorderfinishgridview": {
+        "title": "订单信息",
+        "caption": "订单",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "SalesOrderFinishGridView",
+        "viewfilename": "sales-order-finish-grid-view",
+        "viewtag": "21c30b09fecb0ca2979cf270e3c8b5db",
+        "memo": "系统自动添加"
+    },
     "contactinfo_person": {
         "title": "联系人编辑视图",
         "caption": "联系人",

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_en_US.ts

@@ -17,8 +17,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			customeridyominame: "客户",
-			customeridtype: "客户类型",
+			customername: "客户",
+			customertype: "客户类型",
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_zh_CN.ts

@@ -16,8 +16,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			customeridyominame: "客户",
-			customeridtype: "客户类型",
+			customername: "客户",
+			customertype: "客户类型",
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts

@@ -124,30 +124,6 @@ export default {
       		title: "发票编辑视图",
 		},
 	},
-	main_form: {
-		details: {
-			group1: "invoice基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "发票", 
-			srfmajortext: "发票名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			invoicename: "发票名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
-			invoiceid: "发票", 
-		},
-		uiactions: {
-		},
-	},
 	quickcreate_form: {
 		details: {
 			group1: "发票基本信息", 
@@ -214,6 +190,30 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: "invoice基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			invoicename: "发票名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			invoiceid: "发票", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",
@@ -231,44 +231,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 	infoviewtoolbar_toolbar: {
 		tbitem17_finish: {
 			caption: "确认发票",
@@ -299,7 +261,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -341,7 +303,45 @@ export default {
 			tip: "Filter",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
+	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts

@@ -123,30 +123,6 @@ export default {
       		title: "发票编辑视图",
 		},
 	},
-	main_form: {
-		details: {
-			group1: "invoice基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "发票", 
-			srfmajortext: "发票名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			invoicename: "发票名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
-			invoiceid: "发票", 
-		},
-		uiactions: {
-		},
-	},
 	quickcreate_form: {
 		details: {
 			group1: "发票基本信息", 
@@ -213,6 +189,30 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: "invoice基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			invoicename: "发票名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			invoiceid: "发票", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",
@@ -230,44 +230,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 	infoviewtoolbar_toolbar: {
 		tbitem17_finish: {
 			caption: "确认发票",
@@ -298,7 +260,7 @@ export default {
 			tip: "关闭",
 		},
 	},
-	byparentkeytoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -340,7 +302,45 @@ export default {
 			tip: "过滤",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
+	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/locale/lanres/entities/list-lead/list-lead_en_US.ts

@@ -50,7 +50,7 @@ export default {
 		columns: {
 			entity2name: "潜在顾客",
 			subject: "主题",
-			owneridyominame: "负责人",
+			ownername: "负责人",
 			statuscode: "状态描述",
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/list-lead/list-lead_zh_CN.ts

@@ -49,7 +49,7 @@ export default {
 		columns: {
 			entity2name: "潜在顾客",
 			subject: "主题",
-			owneridyominame: "负责人",
+			ownername: "负责人",
 			statuscode: "状态描述",
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/sales-order/sales-order_en_US.ts

@@ -105,10 +105,18 @@ export default {
     campaignname: "源市场活动",
   },
 	views: {
+		statetabview: {
+			caption: "订单",
+      		title: "订单状态分页视图",
+		},
 		editview: {
 			caption: "订单",
       		title: "订单编辑视图",
 		},
+		finishgridview: {
+			caption: "订单",
+      		title: "订单信息",
+		},
 		infoview: {
 			caption: "订单",
       		title: "订单信息",
@@ -322,6 +330,48 @@ export default {
 			tip: "Filter",
 		},
 	},
+	finishgridviewtoolbar_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: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/sales-order/sales-order_zh_CN.ts

@@ -104,10 +104,18 @@ export default {
     campaignname: "源市场活动",
   },
 	views: {
+		statetabview: {
+			caption: "订单",
+      		title: "订单状态分页视图",
+		},
 		editview: {
 			caption: "订单",
       		title: "订单编辑视图",
 		},
+		finishgridview: {
+			caption: "订单",
+      		title: "订单信息",
+		},
 		infoview: {
 			caption: "订单",
       		title: "订单信息",
@@ -321,6 +329,48 @@ export default {
 			tip: "过滤",
 		},
 	},
+	finishgridviewtoolbar_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: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -31,6 +31,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SalesLiteratureSummaryView",
             "viewtag": "00e76d9dd6b3065c8231e9dc15334d05"
         },
+        "salesorderstatetabview": {
+            "title": "订单状态分页视图",
+            "caption": "订单",
+            "viewtype": "DETABEXPVIEW",
+            "viewmodule": "Sales",
+            "viewname": "SalesOrderStateTabView",
+            "viewtag": "00e8e9d547a2367a0e13e232ea85b920"
+        },
         "contacteditabstract": {
             "title": "联系人选项操作视图",
             "caption": "摘要信息",
@@ -319,6 +327,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ProductPriceLevelProPrilvEditView",
             "viewtag": "2100f4eccfde24bb1307d636c396d51f"
         },
+        "salesorderfinishgridview": {
+            "title": "订单信息",
+            "caption": "订单",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "SalesOrderFinishGridView",
+            "viewtag": "21c30b09fecb0ca2979cf270e3c8b5db"
+        },
         "contactinfo_person": {
             "title": "联系人编辑视图",
             "caption": "联系人",

app_CRM/src/pages/finance/invoice-by-parent-key/invoice-by-parent-key-base.tsx

@@ -494,7 +494,12 @@ export class InvoiceByParentKeyBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
         ];
@@ -540,7 +545,12 @@ export class InvoiceByParentKeyBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
             { pathName: 'infoview', parameterName: 'infoview' },

app_CRM/src/pages/finance/invoice-grid-view/invoice-grid-view-base.tsx

@@ -494,7 +494,12 @@ export class InvoiceGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
         ];
@@ -540,7 +545,12 @@ export class InvoiceGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
             { pathName: 'infoview', parameterName: 'infoview' },

app_CRM/src/store/modules/view-action/state.ts

@@ -863,6 +863,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '95a02c7480abd6ddb76e14dc079f7508',
+                'e0aef8c0d1f1ae28f628a0541b118961',
                 'fed62991d8068c42d2544ad0a9b4820b',
             ],
         },

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

@@ -197,6 +197,11 @@ export default class InvoiceUIServiceBase extends UIService {
         Object.assign(data,parentObj);
         Object.assign(context,parentObj);
         let deResParameters: any[] = [];
+        if(context.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
         ];
@@ -267,6 +272,11 @@ export default class InvoiceUIServiceBase extends UIService {
         Object.assign(data,parentObj);
         Object.assign(context,parentObj);
         let deResParameters: any[] = [];
+        if(context.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'invoices', parameterName: 'invoice' },
             { pathName: 'infoview', parameterName: 'infoview' },

app_CRM/src/uiservice/sales-order/sales-order-ui-service-base.ts

@@ -79,7 +79,9 @@ export default class SalesOrderUIServiceBase extends UIService {
      * @memberof  SalesOrderUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'statetabview',srfappde:'salesorders'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'salesorders'});
+        this.allViewMap.set(':',{viewname:'finishgridview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'infoview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'salesorders'});
         this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'salesorders'});

app_CRM/src/widgets/incident-customer/main-grid/main-grid-base.tsx

@@ -66,16 +66,16 @@ export class MainGridBase extends GridControllerBase {
      */
     public allColumns: any[] = [
         {
-            name: 'customeridyominame',
+            name: 'customername',
             label: '客户',
-            langtag: 'entities.incidentcustomer.main_grid.columns.customeridyominame',
+            langtag: 'entities.incidentcustomer.main_grid.columns.customername',
             show: true,
             util: 'PX'
         },
         {
-            name: 'customeridtype',
+            name: 'customertype',
             label: '客户类型',
-            langtag: 'entities.incidentcustomer.main_grid.columns.customeridtype',
+            langtag: 'entities.incidentcustomer.main_grid.columns.customertype',
             show: true,
             util: 'PX'
         },
@@ -113,8 +113,8 @@ export class MainGridBase extends GridControllerBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'customeridyominame':false,
-        'customeridtype':false,
+        'customername':false,
+        'customertype':false,
     };
 
     /**
@@ -141,7 +141,7 @@ export class MainGridBase extends GridControllerBase {
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         return super.formatExcelData(filterVal, jsonData, [
             {
-                name: 'customeridtype',
+                name: 'customertype',
                 srfkey: 'IncidentCustomer',
                 codelistType : 'STATIC',
                 renderMode: 'other',

app_CRM/src/widgets/incident-customer/main-grid/main-grid.html

@@ -23,28 +23,28 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('customeridyominame')">
-                <el-table-column show-overflow-tooltip :prop="'customeridyominame'" :label="$t('entities.incidentcustomer.main_grid.columns.customeridyominame')" :width="250"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('customername')">
+                <el-table-column show-overflow-tooltip :prop="'customername'" :label="$t('entities.incidentcustomer.main_grid.columns.customername')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.incidentcustomer.main_grid.columns.customeridyominame')}}
+                        {{$t('entities.incidentcustomer.main_grid.columns.customername')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.customeridyominame}}</span>
+                        <span>{{row.customername}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('customeridtype')">
-                <el-table-column show-overflow-tooltip :prop="'customeridtype'" :label="$t('entities.incidentcustomer.main_grid.columns.customeridtype')" :width="100"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('customertype')">
+                <el-table-column show-overflow-tooltip :prop="'customertype'" :label="$t('entities.incidentcustomer.main_grid.columns.customertype')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.incidentcustomer.main_grid.columns.customeridtype')}}
+                        {{$t('entities.incidentcustomer.main_grid.columns.customertype')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.customeridtype" tag='IncidentCustomer' codelistType='STATIC' ></codelist>
+            <codelist :value="row.customertype" tag='IncidentCustomer' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>

app_CRM/src/widgets/list-lead/main-grid/main-grid-base.tsx

@@ -80,9 +80,9 @@ export class MainGridBase extends GridControllerBase {
             util: 'PX'
         },
         {
-            name: 'owneridyominame',
+            name: 'ownername',
             label: '负责人',
-            langtag: 'entities.listlead.main_grid.columns.owneridyominame',
+            langtag: 'entities.listlead.main_grid.columns.ownername',
             show: true,
             util: 'PX'
         },
@@ -129,7 +129,7 @@ export class MainGridBase extends GridControllerBase {
     public hasRowEdit: any = {
         'entity2name':false,
         'subject':false,
-        'owneridyominame':false,
+        'ownername':false,
         'statuscode':false,
     };
 

app_CRM/src/widgets/list-lead/main-grid/main-grid.html

@@ -47,15 +47,15 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('owneridyominame')">
-                <el-table-column show-overflow-tooltip :prop="'owneridyominame'" :label="$t('entities.listlead.main_grid.columns.owneridyominame')" :width="100"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('ownername')">
+                <el-table-column show-overflow-tooltip :prop="'ownername'" :label="$t('entities.listlead.main_grid.columns.ownername')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.listlead.main_grid.columns.owneridyominame')}}
+                        {{$t('entities.listlead.main_grid.columns.ownername')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.owneridyominame}}</span>
+                        <span>{{row.ownername}}</span>
                     </template>
                 </el-table-column>
             </template>

app_CRM/src/widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-base.tsx

@@ -57,6 +57,7 @@ export class InfoViewtabexppanelTabexppanelBase extends TabExpPanelControlBase {
     protected isInit: any = {
         tabviewpanel:  true ,
         tabviewpanel2:  false ,
+        tabviewpanel3:  false ,
     }
 
     /**

app_CRM/src/widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -60,5 +60,29 @@
     @closeview="closeView($event)">
 </view_tabviewpanel2>
         </tab-pane>
+        <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
+            :label="(h) =>{
+                return h('div', [
+                    h('span', '发票'),
+                    h('Badge', {
+                        props: {
+                            count: undefined,
+                            type: 'primary'
+                        }
+                    })
+                ])
+            }" >
+            <view_tabviewpanel3 
+    :viewState="viewState"  
+    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+    :context="JSON.parse(JSON.stringify(context))" 
+    v-if="isInit.tabviewpanel3"
+    name="tabviewpanel3"  
+    ref='tabviewpanel3'
+    :expActive="activatedTabViewPanel === 'tabviewpanel3'"
+    @viewpanelDatasChange = "tabViewPanelDatasChange"
+    @closeview="closeView($event)">
+</view_tabviewpanel3>
+        </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

app_CRM/src/widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.vue

@@ -5,6 +5,7 @@ import { VueLifeCycleProcessing } from '@/studio-core';
 import { InfoViewtabexppanelTabexppanelBase } from './info-viewtabexppanel-tabexppanel-base';
 import view_tabviewpanel from '@widgets/sales-order/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/sales-order/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel.vue';
+import view_tabviewpanel3 from '@widgets/sales-order/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel.vue';
  
 
 /**
@@ -18,6 +19,7 @@ import view_tabviewpanel2 from '@widgets/sales-order/info-viewtabviewpanel2-tabv
     components: {
         view_tabviewpanel, 
         view_tabviewpanel2, 
+        view_tabviewpanel3, 
          
     }
 })

app_CRM/src/widgets/sales-order/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import SalesOrderService from '@/service/sales-order/sales-order-service';
+import InfoViewtabviewpanel3Service from './info-viewtabviewpanel3-tabviewpanel-service';
+
+
+/**
+ * tabviewpanel3部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {InfoViewtabviewpanel3TabviewpanelBase}
+ */
+export class InfoViewtabviewpanel3TabviewpanelBase extends MainControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof InfoViewtabviewpanel3TabviewpanelBase
+     */
+    protected controlType: string = 'TABVIEWPANEL';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {InfoViewtabviewpanel3Service}
+     * @memberof InfoViewtabviewpanel3TabviewpanelBase
+     */
+    public service: InfoViewtabviewpanel3Service = new InfoViewtabviewpanel3Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {SalesOrderService}
+     * @memberof InfoViewtabviewpanel3TabviewpanelBase
+     */
+    public appEntityService: SalesOrderService = new SalesOrderService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof InfoViewtabviewpanel3TabviewpanelBase
+     */
+    protected appDeName: string = 'salesorder';
+
+    /**
+     * 导航模式下项是否激活
+     *
+     * @type {*}
+     * @memberof InfoViewtabviewpanel3
+     */
+    @Prop()
+    public expActive!: any;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public getData(): any {
+        return null;
+    }
+
+    /**
+     * 是否被激活
+     *
+     * @type {boolean}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public isActivied: boolean = true;
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 传入上下文
+     *
+     * @type {string}
+     * @memberof TabExpViewtabviewpanel
+     */
+    public viewdata: string = JSON.stringify(this.context);
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string = JSON.stringify(this.viewparams);
+
+    /**
+     * 视图面板过滤项
+     *
+     * @type {string}
+     * @memberof InfoViewtabviewpanel3
+     */
+    public navfilter: string = "";
+             
+    /**
+     * vue 生命周期
+     *
+     * @returns
+     * @memberof InfoViewtabviewpanel3
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof InfoViewtabviewpanel3
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                this.$forceUpdate();
+                this.initNavParam();
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     * @memberof InfoViewtabviewpanel3
+     */
+    public initNavParam(){
+        if(!Object.is(this.navfilter,"")){
+            Object.assign(this.viewparams,{[this.navfilter]:this.context['majorentity']})
+        }
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata =JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+    /**
+     * 视图数据变化
+     *
+     * @memberof  InfoViewtabviewpanel3
+     */
+    public viewDatasChange($event:any){
+        this.$emit('viewpanelDatasChange',$event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof InfoViewtabviewpanel3
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof InfoViewtabviewpanel3
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+}
\ No newline at end of file

app_CRM/src/widgets/sales-order/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * InfoViewtabviewpanel3 部件服务对象
+ *
+ * @export
+ * @class InfoViewtabviewpanel3Service
+ */
+export default class InfoViewtabviewpanel3Service extends ControlService {
+}
\ No newline at end of file

app_CRM/src/widgets/sales-order/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel.html

+<div class='tabviewpanel' v-if='isActivied'>
+        <invoice-grid-view 
+        class='viewcontainer2' 
+        :viewdata="viewdata" 
+        :viewparam="viewparam"
+        @viewload="viewDatasChange($event)" 
+        :viewDefaultUsage="false"
+        :viewUsage="7"
+        :expActive="expActive"
+    />
+</div>
\ No newline at end of file

app_CRM/src/widgets/sales-order/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel.vue

+<template src="./info-viewtabviewpanel3-tabviewpanel.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { InfoViewtabviewpanel3TabviewpanelBase } from './info-viewtabviewpanel3-tabviewpanel-base';
+ 
+
+/**
+ * tabviewpanel3部件
+ *
+ * @export
+ * @class InfoViewtabviewpanel3Tabviewpanel
+ * @extends {InfoViewtabviewpanel3TabviewpanelBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class InfoViewtabviewpanel3Tabviewpanel extends InfoViewtabviewpanel3TabviewpanelBase { }
+</script>