Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

zhengyiming

9 小时以前 745f1e2ee7072731611391b89c5c0020783828bf

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

 src/views/EnterpriseManage/EnterpriseManageList.vue

@@ -156,19 +156,13 @@
    handleEdit({
      id: row.id,
      enterpriseConfigureType: EnterpriseConfigureType.Electronic,
      realAccess: electronSignSetting.realAccess,
      realVerifyCost: electronSignSetting.realVerifyCost,
      signCost: electronSignSetting.signCost,
      mergeSignCost: electronSignSetting.mergeSignCost,

      electronSignAccesses: electronSignSetting.electronSignAccesses,
      smsAccess: smsSetting.smsAccess,
      chargeType: ChargeTypeEnum.Group,
      smsCost: smsSetting.smsCost,
    });
  } else {
    handleAdd({
      enterpriseConfigureType: EnterpriseConfigureType.Electronic,
      chargeType: ChargeTypeEnum.Group,
    });
  }
}
@@ -178,11 +172,7 @@
  defaultFormParams: {
    id: '',
    enterpriseConfigureType: EnterpriseConfigureType.Electronic,
    realAccess: '' as any as EnumRealAccess,
    realVerifyCost: 0,
    signCost: 0,
    mergeSignCost: 0,
    chargeType: ChargeTypeEnum.Group,
    electronSignAccesses: [] as EnumElectronSignAccess[],
    smsAccess: '' as any as EnumSmsAccess,
    smsCost: 0,
  },
@@ -225,10 +215,7 @@
  try {
    let params: API.SetEnterpriseElectronSignSettingCommand = {
      id: editForm.id,
      realAccess: editForm.realAccess,
      realVerifyCost: editForm.realVerifyCost,
      signCost: editForm.signCost,
      mergeSignCost: editForm.mergeSignCost,
      electronSignAccesses: editForm.electronSignAccesses,
    };
    return await enterpriseServices.setEnterpriseElectronSignSetting(params);
  } catch (error) {}

 src/views/EnterpriseManage/components/ConfigureDialog.vue

@@ -44,56 +44,17 @@
        <div class="configure-dialog-form-title">通道配置</div>
        <ProFormItemV2
          label="名称:"
          prop="realAccess"
          prop="electronSignAccesses"
          :checkRules="[{ message: '请选择电子签通道' }]"
        >
          <ProFormSelect
            v-model="form.realAccess"
            :valueEnum="EnumRealAccessText"
            v-model="form.electronSignAccesses"
            :valueEnum="EnumElectronSignAccessText"
            placeholder="请选择电子签通道"
            multiple
          >
          </ProFormSelect>
        </ProFormItemV2>
        <div class="configure-dialog-form-title">费用配置</div>
        <ProFormItemV2
          label="计费方式:"
          prop="chargeType"
          :checkRules="[{ message: '请选择计费方式' }]"
        >
          <ProFormRadio
            :button-style="false"
            v-model="form.chargeType"
            :value-enum="ChargeTypeEnumText"
          />
        </ProFormItemV2>
        <template v-if="form.chargeType === ChargeTypeEnum.Group">
          <ProFormItemV2 label="实名费用:" prop="realVerifyCost">
            <ProFormInputNumber
              :controls="false"
              v-model="form.realVerifyCost"
              placeholder="请输入"
              unit="元/条"
            />
          </ProFormItemV2>
          <ProFormItemV2 label="签约费用:" prop="signCost">
            <ProFormInputNumber
              :controls="false"
              v-model="form.signCost"
              placeholder="请输入"
              unit="元/份"
            />
          </ProFormItemV2>
        </template>
        <template v-if="form.chargeType === ChargeTypeEnum.Merge">
          <ProFormItemV2 label="统一电子签:" prop="mergeSignCost">
            <ProFormInputNumber
              :controls="false"
              v-model="form.mergeSignCost"
              placeholder="请输入"
              unit="元/份"
            />
          </ProFormItemV2>
        </template>
      </template>
      <template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage">
        <div class="configure-dialog-form-title">通道配置</div>
@@ -141,8 +102,7 @@
  EnterpriseConfigureType,
  EnterpriseConfigureTypeText,
  ChargeTypeEnum,
  ChargeTypeEnumText,
  EnumRealAccessText,
  EnumElectronSignAccessText,
  EnumSmsAccessText,
  EnumRealAccess,
} from '@/constants';
@@ -157,11 +117,7 @@
  // openBranchBank: string;
  // bankAccount: string;
  // verifyStatus: VerifyStatus;
  chargeType: ChargeTypeEnum;
  realAccess: EnumRealAccess;
  realVerifyCost: number;
  signCost: number;
  mergeSignCost: number;
  electronSignAccesses: EnumElectronSignAccess[];
  smsAccess: EnumSmsAccess;
  smsCost: number;
};