解决冲突

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts

@@ -49,15 +49,15 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       properties: {
         configName: {
           type: 'string',
-          title: '配置名称',
+          title: '模板名称',
         },
         stateLocked: {
           type: 'string',
           title: '状态',
           enum: [
             {label: '全部', value: ''},
-            {label: '启用', value: 0},
-            {label: '禁用', value: 1},
+            {label: '生效中', value: 1},
+            {label: '失效', value: 0},
           ],
           ui: {
             widget: 'select',
@@ -129,7 +129,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           },
           {
             text: '禁用',
-            iif: (_record) =>{ return _record.stateLocked == true},
+            iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 ||  _record.partnerType == 2)},
             click: _record => this.viewEvaluate(_record),
           },
           {