xignzi006 发布系统代码

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

@@ -939,6 +939,16 @@
         "viewtag": "893e62d6fbdc4580de7e3e802aec9108",
         "memo": ""
     },
+    "activitypointerredirectview": {
+        "title": "活动数据重定向视图",
+        "caption": "活动",
+        "viewtype": "DEREDIRECTVIEW",
+        "viewmodule": "Base",
+        "viewname": "ActivityPointerRedirectView",
+        "viewfilename": "activity-pointer-redirect-view",
+        "viewtag": "899dbdcf77250023245eb323c6cdeb05",
+        "memo": "系统自动添加"
+    },
     "central": {
         "title": "企业中心",
         "caption": "企业中心",

app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_en_US.ts

@@ -64,6 +64,10 @@ export default {
 			caption: "活动信息",
       		title: "活动",
 		},
+		redirectview: {
+			caption: "活动",
+      		title: "活动数据重定向视图",
+		},
 		byparentkey: {
 			caption: "活动",
       		title: "活动",

app_CRM/src/locale/lanres/entities/activity-pointer/activity-pointer_zh_CN.ts

@@ -63,6 +63,10 @@ export default {
 			caption: "活动信息",
       		title: "活动",
 		},
+		redirectview: {
+			caption: "活动",
+      		title: "活动数据重定向视图",
+		},
 		byparentkey: {
 			caption: "活动",
       		title: "活动",

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

@@ -217,8 +217,9 @@ export default {
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			statuscode: "状态描述",
+			totalamount: "总金额",
+			customerid: "客户",
 		},
 		uiactions: {
 		},

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

@@ -216,8 +216,9 @@ export default {
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			statuscode: "状态描述",
+			totalamount: "总金额",
+			customerid: "客户",
 		},
 		uiactions: {
 		},

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -759,6 +759,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "TaskQuickCreate",
             "viewtag": "893e62d6fbdc4580de7e3e802aec9108"
         },
+        "activitypointerredirectview": {
+            "title": "活动数据重定向视图",
+            "caption": "活动",
+            "viewtype": "DEREDIRECTVIEW",
+            "viewmodule": "Base",
+            "viewname": "ActivityPointerRedirectView",
+            "viewtag": "899dbdcf77250023245eb323c6cdeb05"
+        },
         "central": {
             "title": "企业中心",
             "caption": "企业中心",

app_CRM/src/pages/base/activity-pointer-grid-view/activity-pointer-grid-view-base.tsx

@@ -491,16 +491,8 @@ export class ActivityPointerGridViewBase extends GridViewBase {
             Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'activitypointers', parameterName: 'activitypointer' },
-            { pathName: 'editview', parameterName: 'editview' },
-        ];
-        const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const parameters: any[] = [];
+        // todo 实体数据重定向视图
     }
 
 

app_CRM/src/pages/sales/opportunity-competitor-opp-comp-grid-view/opportunity-competitor-opp-comp-grid-view.html

 <studio-view-style2 viewName="opportunitycompetitoroppcompgridview" viewTitle="商机对手表格视图" class='degridview opportunity-competitor-opp-comp-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view.html

 <studio-view-style2 viewName="quotedetailquodetailgridview" viewTitle="报价单产品表格视图" class='degridview quote-detail-quo-detail-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/ungroup/central/page-register.ts

@@ -9,6 +9,7 @@ export const PageComponents = {
         Vue.component('account-edit-view', () => import('@pages/base/account-edit-view/account-edit-view.vue'));
         Vue.component('lead-pickup-view', () => import('@pages/sales/lead-pickup-view/lead-pickup-view.vue'));
         Vue.component('incident-edit-view', () => import('@pages/service/incident-edit-view/incident-edit-view.vue'));
+        Vue.component('activity-pointer-redirect-view', () => import('@pages/base/activity-pointer-redirect-view/activity-pointer-redirect-view.vue'));
         Vue.component('product-pickup-view', () => import('@pages/product/product-pickup-view/product-pickup-view.vue'));
         Vue.component('quote-info-abstract', () => import('@pages/sales/quote-info-abstract/quote-info-abstract.vue'));
         Vue.component('contact-info-book', () => import('@pages/base/contact-info-book/contact-info-book.vue'));

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

@@ -458,17 +458,18 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'aa79d35850f36fbc1a5085353ecd5af5',
-                '24e222a530526aab94ed4ed22cfedf9a',
-                '99d4a530c13b03a98cd143f341394354',
                 '30458f00562fda145be535e56948b067',
-                'b3cfac5362b3bfb70d1471932f120fa5',
                 '3d538df4ca389d372347f7b53d67269f',
-                '893e62d6fbdc4580de7e3e802aec9108',
-                'a50134133db91e46c8434ad0ebff22c7',
+                'b3cfac5362b3bfb70d1471932f120fa5',
                 'a95d7d9111bc13a8b73a11ee1e4ff92a',
+                'a50134133db91e46c8434ad0ebff22c7',
                 '3f78dcc732a7a8ba6d959dcf6007b225',
                 'f84a705f33385d5999fcfb69124932d4',
                 'a5213905238dbc5d8e1a505029105cc9',
+                '899dbdcf77250023245eb323c6cdeb05',
+                '24e222a530526aab94ed4ed22cfedf9a',
+                '99d4a530c13b03a98cd143f341394354',
+                '893e62d6fbdc4580de7e3e802aec9108',
             ],
         },
         {

app_CRM/src/uiservice/activity-pointer/activity-pointer-ui-service-base.ts

@@ -81,6 +81,7 @@ export default class ActivityPointerUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'activitypointers'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'activitypointers'});
+        this.allViewMap.set('REDIRECTVIEW:',{viewname:'redirectview',srfappde:'activitypointers'});
         this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'activitypointers'});
     }
 

app_CRM/src/widgets/invoice/main-grid/main-grid-base.tsx

@@ -64,16 +64,23 @@ export class MainGridBase extends GridControllerBase {
             util: 'PX'
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.invoice.main_grid.columns.updateman',
+            name: 'statuscode',
+            label: '状态描述',
+            langtag: 'entities.invoice.main_grid.columns.statuscode',
             show: true,
             util: 'PX'
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.invoice.main_grid.columns.updatedate',
+            name: 'totalamount',
+            label: '总金额',
+            langtag: 'entities.invoice.main_grid.columns.totalamount',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'customerid',
+            label: '客户',
+            langtag: 'entities.invoice.main_grid.columns.customerid',
             show: true,
             util: 'PX'
         },
@@ -112,8 +119,9 @@ export class MainGridBase extends GridControllerBase {
      */
     public hasRowEdit: any = {
         'invoicename':false,
-        'updateman':false,
-        'updatedate':false,
+        'statuscode':false,
+        'totalamount':false,
+        'customerid':false,
     };
 
     /**

app_CRM/src/widgets/invoice/main-grid/main-grid-model.ts

@@ -32,8 +32,8 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'customerid',
+          prop: 'customerid',
           dataType: 'TEXT',
         },
         {
@@ -56,16 +56,16 @@ export default class MainModel {
           prop: 'opportunityid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
-        },
         {
           name: 'pricelevelid',
           prop: 'pricelevelid',
           dataType: 'PICKUP',
         },
+        {
+          name: 'statuscode',
+          prop: 'statuscode',
+          dataType: 'NSCODELIST',
+        },
         {
           name: 'srfmajortext',
           prop: 'invoicename',
@@ -81,6 +81,11 @@ export default class MainModel {
           prop: 'invoiceid',
           dataType: 'GUID',
         },
+        {
+          name: 'totalamount',
+          prop: 'totalamount',
+          dataType: 'BIGDECIMAL',
+        },
         {
           name: 'invoice',
           prop: 'invoiceid',

app_CRM/src/widgets/invoice/main-grid/main-grid.html

@@ -35,29 +35,41 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.invoice.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('statuscode')">
+                <el-table-column show-overflow-tooltip :prop="'statuscode'" :label="$t('entities.invoice.main_grid.columns.statuscode')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.invoice.main_grid.columns.updateman')}}
+                        {{$t('entities.invoice.main_grid.columns.statuscode')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
+            <codelist :value="row.statuscode" tag='Invoice__StatusCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.invoice.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('totalamount')">
+                <el-table-column show-overflow-tooltip :prop="'totalamount'" :label="$t('entities.invoice.main_grid.columns.totalamount')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.invoice.main_grid.columns.updatedate')}}
+                        {{$t('entities.invoice.main_grid.columns.totalamount')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
+                        <span>{{row.totalamount}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('customerid')">
+                <el-table-column show-overflow-tooltip :prop="'customerid'" :label="$t('entities.invoice.main_grid.columns.customerid')" :width="160"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.invoice.main_grid.columns.customerid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.customerid}}</span>
                     </template>
                 </el-table-column>
             </template>