fix: 签约

zhengyiming

9 小时以前 97f29024ce18babeb4b635c5d73f907ac493976e

fix: 签约

 src/fabric-editor/components/attributeTemplateParam.vue

@@ -18,6 +18,14 @@
          disabled
        ></el-input>
      </el-form-item>
      <el-form-item :label="'数据绑定字段'" required>
        <el-input
          v-model="baseAttr.bindProperty"
          placeholder="请输入数据参数字段"
          @input="(value) => changeCommon('bindProperty', value)"
          disabled
        ></el-input>
      </el-form-item>
      <el-form-item :label="'合同模板变量类型'" required>
        <FieldSelect
          v-model="baseAttr.templateParamType"
@@ -26,6 +34,7 @@
          @change="(value) => changeCommon('templateParamType', value)"
        />
      </el-form-item>

      <el-form-item :label="'合同模板变量'" required>
        <FieldSelect
          v-model="baseAttr.recorder"
@@ -82,6 +91,7 @@
  userType: EnumUserType.Personal,
  label: '',
  name: '',
  bindProperty: '',
  required: true,
});

@@ -98,6 +108,7 @@
    baseAttr.label = activeObject.get('label');
    baseAttr.name = activeObject.get('name');
    baseAttr.required = activeObject.get('required');
    baseAttr.bindProperty = activeObject.get('bindProperty');
  }
};


 src/fabric-editor/components/systemTemplateDataParamSetting.vue

@@ -70,6 +70,7 @@
    required: true,
    label: item.label,
    name: item.data?.field3,
    bindProperty: item.data?.field4,

    templateDataParamId: '',
    pageNum: templateEditState.currentImageIndex,

 src/fabric-editor/customObject/index.ts

@@ -11,6 +11,7 @@
  'required',
  'templateDataParamId',
  'pageNum',
  'bindProperty',
];

export class TemplateParam extends fabric.IText {

 src/fabric-editor/hooks/context.ts

@@ -184,6 +184,7 @@
              type: x.templateParamType,
              recorder: x.recorder,
              userType: x.userType,
              bindProperty: x.bindProperty,
            } as API.SaveContractTemplateValuesCommandItem)
        ),
        templateJsonData: JSON.stringify(templateEditState.jsonMap),

 src/fabric-editor/types.d.ts

@@ -13,6 +13,8 @@
    name?: string;
    /** 是否必填 */
    required?: boolean;
    /** 绑定字段 */
    bindProperty?: string;
  }
}


 src/services/api/electronSign.ts

@@ -119,6 +119,26 @@
  );
}

/** 查询企业合同模板选择器数据 GET /api/user/electronSign/getEnterpriseContractTemplateSelect */
export async function getEnterpriseContractTemplateSelect(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetEnterpriseContractTemplateSelectParams,
  options?: API.RequestConfig
) {
  return request<API.SelectOptionGuidGetEnterpriseContractTemplateSelectQueryOption[]>(
    '/api/user/electronSign/getEnterpriseContractTemplateSelect',
    {
      method: 'GET',
      params: {
        ...params,
        request: undefined,
        ...params['request'],
      },
      ...(options || {}),
    }
  );
}

/** 查询个人实名结果 GET /api/user/electronSign/getPersonalUserRealResult */
export async function getPersonalUserRealResult(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)

 src/services/api/enterpriseEmployee.ts

@@ -47,8 +47,6 @@
      method: 'GET',
      params: {
        ...params,
        request: undefined,
        ...params['request'],
      },
      ...(options || {}),
    }
@@ -108,3 +106,18 @@
    }
  );
}

/** 邀请灵工签约 POST /api/user/enterpriseEmployee/inviteEnterpriseEmployeeElectronSign */
export async function inviteEnterpriseEmployeeElectronSign(
  body: API.InviteEnterpriseEmployeeElectronSignCommand,
  options?: API.RequestConfig
) {
  return request<string>('/api/user/enterpriseEmployee/inviteEnterpriseEmployeeElectronSign', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

 src/services/api/typings.d.ts

@@ -71,14 +71,21 @@
    enterpriseId?: string;
  }

  interface APIgetEnterpriseContractTemplateSelectParams {
    /** 查询企业合同模板选择器数据 */
    request?: GetEnterpriseContractTemplateSelectQuery;
  }

  interface APIgetEnterpriseElectronSignSettingParams {
    /** Id */
    id?: string;
  }

  interface APIgetEnterpriseEmployeeElectronSignParams {
    /** 查询个人用户签约详情 */
    request?: GetEnterpriseEmployeeElectronSignQuery;
    /** 灵工Id */
    id?: string;
    /** 合同模板业务编码 */
    code?: string;
  }

  interface APIgetEnterpriseEmployeeParams {
@@ -1803,6 +1810,25 @@
    timestamp?: number;
  }

  interface FriendlyResultListSelectOptionGuidGetEnterpriseContractTemplateSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    /** 数据 */
    data?: SelectOptionGuidGetEnterpriseContractTemplateSelectQueryOption[];
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultListSelectOptionStringGetDictionaryDataSelectQueryResultOption {
    /** 跟踪Id */
    traceId?: string;
@@ -2287,6 +2313,8 @@
    label?: string;
    /** 变量代码 */
    name?: string;
    /** 绑定字段 */
    bindProperty?: string;
    /** 是否必填 */
    required?: boolean;
  }
@@ -2470,6 +2498,17 @@
    content?: string[];
  }

  type GetEnterpriseContractTemplateSelectQuery = Record<string, any>;

  interface GetEnterpriseContractTemplateSelectQueryOption {
    /** Id */
    id?: string;
    /** 模板名称 */
    name?: string;
    /** 模板Id */
    templateId?: string;
  }

  interface GetEnterpriseContractTemplatesQuery {
    /** 企业Id */
    enterpriseId?: string;
@@ -2523,9 +2562,27 @@
    electronSignAccesses?: EnumElectronSignAccess[];
  }

  type GetEnterpriseEmployeeElectronSignQuery = Record<string, any>;

  type GetEnterpriseEmployeeElectronSignQueryResult = Record<string, any>;
  interface GetEnterpriseEmployeeElectronSignQueryResult {
    /** 合同编号 */
    contractCode?: string;
    userSignContractStatus?: EnumTaskUserSignContractStatus;
    /** 签约方信息-员工-姓名 */
    name?: string;
    /** 签约方信息-员工-证件类型 */
    identityType?: string;
    /** 签约方信息-员工-证件号码 */
    identity?: string;
    /** 签约方信息-员工-签约时间 */
    userSignContractTime?: string;
    /** 签约方信息-公司主体-主体类型 */
    enterpriseType?: string;
    /** 签约方信息-公司主体-签约主体 */
    enterpriseName?: string;
    /** 签约方信息-公司主体-签约时间 */
    enterpriseSignContractTime?: string;
    /** 协议内容 */
    contractUrl?: string;
  }

  interface GetEnterpriseEmployeeElectronSignsQuery {
    userSignContractStatus?: EnumTaskUserSignContractStatus;
@@ -2539,7 +2596,7 @@
  }

  interface GetEnterpriseEmployeeElectronSignsQueryResultItem {
    /** Id */
    /** 灵工Id */
    id?: string;
    /** 企业全称 */
    enterpriseName?: string;
@@ -3997,6 +4054,13 @@
    identity?: string;
  }

  interface InviteEnterpriseEmployeeElectronSignCommand {
    /** 灵工Id */
    id?: string;
    /** 合同模板Id */
    contractTemplateId?: string;
  }

  interface LoginCommandCallback {
    /** 用户Id */
    id?: string;
@@ -4152,6 +4216,8 @@
    label?: string;
    /** 变量代码 */
    name?: string;
    /** 绑定字段 */
    bindProperty?: string;
    /** 是否必填 */
    required?: boolean;
  }
@@ -4475,6 +4541,14 @@
    data?: GetDictionaryCategorySelectQueryOption;
  }

  interface SelectOptionGuidGetEnterpriseContractTemplateSelectQueryOption {
    /** 值 */
    value?: string;
    /** 标签 */
    label?: string;
    data?: GetEnterpriseContractTemplateSelectQueryOption;
  }

  interface SelectOptionStringGetDictionaryDataSelectQueryResultOption {
    /** 值 */
    value?: string;

 src/views/DictionaryManage/DataDictionary.vue

@@ -160,6 +160,7 @@
      field1: row.field1,
      field3: row.field3,
      field2: convertApi2FormUrlOnlyOne(row.field2),
      field4: row.field4,
    });
  } else {
    handleAdd({
@@ -180,6 +181,7 @@
    field1: '',
    field2: [] as UploadUserFile[],
    field3: '',
    field4: '',
    title: '新增字典',
  },
  editTitle: '编辑字典',

 src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue

@@ -39,14 +39,23 @@
      <ProFormItemV2 label="编号:" prop="code" :check-rules="[{ message: '请输入编号' }]">
        <ProFormText v-model.trim="form.code" :disabled="!!form.id"></ProFormText>
      </ProFormItemV2>
      <ProFormItemV2
        label="参数字段名:"
        prop="field3"
        :check-rules="[{ message: '请输入参数字段名' }]"
        v-if="category?.data?.code === CategoryCode.ElectronSignParam"
      >
        <ProFormText v-model.trim="form.field3"></ProFormText>
      </ProFormItemV2>
      <template v-if="category?.data?.code === CategoryCode.ElectronSignParam">
        <ProFormItemV2
          label="参数字段名:"
          prop="field3"
          :check-rules="[{ message: '请输入参数字段名' }]"
        >
          <ProFormText v-model.trim="form.field3" placeholder="请输入参数字段名"></ProFormText>
        </ProFormItemV2>
        <ProFormItemV2
          label="绑定字段名:"
          prop="field4"
          :check-rules="[{ message: '请输入绑定字段名' }]"
        >
          <ProFormText v-model.trim="form.field4" placeholder="请输入绑定字段名"></ProFormText>
        </ProFormItemV2>
      </template>

      <ProFormItemV2
        label="图片:"
        prop="field2"
@@ -105,6 +114,7 @@
  field1?: string;
  field2?: UploadUserFile[];
  field3?: string;
  field4?: string;
};

const form = defineModel<Form>('form');