xignzi006 发布系统代码

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

@@ -689,6 +689,16 @@
         "viewtag": "3b3a9dc75518028c6577a3634f853bdc",
         "memo": ""
     },
+    "leadcompetitoredit_compleadview": {
+        "title": "竞争对手潜在顾客信息",
+        "caption": "潜在客户对手",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Sales",
+        "viewname": "LeadCompetitorEdit_CompLeadView",
+        "viewfilename": "lead-competitor-edit-comp-lead-view",
+        "viewtag": "3bcf50e94ca826894b625ce946d9d8c8",
+        "memo": ""
+    },
     "productpricelevelproprilvgridview": {
         "title": "产品价目表项",
         "caption": "价目表项",
@@ -1259,6 +1269,16 @@
         "viewtag": "73cfeee47b3d8226faade73f93a2097c",
         "memo": "系统自动添加"
     },
+    "leadcompetitorcompleadgridview": {
+        "title": "竞争对手潜在顾客信息",
+        "caption": "潜在客户对手",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "LeadCompetitorCompLeadGridView",
+        "viewfilename": "lead-competitor-comp-lead-grid-view",
+        "viewtag": "74d764142f94fb7dafabc018c953002c",
+        "memo": ""
+    },
     "contacteditaddress": {
         "title": "联系人选项操作视图",
         "caption": "地址信息",

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

@@ -14,6 +14,14 @@ export default {
     entity2name: "对手",
   },
 	views: {
+		edit_compleadview: {
+			caption: "潜在客户对手",
+      		title: "竞争对手潜在顾客信息",
+		},
+		compleadgridview: {
+			caption: "潜在客户对手",
+      		title: "竞争对手潜在顾客信息",
+		},
 		editview: {
 			caption: "潜在客户对手",
       		title: "潜在客户对手编辑视图",
@@ -42,6 +50,26 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_complead_form: {
+		details: {
+			group1: "潜在客户对手基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "关系标识", 
+			srfmajortext: "关系名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			entity2id: "竞争对手", 
+			entityname: "潜在客户", 
+			relationshipsid: "关系标识", 
+			entityid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entityname: "潜在客户",
@@ -117,4 +145,8 @@ export default {
 			tip: "关闭",
 		},
 	},
+	edit_compleadviewtoolbar_toolbar: {
+	},
+	compleadgridviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

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

@@ -13,6 +13,14 @@ export default {
     entity2name: "对手",
   },
 	views: {
+		edit_compleadview: {
+			caption: "潜在客户对手",
+      		title: "竞争对手潜在顾客信息",
+		},
+		compleadgridview: {
+			caption: "潜在客户对手",
+      		title: "竞争对手潜在顾客信息",
+		},
 		editview: {
 			caption: "潜在客户对手",
       		title: "潜在客户对手编辑视图",
@@ -41,6 +49,26 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_complead_form: {
+		details: {
+			group1: "潜在客户对手基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "关系标识", 
+			srfmajortext: "关系名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			entity2id: "竞争对手", 
+			entityname: "潜在客户", 
+			relationshipsid: "关系标识", 
+			entityid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			entityname: "潜在客户",
@@ -116,4 +144,8 @@ export default {
 			tip: "关闭",
 		},
 	},
+	edit_compleadviewtoolbar_toolbar: {
+	},
+	compleadgridviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -559,6 +559,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "CompetitorInfo_Abstract",
             "viewtag": "3b3a9dc75518028c6577a3634f853bdc"
         },
+        "leadcompetitoredit_compleadview": {
+            "title": "竞争对手潜在顾客信息",
+            "caption": "潜在客户对手",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Sales",
+            "viewname": "LeadCompetitorEdit_CompLeadView",
+            "viewtag": "3bcf50e94ca826894b625ce946d9d8c8"
+        },
         "productpricelevelproprilvgridview": {
             "title": "产品价目表项",
             "caption": "价目表项",
@@ -1015,6 +1023,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ConnectionRoleEditView",
             "viewtag": "73cfeee47b3d8226faade73f93a2097c"
         },
+        "leadcompetitorcompleadgridview": {
+            "title": "竞争对手潜在顾客信息",
+            "caption": "潜在客户对手",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "LeadCompetitorCompLeadGridView",
+            "viewtag": "74d764142f94fb7dafabc018c953002c"
+        },
         "contacteditaddress": {
             "title": "联系人选项操作视图",
             "caption": "地址信息",

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

@@ -79,6 +79,8 @@ export default class LeadCompetitorUIServiceBase extends UIService {
      * @memberof  LeadCompetitorUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'edit_compleadview',srfappde:'leadcompetitors'});
+        this.allViewMap.set(':',{viewname:'compleadgridview',srfappde:'leadcompetitors'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'leadcompetitors'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'leadcompetitors'});
     }

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form.html

@@ -6,7 +6,7 @@
     <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.edit_datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.account.edit_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
  <dropdown-list 
     v-model="data.industrycode" 
@@ -24,25 +24,25 @@
 
 </i-col>
 <i-col v-show="detailsModel.telephone1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='telephone1' :itemRules="this.rules.telephone1" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.telephone1')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.telephone1.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='telephone1' :itemRules="this.rules.telephone1" class='' :caption="$t('entities.account.edit_datapanel_form.details.telephone1')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.telephone1.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box v-model="data.telephone1"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.telephone1.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.revenue.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='revenue' :itemRules="this.rules.revenue" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='revenue' :itemRules="this.rules.revenue" class='' :caption="$t('entities.account.edit_datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box v-model="data.revenue"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.revenue.disabled" type='number'  style=""></input-box>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.numberofemployees.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='' :caption="$t('entities.account.edit_datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box v-model="data.numberofemployees"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.numberofemployees.disabled" type='number'  style=""></input-box>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.statuscode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.account.edit_datapanel_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
  <dropdown-list 
     v-model="data.statuscode" 
@@ -60,7 +60,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.edit_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.account.edit_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
 </app-form-item>
 

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form.vue

@@ -20,6 +20,3 @@ import { Edit_DataPanelEditFormBase } from './edit-data-panel-form-base';
 @VueLifeCycleProcessing()
 export default class Edit_DataPanelEditForm extends Edit_DataPanelEditFormBase { }
 </script>
-<style lang='less'>
-@import './edit-data-panel-form.less';
-</style>

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form.html

@@ -6,42 +6,42 @@
     <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.info_datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <div style="height: 100%;display: flex;">
         <div  v-show="detailsModel.industrycode.visible" :style="{}">
-<app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='industrycode' :value="data.industrycode" tag='Account__IndustryCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.telephone1.visible" :style="{}">
-<app-form-item name='telephone1' :itemRules="this.rules.telephone1" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.telephone1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone1.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='telephone1' :itemRules="this.rules.telephone1" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.telephone1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone1.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='telephone1' :value="data.telephone1" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.revenue.visible" :style="{}">
-<app-form-item name='revenue' :itemRules="this.rules.revenue" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='revenue' :itemRules="this.rules.revenue" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='revenue' :value="data.revenue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.numberofemployees.visible" :style="{}">
-<app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='numberofemployees' :value="data.numberofemployees" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.statuscode.visible" :style="{}">
-<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='datapanel-style' :caption="$t('entities.account.info_datapanel_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='Account__StatusCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.account.info_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form.less

@@ -2,13 +2,31 @@
     color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold;text-align:left
 }
 .datapanel-style {
-color:white;
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
+}
+
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
 }
 .form-btn-noborder-transparent {
     background-color:rgba(255, 0, 0, 0);border-style:none;margin:0px 10px 0px 0px
 }
-
-.datapanel-label-style {
-    color:rgba(245, 244, 244, 1);font-size:12px;margin:0px 0px 0px 0px
+.form-btn-noborder-transparent {
+    background-color:transparent!important;
+    border-style:none;
+    margin:0px 5px 0px 5px
 }
-

app_CRM/src/widgets/competitor/data-panel-form/data-panel-form.html

@@ -4,16 +4,16 @@
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.competitor.datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
-    <div style="height: 100%;display: flex;justify-content: space-between;">
+    <div style="height: 100%;display: flex;">
         <div  v-show="detailsModel.reportedrevenue.visible" :style="{}">
-<app-form-item name='reportedrevenue' :itemRules="this.rules.reportedrevenue" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.competitor.datapanel_form.details.reportedrevenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.reportedrevenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='reportedrevenue' :itemRules="this.rules.reportedrevenue" class='datapanel-style' :caption="$t('entities.competitor.datapanel_form.details.reportedrevenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.reportedrevenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='reportedrevenue' :value="data.reportedrevenue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.websiteurl.visible" :style="{}">
-<app-form-item name='websiteurl' :itemRules="this.rules.websiteurl" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.competitor.datapanel_form.details.websiteurl')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.websiteurl.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='websiteurl' :itemRules="this.rules.websiteurl" class='datapanel-style' :caption="$t('entities.competitor.datapanel_form.details.websiteurl')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.websiteurl.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='websiteurl' :value="data.websiteurl" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>

app_CRM/src/widgets/competitor/data-panel-form/data-panel-form.less

@@ -2,9 +2,23 @@
     color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold;text-align:left
 }
 .datapanel-style {
-color:white;
-}
-.datapanel-label-style {
-    color:rgba(245, 244, 244, 1);font-size:12px;margin:0px 0px 0px 0px
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
 }
 
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
+}

app_CRM/src/widgets/contact/date-panel-form/date-panel-form.less

@@ -2,7 +2,25 @@
     color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold;text-align:left
 }
 .datapanel-style {
-color:white;
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
+}
+
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
 }
 .datapanel-label-style {
     color:rgba(245, 244, 244, 1);font-size:12px;margin:0px 0px 0px 0px

app_CRM/src/widgets/lead/data-panel-form/data-panel-form.html

@@ -6,28 +6,28 @@
     <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.lead.datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <div style="height: 100%;display: flex;justify-content: space-between;">
         <div  v-show="detailsModel.revenue.visible" :style="{}">
-<app-form-item name='revenue' :itemRules="this.rules.revenue" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.lead.datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='revenue' :itemRules="this.rules.revenue" class='datapanel-style' :caption="$t('entities.lead.datapanel_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='revenue' :value="data.revenue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.numberofemployees.visible" :style="{}">
-<app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.lead.datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='datapanel-style' :caption="$t('entities.lead.datapanel_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='numberofemployees' :value="data.numberofemployees" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.statuscode.visible" :style="{}">
-<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.lead.datapanel_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='datapanel-style' :caption="$t('entities.lead.datapanel_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='Lead__StatusCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.lead.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.lead.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
@@ -37,7 +37,7 @@
 <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.lead.datapanel_form.details.grouppanel1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <div style="height: 100%;display: flex;align-items: center;">
         <div  v-show="detailsModel.button1.visible" :style="{}">
-    <i-button type="primary" @click="button1_click($event)"
+    <i-button type="primary" @click="button1_click($event)" class="form-btn-noborder-transparent"
          style="">
            
         

app_CRM/src/widgets/lead/data-panel-form/data-panel-form.less

@@ -2,9 +2,31 @@
     color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold;text-align:left
 }
 .datapanel-style {
-color:white;
-}
-.datapanel-label-style {
-    color:rgba(245, 244, 244, 1);font-size:12px;margin:0px 0px 0px 0px
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
 }
 
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
+}
+.form-btn-noborder-transparent {
+    background-color:rgba(255, 0, 0, 0);border-style:none;margin:0px 10px 0px 0px
+}
+.form-btn-noborder-transparent {
+    background-color:transparent!important;
+    border-style:none;
+    margin:0px 5px 0px 5px
+}

app_CRM/src/widgets/opportunity/data-panel-form/data-panel-form.html

@@ -6,28 +6,28 @@
     <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.opportunity.datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <div style="height: 100%;display: flex;justify-content: space-between;">
         <div  v-show="detailsModel.estimatedclosedate.visible" :style="{}">
-<app-form-item name='estimatedclosedate' :itemRules="this.rules.estimatedclosedate" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.opportunity.datapanel_form.details.estimatedclosedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.estimatedclosedate.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='estimatedclosedate' :itemRules="this.rules.estimatedclosedate" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.estimatedclosedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.estimatedclosedate.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='estimatedclosedate' :value="data.estimatedclosedate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.estimatedvalue.visible" :style="{}">
-<app-form-item name='estimatedvalue' :itemRules="this.rules.estimatedvalue" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.opportunity.datapanel_form.details.estimatedvalue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.estimatedvalue.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='estimatedvalue' :itemRules="this.rules.estimatedvalue" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.estimatedvalue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.estimatedvalue.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='estimatedvalue' :value="data.estimatedvalue" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.statecode.visible" :style="{}">
-<app-form-item name='statecode' :itemRules="this.rules.statecode" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.opportunity.datapanel_form.details.statecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statecode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='statecode' :itemRules="this.rules.statecode" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.statecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statecode.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='statecode' :value="data.statecode" tag='Opportunity__StateCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>
 <div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.opportunity.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
 <app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>

app_CRM/src/widgets/opportunity/data-panel-form/data-panel-form.less

@@ -2,13 +2,31 @@
     color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold;text-align:left
 }
 .datapanel-style {
-color:white;
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
+}
+
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
 }
 .form-btn-noborder-transparent {
     background-color:rgba(255, 0, 0, 0);border-style:none;margin:0px 10px 0px 0px
 }
-
-.datapanel-label-style {
-    color:rgba(245, 244, 244, 1);font-size:12px;margin:0px 0px 0px 0px
+.form-btn-noborder-transparent {
+    background-color:transparent!important;
+    border-style:none;
+    margin:0px 5px 0px 5px
 }
-