xignzi006 发布系统代码

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

@@ -2079,6 +2079,16 @@
         "viewtag": "b5ff54b0672efd3222a44d81f4e7362e",
         "memo": ""
     },
+    "opportunitycompetitoredit_compoppview": {
+        "title": "竞争对手商机信息",
+        "caption": "商机对手",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Sales",
+        "viewname": "OpportunityCompetitorEdit_CompOppView",
+        "viewfilename": "opportunity-competitor-edit-comp-opp-view",
+        "viewtag": "b697e75d9c2af9b203503e4c58c4ec51",
+        "memo": ""
+    },
     "contactpickupview": {
         "title": "联系人数据选择视图",
         "caption": "联系人",

app_CRM/src/locale/lanres/entities/opportunity-competitor/opportunity-competitor_en_US.ts

@@ -24,6 +24,10 @@ export default {
 			caption: "商机对手",
       		title: "商机对手表格视图",
 		},
+		edit_compoppview: {
+			caption: "商机对手",
+      		title: "竞争对手商机信息",
+		},
 		editview: {
 			caption: "商机对手",
       		title: "商机对手编辑视图",
@@ -52,6 +56,29 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_compopp_form: {
+		details: {
+			group1: "商机对手基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "关系标识", 
+			srfmajortext: "关系名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			entity2id: "竞争对手", 
+			entityname: "商机", 
+			estimatedvalue: "预计收入", 
+			estimatedclosedate: "预计结束日期", 
+			statecode: "状态", 
+			relationshipsid: "关系标识", 
+			entityid: "商机", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entityname: "商机",
@@ -135,4 +162,14 @@ export default {
 			tip: "关闭",
 		},
 	},
+	edit_compoppviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/opportunity-competitor/opportunity-competitor_zh_CN.ts

@@ -23,6 +23,10 @@ export default {
 			caption: "商机对手",
       		title: "商机对手表格视图",
 		},
+		edit_compoppview: {
+			caption: "商机对手",
+      		title: "竞争对手商机信息",
+		},
 		editview: {
 			caption: "商机对手",
       		title: "商机对手编辑视图",
@@ -51,6 +55,29 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_compopp_form: {
+		details: {
+			group1: "商机对手基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "关系标识", 
+			srfmajortext: "关系名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			entity2id: "竞争对手", 
+			entityname: "商机", 
+			estimatedvalue: "预计收入", 
+			estimatedclosedate: "预计结束日期", 
+			statecode: "状态", 
+			relationshipsid: "关系标识", 
+			entityid: "商机", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entityname: "商机",
@@ -134,4 +161,14 @@ export default {
 			tip: "关闭",
 		},
 	},
+	edit_compoppviewtoolbar_toolbar: {
+		tbitem1: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -1671,6 +1671,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "LeadDashboardView",
             "viewtag": "b5ff54b0672efd3222a44d81f4e7362e"
         },
+        "opportunitycompetitoredit_compoppview": {
+            "title": "竞争对手商机信息",
+            "caption": "商机对手",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Sales",
+            "viewname": "OpportunityCompetitorEdit_CompOppView",
+            "viewtag": "b697e75d9c2af9b203503e4c58c4ec51"
+        },
         "contactpickupview": {
             "title": "联系人数据选择视图",
             "caption": "联系人",

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

@@ -8,10 +8,10 @@
             :viewparams="viewparams" 
             :context="context" 
             :showBusyIndicator="true"
-            v-show="true"
+            v-show="isExpandSearchForm"
             loaddraftAction="FilterGetDraft"
             loadAction="FilterGet"
-        @valuechange="quickFormValueChange"
+        
             name="searchform"  
             ref='searchform' 
             @save="searchform_save($event)"  

app_CRM/src/uiservice/opportunity-competitor/opportunity-competitor-ui-service-base.ts

@@ -80,6 +80,7 @@ export default class OpportunityCompetitorUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'oppcompgridview',srfappde:'opportunitycompetitors'});
+        this.allViewMap.set(':',{viewname:'edit_compoppview',srfappde:'opportunitycompetitors'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'opportunitycompetitors'});
     }
 

app_CRM/src/widgets/multi-pick-data/default-searchform/default-searchform.html

 <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
+  <div class="search-button">
+    <i-button size="small" type="primary" ghost @click="onSearch.apply(_self, arguments)">{{$t('app.searchButton.search')}}</i-button>
+    <i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
+  </div>
   <div class="form-content">
                   
           <i-col v-show="detailsModel.n_pickdataname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">