diff --git a/frontend/public/file/注册操作手册.docx b/frontend/public/file/注册操作手册.docx new file mode 100644 index 0000000..866c3f0 Binary files /dev/null and b/frontend/public/file/注册操作手册.docx differ diff --git a/frontend/public/file/过鱼设施数据填报操作手册.docx b/frontend/public/file/过鱼设施数据填报操作手册.docx new file mode 100644 index 0000000..d763b0e Binary files /dev/null and b/frontend/public/file/过鱼设施数据填报操作手册.docx differ diff --git a/frontend/src/api/shengPiJiLu/index.ts b/frontend/src/api/shengPiJiLu/index.ts index 63510f6..7020313 100644 --- a/frontend/src/api/shengPiJiLu/index.ts +++ b/frontend/src/api/shengPiJiLu/index.ts @@ -34,3 +34,12 @@ export function batchApproveByApprovalId(data: any) { data }); } + +// 批量驳回 +export function batchReject(data: { approvalIds: string[], rejectReason: string }) { + return request({ + url: '/data/fishDraft/batchReject', + method: 'post', + data + }); +} diff --git a/frontend/src/views/register/index.vue b/frontend/src/views/register/index.vue index 5b75f8b..f1d39d9 100644 --- a/frontend/src/views/register/index.vue +++ b/frontend/src/views/register/index.vue @@ -25,7 +25,7 @@ - + @@ -83,12 +83,18 @@ - + 已有账号?返回登录 - - + + | + +
+ + + 注册用户操作手册 + +
@@ -96,7 +102,7 @@ + @ok="onRegister" @cancel="handleModalCancel" :maskClosable="false"> @@ -445,10 +451,10 @@ const handleSendSms = async () => { } try { - const res:any = await sendSmsCode(registerData.phone, 1); // type=1 表示注册 - if (res.code == 1) { - return; - } + const res: any = await sendSmsCode(registerData.phone, 1); // type=1 表示注册 + if (res.code == 1) { + return; + } message.success("验证码已发送"); // 启动60秒倒计时 @@ -838,4 +844,5 @@ const filterOption = (inputValue: string, option: any) => { } } } -} +} + diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/guoYuSheShiShuJuHistorySearch.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/guoYuSheShiShuJuHistorySearch.vue index c5efbd1..e32a364 100644 --- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/guoYuSheShiShuJuHistorySearch.vue +++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/guoYuSheShiShuJuHistorySearch.vue @@ -87,16 +87,16 @@ const searchList: any = computed(() => [ allowClear: true, }, }, - { - width: 120, - type: "Select", - name: "status", - label: "数据状态", - fieldProps: { - // allowClear: true, - }, - options: props.guoyuStatus, - }, + // { + // width: 120, + // type: "Select", + // name: "status", + // label: "数据状态", + // fieldProps: { + // // allowClear: true, + // }, + // options: props.guoyuStatus, + // }, { span: 12, type: "RangePicker", diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue index 4b95ffc..ba37e67 100644 --- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue +++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuHistory/index.vue @@ -2,7 +2,7 @@
- +
@@ -349,13 +349,13 @@ const handleSearchFinish = (values: any) => { field: "strdt", operator: "gte", dataType: "date", - value: values.strdt[0], + value: values.strdt[0] + ' 00:00:00', }, { field: "strdt", operator: "lte", dataType: "date", - value: values.strdt[1], + value: values.strdt[1] + ' 23:59:59', }, values.direction && { field: "direction", @@ -363,11 +363,11 @@ const handleSearchFinish = (values: any) => { dataType: "string", value: values.direction, }, - values.status && { + { field: "status", operator: "eq", dataType: "string", - value: values.status, + value: 'APPROVED', }, values.stcd && { field: "stcd", @@ -418,11 +418,11 @@ onMounted(() => { observer.observe(tableContainerRef.value); } }); - + getDictItemsByCode({ dictCode: "direction" }).then((res) => { direction.value = res.data; }); - + getDictItemsByCode({ dictCode: "approvalStatus" }).then((res) => { guoyuStatus.value.length = 0; res.data.forEach((item: any) => { diff --git a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoSearch.vue b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoSearch.vue index 9fbdbe5..a3bb5d5 100644 --- a/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoSearch.vue +++ b/frontend/src/views/shuJuTianBao/guoYuSheShiShuJuTianBao/guoYuSheShiShuJuTianBaoSearch.vue @@ -1,13 +1,13 @@