chitanda 发布系统代码

app_CRM/src/components/dropdown-list-mpicker/dropdown-list-mpicker.less

-
 .ivu-select-multiple .ivu-select-item-selected:after{
   display: none;
 }
+.dropdown-list-mpicker-transfer{
+  .ivu-select-dropdown-list > .ivu-select-item.ivu-select-item-focus {
+    background: var(--form-editor-background-color) !important;
+  }
+  .ivu-select-dropdown-list > .ivu-select-item.ivu-select-item-selected {
+    background: var(--form-editor-active-color) !important;
+  }
+}

app_CRM/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -3,6 +3,7 @@
         class='dropdown-list-mpicker'
         multiple 
         :transfer="true"
+        transfer-class-name="dropdown-list-mpicker-transfer"
         v-model="currentVal"
         :disabled="disabled === true ? true : false"
         :clearable="true"
@@ -10,7 +11,7 @@
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListMpicker.placeholder')">
         <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
-          <Checkbox :value = "(currentVal.indexOf(item.value))==-1?false:true">
+          <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
              {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
           </Checkbox>
         </i-option>

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -453,7 +453,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			revenue: "年收入", 
+			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
+			owneridyominame: "负责人", 
 			accountid: "客户", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -452,7 +452,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			revenue: "年收入", 
+			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
+			owneridyominame: "负责人", 
 			accountid: "客户", 
 		},
 		uiactions: {

app_CRM/src/studio-core/components/app-breadcrumb/app-breadcrumb.less

@@ -26,8 +26,9 @@
                     .ivu-select-selected-value {
                         padding-left: 0;
                         padding-right: 12px;
-                        height: 18px;
-                        line-height: 18px;
+                        height: 20px;
+                        line-height: 16px;
+                        font-size: 15px;
                     }
 
                     .ivu-select-arrow {
@@ -45,7 +46,8 @@
                             color: var(--app-header-color);
                         }
 
-                        .ivu-select-item:hover, .ivu-select-item.ivu-select-item-focus {
+                        .ivu-select-item:hover,
+                        .ivu-select-item.ivu-select-item-focus {
                             background: var(--app-header-background-color-active);
                         }
 
@@ -67,7 +69,7 @@
 
     .app-breadcrumb-item.last {
         cursor: unset;
-        
+
         .content {
             color: var(--app-header-color);
         }

app_CRM/src/studio-core/index.ts

@@ -38,6 +38,7 @@ export { DataViewBase } from './view/DataViewBase';
 export { PickupView3Base } from './view/PickupView3Base';
 export { TreeExpViewBase } from './view/TreeExpViewBase';
 export { TreeView9Base } from './view/TreeView9Base';
+export { TreeGridExViewBase } from './view/TreeGridExViewBase';
 export { TreeViewBase } from './view/TreeViewBase';
 export { PickupTreeViewBase } from './view/PickupTreeViewBase';
 export { WizardViewBase } from './view/WizardViewBase';

app_CRM/src/studio-core/view/MPickupViewBase.tsx

@@ -122,9 +122,20 @@ export class MPickupViewBase extends PickupViewBase {
                     newSelections.push(this.viewSelections[index]);
                 }
             });
-            this.viewSelections = newSelections;
+            this.viewSelections = this.removeDuplicates([...newSelections,...this.viewSelections]);
         });
-        this.selectedData = JSON.stringify(this.viewSelections);
+    }
+
+    /**
+     * 去重
+     *
+     * @param {*} data
+     * @returns {Array<any>}
+     * @memberof MPickupViewBase
+     */
+    public removeDuplicates(data:any):Array<any> {
+        const uniqueSet = new Set(data);
+        return [...uniqueSet];
     }
 
     /**

app_CRM/src/studio-core/view/TreeExpViewBase.tsx

-import { ExpViewBase } from './ExpViewBase';
+import { GridViewBase } from './GridViewBase';
 
 /**
- * 树导航视图基类
+ * 树表格视图基类
  *
  * @export
- * @class TreeExpViewBase
- * @extends {ExpViewBase}
+ * @class TreeGridExViewBase
+ * @extends {GridViewBase}
  */
-export class TreeExpViewBase extends ExpViewBase {
+export class TreeGridExViewBase extends GridViewBase {
 
 }
\ No newline at end of file

app_CRM/src/widgets/account/quick-summary-form/quick-summary-form-base.tsx

@@ -55,7 +55,10 @@ export class QuickSummaryEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
+        revenue: null,
+        numberofemployees: null,
         statuscode: null,
+        owneridyominame: null,
         accountid: null,
         account:null,
     };
@@ -67,6 +70,10 @@ export class QuickSummaryEditFormBase extends EditFormControlBase {
      * @memberof QuickSummaryEditFormBase
      */
     public rules: any = {
+        owneridyominame: [
+            { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
+        ],
     }
 
     /**
@@ -96,8 +103,14 @@ export class QuickSummaryEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
+        revenue: new FormItemModel({ caption: '年收入', detailType: 'FORMITEM', name: 'revenue', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        numberofemployees: new FormItemModel({ caption: '员工人数', detailType: 'FORMITEM', name: 'numberofemployees', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
         statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
+        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 }),
+
         accountid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'accountid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
     };

app_CRM/src/widgets/account/quick-summary-form/quick-summary-form-model.ts

@@ -55,11 +55,26 @@ export default class QuickSummaryModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'revenue',
+        prop: 'revenue',
+        dataType: 'BIGDECIMAL',
+      },
+      {
+        name: 'numberofemployees',
+        prop: 'numberofemployees',
+        dataType: 'INT',
+      },
       {
         name: 'statuscode',
         prop: 'statuscode',
         dataType: 'NSCODELIST',
       },
+      {
+        name: 'owneridyominame',
+        prop: 'owneridyominame',
+        dataType: 'TEXT',
+      },
       {
         name: 'accountid',
         prop: 'accountid',

app_CRM/src/widgets/account/quick-summary-form/quick-summary-form.html

@@ -3,10 +3,22 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.quicksummary_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <row>
-        <i-col v-show="detailsModel.statuscode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.account.quicksummary_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="TOP">
+    <app-form-group layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.account.quicksummary_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <div style="height: 100%;display: flex;">
+        <div  v-show="detailsModel.revenue.visible" :style="{}">
+<app-form-item name='revenue' :itemRules="this.rules.revenue" class='' :caption="$t('entities.account.quicksummary_form.details.revenue')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.revenue.error" :isEmptyCaption="false" labelPos="TOP">
+    <input-box v-model="data.revenue"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.revenue.disabled" type='number'  style=""></input-box>
+</app-form-item>
+
+</div>
+<div  v-show="detailsModel.numberofemployees.visible" :style="{}">
+<app-form-item name='numberofemployees' :itemRules="this.rules.numberofemployees" class='' :caption="$t('entities.account.quicksummary_form.details.numberofemployees')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.numberofemployees.error" :isEmptyCaption="false" labelPos="TOP">
+    <input-box v-model="data.numberofemployees"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.numberofemployees.disabled" type='number'  style=""></input-box>
+</app-form-item>
+
+</div>
+<div  v-show="detailsModel.statuscode.visible" :style="{}">
+<app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.account.quicksummary_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="TOP">
     
  <dropdown-list 
     v-model="data.statuscode" 
@@ -22,9 +34,15 @@
  </dropdown-list>
 </app-form-item>
 
-</i-col>
-    
-    </row>
+</div>
+<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
+<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.account.quicksummary_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="TOP">
+    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
+</div>
+
+    </div>
 </app-form-group>
 
 </i-col>