xignzi006 发布系统代码

58306ba4 · ibizdev · ea405e32 · 58306ba4 · 58306ba4 · 58306ba4
--- a/app_CRM/src/components/app-mpicker/app-mpicker.vue
+++ b/app_CRM/src/components/app-mpicker/app-mpicker.vue
@@ -251,7 +251,7 @@ export default class AppMpicker extends Vue {
                            if (this.extraFillParams.hasOwnProperty(key)) {
                                const self = this.extraFillParams[key];
                                if (isExist(item[self.key])) {
-                                    Object.assign(params, { name: self.value, value: item[self.key]});
+                                    Object.assign(params, { [self.value]: item[self.key]});
                                }
                            }
                        }
@@ -360,7 +360,7 @@ export default class AppMpicker extends Vue {
                                    if (this.extraFillParams.hasOwnProperty(key)) {
                                        const self = this.extraFillParams[key];
                                        if (isExist(select[self.key])) {
-                                            Object.assign(params, { name: self.value, value: select[self.key]});
+                                            Object.assign(params, { [self.value]: select[self.key]});
                                        }
                                    }
                                }

--- a/app_CRM/src/pages/base/central/page-register.ts
+++ b/app_CRM/src/pages/base/central/page-register.ts
@@ -208,6 +208,7 @@ export const PageComponents = {
        Vue.component('list-account-edit-view', () => import('@pages/marketing/list-account-edit-view/list-account-edit-view.vue'));
        Vue.component('entitlement-pickup-grid-view', () => import('@pages/service/entitlement-pickup-grid-view/entitlement-pickup-grid-view.vue'));
        Vue.component('contact-grid-view', () => import('@pages/base/contact-grid-view/contact-grid-view.vue'));
+        Vue.component('incident-customer-mpickup-view', () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'));
        Vue.component('campaign-activity-by-parent-key', () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'));
        Vue.component('price-level-pickup-grid-view', () => import('@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'));
        Vue.component('ibiz-list-effective-grid-view', () => import('@pages/marketing/ibiz-list-effective-grid-view/ibiz-list-effective-grid-view.vue'));
@@ -225,8 +226,8 @@ export const PageComponents = {
        Vue.component('sales-order-by-parent-key', () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'));
        Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'));
        Vue.component('list-lead-quick-create-by-list', () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'));
-        Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
        Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
+        Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
        Vue.component('connection-role-grid-view', () => import('@pages/runtime/connection-role-grid-view/connection-role-grid-view.vue'));
        Vue.component('incident-pickup-view', () => import('@pages/service/incident-pickup-view/incident-pickup-view.vue'));
        Vue.component('contact-edit-data-panel-view', () => import('@pages/base/contact-edit-data-panel-view/contact-edit-data-panel-view.vue'));

--- a/app_CRM/src/pages/base/central/router.ts
+++ b/app_CRM/src/pages/base/central/router.ts
@@ -8744,6 +8744,20 @@ const router = new Router({
                    },
                    component: () => import('@pages/base/contact-grid-view/contact-grid-view.vue'),
                },
+                {
+                    path: 'incidentcustomers/:incidentcustomer?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.incidentcustomer.views.mpickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'incidentcustomers', parameterName: 'incidentcustomer' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'),
+                },
                {
                    path: 'campaignactivities/:campaignactivity?/byparentkey/:byparentkey?',
                    meta: {
@@ -9524,32 +9538,32 @@ const router = new Router({
                    component: () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'),
                },
                {
-                    path: 'accounts/:account?/info/:info?',
+                    path: 'goals/:goal?/summaryview/:summaryview?',
                    meta: {
-                        caption: 'entities.account.views.info.title',
+                        caption: 'entities.goal.views.summaryview.title',
                        info:'',
                        parameters: [
                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'info', parameterName: 'info' },
+                            { pathName: 'goals', parameterName: 'goal' },
+                            { pathName: 'summaryview', parameterName: 'summaryview' },
                        ],
                        requireAuth: true,
                    },
-                    component: () => import('@pages/base/account-info/account-info.vue'),
+                    component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
                },
                {
-                    path: 'goals/:goal?/summaryview/:summaryview?',
+                    path: 'accounts/:account?/info/:info?',
                    meta: {
-                        caption: 'entities.goal.views.summaryview.title',
+                        caption: 'entities.account.views.info.title',
                        info:'',
                        parameters: [
                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'goals', parameterName: 'goal' },
-                            { pathName: 'summaryview', parameterName: 'summaryview' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'info', parameterName: 'info' },
                        ],
                        requireAuth: true,
                    },
-                    component: () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'),
+                    component: () => import('@pages/base/account-info/account-info.vue'),
                },
                {
                    path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/pickupgridview/:pickupgridview?',

--- a/app_CRM/src/store/modules/view-action/state.ts
+++ b/app_CRM/src/store/modules/view-action/state.ts
@@ -1102,6 +1102,7 @@ export const viewstate: any = {
                '05d66c9ecb6eeb18a00a23cca19bf042',
                'e52af970c14fd89546ac8ccaecab460c',
                'ba34ee36c1d0de288403607e17e7eb3e',
+                '5f31eceb2d615687c16eab39b11af0b9',
                '0dff48c04927315f77dd70a9a2767b59',
            ],
        },
@@ -1154,6 +1155,16 @@ export const viewstate: any = {
                'c420212fae385872d6ae89e3d237350a',
            ],
        },
+        {
+            viewtag: '5f31eceb2d615687c16eab39b11af0b9',
+            viewmodule: 'Service',
+            viewname: 'IncidentCustomerMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '8dca8823a924f513bf8c52bc3d321cff',
+            ],
+        },
        {
            viewtag: '5f8f689d5dccc3db6d2b74a24a8b24ef',
            viewmodule: 'Sales',
@@ -1291,6 +1302,7 @@ export const viewstate: any = {
                '05d66c9ecb6eeb18a00a23cca19bf042',
                'e52af970c14fd89546ac8ccaecab460c',
                'ba34ee36c1d0de288403607e17e7eb3e',
+                '5f31eceb2d615687c16eab39b11af0b9',
                '0dff48c04927315f77dd70a9a2767b59',
            ],
        },

--- a/app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html
+++ b/app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html
@@ -151,7 +151,24 @@
 <i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
    <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.byparentkey_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
    
-// description多项选择编辑器未配置选择视图
+<app-mpicker
+    :activeData="data"
+    :disabled="detailsModel.description.disabled"
+    :curvalue="data.description"
+    name="description"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :service="service"
+    valueitem=''
+    deMajorField='customername'
+    deKeyField='incidentcustomer'
+    :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
+    :pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
+    @formitemvaluechange="onFormItemValueChange($event)" 
+    style="">
+</app-mpicker>

 </app-form-item>


--- a/app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html
+++ b/app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html
@@ -140,7 +140,25 @@
 <i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
    <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.incident.quickcreate_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
    
-// description多项选择编辑器未配置选择视图
+<app-mpicker
+    :activeData="data"
+    :disabled="detailsModel.description.disabled"
+    :curvalue="data.description"
+    name="description"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :service="service"
+    valueitem=''
+    deMajorField='customername'
+    deKeyField='incidentcustomer'
+    :extraFillParams="[{ key: 'customertype', value: 'customertype' }]"
+    :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
+    :pickupView="{ viewname: 'incident-customer-mpickup-view', title: $t('entities.incidentcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
+    @formitemvaluechange="onFormItemValueChange($event)" 
+    style="">
+</app-mpicker>

 </app-form-item>