xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -4807,6 +4807,33 @@
             }
         ]
     }, 
+    {
+        "srfkey": "PickDataType_AC",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "ACCOUNT",
+                "label": "客户",
+                "text": "客户",
+                "data":"",
+                "codename":"Account",
+                "value": "ACCOUNT",
+                
+                "disabled": false
+            }
+            , {
+                "id": "CONTACT",
+                "label": "联系人",
+                "text": "联系人",
+                "data":"",
+                "codename":"Contact",
+                "value": "CONTACT",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Activitypointer__PriorityCode",
         "emptytext": "未定义",

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -597,6 +597,11 @@ export default {
         "1": "无控制",
         "empty": ""
     },
+    PickDataType_AC: {
+        "ACCOUNT": "客户",
+        "CONTACT": "联系人",
+        "empty": ""
+    },
     Activitypointer__PriorityCode: {
         "0": "低",
         "1": "正常",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -597,6 +597,11 @@ export default {
         "1": "无控制",
         "empty": "",
     },
+    PickDataType_AC: {
+        "ACCOUNT": "客户",
+        "CONTACT": "联系人",
+        "empty": "",
+    },
     Activitypointer__PriorityCode: {
         "0": "低",
         "1": "正常",

app_CRM/src/mock/codelist/codelist.ts

@@ -4815,6 +4815,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "PickDataType_AC",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "ACCOUNT",
+                label: "客户",
+                text: "客户",
+                "data":"",
+                "codename":"Account",
+                value: "ACCOUNT",
+                
+                disabled: false,
+            },
+            {
+                id: "CONTACT",
+                label: "联系人",
+                text: "联系人",
+                "data":"",
+                "codename":"Contact",
+                value: "CONTACT",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Activitypointer__PriorityCode",
         emptytext: "未定义",

app_CRM/src/pages/base/multi-pick-data-acgrid/multi-pick-data-acgrid.html

 <studio-view-style2 viewName="multipickdataacgrid" viewTitle="客户、联系人" class='depickupgridview multi-pick-data-acgrid'>
+    <template slot="quickGroupSearch">
+        <app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange($event)"></app-quick-group>
+    </template>
     <template slot="searchForm">
                 <view_searchform 
             :viewState="viewState"  

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

@@ -289,14 +289,29 @@ export default class LeadUIServiceBase extends UIService {
         }
         const parameters: any[] = [
             { pathName: 'leads', parameterName: 'lead' },
-            { pathName: 'edit_datapanelview', parameterName: 'edit_datapanelview' },
         ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            return null;
+            const openPopOver = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
                     }
-        openIndexViewTab(data);
+                    const _this: any = actionContext;
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    return result.datas;
+                });
+            }
+            const view: any = {
+                viewname: 'lead-edit-data-panel-view', 
+                height: 300, 
+                width: 300,  
+                title: actionContext.$t('entities.lead.views.edit_datapanelview.title'),
+                placement: 'POPOVER',
+            };
+            openPopOver(view, data);
     }
 
     /**