xignzi006 发布系统代码，系统代码表处理

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

@@ -222,8 +222,9 @@ export default {
 	main_grid: {
 		columns: {
 			quotename: "报价名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			totalamount: "总金额",
+			customerid: "潜在客户",
+			statecode: "状态",
 		},
 		uiactions: {
 		},

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

@@ -221,8 +221,9 @@ export default {
 	main_grid: {
 		columns: {
 			quotename: '报价名称',
-			updateman: '更新人',
-			updatedate: '更新时间',
+			totalamount: '总金额',
+			customerid: '潜在客户',
+			statecode: '状态',
 		},
 		uiactions: {
 		},

app_CRM/src/pages/base/account-grid-view/account-grid-view-base.vue

@@ -543,28 +543,16 @@ export default class AccountGridViewBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openDrawer = (view: any, data: any) => {
-            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
-            container.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
-                }
-                xData.refresh(result.datas);
-            });
+        const openIndexViewTab = (data: any) => {
+            const _data: any = { w: (new Date().getTime()) };
+            Object.assign(_data, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
+            this.$router.push(routePath);
         }
-        const view: any = {
-            viewname: 'account-edit-view', 
-            height: 0, 
-            width: 0,  
-            title: this.$t('entities.account.views.editview.title'),
-            placement: 'DRAWER_TOP',
-        };
-        openDrawer(view, data);
+        openIndexViewTab(data);
     }
 
 

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

@@ -273,32 +273,17 @@ export default class AccountUIServiceBase extends UIService {
         let deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'accounts', parameterName: 'account' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if(window.opener){
-                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
-                        window.close();
-                    }
-                    return result.datas;
-                });
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            if (xData && xData.refresh && xData.refresh instanceof Function) {
+                xData.refresh(args);
             }
-            const view: any = {
-                viewname: 'account-edit-view', 
-                height: 0, 
-                width: 0,  
-                title: actionContext.$t('entities.account.views.editview.title'),
-                placement: 'DRAWER_TOP',
-            };
-            openDrawer(view, data);
+            return null;
+        }
+        openIndexViewTab(data);
     }
 
     /**

app_CRM/src/widgets/account/default-searchform/default-searchform-base.vue

@@ -23,7 +23,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_statecode_eq.disabled"  
-              tag='State' 
+              tag='Account__StateCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>

app_CRM/src/widgets/activity-pointer/main-grid/main-grid-base.vue

@@ -70,7 +70,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statecode" tag='State' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statecode" tag='Activitypointer__StateCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -1036,7 +1036,7 @@ export default class MainBase extends Vue implements ControlInterface {
           },
           {
             name: 'statecode',
-            srfkey: 'State',
+            srfkey: 'Activitypointer__StateCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/campaign/edit-head-form/edit-head-form-base.vue

@@ -42,7 +42,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.statuscode.disabled"  
-    tag='Status' 
+    tag='Campaign__StatusCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

app_CRM/src/widgets/campaign/info-head-form/info-head-form-base.vue

@@ -52,7 +52,7 @@
 <div  v-show="detailsModel.statuscode.visible" :style="{}">
 <app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.campaign.info_head_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='statuscode' :value="data.statuscode" tag='Status' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='statuscode' :value="data.statuscode" tag='Campaign__StatusCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/campaign/main-grid/main-grid-base.vue

@@ -96,7 +96,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statuscode" tag='Status' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statuscode" tag='Campaign__StatusCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -1082,7 +1082,7 @@ export default class MainBase extends Vue implements ControlInterface {
           },
           {
             name: 'statuscode',
-            srfkey: 'Status',
+            srfkey: 'Campaign__StatusCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/contact/default-searchform/default-searchform-base.vue

@@ -23,7 +23,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_statecode_eq.disabled"  
-              tag='State' 
+              tag='Contact__StateCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>

app_CRM/src/widgets/lead/default-searchform/default-searchform-base.vue

@@ -17,7 +17,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_statecode_eq.disabled"  
-              tag='State' 
+              tag='Lead__StateCode' 
               codelistType='STATIC'
               placeholder='请选择...' style="">
            </dropdown-list>

app_CRM/src/widgets/lead/main-grid/main-grid-base.vue

@@ -56,7 +56,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statuscode" tag='Status' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statuscode" tag='Lead__StatusCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -934,7 +934,7 @@ export default class MainBase extends Vue implements ControlInterface {
         let codelistColumns:Array<any> = [
           {
             name: 'statuscode',
-            srfkey: 'Status',
+            srfkey: 'Lead__StatusCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/list-account/main-grid/main-grid-base.vue

@@ -68,7 +68,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statecode" tag='State' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statecode" tag='Account__StateCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -967,7 +967,7 @@ export default class MainBase extends Vue implements ControlInterface {
         let codelistColumns:Array<any> = [
           {
             name: 'statecode',
-            srfkey: 'State',
+            srfkey: 'Account__StateCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/list-contact/inner-grid/inner-grid-base.vue

@@ -80,7 +80,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statecode" tag='State' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statecode" tag='Contact__StateCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -951,7 +951,7 @@ export default class InnerBase extends Vue implements ControlInterface {
         let codelistColumns:Array<any> = [
           {
             name: 'statecode',
-            srfkey: 'State',
+            srfkey: 'Contact__StateCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/list-contact/main-grid/main-grid-base.vue

@@ -80,7 +80,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statecode" tag='State' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statecode" tag='Contact__StateCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -986,7 +986,7 @@ export default class MainBase extends Vue implements ControlInterface {
         let codelistColumns:Array<any> = [
           {
             name: 'statecode',
-            srfkey: 'State',
+            srfkey: 'Contact__StateCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

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

@@ -68,7 +68,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.statuscode" tag='Status' codelistType='STATIC' ></codelist>
+            <codelist :value="row.statuscode" tag='Lead__StatusCode' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
@@ -967,7 +967,7 @@ export default class MainBase extends Vue implements ControlInterface {
         let codelistColumns:Array<any> = [
           {
             name: 'statuscode',
-            srfkey: 'Status',
+            srfkey: 'Lead__StatusCode',
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-base.vue

@@ -122,7 +122,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.statecode.disabled"  
-    tag='State' 
+    tag='Quote__StateCode' 
     codelistType='STATIC'
     placeholder='请选择...' style="">
  </dropdown-list>

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

@@ -27,8 +27,13 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'statecode',
+          prop: 'statecode',
+          dataType: 'NSCODELIST',
+        },
+        {
+          name: 'customerid',
+          prop: 'customerid',
           dataType: 'TEXT',
         },
         {
@@ -56,11 +61,6 @@ export default class MainModel {
           prop: 'slaid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
-        },
         {
           name: 'pricelevelid',
           prop: 'pricelevelid',
@@ -81,6 +81,11 @@ export default class MainModel {
           prop: 'quoteid',
           dataType: 'GUID',
         },
+        {
+          name: 'totalamount',
+          prop: 'totalamount',
+          dataType: 'BIGDECIMAL',
+        },
         {
           name: 'quote',
           prop: 'quoteid',