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

V1.0.1.250205-250325

1.安排值班>列表及顶部》增加 “相互换班功能”
2.系统配置》值班类型〉支持启用禁用功能
上级 bfc0d625
流水线 #33902 已失败 ,包含阶段
in 31 second
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
.selectTitleIcon[data-v-cb788a4c]:hover{cursor:pointer}
\ No newline at end of file
.selectTitleIcon[data-v-444bf3f9]:hover{cursor:pointer}
\ No newline at end of file
<!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"><link rel="shortcut icon" href=favicon.ico><title>值班管理</title><link href=css/app.35e59e0d.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/gljs?v=1.exp&key=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.231bdbe1.js></script><script src=js/app.5ed199ca.js></script></body></html>
\ No newline at end of file
<!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"><link rel="shortcut icon" href=favicon.ico><title>值班管理</title><link href=css/app.37b2e41c.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/gljs?v=1.exp&key=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.231bdbe1.js></script><script src=js/app.405261ce.js></script></body></html>
\ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0a44c5"],{"069b":function(t,e,r){"use strict";r.d(e,"a",(function(){return i})),r.d(e,"b",(function(){return p})),r.d(e,"c",(function(){return s}));var n=r("b6bd");r("8e6e"),r("ac6a"),r("456d");var c=r("bd86");r("7f7f");function o(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,n)}return r}function a(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?o(Object(r),!0).forEach((function(e){Object(c["a"])(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}))}return t}function i(t,e){var r={first_id:t.first_id,second_id:t.second_id};return n["a"].get("/api/Watch/api/Watch/ExchangeDuty",a({params:r},e))}function p(t){return n["a"].get("/api/Watch/api/Watch/GetExchangableDuty",t)}function u(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,n)}return r}function b(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?u(Object(r),!0).forEach((function(e){Object(c["a"])(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):u(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}))}return t}function s(t,e){var r={id:t.id,status:t.status};return n["a"].get("/api/WatchType/api/WatchType/EnableWatchType",b({params:r},e))}}}]);
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
import { type AxiosRequestConfig } from "axios";
/**
* 双向换班
* /api/Watch/api/Watch/ExchangeDuty
*/
export declare function getApiWatchApiWatchExchangeDuty(params: GetApiWatchApiWatchExchangeDutyParams, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
export interface GetApiWatchApiWatchExchangeDutyParams {
/** 换班id的第一个id */
first_id?: string;
/** 换班id的第二个id */
second_id?: string;
}
import request from "@/plugins/request";
/**
* 双向换班
* /api/Watch/api/Watch/ExchangeDuty
*/
export function getApiWatchApiWatchExchangeDuty(params, config) {
const paramsInput = {
first_id: params.first_id,
second_id: params.second_id,
};
return request.get(`/api/Watch/api/Watch/ExchangeDuty`, {
params: paramsInput,
...config,
});
}
import { type AxiosRequestConfig } from "axios";
/**
* 获取调班值班
* /api/Watch/api/Watch/GetExchangableDuty
*/
export declare function getApiWatchApiWatchGetExchangableDuty(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
watchid: string;
watch_date: string;
dept_id: string;
card_name: string;
username: string;
dept_name: string;
}[];
}>;
import request from "@/plugins/request";
/**
* 获取调班值班
* /api/Watch/api/Watch/GetExchangableDuty
*/
export function getApiWatchApiWatchGetExchangableDuty(config) {
return request.get(`/api/Watch/api/Watch/GetExchangableDuty`, config);
}
......@@ -7,6 +7,8 @@ export * from "./postApiWatchApiWatchWatchDataExport";
export * from "./getApiWatchApiWatchWatchImportTemplate";
export * from "./postApiWatchApiWatchWatchImport";
export * from "./getApiWatchApiWatchWatchInfoSaveOneSelf";
export * from "./getApiWatchApiWatchExchangeDuty";
export * from "./getApiWatchApiWatchGetExchangableDuty";
export * from "./postApiWatchApiWatchWatchSendMeg";
export * from "./getApiWatchApiWatchGetWatchCount";
export * from "./getApiWatchApiWatchGetWatchHourTime";
......
......@@ -7,6 +7,8 @@ export * from "./postApiWatchApiWatchWatchDataExport";
export * from "./getApiWatchApiWatchWatchImportTemplate";
export * from "./postApiWatchApiWatchWatchImport";
export * from "./getApiWatchApiWatchWatchInfoSaveOneSelf";
export * from "./getApiWatchApiWatchExchangeDuty";
export * from "./getApiWatchApiWatchGetExchangableDuty";
export * from "./postApiWatchApiWatchWatchSendMeg";
export * from "./getApiWatchApiWatchGetWatchCount";
export * from "./getApiWatchApiWatchGetWatchHourTime";
......
import { type AxiosRequestConfig } from "axios";
/**
* 启用禁用值班类型
* /api/WatchType/api/WatchType/EnableWatchType
*/
export declare function getApiWatchTypeApiWatchTypeEnableWatchType(params: GetApiWatchTypeApiWatchTypeEnableWatchTypeParams, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
export interface GetApiWatchTypeApiWatchTypeEnableWatchTypeParams {
/** 值班类型id */
id: string;
/** true-启用,false-禁用 */
status: boolean;
}
import request from "@/plugins/request";
/**
* 启用禁用值班类型
* /api/WatchType/api/WatchType/EnableWatchType
*/
export function getApiWatchTypeApiWatchTypeEnableWatchType(params, config) {
const paramsInput = {
id: params.id,
status: params.status,
};
return request.get(`/api/WatchType/api/WatchType/EnableWatchType`, {
params: paramsInput,
...config,
});
}
......@@ -16,6 +16,8 @@ export declare function getApiWatchTypeApiWatchTypeGetWatchTypeInfo(params: GetA
sign_type: number;
watchhour_id: string;
watchhourname: string;
is_del: number;
is_enable: number;
};
}>;
export interface GetApiWatchTypeApiWatchTypeGetWatchTypeInfoParams {
......
......@@ -36,6 +36,8 @@ export declare function getApiWatchTypeApiWatchTypeGetWatchTypeList(params: GetA
sign_type: number;
watchhour_id: string;
watchhourname: string;
is_del: number;
is_enable: number;
}[];
query: {
[x: string]: any;
......
......@@ -2,3 +2,4 @@ export * from "./getApiWatchTypeApiWatchTypeGetWatchTypeList";
export * from "./getApiWatchTypeApiWatchTypeGetWatchTypeInfo";
export * from "./postApiWatchTypeApiWatchTypeWatchTypeSave";
export * from "./getApiWatchTypeApiWatchTypeWatchTypeDel";
export * from "./getApiWatchTypeApiWatchTypeEnableWatchType";
......@@ -2,3 +2,4 @@ export * from "./getApiWatchTypeApiWatchTypeGetWatchTypeList";
export * from "./getApiWatchTypeApiWatchTypeGetWatchTypeInfo";
export * from "./postApiWatchTypeApiWatchTypeWatchTypeSave";
export * from "./getApiWatchTypeApiWatchTypeWatchTypeDel";
export * from "./getApiWatchTypeApiWatchTypeEnableWatchType";
export interface ExchangableWatchResponse {
/**
* Desc:值班id
* Default:
* Nullable:False
*/
watchid?: string;
/**
* Desc:值班日期
* Default:
* Nullable:True
*/
watch_date?: string;
/**
* Desc:部门
* Default:
* Nullable:True
*/
dept_id?: string;
/**
* Desc:员工号
* Default:
* Nullable:True
*/
card_name?: string;
/**
* Desc:员工姓名
* Default:
* Nullable:True
*/
username?: string;
/**
* Desc:值班部门
* Default:
* Nullable:True
*/
dept_name?: string;
}
import { type ExchangableWatchResponse } from "../../interface";
export interface ExchangableWatchResponseListMessageModel {
code?: number;
status?: string;
msg?: string;
msg_detail?: string;
response?: ExchangableWatchResponse[];
}
......@@ -6,4 +6,6 @@ export interface WatchType {
sign_type?: number;
watchhour_id?: string;
watchhourname?: string;
is_del?: number;
is_enable?: number;
}
......@@ -60,6 +60,8 @@ export * from "./apiTypes/Watch";
export * from "./apiTypes/WatchPageModel";
export * from "./apiTypes/WatchPageModelMessageModel";
export * from "./apiTypes/WatchMessageModel";
export * from "./apiTypes/ExchangableWatchResponse";
export * from "./apiTypes/ExchangableWatchResponseListMessageModel";
export * from "./apiTypes/Int32MessageModel";
export * from "./apiTypes/StringListMessageModel";
export * from "./apiTypes/WatchHour";
......
......@@ -60,6 +60,8 @@ export * from "./apiTypes/Watch";
export * from "./apiTypes/WatchPageModel";
export * from "./apiTypes/WatchPageModelMessageModel";
export * from "./apiTypes/WatchMessageModel";
export * from "./apiTypes/ExchangableWatchResponse";
export * from "./apiTypes/ExchangableWatchResponseListMessageModel";
export * from "./apiTypes/Int32MessageModel";
export * from "./apiTypes/StringListMessageModel";
export * from "./apiTypes/WatchHour";
......
......@@ -4,11 +4,11 @@ import Vue from "vue";
let vm = new Vue()
export function publicConfirm(publicFunction) {
export function publicConfirm(publicFunction,text='<p>是否继续此操作?</p>') {
// 公共弹窗删除
Modal.confirm({
title: '警告',
content: '<p>是否继续此操作?</p>',
title: '提示',
content: text,
cancelText: "取消",
okText: '确定',
onOk: async () => {
......@@ -49,36 +49,46 @@ export function storageAddEventListener(fun) {
});
}
export async function myEncapsulationFunction(fun) {
export async function myEncapsulationFunction(fun, isShowSuccessText = false, text = '正在提交中...') {
// Spin.show()
Message.loading({
duration: 0,
content: text,
})
let res = await fun()
if (isShowSuccessText) return Message.destroy();
try {
switch (res.code) {
case 1 :
Message.destroy()
Message['success']({
background: true,
content: res.msg
content: res.msg,
duration: 2,
});
break;
default :
Message.destroy()
Message['error']({
background: true,
content: res.msg_detail
content: res.msg_detail,
duration: 2,
});
}
console.log("try")
// Spin.hide()
return res
} catch (e) {
console.log("catch,", e)
Spin.hide()
Message.destroy()
Message['error']({
background: true,
content: res.msg_detail
content: res.msg_detail,
duration: 2,
});
}
}
export function getInitListRequest(fun) {
try {
vm.prototypeLoading = true
......
......@@ -40,7 +40,7 @@
width: 100%;
"
>
V1.0.1.250205-250305
V1.0.1.250205-250325
</span>
</div>
</div>
......
此差异已折叠。
......@@ -22,6 +22,21 @@
<span v-if="row.sign_type == 1">无定位打卡</span>
<span v-if="row.sign_type == 2">定位拍照打卡</span>
</template>
<template #is_enable="{ row }">
<Switch
@on-change="onChangeSwitch($event,row)"
size="large"
v-model="row.is_enable"
:true-value="1"
:false-value="0">
<template #open>
<span>启用</span>
</template>
<template #close>
<span>禁用</span>
</template>
</Switch>
</template>
<!-- 操作 -->
<template #action="{row}">
<Button type="primary" size="small" @click="update(row)">修改</Button>
......@@ -89,6 +104,7 @@
<script>
import * as api from '../../../../api/lezRequest'
import * as request from '@/api/request/controller'
import * as hooks from '../../../../hooks/index'
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
......@@ -138,6 +154,11 @@
title: '值班时间',
key: 'watchhourname',
},
{
title: '启用/禁用',
slot: 'is_enable',
},
// {
// title: '备注',
// key:'role_remark',
......@@ -185,6 +206,20 @@
},
//方法集合",
methods: {
//启用或禁用
onChangeSwitch(e,row){
hooks.myEncapsulationFunction(()=>{
return request.getApiWatchTypeApiWatchTypeEnableWatchType({
id:row.watchtypeid,
status:Boolean(e)
}).then(res=>{
if (res.code === 1){
this.GetWatchTypeList()
}
return res
})
})
},
modalOk() {
hooks.myEncapsulationFunction(async () => {
let data = {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或