Commit 84b6aae9 authored by chenqikuai's avatar chenqikuai

fix

parent bf5d62a2
...@@ -79,7 +79,7 @@ export interface iCopyRight { ...@@ -79,7 +79,7 @@ export interface iCopyRight {
contact_address: string; contact_address: string;
authentication_ids: number[]; authentication_ids: number[];
authentication_main_id: number; authentication_main_id: number;
authentication_audit_opinions?: string; record_audit_opinions?: string;
record_work_status: string; record_work_status: string;
record_work_id: number; record_work_id: number;
certificate: string; certificate: string;
......
...@@ -25,3 +25,9 @@ export const checkVerificationCode = (rule: any, value: any, callback: any) => { ...@@ -25,3 +25,9 @@ export const checkVerificationCode = (rule: any, value: any, callback: any) => {
if (!checkReg.test(value)) callback(new Error("请输入6位数字验证码")); if (!checkReg.test(value)) callback(new Error("请输入6位数字验证码"));
else callback(); else callback();
}; };
export const checkEmail = (rule: any, value: any, callback: any) => {
const checkReg = /^.+\@.+\..+$/;
if (!checkReg.test(value)) callback(new Error("请输入正确格式的邮箱"));
else callback();
};
...@@ -40,6 +40,7 @@ watch( ...@@ -40,6 +40,7 @@ watch(
(newV) => { (newV) => {
URL.revokeObjectURL(url.value); URL.revokeObjectURL(url.value);
url.value = getImageUrl(props.modelValue) || ""; url.value = getImageUrl(props.modelValue) || "";
console.log(getImageUrl(props.modelValue), props.modelValue);
} }
); );
......
...@@ -256,6 +256,7 @@ import CommonDialog from "@/components/CommonDialog/index.vue"; ...@@ -256,6 +256,7 @@ import CommonDialog from "@/components/CommonDialog/index.vue";
import syDialogInput from "@/components/CommonInput/index.vue"; import syDialogInput from "@/components/CommonInput/index.vue";
import syRadio from "@/components/Radio/index.vue"; import syRadio from "@/components/Radio/index.vue";
import syDatePicker from "../../components/DatePicker/index.vue"; import syDatePicker from "../../components/DatePicker/index.vue";
import { checkEmail, checkIdNumber, checkPhone } from "@/utils/match";
function handle() { function handle() {
console.log(...arguments); console.log(...arguments);
...@@ -288,7 +289,12 @@ const modelOfCert = ref({ ...@@ -288,7 +289,12 @@ const modelOfCert = ref({
const rulesOfCert = { const rulesOfCert = {
name: [{ required: true, message: "请输入姓名/名称" }], name: [{ required: true, message: "请输入姓名/名称" }],
property: [{ required: true, message: "选择主体性质" }], property: [{ required: true, message: "选择主体性质" }],
idCard: [{ required: true, message: "请输入身份证号码" }], idCard: [
{ required: true, message: "请输入身份证号码" },
{
validator: checkIdNumber,
},
],
city: [{ required: true, message: "请选择所在城市" }], city: [{ required: true, message: "请选择所在城市" }],
idCardImg: [{ required: true, message: "请上传身份证" }], idCardImg: [{ required: true, message: "请上传身份证" }],
auth: [], auth: [],
...@@ -326,12 +332,18 @@ const rulesOfContact = { ...@@ -326,12 +332,18 @@ const rulesOfContact = {
required: true, required: true,
message: "请输入电子邮箱", message: "请输入电子邮箱",
}, },
{
validator: checkEmail,
},
], ],
cellphoneNumber: [ cellphoneNumber: [
{ {
required: true, required: true,
message: "请输入手机号", message: "请输入手机号",
}, },
{
validator: checkPhone,
},
], ],
phoneNumber: [], phoneNumber: [],
postCode: [], postCode: [],
...@@ -411,8 +423,8 @@ const handleConfirm = () => { ...@@ -411,8 +423,8 @@ const handleConfirm = () => {
emit("addSuccess"); emit("addSuccess");
} else { } else {
} }
loading.value = false;
} }
loading.value = false;
}); });
}); });
}; };
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
v-if="data?.record_work_status === eStatusOfCopyright.NOT_PASSED" v-if="data?.record_work_status === eStatusOfCopyright.NOT_PASSED"
> >
<span style="color: var(--sy-gray)">审核意见:</span> <span style="color: var(--sy-gray)">审核意见:</span>
<span>{{ data.authentication_audit_opinions }}</span> <span>{{ data.record_audit_opinions }}</span>
</div> </div>
<div> <div>
<span style="color: var(--sy-gray)">备注说明:</span> <span style="color: var(--sy-gray)">备注说明:</span>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import LayoutVue from "@/components/Layout.vue"; import LayoutVue from "@/components/Layout.vue";
import { ref, watch } from "vue"; import { nextTick, ref, watch } from "vue";
import Search from "@/components/Search/index.vue"; import Search from "@/components/Search/index.vue";
import Avatar from "@/components/Avatar/index.vue"; import Avatar from "@/components/Avatar/index.vue";
import Title from "@/components/Title.vue"; import Title from "@/components/Title.vue";
...@@ -131,6 +131,7 @@ const handleClickStatusFilter = (status: eStatusOfFilerCertification) => { ...@@ -131,6 +131,7 @@ const handleClickStatusFilter = (status: eStatusOfFilerCertification) => {
const handleClickEdit = ({ id }: { id: number }) => { const handleClickEdit = ({ id }: { id: number }) => {
addFilingPersonDailogVisible.value = true; addFilingPersonDailogVisible.value = true;
nextTick(() => {
const raw = tableData.value.find((i) => i.id === id); const raw = tableData.value.find((i) => i.id === id);
AddFilingPersonRef.value!.mode = "edit"; AddFilingPersonRef.value!.mode = "edit";
AddFilingPersonRef.value!.modelOfCert.name = raw!.authentication_name; AddFilingPersonRef.value!.modelOfCert.name = raw!.authentication_name;
...@@ -149,7 +150,8 @@ const handleClickEdit = ({ id }: { id: number }) => { ...@@ -149,7 +150,8 @@ const handleClickEdit = ({ id }: { id: number }) => {
AddFilingPersonRef.value!.modelOfContact.email = raw!.contact_email; AddFilingPersonRef.value!.modelOfContact.email = raw!.contact_email;
AddFilingPersonRef.value!.modelOfContact.cellphoneNumber = AddFilingPersonRef.value!.modelOfContact.cellphoneNumber =
raw!.contact_mobile; raw!.contact_mobile;
AddFilingPersonRef.value!.modelOfContact.phoneNumber = raw!.contact_telephone; AddFilingPersonRef.value!.modelOfContact.phoneNumber =
raw!.contact_telephone;
AddFilingPersonRef.value!.modelOfContact.postCode = raw!.contact_post_code; AddFilingPersonRef.value!.modelOfContact.postCode = raw!.contact_post_code;
AddFilingPersonRef.value!.modelOfContact.fax = raw!.contact_fax; AddFilingPersonRef.value!.modelOfContact.fax = raw!.contact_fax;
AddFilingPersonRef.value!.modelOfContact.addr = raw!.contact_address; AddFilingPersonRef.value!.modelOfContact.addr = raw!.contact_address;
...@@ -167,6 +169,7 @@ const handleClickEdit = ({ id }: { id: number }) => { ...@@ -167,6 +169,7 @@ const handleClickEdit = ({ id }: { id: number }) => {
}; };
AddFilingPersonRef.value!.id = id; AddFilingPersonRef.value!.id = id;
});
}; };
watch(searchValue, () => { watch(searchValue, () => {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Icon icon-name="iconshenpiweitongguo-chakanyuanyin"></Icon> <Icon icon-name="iconshenpiweitongguo-chakanyuanyin"></Icon>
</template> </template>
<template #message> <template #message>
{{ rowData?.authentication_audit_opinions }} {{ rowData?.record_audit_opinions }}
<!-- <span v-if="!msg" class="text-xs">原因加载中...</span> <!-- <span v-if="!msg" class="text-xs">原因加载中...</span>
<span v-else class=""> <span v-else class="">
{{ msg }} {{ msg }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment