From a8a1d9ed65cc4d66d084d0a34703b310fbe92f70 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 26 Apr 2022 10:59:33 +0800
Subject: [PATCH] fix bug

---
 .../components/edit/edit.component.ts         | 23 +++++++++++++------
 .../components/list/list.component.ts         |  1 +
 .../rebate-setting/add/add.component.html     | 18 +++++++--------
 .../rebate-setting/add/add.component.ts       |  8 +++++--
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 1ae908ee..bd12ea3a 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -33,16 +33,25 @@ export class ParterChannelSalesEditComponent implements OnInit {
     if(!this.sts) {
       this.service.request(this.service.$api_getChannelSalesInfo, {id:this.i?.id}).subscribe(res => {
         if(res){
-          this.record = res;
-
-          // this.sf.getProperty('/employeeVO')!.schema.enum = res;
-          // this.sf.getProperty('/employeeVO')!.widget.reset(res);
-          // this.sf.setValue('/employeeVO', this.enterpriseProjectIds);
-           this.initSF();
+         let value1 =  Object.assign({}, res)
+         delete value1.employeeVO;
+         this.record = value1;
+         console.log(value1);
+         console.log(this.record);
+         
+        let value = res.employeeVO;
+        let yeeVO = {label: value.empName+"/"+value.empNo, value: value.empNo}
+        console.log(yeeVO);
+          
+       setTimeout(()=>{
+        this.sf.getProperty('/employeeVO')!.schema.enum = [yeeVO];
+        this.sf.getProperty('/employeeVO')!.widget.reset([yeeVO]);
+       })
+       
+          this.initSF();
         }
       });
     }
-    this.initSF();
     
   }
   initSF() {
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
index 2a5a8db1..88b791a4 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.ts
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -122,6 +122,7 @@ export class ParterChannelSalesListComponent implements OnInit {
         title: '操作',
         className: 'text-center',
         width: '120px',
+        fixed: 'right',
         buttons: [
           {
             text: '编辑',
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
index 8aa67c55..0482f6e6 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-25 19:58:03
+ * @LastEditTime : 2022-04-26 10:53:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,16 +12,16 @@
 <nz-card>
   <!-- 数据列表 -->
  <sv-container col="1">
-    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [(ngModel)]="configName" /></sv>
+    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [disabled]="hiden"  [(ngModel)]="configName" /></sv>
 
    <sv-title>固定结算费率配置</sv-title>
 
-   <sv label="固定结算费率"> <nz-input-number [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+   <sv label="固定结算费率"> <nz-input-number [disabled]="hiden"  [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
 
    <sv-title>业务量和管理费比例配置</sv-title>
 
    <sv label="选择配置类型">
-    <nz-radio-group [(ngModel)]="configType">
+    <nz-radio-group [(ngModel)]="configType" [disabled]="hiden" >
       <label nz-radio nzValue="1">按全部等级配置</label>
       <label nz-radio nzValue="2">按不同等级配置</label>
     </nz-radio-group>
@@ -36,7 +36,7 @@
    <sv-title>关联合伙人配置</sv-title>
 
    <sv label="合伙人选择">
-    <nz-select [(ngModel)]="partnerType" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
+    <nz-select [(ngModel)]="partnerType" [disabled]="hiden" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
       <nz-option nzValue="1" nzLabel="全部合伙人"></nz-option>
       <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
       <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
@@ -51,7 +51,7 @@
   </sv>
 
    <sv label="优先级" col="1">
-    <nz-select [(ngModel)]="priority" style="max-width: 400px; min-width: 200px;margin-left: 28px;">
+    <nz-select [(ngModel)]="priority" [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 28px;">
       <nz-option nzValue=1 nzLabel="1">1</nz-option>
       <nz-option nzValue=2 nzLabel="2">2</nz-option>
       <nz-option nzValue=3 nzLabel="3">3</nz-option>
@@ -60,13 +60,13 @@
     </nz-select>
   </sv>
 
-   <sv label="规则说明" col="1">
-    <sf #sf mode="edit" [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 12 }} }"
+   <sv label="规则说明" col="1" >
+    <sf #sf mode="edit" [disabled]="hiden"  [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 12 }} }"
     button="none"> </sf>
   </sv>
 
    <sv label="备注" col="1" style="margin-top: 16px;">
-    <textarea style="max-width: 400px; min-width: 200px;margin-left: 40px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
+    <textarea [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 40px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
   </sv>
 
  </sv-container>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
index d85611c3..71097915 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-21 09:26:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-25 19:56:41
+ * @LastEditTime : 2022-04-26 10:58:58
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -67,6 +67,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         {
           text: '移除',
           click: _record => this.delete(_record),
+          iif: ()=> this.hiden,
           acl: { ability: ['AbnormalAppear-reply'] }
         }
       ]
@@ -78,7 +79,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         ruleDescription: {
           type: 'string',
           title: '',
+          disabled: this.hiden,
           ui: {
+            
             widget: 'tinymce',
             loadingTip: 'loading...',
             config: {
@@ -176,7 +179,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         this.partnerType = res?.partnerType + '';
         this.partnerPeopleList = res?.partnerListVOs;
         this.priority = res?.priority + '';
-        this.formData = res?.ruleDescription;
+        this.formData = {ruleDescription: res?.ruleDescription};
+        this.remarke = res.remark;
       }
     })
   }