提交 c2f76687 编写于 作者: 刘英杰's avatar 刘英杰

V20240920 新增》值班配置“是否签到”字段

上级 91ba9049
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><title>值班管理</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.a786022a.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 值班管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.9ae50470.js></script><script src=js/app.4c45fae7.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><title>值班管理</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.a786022a.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 值班管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.9ae50470.js></script><script src=js/app.6839b741.js></script></body></html>
\ No newline at end of file \ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetLogRecordBacklogList(params: GetApiDu ...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetLogRecordBacklogList(params: GetApiDu
duty_data: { duty_data: {
begin: string; begin: string;
end: string; end: string;
morrow: number;
practical_sign_end: string; practical_sign_end: string;
state: number; state: number;
sel_state: number; sel_state: number;
......
...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetLogRecordRepairList(config?: AxiosReq ...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetLogRecordRepairList(config?: AxiosReq
duty_data: { duty_data: {
begin: string; begin: string;
end: string; end: string;
morrow: number;
practical_sign_end: string; practical_sign_end: string;
state: number; state: number;
sel_state: number; sel_state: number;
......
...@@ -19,6 +19,7 @@ export declare function getApiDutyRecordGetSignInitNew(config?: AxiosRequestConf ...@@ -19,6 +19,7 @@ export declare function getApiDutyRecordGetSignInitNew(config?: AxiosRequestConf
duty_data: { duty_data: {
begin: string; begin: string;
end: string; end: string;
morrow: number;
practical_sign_end: string; practical_sign_end: string;
state: number; state: number;
sel_state: number; sel_state: number;
......
...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetSubordinateLogRecordList(params: GetA ...@@ -23,6 +23,7 @@ export declare function getApiDutyRecordGetSubordinateLogRecordList(params: GetA
duty_data: { duty_data: {
begin: string; begin: string;
end: string; end: string;
morrow: number;
practical_sign_end: string; practical_sign_end: string;
state: number; state: number;
sel_state: number; sel_state: number;
......
...@@ -44,6 +44,7 @@ export declare function postApiDutyRecordGetMyDutyRecordListNew(input?: MyDutyRe ...@@ -44,6 +44,7 @@ export declare function postApiDutyRecordGetMyDutyRecordListNew(input?: MyDutyRe
duty_data: { duty_data: {
begin: string; begin: string;
end: string; end: string;
morrow: number;
practical_sign_end: string; practical_sign_end: string;
state: number; state: number;
sel_state: number; sel_state: number;
......
...@@ -90,4 +90,6 @@ export interface AddDutyConfigRequest { ...@@ -90,4 +90,6 @@ export interface AddDutyConfigRequest {
* Nullable:True * Nullable:True
*/ */
effect_end?: string; effect_end?: string;
/** 是否签到 */
is_sign?: number;
} }
export interface DutyTimeData { export interface DutyTimeData {
begin?: string; begin?: string;
end?: string; end?: string;
/** 0-当天,1-次日 */
morrow?: number;
/** 已签到时间 */ /** 已签到时间 */
practical_sign_end?: string; practical_sign_end?: string;
/** 0-未签到,1-待签到,2-已签到 */ /** 0-未签到,1-待签到,2-已签到,3-超时 */
state?: number; state?: number;
/** 0-未生效,1-生效 */ /** 0-未生效,1-生效 */
sel_state?: number; sel_state?: number;
......
...@@ -21,4 +21,6 @@ export interface LogRecordRequests { ...@@ -21,4 +21,6 @@ export interface LogRecordRequests {
dispose_content?: string; dispose_content?: string;
createtime?: string; createtime?: string;
file_list?: DutyFile[]; file_list?: DutyFile[];
/** 0-保存,1-提交 */
is_save?: number;
} }
...@@ -7,7 +7,7 @@ export interface SignInitResponses { ...@@ -7,7 +7,7 @@ export interface SignInitResponses {
duty_date?: string; duty_date?: string;
duty_type_id?: string; duty_type_id?: string;
duty_type_name?: string; duty_type_name?: string;
/** 0-当前正在值班,1-值班结束,2-非值班当天 */ /** 0-当前正在值班,1-值班结束,2-非值班当天 3-无须值班 */
duty_state?: number; duty_state?: number;
duty_data?: DutyTimeData[]; duty_data?: DutyTimeData[];
/** 坐标 */ /** 坐标 */
......
...@@ -11,4 +11,6 @@ export interface TimeSlot { ...@@ -11,4 +11,6 @@ export interface TimeSlot {
* Nullable:True * Nullable:True
*/ */
end?: string; end?: string;
/** 0-当天,1-次日 */
morrow?: number;
} }
...@@ -84,4 +84,6 @@ export interface UpdateDutyConfigRequest { ...@@ -84,4 +84,6 @@ export interface UpdateDutyConfigRequest {
* Nullable:True * Nullable:True
*/ */
effect_end?: string; effect_end?: string;
/** 是否签到 */
is_sign?: number;
} }
...@@ -173,6 +173,9 @@ ...@@ -173,6 +173,9 @@
<template #log_content="{row}"> <template #log_content="{row}">
<Ellipsis :height="80" :text="row.log_content" :transfer="true" tooltip/> <Ellipsis :height="80" :text="row.log_content" :transfer="true" tooltip/>
</template> </template>
<template #is_sign="{row}">
<Tag :type="['warning','blue'][row.is_sign]">{{['否','是'][row.is_sign]}}</Tag>
</template>
</CTable> </CTable>
</Card> </Card>
</div> </div>
...@@ -299,6 +302,7 @@ export default { ...@@ -299,6 +302,7 @@ export default {
{key: 'effect_begin', title: '配置生效开始时间', align: 'center', minWidth: 150, show: true}, {key: 'effect_begin', title: '配置生效开始时间', align: 'center', minWidth: 150, show: true},
{key: 'effect_end', title: '配置生效结束时间', align: 'center', minWidth: 150, show: true}, {key: 'effect_end', title: '配置生效结束时间', align: 'center', minWidth: 150, show: true},
{slot: 'log_content', title: '值班日志', align: 'center', minWidth: 150, show: true}, {slot: 'log_content', title: '值班日志', align: 'center', minWidth: 150, show: true},
{slot: 'is_sign', title: '是否签到', align: 'center', minWidth: 150, show: true},
{slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 150, show: true}, {slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 150, show: true},
{slot: 'actionAndDetails', title: '操作', align: 'center', minWidth: 160, show: true, fixed: 'right'}, {slot: 'actionAndDetails', title: '操作', align: 'center', minWidth: 160, show: true, fixed: 'right'},
], ],
...@@ -339,6 +343,7 @@ export default { ...@@ -339,6 +343,7 @@ export default {
{id: 'sign_night_time', name: '晚上签到时间', type: 'areaTime2', disabled: false, require: false, optList: []}, {id: 'sign_night_time', name: '晚上签到时间', type: 'areaTime2', disabled: false, require: false, optList: []},
{id: 'log_content', name: '配置日志', type: 'textarea', disabled: false, require: false, optList: []}, {id: 'log_content', name: '配置日志', type: 'textarea', disabled: false, require: false, optList: []},
{id: 'attandence_area', name: '值班打卡坐标', type: 'area', disabled: false, require: false, optList: []}, {id: 'attandence_area', name: '值班打卡坐标', type: 'area', disabled: false, require: false, optList: []},
{id: 'is_sign', name: '是否签到', type: 'switch', disabled: false, require: false, optList: []},
/* { id: 'effect_begin', name: '配置生效开始时间', type: 'datetime', disabled: false, require: false, optList: [] }, /* { id: 'effect_begin', name: '配置生效开始时间', type: 'datetime', disabled: false, require: false, optList: [] },
{ id: 'effect_end', name: '配置生效结束时间', type: 'datetime', disabled: false, require: false, optList: [] },*/ { id: 'effect_end', name: '配置生效结束时间', type: 'datetime', disabled: false, require: false, optList: [] },*/
...@@ -386,7 +391,7 @@ export default { ...@@ -386,7 +391,7 @@ export default {
"day_time_end": "", "day_time_end": "",
"effect_begin": "", "effect_begin": "",
"effect_end": "", "effect_end": "",
"is_sign":0,
}, },
// 角色 // 角色
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或