提交 ce7e9792 编写于 作者: 钟一霄's avatar 钟一霄

完成:系统配置快捷评语;活动管理查看物资(树)、评论、轨迹;黑名单管理;

上级 951a8d22
/**
* 活动取消
* /api/Activity/ActivityCancel
*/
export declare function getApiActivityActivityCancel(params: GetApiActivityActivityCancelParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
interface GetApiActivityActivityCancelParams {
id?: string;
}
export {};
import request from "@/plugins/request";
/**
* 活动取消
* /api/Activity/ActivityCancel
*/
export function getApiActivityActivityCancel(params) {
const paramsInput = {
id: params.id,
};
return request.get(`/api/Activity/ActivityCancel`, {
params: paramsInput,
});
}
/**
* 活动删除
* /api/Activity/ActivityDel
*/
export declare function getApiActivityActivityDel(params: GetApiActivityActivityDelParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
interface GetApiActivityActivityDelParams {
id?: string;
}
export {};
import request from "@/plugins/request";
/**
* 活动删除
* /api/Activity/ActivityDel
*/
export function getApiActivityActivityDel(params) {
const paramsInput = {
id: params.id,
};
return request.get(`/api/Activity/ActivityDel`, {
params: paramsInput,
});
}
...@@ -42,6 +42,7 @@ export declare function getApiActivityGetActivityInfo(params: GetApiActivityGetA ...@@ -42,6 +42,7 @@ export declare function getApiActivityGetActivityInfo(params: GetApiActivityGetA
activity_name: string; activity_name: string;
is_evaluate: number; is_evaluate: number;
flow_id: string; flow_id: string;
flow_no: string;
}; };
}>; }>;
interface GetApiActivityGetActivityInfoParams { interface GetApiActivityGetActivityInfoParams {
......
...@@ -3,7 +3,8 @@ export * from "./postApiActivityGetActivityListByWxPlaceAdmin"; ...@@ -3,7 +3,8 @@ export * from "./postApiActivityGetActivityListByWxPlaceAdmin";
export * from "./postApiActivityGetActivityListByWxUser"; export * from "./postApiActivityGetActivityListByWxUser";
export * from "./getApiActivityGetActivityInfo"; export * from "./getApiActivityGetActivityInfo";
export * from "./postApiActivityActivityDirectIns"; export * from "./postApiActivityActivityDirectIns";
export * from "./postApiActivityActivityApplyIns"; export * from "./getApiActivityActivityCancel";
export * from "./getApiActivityActivityDel";
export * from "./getApiActivityActivityAdjustTimeOrPlaceSave"; export * from "./getApiActivityActivityAdjustTimeOrPlaceSave";
export * from "./getApiActivityGetParticipantList"; export * from "./getApiActivityGetParticipantList";
export * from "./postApiActivityParticipantIns"; export * from "./postApiActivityParticipantIns";
......
...@@ -3,7 +3,8 @@ export * from "./postApiActivityGetActivityListByWxPlaceAdmin"; ...@@ -3,7 +3,8 @@ export * from "./postApiActivityGetActivityListByWxPlaceAdmin";
export * from "./postApiActivityGetActivityListByWxUser"; export * from "./postApiActivityGetActivityListByWxUser";
export * from "./getApiActivityGetActivityInfo"; export * from "./getApiActivityGetActivityInfo";
export * from "./postApiActivityActivityDirectIns"; export * from "./postApiActivityActivityDirectIns";
export * from "./postApiActivityActivityApplyIns"; export * from "./getApiActivityActivityCancel";
export * from "./getApiActivityActivityDel";
export * from "./getApiActivityActivityAdjustTimeOrPlaceSave"; export * from "./getApiActivityActivityAdjustTimeOrPlaceSave";
export * from "./getApiActivityGetParticipantList"; export * from "./getApiActivityGetParticipantList";
export * from "./postApiActivityParticipantIns"; export * from "./postApiActivityParticipantIns";
......
...@@ -6,5 +6,3 @@ export * from "./getApiCommonGetPlaceTypeSelect"; ...@@ -6,5 +6,3 @@ export * from "./getApiCommonGetPlaceTypeSelect";
export * from "./getApiCommonGetPlaceSelect"; export * from "./getApiCommonGetPlaceSelect";
export * from "./getApiCommonGetKeyByActivityList"; export * from "./getApiCommonGetKeyByActivityList";
export * from "./getApiCommonGetSexSelect"; export * from "./getApiCommonGetSexSelect";
export * from "./getApiCommonGetFlowSelect";
export * from "./getApiCommonGetUserInfo";
...@@ -6,5 +6,3 @@ export * from "./getApiCommonGetPlaceTypeSelect"; ...@@ -6,5 +6,3 @@ export * from "./getApiCommonGetPlaceTypeSelect";
export * from "./getApiCommonGetPlaceSelect"; export * from "./getApiCommonGetPlaceSelect";
export * from "./getApiCommonGetKeyByActivityList"; export * from "./getApiCommonGetKeyByActivityList";
export * from "./getApiCommonGetSexSelect"; export * from "./getApiCommonGetSexSelect";
export * from "./getApiCommonGetFlowSelect";
export * from "./getApiCommonGetUserInfo";
/**
* 场地带出字段
* /api/Flow/FlowPlaceDataOut
*/
export declare function getApiFlowFlowPlaceDataOut(params: GetApiFlowFlowPlaceDataOutParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
place_id: string;
place_name: string;
place_code: string;
sex: string;
place_address: string;
capacity: string;
threshold: string;
description: string;
};
}>;
interface GetApiFlowFlowPlaceDataOutParams {
id?: string;
}
export {};
import request from "@/plugins/request";
/**
* 场地带出字段
* /api/Flow/FlowPlaceDataOut
*/
export function getApiFlowFlowPlaceDataOut(params) {
const paramsInput = {
id: params.id,
};
return request.get(`/api/Flow/FlowPlaceDataOut`, {
params: paramsInput,
});
}
/**
* 获取允许加时时间段个数
* /api/Flow/GetFlowAddTimeNum
*/
export declare function getApiFlowGetFlowAddTimeNum(): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 获取允许加时时间段个数
* /api/Flow/GetFlowAddTimeNum
*/
export function getApiFlowGetFlowAddTimeNum() {
return request.get(`/api/Flow/GetFlowAddTimeNum`);
}
/**
* 获取物资树
* /api/Flow/GetFlowCommodityTree
*/
export declare function getApiFlowGetFlowCommodityTree(params: GetApiFlowGetFlowCommodityTreeParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
id: string;
commodity_name: string;
parent_id: string;
place_type_id: string;
place_type_name: string;
file_id: string;
is_enable: number;
is_del: number;
createby: string;
createtime: string;
modifyby: string;
modify_time: string;
children: any[];
}[];
}>;
interface GetApiFlowGetFlowCommodityTreeParams {
place_type_id?: string;
}
export {};
import request from "@/plugins/request";
/**
* 获取物资树
* /api/Flow/GetFlowCommodityTree
*/
export function getApiFlowGetFlowCommodityTree(params) {
const paramsInput = {
place_type_id: params.place_type_id,
};
return request.get(`/api/Flow/GetFlowCommodityTree`, {
params: paramsInput,
});
}
/**
* 获取场地时间段
* /api/Flow/GetFlowPlaceHourList
*/
export declare function getApiFlowGetFlowPlaceHourList(params: GetApiFlowGetFlowPlaceHourListParams): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
place_id: string;
place_code: string;
place_name: string;
card: string;
name: string;
begin_time: string;
end_time: string;
time_section: string;
occupy_flag: number;
occupy_name: string;
}[];
}>;
interface GetApiFlowGetFlowPlaceHourListParams {
place_id: string;
day: string;
}
export {};
import request from "@/plugins/request";
/**
* 获取场地时间段
* /api/Flow/GetFlowPlaceHourList
*/
export function getApiFlowGetFlowPlaceHourList(params) {
const paramsInput = {
place_id: params.place_id,
day: params.day,
};
return request.get(`/api/Flow/GetFlowPlaceHourList`, {
params: paramsInput,
});
}
/**
* 场地类型带出场地下拉框
* /api/Flow/GetFlowPlaceSelect
*/
export declare function getApiFlowGetFlowPlaceSelect(params: GetApiFlowGetFlowPlaceSelectParams): import("axios").AxiosPromise<{
name: string;
id: string;
}[]>;
interface GetApiFlowGetFlowPlaceSelectParams {
id?: string;
sex?: string;
}
export {};
import request from "@/plugins/request";
/**
* 场地类型带出场地下拉框
* /api/Flow/GetFlowPlaceSelect
*/
export function getApiFlowGetFlowPlaceSelect(params) {
const paramsInput = {
id: params.id,
sex: params.sex,
};
return request.get(`/api/Flow/GetFlowPlaceSelect`, {
params: paramsInput,
});
}
/**
* 获取场地类型下拉框
* /api/Flow/GetFlowPlaceTypeSelect
*/
export declare function getApiFlowGetFlowPlaceTypeSelect(): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
name: string;
id: string;
}[];
}>;
import request from "@/plugins/request";
/**
* 获取场地类型下拉框
* /api/Flow/GetFlowPlaceTypeSelect
*/
export function getApiFlowGetFlowPlaceTypeSelect() {
return request.get(`/api/Flow/GetFlowPlaceTypeSelect`);
}
/** /**
* 获取流程选择框 * 获取流程选择框
* /api/Common/GetFlowSelect * /api/Flow/GetFlowSelect
*/ */
export declare function getApiCommonGetFlowSelect(): import("axios").AxiosPromise<{ export declare function getApiFlowGetFlowSelect(): import("axios").AxiosPromise<{
name: string; name: string;
id: string; id: string;
}[]>; }[]>;
import request from "@/plugins/request"; import request from "@/plugins/request";
/** /**
* 获取流程选择框 * 获取流程选择框
* /api/Common/GetFlowSelect * /api/Flow/GetFlowSelect
*/ */
export function getApiCommonGetFlowSelect() { export function getApiFlowGetFlowSelect() {
return request.get(`/api/Common/GetFlowSelect`); return request.get(`/api/Flow/GetFlowSelect`);
} }
/** /**
* 根据卡号获取用户信息 * 根据卡号获取用户信息
* /api/Common/GetUserInfo * /api/Flow/GetFlowUserInfo
*/ */
export declare function getApiCommonGetUserInfo(params: GetApiCommonGetUserInfoParams): import("axios").AxiosPromise<{ export declare function getApiFlowGetFlowUserInfo(params: GetApiFlowGetFlowUserInfoParams): import("axios").AxiosPromise<{
code: number; code: number;
status: string; status: string;
msg: string; msg: string;
...@@ -19,7 +19,7 @@ export declare function getApiCommonGetUserInfo(params: GetApiCommonGetUserInfoP ...@@ -19,7 +19,7 @@ export declare function getApiCommonGetUserInfo(params: GetApiCommonGetUserInfoP
sex: string; sex: string;
}; };
}>; }>;
interface GetApiCommonGetUserInfoParams { interface GetApiFlowGetFlowUserInfoParams {
card: string; card: string;
} }
export {}; export {};
import request from "@/plugins/request"; import request from "@/plugins/request";
/** /**
* 根据卡号获取用户信息 * 根据卡号获取用户信息
* /api/Common/GetUserInfo * /api/Flow/GetFlowUserInfo
*/ */
export function getApiCommonGetUserInfo(params) { export function getApiFlowGetFlowUserInfo(params) {
const paramsInput = { const paramsInput = {
card: params.card, card: params.card,
}; };
return request.get(`/api/Common/GetUserInfo`, { return request.get(`/api/Flow/GetFlowUserInfo`, {
params: paramsInput, params: paramsInput,
}); });
} }
export * from "./getApiFlowGetFlowSelect";
export * from "./getApiFlowGetFlowUserInfo";
export * from "./getApiFlowFlowPlaceDataOut";
export * from "./getApiFlowGetFlowPlaceTypeSelect";
export * from "./getApiFlowGetFlowPlaceSelect";
export * from "./postApiFlowFlowActivityApplyIns";
export * from "./getApiFlowGetFlowCommodityTree";
export * from "./getApiFlowGetFlowPlaceHourList";
export * from "./getApiFlowGetFlowAddTimeNum";
export * from "./postApiFlowFlowActivityConflict";
export * from "./postApiFlowFlowActivityPass";
export * from "./getApiFlowGetFlowSelect";
export * from "./getApiFlowGetFlowUserInfo";
export * from "./getApiFlowFlowPlaceDataOut";
export * from "./getApiFlowGetFlowPlaceTypeSelect";
export * from "./getApiFlowGetFlowPlaceSelect";
export * from "./postApiFlowFlowActivityApplyIns";
export * from "./getApiFlowGetFlowCommodityTree";
export * from "./getApiFlowGetFlowPlaceHourList";
export * from "./getApiFlowGetFlowAddTimeNum";
export * from "./postApiFlowFlowActivityConflict";
export * from "./postApiFlowFlowActivityPass";
import { type ActivityDirectRequest } from "../../interface"; import { type ActivityFlowRequest } from "../../interface";
/** /**
* 申请活动 * 申请活动
* /api/Activity/ActivityApplyIns * /api/Flow/FlowActivityApplyIns
*/ */
export declare function postApiActivityActivityApplyIns(input?: ActivityDirectRequest): import("axios").AxiosPromise<{ export declare function postApiFlowFlowActivityApplyIns(input?: ActivityFlowRequest): import("axios").AxiosPromise<{
code: number; code: number;
status: string; status: string;
msg: string; msg: string;
......
import request from "@/plugins/request"; import request from "@/plugins/request";
/** /**
* 申请活动 * 申请活动
* /api/Activity/ActivityApplyIns * /api/Flow/FlowActivityApplyIns
*/ */
export function postApiActivityActivityApplyIns(input) { export function postApiFlowFlowActivityApplyIns(input) {
return request.post(`/api/Activity/ActivityApplyIns`, input); return request.post(`/api/Flow/FlowActivityApplyIns`, input);
} }
import { type ActivityFlowRequest } from "../../interface";
/**
* 验证是否占用
* /api/Flow/FlowActivityConflict
*/
export declare function postApiFlowFlowActivityConflict(input?: ActivityFlowRequest): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 验证是否占用
* /api/Flow/FlowActivityConflict
*/
export function postApiFlowFlowActivityConflict(input) {
return request.post(`/api/Flow/FlowActivityConflict`, input);
}
import { type ActivityFlowRequest } from "../../interface";
/**
* 流程审批通过
* /api/Flow/FlowActivityPass
*/
export declare function postApiFlowFlowActivityPass(input?: ActivityFlowRequest): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 流程审批通过
* /api/Flow/FlowActivityPass
*/
export function postApiFlowFlowActivityPass(input) {
return request.post(`/api/Flow/FlowActivityPass`, input);
}
...@@ -15,6 +15,7 @@ export declare function getApiPlacePlaceDataOut(params: GetApiPlacePlaceDataOutP ...@@ -15,6 +15,7 @@ export declare function getApiPlacePlaceDataOut(params: GetApiPlacePlaceDataOutP
place_address: string; place_address: string;
capacity: string; capacity: string;
threshold: string; threshold: string;
description: string;
}; };
}>; }>;
interface GetApiPlacePlaceDataOutParams { interface GetApiPlacePlaceDataOutParams {
......
...@@ -2,6 +2,7 @@ export * from "./Activity"; ...@@ -2,6 +2,7 @@ export * from "./Activity";
export * from "./Commodity"; export * from "./Commodity";
export * from "./Common"; export * from "./Common";
export * from "./Evaluate"; export * from "./Evaluate";
export * from "./Flow";
export * from "./Key"; export * from "./Key";
export * from "./Login"; export * from "./Login";
export * from "./Place"; export * from "./Place";
......
...@@ -2,6 +2,7 @@ export * from "./Activity"; ...@@ -2,6 +2,7 @@ export * from "./Activity";
export * from "./Commodity"; export * from "./Commodity";
export * from "./Common"; export * from "./Common";
export * from "./Evaluate"; export * from "./Evaluate";
export * from "./Flow";
export * from "./Key"; export * from "./Key";
export * from "./Login"; export * from "./Login";
export * from "./Place"; export * from "./Place";
......
...@@ -33,4 +33,5 @@ export interface Activity { ...@@ -33,4 +33,5 @@ export interface Activity {
activity_name?: string; activity_name?: string;
is_evaluate?: number; is_evaluate?: number;
flow_id?: string; flow_id?: string;
flow_no?: string;
} }
export interface ActivityFlowRequest {
/** 流程id */
flow_id?: string;
/** 流程编号 */
flow_no?: string;
/** 用户卡号 */
card?: string;
/** 手机号 */
phone?: string;
place_type_id?: string;
place_id?: string;
begin_time?: string;
end_time?: string;
remark?: string;
commodity_list?: string[];
}
...@@ -8,4 +8,6 @@ export interface PlaceOutResponse { ...@@ -8,4 +8,6 @@ export interface PlaceOutResponse {
capacity?: string; capacity?: string;
/** 最低申请人数 */ /** 最低申请人数 */
threshold?: string; threshold?: string;
/** 场地描述 */
description?: string;
} }
...@@ -36,8 +36,6 @@ export * from "./apiTypes/SelectResponsesListMessageModel"; ...@@ -36,8 +36,6 @@ export * from "./apiTypes/SelectResponsesListMessageModel";
export * from "./apiTypes/PersonResponse"; export * from "./apiTypes/PersonResponse";
export * from "./apiTypes/KeyResponse"; export * from "./apiTypes/KeyResponse";
export * from "./apiTypes/KeyResponseListMessageModel"; export * from "./apiTypes/KeyResponseListMessageModel";
export * from "./apiTypes/UserInfoResponse";
export * from "./apiTypes/UserInfoResponseMessageModel";
export * from "./apiTypes/BlacklistRequest"; export * from "./apiTypes/BlacklistRequest";
export * from "./apiTypes/Blacklist"; export * from "./apiTypes/Blacklist";
export * from "./apiTypes/BlacklistMessageModel"; export * from "./apiTypes/BlacklistMessageModel";
...@@ -46,6 +44,13 @@ export * from "./apiTypes/EvaluateViewModel"; ...@@ -46,6 +44,13 @@ export * from "./apiTypes/EvaluateViewModel";
export * from "./apiTypes/EvaluateViewModelListMessageModel"; export * from "./apiTypes/EvaluateViewModelListMessageModel";
export * from "./apiTypes/EvaluateViewModelMessageModel"; export * from "./apiTypes/EvaluateViewModelMessageModel";
export * from "./apiTypes/EvaluateRequest"; export * from "./apiTypes/EvaluateRequest";
export * from "./apiTypes/UserInfoResponse";
export * from "./apiTypes/UserInfoResponseMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/ActivityFlowRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/KeySearchRequest"; export * from "./apiTypes/KeySearchRequest";
export * from "./apiTypes/Key"; export * from "./apiTypes/Key";
export * from "./apiTypes/KeyMessageModel"; export * from "./apiTypes/KeyMessageModel";
...@@ -73,10 +78,6 @@ export * from "./apiTypes/PlaceMessageModelPageModel"; ...@@ -73,10 +78,6 @@ export * from "./apiTypes/PlaceMessageModelPageModel";
export * from "./apiTypes/PlaceViewModel"; export * from "./apiTypes/PlaceViewModel";
export * from "./apiTypes/PlaceViewModelMessageModel"; export * from "./apiTypes/PlaceViewModelMessageModel";
export * from "./apiTypes/PlaceRequest"; export * from "./apiTypes/PlaceRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/PlaceType"; export * from "./apiTypes/PlaceType";
export * from "./apiTypes/PlaceTypeMessageModel"; export * from "./apiTypes/PlaceTypeMessageModel";
export * from "./apiTypes/PlaceTypeMessageModelPageModel"; export * from "./apiTypes/PlaceTypeMessageModelPageModel";
......
...@@ -36,8 +36,6 @@ export * from "./apiTypes/SelectResponsesListMessageModel"; ...@@ -36,8 +36,6 @@ export * from "./apiTypes/SelectResponsesListMessageModel";
export * from "./apiTypes/PersonResponse"; export * from "./apiTypes/PersonResponse";
export * from "./apiTypes/KeyResponse"; export * from "./apiTypes/KeyResponse";
export * from "./apiTypes/KeyResponseListMessageModel"; export * from "./apiTypes/KeyResponseListMessageModel";
export * from "./apiTypes/UserInfoResponse";
export * from "./apiTypes/UserInfoResponseMessageModel";
export * from "./apiTypes/BlacklistRequest"; export * from "./apiTypes/BlacklistRequest";
export * from "./apiTypes/Blacklist"; export * from "./apiTypes/Blacklist";
export * from "./apiTypes/BlacklistMessageModel"; export * from "./apiTypes/BlacklistMessageModel";
...@@ -46,6 +44,13 @@ export * from "./apiTypes/EvaluateViewModel"; ...@@ -46,6 +44,13 @@ export * from "./apiTypes/EvaluateViewModel";
export * from "./apiTypes/EvaluateViewModelListMessageModel"; export * from "./apiTypes/EvaluateViewModelListMessageModel";
export * from "./apiTypes/EvaluateViewModelMessageModel"; export * from "./apiTypes/EvaluateViewModelMessageModel";
export * from "./apiTypes/EvaluateRequest"; export * from "./apiTypes/EvaluateRequest";
export * from "./apiTypes/UserInfoResponse";
export * from "./apiTypes/UserInfoResponseMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/ActivityFlowRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/KeySearchRequest"; export * from "./apiTypes/KeySearchRequest";
export * from "./apiTypes/Key"; export * from "./apiTypes/Key";
export * from "./apiTypes/KeyMessageModel"; export * from "./apiTypes/KeyMessageModel";
...@@ -73,10 +78,6 @@ export * from "./apiTypes/PlaceMessageModelPageModel"; ...@@ -73,10 +78,6 @@ export * from "./apiTypes/PlaceMessageModelPageModel";
export * from "./apiTypes/PlaceViewModel"; export * from "./apiTypes/PlaceViewModel";
export * from "./apiTypes/PlaceViewModelMessageModel"; export * from "./apiTypes/PlaceViewModelMessageModel";
export * from "./apiTypes/PlaceRequest"; export * from "./apiTypes/PlaceRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/PlaceType"; export * from "./apiTypes/PlaceType";
export * from "./apiTypes/PlaceTypeMessageModel"; export * from "./apiTypes/PlaceTypeMessageModel";
export * from "./apiTypes/PlaceTypeMessageModelPageModel"; export * from "./apiTypes/PlaceTypeMessageModelPageModel";
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<!-- 详情 --> <!-- 详情 -->
<Row v-if="isDetails"> <Row v-if="isDetails">
<Col v-bind="grid" v-for="item in formItem.filter(a => a.type != 'file')" :key="item.id"> <Col v-bind="grid" v-for="item in formItem.filter(a => a.type != 'file' && (!a.hasOwnProperty('show') || a.show))" :key="item.id">
<FormItem :label="item.name" :prop="item.name"> <FormItem :label="item.name" :prop="item.name">
<span v-if="item.type == 'input'">{{ formData[item.id] }}</span> <span v-if="item.type == 'input'">{{ formData[item.id] }}</span>
<!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 --> <!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 -->
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<span v-if="item.type == 'switch'">{{ `${formData[item.id] == 1 ? '是' : '否'}` }}</span> <span v-if="item.type == 'switch'">{{ `${formData[item.id] == 1 ? '是' : '否'}` }}</span>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12" v-for="item in formItem.filter(a => a.type == 'file')" :key="item.id"> <Col span="12" v-for="item in formItem.filter(a => a.type == 'file' && (!a.hasOwnProperty('show') || a.show))" :key="item.id">
<FormItem :label="item.name" :prop="item.name"> <FormItem :label="item.name" :prop="item.name">
<p <p
v-for="file in formData[item.id]" v-for="file in formData[item.id]"
...@@ -224,9 +224,9 @@ export default { ...@@ -224,9 +224,9 @@ export default {
}) })
}, },
// 查看详情时初始化 // 查看详情时初始化
modalDetailsInit(row) { modalDetailsInit(row, itemName) {
this.isDetails = true this.isDetails = true
this.modalTitle = `${row.place_name} - 详情` this.modalTitle = `${row[itemName]} - 详情`
this.formData = cloneDeep(row) this.formData = cloneDeep(row)
}, },
......
...@@ -47,7 +47,10 @@ ...@@ -47,7 +47,10 @@
<Icon class="cyrIcon" type="md-person" @click="ptcDetails(row)"/> <Icon class="cyrIcon" type="md-person" @click="ptcDetails(row)"/>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<a @click="rowDetails(row)">详情</a> <a @click="cmdDetails(row)">物资</a>
<a style="margin-left: 8px;" @click="eltDetails(row)">评价</a>
<a style="margin-left: 8px;" @click="trkDetails(row)">轨迹</a>
<a style="margin-left: 8px;" @click="rowDetails(row)">详情</a>
<!-- <a style="margin-left: 8px;" @click="rowCancel(row)">取消活动</a> --> <!-- <a style="margin-left: 8px;" @click="rowCancel(row)">取消活动</a> -->
<!-- <Button type="info" size="small" @click="rowEdit(row)" style="margin-left: 8px">编辑</Button> --> <!-- <Button type="info" size="small" @click="rowEdit(row)" style="margin-left: 8px">编辑</Button> -->
<!-- <Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)"> <!-- <Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)">
...@@ -159,6 +162,142 @@ ...@@ -159,6 +162,142 @@
<Button style="margin-left: 8px;" @click="ptcModalShow = false">关闭</Button> <Button style="margin-left: 8px;" @click="ptcModalShow = false">关闭</Button>
</template> </template>
</Modal> </Modal>
<!-- 物资Modal -->
<Modal
v-model="cmdModalShow"
:title="cmdModalTitle"
:width="80"
:transfer="false"
@on-cancel="cmdModalShow = false">
<!-- 物资列表 -->
<CTable
:tableColumns="cmdTableColumns.filter(a => a.show)"
:tableData="cmdTableDataCal"
:tableLoading="cmdTableLoading"
:dataCount="cmdDataCount"
:pageIndex="cmdParams.page_index"
:pageSize="cmdParams.page_size"
@onPageChange="onCmdPageChange"
@onPageSizeChange="onCmdPageSizeChange">
<template #details="{ row }">
<a @click="cmdDetailsShow(row)">详情</a>
</template>
</CTable>
<!-- 物资详情Modal -->
<CEditModal
ref="cmddetailsmodal"
v-model="cmdDetailsModalShow"
:formItem="cmdDetailsFormItem"
:loading="cmdDetailsModalLoading"
:formLabelWidth="100"
:width="800"
@onClose="cmdDetailsModalShow = false"></CEditModal>
<template #footer>
<Button @click="cmdModalShow = false">关闭</Button>
</template>
</Modal>
<!-- 评价Modal -->
<Modal
v-model="eltModalShow"
:title="eltModalTitle"
:width="60"
:transfer="false"
@on-cancel="eltModalShow = false">
<!-- 评价列表 -->
<!-- <CTable
:tableColumns="eltTableColumns.filter(a => a.show)"
:tableData="eltTableDataCal"
:tableLoading="eltTableLoading"
:dataCount="eltDataCount"
:pageIndex="eltParams.page_index"
:pageSize="eltParams.page_size"
@onPageChange="onEltPageChange"
@onPageSizeChange="onEltPageSizeChange">
<template #details="{ row }">
<a @click="eltDetailsShow(row)">详情</a>
</template>
</CTable> -->
<!-- 评价详情Modal -->
<!-- <CEditModal
ref="eltdetailsmodal"
v-model="eltDetailsModalShow"
:formItem="eltDetailsFormItem"
:loading="eltDetailsModalLoading"
:formLabelWidth="100"
:width="800"
@onClose="eltDetailsModalShow = false"></CEditModal> -->
<!-- loading -->
<Spin size="large" fix v-if="eltModalLoading"></Spin>
<List v-if="eltTableData.length != 0" item-layout="vertical">
<ListItem v-for="item in eltTableData" :key="item.id">
<ListItemMeta
:title="item.name"
:description="`评价人:${item.evaluate_card}`" />
<p>
<Rate
v-model="item.grade"
allow-half
disabled
icon="md-star"/>
</p>
<p>{{ item.content }}</p>
<template #extra>
<img
v-for="file in item.file_list"
:key="file.id"
style="width: 200px"
:src="file.path"
@click="eltImgPreview(file)">
<!-- <p
v-for="file in getOtherFileList(item.file_list)"
:key="file.id">
<a :href="file.path" target="_blanck">{{ file.file_name }}</a>
</p> -->
</template>
</ListItem>
</List>
<p v-else style="text-align: center;">暂无评价</p>
<template #footer>
<Button @click="eltModalShow = false">关闭</Button>
</template>
</Modal>
<!-- 轨迹Modal -->
<Modal
v-model="trkModalShow"
:title="trkModalTitle"
:width="500"
:transfer="false"
@on-cancel="trkModalShow = false">
<Steps :current="trkData.length" direction="vertical">
<Step
v-for="item in trkData"
:key="item.id">
<template #title>
<span style="font-size: 14px; color: #666">
{{ item.activity_state }}
</span>
</template>
<template #content>
<span style="color: #666">
{{ `${item.createtime} &nbsp;&nbsp;&nbsp; ${item.content}` }}
</span>
</template>
</Step>
</Steps>
<template #footer>
<Button @click="trkModalShow = false">关闭</Button>
</template>
</Modal>
</Card> </Card>
</div> </div>
</template> </template>
...@@ -229,7 +368,7 @@ export default { ...@@ -229,7 +368,7 @@ export default {
{ key: 'is_evaluate', title: '是否评价', align: 'center', minWidth: 150, show: true }, { key: 'is_evaluate', title: '是否评价', align: 'center', minWidth: 150, show: true },
{ key: 'flow_id', title: '关联流程id', align: 'center', minWidth: 150, show: false }, { key: 'flow_id', title: '关联流程id', align: 'center', minWidth: 150, show: false },
{ slot: 'participant', title: '参与人', align: 'center', minWidth: 80, show: true, fixed: 'right' }, { slot: 'participant', title: '参与人', align: 'center', minWidth: 80, show: true, fixed: 'right' },
{ slot: 'action', title: '操作', align: 'center', minWidth: 80, show: true, fixed: 'right' }, { slot: 'action', title: '操作', align: 'center', minWidth: 180, show: true, fixed: 'right' },
], ],
tableLoading: false, tableLoading: false,
...@@ -290,6 +429,7 @@ export default { ...@@ -290,6 +429,7 @@ export default {
modify_time: null modify_time: null
}, },
//#region 参与人员
// 参与人员Modal // 参与人员Modal
ptcModalShow: false, ptcModalShow: false,
ptcActiveId: '', ptcActiveId: '',
...@@ -324,6 +464,93 @@ export default { ...@@ -324,6 +464,93 @@ export default {
user_type: 0, user_type: 0,
keyword: '', keyword: '',
}, },
//#endregion
//#region 物资
// 物资Modal
cmdModalShow: false,
cmdModalTitle: '',
cmdActiveId: '',
cmdTableColumns: [
{ type: 'index', title: '序号', align: 'center', width: 80, show: true, fixed: 'left' },
{ key: 'name', title: '借用人', align: 'center', minWidth: 150, show: true },
{ key: 'card', title: '借用人卡号', align: 'center', minWidth: 150, show: true },
{ key: 'commodity_name', title: '物资名称', align: 'center', minWidth: 250, show: true },
{ key: 'parent_id', title: '父级id', align: 'center', minWidth: 300, show: false },
{ key: 'place_type_id', title: '场地类型id', align: 'center', minWidth: 150, show: false },
{ key: 'place_type_name', title: '场地类型', align: 'center', minWidth: 250, show: true },
// { key: 'is_enable', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'details', title: '操作', align: 'center', minWidth: 100, show: true, fixed: 'right' },
],
cmdTableData: [],
cmdTableLoading: false,
cmdDataCount: 0,
cmdParams: {
page_index: 1,
page_size: 10,
},
// 物资详情Modal
cmdDetailsModalShow: false,
cmdDetailsModalLoading: false,
cmdDetailsFormItem: [
{ id: 'id', name: 'id', type: 'input', disabled: true, require: false, optList: [], show: false },
{ id: 'commodity_id', name: '物资id', type: 'input', disabled: true, require: false, optList: [], show: false },
{ id: 'commodity_parent_id', name: '物资父级id', type: 'input', disabled: true, require: false, optList: [], show: false },
{ id: 'commodity_name', name: '物资名称', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'place_type_id', name: '场地id', type: 'input', disabled: true, require: false, optList: [], show: false },
{ id: 'place_type_name', name: '场地名称', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'activity_id', name: '活动id', type: 'input', disabled: true, require: false, optList: [], show: false },
{ id: 'card', name: '借用人卡号', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'name', name: '借用人', type: 'input', disabled: true, require: false, optList: [] },
],
//#endregion
//#region 评价
// 评价Modal
eltModalShow: false,
eltModalLoading: false,
eltModalTitle: '',
eltActiveId: '',
// eltTableColumns: [
// { type: 'index', title: '序号', align: 'center', width: 80, show: true, fixed: 'left' },
// { key: 'name', title: '借用人', align: 'center', minWidth: 150, show: true },
// { key: 'card', title: '借用人卡号', align: 'center', minWidth: 150, show: true },
// { key: 'commodity_name', title: '物资名称', align: 'center', minWidth: 250, show: true },
// { key: 'parent_id', title: '父级id', align: 'center', minWidth: 300, show: false },
// { key: 'place_type_id', title: '场地类型id', align: 'center', minWidth: 150, show: false },
// { key: 'place_type_name', title: '场地类型', align: 'center', minWidth: 250, show: true },
// // { key: 'is_enable', title: '启用', align: 'center', minWidth: 80, show: true },
// { slot: 'details', title: '操作', align: 'center', minWidth: 100, show: true, fixed: 'right' },
// ],
eltTableData: [],
// eltDataCount: 0,
// eltParams: {
// page_index: 1,
// page_size: 10,
// },
// // 评价详情Modal
// eltDetailsModalShow: false,
// eltDetailsModalLoading: false,
// eltDetailsFormItem: [
// { id: 'id', name: 'id', type: 'input', disabled: true, require: false, optList: [], show: false },
// { id: 'commodity_id', name: '物资id', type: 'input', disabled: true, require: false, optList: [], show: false },
// { id: 'commodity_parent_id', name: '物资父级id', type: 'input', disabled: true, require: false, optList: [], show: false },
// { id: 'commodity_name', name: '物资名称', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'place_type_id', name: '场地id', type: 'input', disabled: true, require: false, optList: [], show: false },
// { id: 'place_type_name', name: '场地名称', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'activity_id', name: '活动id', type: 'input', disabled: true, require: false, optList: [], show: false },
// { id: 'card', name: '借用人卡号', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'name', name: '借用人', type: 'input', disabled: true, require: false, optList: [] },
// ],
//#endregion
//#region 轨迹
// 轨迹Modal
trkModalShow: false,
trkModalLoading: false,
trkModalTitle: '',
trkData: '',
//#endregion
} }
}, },
computed: { computed: {
...@@ -334,6 +561,18 @@ export default { ...@@ -334,6 +561,18 @@ export default {
return `${arr[1]} ${arr[2]}` return `${arr[1]} ${arr[2]}`
} }
}, },
// 物资列表data计算
cmdTableDataCal() {
let start = (this.cmdParams.page_index - 1) * this.cmdParams.page_size
let end = start + this.cmdParams.page_size
return this.cmdTableData.slice(start, end)
},
// 评价列表data计算
eltTableDataCal() {
let start = (this.eltParams.page_index - 1) * this.eltParams.page_size
let end = start + this.eltParams.page_size
return this.eltTableData.slice(start, end)
},
}, },
// 查询条件初始化 // 查询条件初始化
created(){}, created(){},
...@@ -410,6 +649,36 @@ export default { ...@@ -410,6 +649,36 @@ export default {
} }
}) })
}, },
// 获取物资借用列表
getCmdData() {
this.cmdTableLoading = true
this.asc.getApiCommodityGetCommodityTrackList({activity_id: this.cmdActiveId}).then(res => {
// console.log('物资借用列表', res)
this.cmdTableData = res.response
this.cmdDataCount = res.response.length
this.cmdTableLoading = false
})
},
// 获取评价列表
getEltData() {
this.eltModalLoading = true
this.asc.getApiEvaluateGetEvaluateList({activity_id: this.eltActiveId}).then(res => {
// console.log('评价列表', res)
this.eltTableData = res.response
// this.eltDataCount = res.response.length
this.eltModalLoading = false
})
},
// 获取轨迹
getTrkData() {
this.trkModalLoading = true
this.asc.getApiActivityGetActivityTrackList({activity_id: this.trkActiveId}).then(res => {
// console.log('获取轨迹', res)
this.trkData = res.response
this.trkModalLoading = false
})
},
// 新增 // 新增
// add(){ // add(){
...@@ -453,7 +722,7 @@ export default { ...@@ -453,7 +722,7 @@ export default {
// 是否评价 // 是否评价
let isEl = res.response.is_evaluate let isEl = res.response.is_evaluate
res.response.is_evaluate = isEl == 0 ? '否' : isEl == 1 ? '是' : '' res.response.is_evaluate = isEl == 0 ? '否' : isEl == 1 ? '是' : ''
this.$refs.ceditmodal.modalDetailsInit(res.response) this.$refs.ceditmodal.modalDetailsInit(res.response, 'activity_name')
this.editModalLoading = false this.editModalLoading = false
}) })
}, },
...@@ -518,6 +787,7 @@ export default { ...@@ -518,6 +787,7 @@ export default {
} }
}, },
//#region 参与人员
// 查看参与人员 // 查看参与人员
ptcDetails(row) { ptcDetails(row) {
this.ptcModalShow = true this.ptcModalShow = true
...@@ -600,6 +870,123 @@ export default { ...@@ -600,6 +870,123 @@ export default {
this.onPtcPageChange(1) this.onPtcPageChange(1)
} }
}, },
//#endregion
//#region 物资
// 查看物资
cmdDetails(row) {
// console.log('查看物资', row)
this.cmdActiveId = row.id
this.cmdModalShow = true
this.cmdModalTitle = row.activity_name + ' - 物资'
this.getCmdData()
},
// 更改物资页码
onCmdPageChange(val) {
this.cmdParams.page_index = val
// this.getCmdData()
},
// 更改物资每页条数
onCmdPageSizeChange(val) {
this.cmdParams.page_size = val
if (this.cmdParams.page_index == 1) {
this.onCmdPageChange(1)
}
},
// 物资详情查看
cmdDetailsShow(row) {
// console.log('物资详情查看', row)
this.cmdDetailsModalShow = true
this.cmdDetailsModalLoading = true
this.asc.getApiCommodityGetCommodityTrackInfo({id: row.id}).then(res => {
// console.log('物资详情结果', res)
if (res.code == 1) {
this.$refs.cmddetailsmodal.modalDetailsInit(res.response, 'commodity_name')
} else {
this.$Message.error(res.msg_detail)
}
}).finally(() => {
this.cmdDetailsModalLoading = false
})
},
//#endregion
//#region 评价
// 查看评价
eltDetails(row) {
// console.log('查看评价', row)
this.eltActiveId = row.id
this.eltModalShow = true
this.eltModalTitle = row.activity_name + ' - 评价'
this.getEltData()
},
// // 更改评价页码
// onEltPageChange(val) {
// this.eltParams.page_index = val
// // this.getEltData()
// },
// // 更改评价每页条数
// onEltPageSizeChange(val) {
// this.eltParams.page_size = val
// if (this.eltParams.page_index == 1) {
// this.onEltPageChange(1)
// }
// },
// // 评价详情查看
// eltDetailsShow(row) {
// // console.log('评价详情查看', row)
// this.eltDetailsModalShow = true
// this.eltDetailsModalLoading = true
// this.asc.getApiEvaluateGetEvaluateInfo({id: row.id}).then(res => {
// // console.log('评价详情结果', res)
// if (res.code == 1) {
// this.$refs.eltdetailsmodal.modalDetailsInit(res.response, 'commodity_name')
// } else {
// this.$Message.error(res.msg_detail)
// }
// }).finally(() => {
// this.eltDetailsModalLoading = false
// })
// },
// 获取图片文件列表
getImageFileList(arr) {
return arr.filter(a => a.suffix.toLowerCase() == '.png' ||
a.suffix.toLowerCase() == '.bmp' ||
a.suffix.toLowerCase() == '.jpg' ||
a.suffix.toLowerCase() == '.jpeg')
},
// 获取其他文件列表
getOtherFileList(arr) {
return arr.filter(a => !(a.suffix.toLowerCase() == '.png' ||
a.suffix.toLowerCase() == '.bmp' ||
a.suffix.toLowerCase() == '.jpg' ||
a.suffix.toLowerCase() == '.jpeg'))
},
// 预览图片
eltImgPreview(file) {
// console.log('预览图片', file)
window.open(file.path)
},
//#endregion
//#region 轨迹
// 查看评价
trkDetails(row) {
// console.log('查看评价', row)
this.trkActiveId = row.id
this.trkModalShow = true
this.trkModalTitle = row.activity_name + ' - 轨迹'
this.getTrkData()
},
//#endregion
} }
} }
</script> </script>
......
<template> <template>
<!-- 黑名单管理 -->
<div> <div>
<Card ref="card"> <Card>
<TableFrom /> <!-- 搜索条件 -->
<Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增</Button> <SearchCondForm
<Table :searchCondList="searchCondList"
:columns="columns" :labelWidth="120"
:data="tableData" @onSubmit="search"
class="ivu-mt" @onReset="reset"></SearchCondForm>
:loading="loading"
:size="tableSize" <Button disabled type="primary" class="ivu-ml-8"><Icon type="md-trash" />清空黑名单</Button>
>
<template slot-scope="{ row }" slot="status"> <!-- 数据table -->
<Switch size="large" v-model="row.status" :true-value="1" :false-value="0" @on-change="switchChange(row)"> <CTable
<span type="md-checkmark" slot="open" >启用</span> :tableColumns="tableColumns.filter(a => a.show)"
<span type="md-close" slot="close">停用</span> :tableData="tableData"
</Switch> :tableLoading="tableLoading"
:tableSize="tableSize"
:dataCount="dataCount"
:pageIndex="params.page_index"
:pageSize="params.page_size"
@onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange">
<!-- 状态 -->
<template #state="{ row }">
<span v-if="row.state == 0">过期</span>
<span v-if="row.state == 1">生效</span>
<span v-if="row.state == 2">强制取消</span>
</template> </template>
<template slot-scope="{ row }" slot="action">
<Button type="info" @click="edit(row)">编辑</Button> <template #action="{ row }">
<Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel"> <a @click="eltDetails(row)">评价</a>
<Button type="error" style="margin-left: 20px">删除</Button> <Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
</Poptip> </Poptip>
</template> </template>
</Table> </CTable>
<div class="ivu-text-center ivu-mt">
<Page <!-- 评价Modal -->
:total="total" <Modal
:current.sync="params.pageIndex" v-model="eltModalShow"
show-total :title="eltModalTitle"
show-sizer :width="60"
:page-size="params.pageSize" :transfer="false"
@on-change="handleChangePage" @on-cancel="eltModalShow = false">
@on-page-size-change="handleChangePageSize" <!-- loading -->
/> <Spin size="large" fix v-if="eltModalLoading"></Spin>
</div>
<!-- 新增修改 --> <List v-if="eltTableData.length != 0" item-layout="vertical">
<AddEditDrawer ref="addEdit" @getData="getData"/> <ListItem v-for="item in eltTableData" :key="item.id">
<ListItemMeta
:title="item.name"
:description="`评价人:${item.evaluate_card}`" />
<p>
<Rate
v-model="item.grade"
allow-half
disabled
icon="md-star"/>
</p>
<p>{{ item.content }}</p>
<template #extra>
<img
v-for="file in item.file_list"
:key="file.id"
style="width: 200px"
:src="file.path"
@click="eltImgPreview(file)">
</template>
</ListItem>
</List>
<p v-else style="text-align: center;">暂无评价</p>
<template #footer>
<Button @click="eltModalShow = false">关闭</Button>
</template>
</Modal>
</Card> </Card>
</div> </div>
</template> </template>
<script> <script>
import CTable from '@/components/CTable.vue'
import CEditModal from '@/components/CEditModal.vue'
import SearchCondForm from '@/components/SearchCondForm.vue'
import AddEditDrawer from './component/addEditDrawer.vue' export default {
import TableFrom from './component/table-from.vue'
export default {
name: 'list', name: 'list',
components: { AddEditDrawer, TableFrom }, components: {
CTable,
CEditModal,
SearchCondForm,
},
data(){ data(){
return { return {
grid: { // 搜索项
xl: 8, searchCondList: [
lg: 12, { id: 'card_name', name: '卡号或姓名', type: 'input', show: true, optList: [] },
md: 24, { id: 'begin_time', name: '开始时间', type: 'input', show: true, optList: [] },
sm: 24, { id: 'end_time', name: '结束时间', type: 'input', show: true, optList: [] },
xs: 24 { id: 'state', name: '状态', type: 'select', show: true, optList: [{value:0,label:'过期'},{value:1,label:'生效'},{value:2,label:'强制取消'}] },
}, ],
columns:[ // 搜索条件
{ params:{
title: '序号', page_index: 1,
type: 'index', page_size: 10,
align: 'center', card_name: "",
show: true, begin_time: "",
width: 80 end_time: "",
}, state: "",
{
title: '班级编号',
key: 'class_code',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '班级名称',
key: 'class_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '年级',
key: 'grade',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '培养层次',
key: 'training',
align: 'center',
show: true,
minWidth: 120,
},
{
title: '辅导员工号',
key: 'counselor_card',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '辅导员姓名',
key: 'counselor_name',
align: 'center',
show: true,
minWidth: 120,
},
{
title: '班主任工号',
key: 'head_teacher_card',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '班主任姓名',
key: 'head_teacher_name',
align: 'center',
show: true,
minWidth: 120,
},
{
title: '院系名称',
key: 'college_name',
align: 'center',
show: true,
minWidth: 200,
},
{
title: '状态',
key: 'status',
align: 'center',
slot: 'status',
show: true,
minWidth: 130,
}, },
{
title: '操作', tableColumns:[
align: 'center', { type: 'index', title: '序号', align: 'center', width: 80, show: true, fixed: 'left' },
minWidth: 180, { key: 'card', title: '卡号', align: 'center', minWidth: 120, show: true },
fixed: 'right', { key: 'name', title: '姓名', align: 'center', minWidth: 150, show: true },
show: true, { key: 'createtime', title: '开始时间', align: 'center', minWidth: 180, show: true },
slot: 'action' { key: 'end_time', title: '结束时间', align: 'center', minWidth: 180, show: true },
} { slot: 'state', title: '状态', align: 'center', minWidth: 150, show: true },
{ key: 'remark', title: '备注', align: 'center', minWidth: 200, show: true },
{ slot: 'action', title: '操作', align: 'center', minWidth: 120, show: true, fixed: 'right' },
], ],
loading: false, tableLoading: false,
tableData:[ tableData:[],
{ },
],
tableSize: 'default', tableSize: 'default',
tableFullscreen: false, tableFullscreen: false,
total: 0, dataCount: 0,
collapse: false, collapse: false,
params:{
pageIndex: 1, //#region 评价
pageSize: 10, // 评价Modal
college_id: '', eltModalShow: false,
grade: '', eltModalLoading: false,
classId_Name: '', eltModalTitle: '',
status: '' eltActiveId: '',
} eltTableData: [],
//#endregion
} }
}, },
// 查询条件初始化 // 查询条件初始化
...@@ -173,48 +148,77 @@ ...@@ -173,48 +148,77 @@
this.getData() this.getData()
}, },
methods: { methods: {
// 查询 // 搜索
getData(){ search(val) {
this.params.college_id = this.params.college_id == undefined ? "" : this.params.college_id Object.keys(val).forEach(a => {
this.params.grade = this.params.grade == undefined ? "" : this.params.grade if (val[a]) {
// this.params.classCodeOrName = this.params.classCodeOrName == undefined ? "" : this.params.classCodeOrName this.params[a] = val[a]
this.params.classId_Name = this.params.classId_Name == undefined ? "" : this.params.classId_Name }
this.params.status = this.params.status == undefined ? "" : this.params.status })
// this.loading = true this.onPageChange(1)
this.params.pageIndex = 1
},
// 新增
add(){
this.$refs.addEdit.add()
},
// 修改
edit(row){
this.$refs.addEdit.edit(row)
}, },
// 删除 // 重置
del(row) { reset() {
console.log('删除'); this.searchCondList.forEach(a => {
this.$Message.info('删除成功'); this.params[a.id] = ''
})
this.onPageChange(1)
}, },
// 取消删除 // 查询列表
cancel () { getData(){
this.$Message.info('You click cancel'); this.tableLoading = true
this.asc.postApiEvaluateGetBlacklist(this.params).then(res => {
// console.log('查询数据', res)
this.tableData = res.response.data
this.dataCount = res.response.data_count
this.tableLoading = false
})
}, },
// 切换第几页 // 更改页码
handleChangePage(pageNumber) { onPageChange(val) {
this.params.pageIndex = pageNumber this.params.page_index = val
this.getData() this.getData()
}, },
// 切换每页条数 // 更改每页条数
handleChangePageSize(size){ onPageSizeChange(val){
this.current = 1; this.params.page_size = val
this.params.pageSize = size if (this.params.page_index == 1) {
this.getData() this.onPageChange(1)
}
}, },
// 查看评价
eltDetails(row) {
// console.log('查看评价', row)
this.eltModalShow = true
this.eltModalLoading = true
this.eltModalTitle = row.name + '的评价'
this.asc.getApiEvaluateGetEvaluateErrorList({userid: row.userid}).then(res => {
// console.log('查看评价结果', res)
if (res.code == 1) {
this.eltTableData = res.response
} else {
this.$Message.error(res.msg_detail)
} }
}).finally(() => {
this.eltModalLoading = false
})
},
// 删除
rowDelete(row) {
// console.log('删除', row)
this.asc.getApiEvaluateBlacklistDel({id: row.id, is_del: 1}).then(res => {
// console.log('删除结果', res)
if (res.code == 1) {
this.$Message.success(res.response)
this.getData()
} else {
this.$Message.error(res.msg_detail)
}
})
},
} }
}
</script> </script>
\ No newline at end of file
...@@ -360,7 +360,7 @@ export default { ...@@ -360,7 +360,7 @@ export default {
this.editModalLoading = true this.editModalLoading = true
this.asc.getApiPlaceGetPlaceInfo({id:row.id}).then(res => { this.asc.getApiPlaceGetPlaceInfo({id:row.id}).then(res => {
// console.log('编辑详情', res) // console.log('编辑详情', res)
this.$refs.ceditmodal.modalDetailsInit(res.response) this.$refs.ceditmodal.modalDetailsInit(res.response, 'place_name')
this.editModalLoading = false this.editModalLoading = false
}) })
}, },
......
...@@ -34,7 +34,21 @@ ...@@ -34,7 +34,21 @@
</Row> </Row>
</Form> </Form>
</Card> </Card>
<Card class="bigCard" title="评价快捷用语"></Card> <Card class="bigCard kjyyCard" title="评价快捷用语">
<template #extra>
<a @click="fastContentAdd"><Icon type="md-add" /></a>
</template>
<p v-for="item in fastContentList" :key="item.id" name="fastCP">
<span>{{ item.content }}</span>
<span>
<a><Icon type="md-create" @click="fastContentEditRow(item)"/></a>
<Poptip confirm transfer title="是否确认删除?" @on-ok="fastContentDelRow(item)">
<a name="del"><Icon type="md-close"/></a>
</Poptip>
</span>
</p>
</Card>
<Card class="smallCard" title="加时配置"> <Card class="smallCard" title="加时配置">
<Form label-colon label-position="top"> <Form label-colon label-position="top">
<Row> <Row>
...@@ -118,7 +132,10 @@ ...@@ -118,7 +132,10 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem label="自动好评星数"> <FormItem label="自动好评星数">
<Rate allow-half v-model="configData.auto_goodevaluate_num" /> <Rate
v-model="configData.auto_goodevaluate_num"
allow-half
icon="md-star"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
...@@ -151,15 +168,29 @@ ...@@ -151,15 +168,29 @@
<p>&nbsp;</p> <p>&nbsp;</p>
<Button class="save-bt" type="primary" @click="saveBt('black_day')">保存</Button> <Button class="save-bt" type="primary" @click="saveBt('black_day')">保存</Button>
</Card> </Card>
<!-- 快捷用语新增修改Modal -->
<CEditModal
ref="ceditmodal"
v-model="fastContentModalShow"
:formItem="formItem"
:loading="fastContentModalLoading"
:formLabelWidth="100"
:width="800"
@onSubmit="fastContentSubmit"
@onClose="fastContentModalShow = false"></CEditModal>
</div> </div>
</template> </template>
<script> <script>
import CEditModal from '@/components/CEditModal.vue'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
export default { export default {
name: 'list', name: 'list',
components: {}, components: {
CEditModal,
},
data(){ data(){
return { return {
configData: { configData: {
...@@ -191,6 +222,23 @@ export default { ...@@ -191,6 +222,23 @@ export default {
// 快捷用语 // 快捷用语
fastContentList: [], fastContentList: [],
// 快捷用语编辑Modal
fastContentModalShow: false,
fastContentModalLoading: false,
fastContentIsEdit: false,
// 新增编辑表单项
formItem: [
{ id: 'content', name: '快捷用语', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
],
defaultFormData: {
id: "",
content: "",
createby: "",
createtime: "",
is_enable: 0,
is_del: 0
},
} }
}, },
computed: {}, computed: {},
...@@ -202,7 +250,7 @@ export default { ...@@ -202,7 +250,7 @@ export default {
methods: { methods: {
getData() { getData() {
this.asc.getApiSysConfigGetSysConfigAll().then(res => { this.asc.getApiSysConfigGetSysConfigAll().then(res => {
console.log('获取系统配置', res) // console.log('获取系统配置', res)
res.response.forEach(a => { res.response.forEach(a => {
this.configData[a.id] = a.value this.configData[a.id] = a.value
}) })
...@@ -211,14 +259,14 @@ export default { ...@@ -211,14 +259,14 @@ export default {
// 获取快捷用语 // 获取快捷用语
getFastContent() { getFastContent() {
this.asc.getApiSysConfigGetCommentContentList().then(res => { this.asc.getApiSysConfigGetCommentContentList().then(res => {
console.log('快捷用语', res) // console.log('快捷用语', res)
this.fastContentList = res.response this.fastContentList = res.response
}) })
}, },
// 保存按钮 // 保存按钮
async saveBt(...id) { async saveBt(...id) {
console.log('保存按钮', id) // console.log('保存按钮', id)
for (var i = 0; i < id.length; i++) { for (var i = 0; i < id.length; i++) {
let obj = { let obj = {
id: id[i], id: id[i],
...@@ -232,6 +280,56 @@ export default { ...@@ -232,6 +280,56 @@ export default {
} }
this.$Message.success('修改成功') this.$Message.success('修改成功')
}, },
// 新增快捷用语
fastContentAdd() {
this.fastContentModalShow = true
this.fastContentIsEdit = false
this.$refs.ceditmodal.modalInit('add', this.defaultFormData)
},
// 编辑快捷用语
fastContentEditRow(row) {
// console.log(row)
this.fastContentModalShow = true
this.fastContentIsEdit = true
this.$refs.ceditmodal.modalInit('edit', row)
},
// 保存快捷用语
fastContentSubmit(val) {
this.$Modal.confirm({
title: '提示',
content: '是否确认提交?',
loading: true,
onOk: () => {
this.asc.postApiSysConfigCommentContentSave(val).then(res => {
// console.log('保存快捷用语结果', res)
if (res.code == 1) {
this.$Message.success(res.response)
this.fastContentModalShow = false
this.getFastContent()
} else {
this.$Message.error(res.msg_detail)
}
}).finally(() => {
this.$Modal.remove()
})
}
})
},
// 删除快捷用语
fastContentDelRow(row) {
// console.log('删除快捷用语', row)
this.asc.getApiSysConfigCommentContentDel({id:row.id, is_del: 1}).then(res => {
// console.log('删除快捷用语结果', res)
if (res.code == 1) {
this.$Message.success(res.response)
this.getFastContent()
} else {
this.$Message.error(res.msg_detail)
}
})
},
} }
} }
</script> </script>
...@@ -245,20 +343,41 @@ export default { ...@@ -245,20 +343,41 @@ export default {
justify-content: space-between; justify-content: space-between;
.bigCard, .smallCard{ .bigCard, .smallCard{
margin-bottom: 16px; margin-bottom: 16px;
/deep/.ivu-card-body{
height: calc(~"100% - 51px");
.ivu-form-item{ .ivu-form-item{
margin-bottom: 12px; margin-bottom: 12px;
} }
} }
}
.bigCard{ .bigCard{
width: calc(~"(100% - 16px) / 2"); width: calc(~"(100% - 16px) / 2");
} }
.smallCard{ .smallCard{
width: calc(~"(100% - 32px) / 3"); width: calc(~"(100% - 32px) / 3");
/deep/.ivu-card-body{ // /deep/.ivu-card-body{
height: calc(~"100% - 51px"); // height: calc(~"100% - 51px");
} // }
} }
/deep/.kjyyCard{
.ivu-card-body{
overflow: auto;
p[name=fastCP]{
display: flex;
justify-content: space-between;
a[name=del]{
color: #ed4014;
}
a[name=del]:hover{
color: #f16643;
}
a[name=del]:active{
color: #e13d13;
}
}
}
}
/deep/.cplhsCard{ /deep/.cplhsCard{
.ivu-card-body{ .ivu-card-body{
// height: calc(~"100% - 51px"); // height: calc(~"100% - 51px");
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或