lab_gzf 发布系统代码

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

@@ -900,7 +900,7 @@
         "memo": "系统自动添加"
     },
     "opportunitygridview": {
-        "title": "商机表格视图",
+        "title": "商机信息",
         "caption": "商机信息",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Sales",

app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -711,7 +711,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -748,9 +748,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
 		},
 		tbitem15: {
 			caption: "-",
@@ -761,7 +761,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -798,9 +798,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",

app_CRM/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -710,7 +710,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -747,9 +747,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
 		},
 		tbitem15: {
 			caption: "-",
@@ -760,7 +760,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -797,9 +797,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",

app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts

@@ -124,7 +124,7 @@ export default {
 		},
 		gridview: {
 			caption: "商机信息",
-      		title: "商机表格视图",
+      		title: "商机信息",
 		},
 		info_abstract: {
 			caption: "商机",

app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts

@@ -123,7 +123,7 @@ export default {
 		},
 		gridview: {
 			caption: "商机信息",
-      		title: "商机表格视图",
+      		title: "商机信息",
 		},
 		info_abstract: {
 			caption: "商机",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -728,7 +728,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "5de2a290b5d079445ad825f6d6418dd6"
         },
         "opportunitygridview": {
-            "title": "商机表格视图",
+            "title": "商机信息",
             "caption": "商机信息",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Sales",

app_CRM/src/pages/sales/opportunity-grid-view/opportunity-grid-view-base.tsx

@@ -8,7 +8,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 商机表格视图视图基类
+ * 商机信息视图基类
  *
  * @export
  * @class OpportunityGridViewBase

app_CRM/src/pages/sales/opportunity-grid-view/opportunity-grid-view.html

-<studio-view-style2 viewName="opportunitygridview" viewTitle="商机表格视图" class='degridview opportunity-grid-view'>
+<studio-view-style2 viewName="opportunitygridview" viewTitle="商机信息" class='degridview opportunity-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_CRM/src/pages/sales/opportunity-grid-view/opportunity-grid-view.vue

@@ -7,7 +7,7 @@ import view_grid from '@widgets/opportunity/main-grid/main-grid.vue';
 import view_searchform from '@widgets/opportunity/default-searchform/default-searchform.vue';
 
 /**
- * 商机表格视图视图
+ * 商机信息视图
  *
  * @export
  * @class OpportunityGridView

app_CRM/src/widgets/contact/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-base.tsx

@@ -47,8 +47,8 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
      */
     protected isInit: any = {
         tabviewpanel:  true ,
-        tabviewpanel3:  false ,
         tabviewpanel2:  false ,
+        tabviewpanel3:  false ,
     }
 
     /**

app_CRM/src/widgets/contact/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.html

@@ -24,10 +24,10 @@
     @closeview="closeView($event)">
 </view_tabviewpanel>
         </tab-pane>
-        <tab-pane :index="1" name='tabviewpanel3' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="1" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
-                    h('span', '停用联系人'),
+                    h('span', '可用联系人'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -36,22 +36,22 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel3 
+            <view_tabviewpanel2 
     :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'"
+    v-if="isInit.tabviewpanel2"
+    name="tabviewpanel2"  
+    ref='tabviewpanel2'
+    :expActive="activatedTabViewPanel === 'tabviewpanel2'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel3>
+</view_tabviewpanel2>
         </tab-pane>
-        <tab-pane :index="2" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="2" name='tabviewpanel3' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
-                    h('span', '可用联系人'),
+                    h('span', '停用联系人'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -60,17 +60,17 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel2 
+            <view_tabviewpanel3 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel2"
-    name="tabviewpanel2"  
-    ref='tabviewpanel2'
-    :expActive="activatedTabViewPanel === 'tabviewpanel2'"
+    v-if="isInit.tabviewpanel3"
+    name="tabviewpanel3"  
+    ref='tabviewpanel3'
+    :expActive="activatedTabViewPanel === 'tabviewpanel3'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel2>
+</view_tabviewpanel3>
         </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

app_CRM/src/widgets/contact/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue

@@ -4,8 +4,8 @@ import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { TabExpViewtabexppanelTabexppanelBase } from './tab-exp-viewtabexppanel-tabexppanel-base';
 import view_tabviewpanel from '@widgets/contact/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel.vue';
-import view_tabviewpanel3 from '@widgets/contact/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/contact/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.vue';
+import view_tabviewpanel3 from '@widgets/contact/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
  
 
 /**
@@ -18,8 +18,8 @@ import view_tabviewpanel2 from '@widgets/contact/tab-exp-viewtabviewpanel2-tabvi
 @Component({
     components: {
         view_tabviewpanel, 
-        view_tabviewpanel3, 
         view_tabviewpanel2, 
+        view_tabviewpanel3, 
          
     }
 })

app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form-service.ts

@@ -119,9 +119,6 @@ export default class Edit_ChildIncidentService extends ControlService {
         if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
         }
-        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
-        }
         if (Object.is(serviceName, 'ProductService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.productService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'productid', 'product');
         }

app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form.html

@@ -77,7 +77,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
+  :acParams="{ }"
   valueitem='primarycontactid' 
   :value="data.primarycontactname" 
   editortype="" 

app_CRM/src/widgets/lead/qualification-form/qualification-form-service.ts

@@ -98,9 +98,6 @@ export default class QualificationService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
-        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/lead/qualification-form/qualification-form.html

@@ -20,7 +20,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
+  :acParams="{ }"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype="" 

app_CRM/src/widgets/opportunity/main-form/main-form-service.ts

@@ -116,9 +116,6 @@ export default class MainService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
-        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/opportunity/main-form/main-form.html

@@ -26,7 +26,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
+  :acParams="{ }"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype="" 

app_CRM/src/widgets/opportunity/quick-create-form/quick-create-form-service.ts

@@ -107,9 +107,6 @@ export default class QuickCreateService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
-        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/opportunity/quick-create-form/quick-create-form.html

@@ -26,7 +26,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
+  :acParams="{ }"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype=""