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

保存

上级 bb0cf43a
...@@ -16,7 +16,7 @@ export declare function getApiClassificationGetClassificationById(params: GetApi ...@@ -16,7 +16,7 @@ export declare function getApiClassificationGetClassificationById(params: GetApi
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiCommonUserSelect(params: GetApiCommonUserSelectPar ...@@ -16,7 +16,7 @@ export declare function getApiCommonUserSelect(params: GetApiCommonUserSelectPar
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -3,3 +3,4 @@ export * from "./getApiCommonUserSelect"; ...@@ -3,3 +3,4 @@ export * from "./getApiCommonUserSelect";
export * from "./postApiCommonUploadFile"; export * from "./postApiCommonUploadFile";
export * from "./postApiCommonGetDept"; export * from "./postApiCommonGetDept";
export * from "./postApiCommonGetLog"; export * from "./postApiCommonGetLog";
export * from "./postApiCommonParaTest";
...@@ -3,3 +3,4 @@ export * from "./getApiCommonUserSelect"; ...@@ -3,3 +3,4 @@ export * from "./getApiCommonUserSelect";
export * from "./postApiCommonUploadFile"; export * from "./postApiCommonUploadFile";
export * from "./postApiCommonGetDept"; export * from "./postApiCommonGetDept";
export * from "./postApiCommonGetLog"; export * from "./postApiCommonGetLog";
export * from "./postApiCommonParaTest";
...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditList(params: GetApiMaterialAudit ...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditList(params: GetApiMaterialAudit
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditPassedList(params: GetApiMateria ...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditPassedList(params: GetApiMateria
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditRejectList(params: GetApiMateria ...@@ -16,7 +16,7 @@ export declare function getApiMaterialAuditAuditRejectList(params: GetApiMateria
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiConsumaMaterilaApplicationConsumaMaterilaApplicati ...@@ -16,7 +16,7 @@ export declare function getApiConsumaMaterilaApplicationConsumaMaterilaApplicati
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiConsumaMaterilaApplicationPersonConsumaMaterilaApp ...@@ -16,7 +16,7 @@ export declare function getApiConsumaMaterilaApplicationPersonConsumaMaterilaApp
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialLendRecordList(params: GetApiConsum ...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialLendRecordList(params: GetApiConsum
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
...@@ -90,8 +90,11 @@ export declare function getApiConsumaMeterialLendRecordList(params: GetApiConsum ...@@ -90,8 +90,11 @@ export declare function getApiConsumaMeterialLendRecordList(params: GetApiConsum
}; };
}, any>>; }, any>>;
export interface GetApiConsumaMeterialLendRecordListParams { export interface GetApiConsumaMeterialLendRecordListParams {
/** 查询开始时间 */
start_date?: string; start_date?: string;
/** 查询结束时间 */
end_date?: string; end_date?: string;
/** 关键字:领用人卡号/领用人名称 */
query?: string; query?: string;
page_index?: number; page_index?: number;
page_size?: number; page_size?: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialMaterialList(params: GetApiConsumaM ...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialMaterialList(params: GetApiConsumaM
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialPersonalLendRecordList(params: GetA ...@@ -16,7 +16,7 @@ export declare function getApiConsumaMeterialPersonalLendRecordList(params: GetA
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -7,8 +7,12 @@ export * from "./postApiConsumaMeterialMaterialBatchAdd"; ...@@ -7,8 +7,12 @@ export * from "./postApiConsumaMeterialMaterialBatchAdd";
export * from "./postApiConsumaMeterialMaterialBatchUpdate"; export * from "./postApiConsumaMeterialMaterialBatchUpdate";
export * from "./getApiConsumaMeterialMaterialBatchListInit"; export * from "./getApiConsumaMeterialMaterialBatchListInit";
export * from "./postApiConsumaMeterialMaterialBatchList"; export * from "./postApiConsumaMeterialMaterialBatchList";
export * from "./postApiConsumaMeterialMaterialBatchListExport";
export * from "./getApiConsumaMeterialMaterialBatchDelete"; export * from "./getApiConsumaMeterialMaterialBatchDelete";
export * from "./getApiConsumaMeterialPersonalLendRecordListInit"; export * from "./getApiConsumaMeterialPersonalLendRecordListInit";
export * from "./getApiConsumaMeterialPersonalLendRecordList"; export * from "./getApiConsumaMeterialPersonalLendRecordList";
export * from "./getApiConsumaMeterialLendRecordListInit"; export * from "./getApiConsumaMeterialLendRecordListInit";
export * from "./getApiConsumaMeterialLendRecordList"; export * from "./getApiConsumaMeterialLendRecordList";
export * from "./getApiConsumaMeterialLendRecordListOutPut";
export * from "./postApiConsumaMeterialMaterialBatchImport";
export * from "./getApiConsumaMeterialMaterialBatchImportBaseFile";
...@@ -7,8 +7,12 @@ export * from "./postApiConsumaMeterialMaterialBatchAdd"; ...@@ -7,8 +7,12 @@ export * from "./postApiConsumaMeterialMaterialBatchAdd";
export * from "./postApiConsumaMeterialMaterialBatchUpdate"; export * from "./postApiConsumaMeterialMaterialBatchUpdate";
export * from "./getApiConsumaMeterialMaterialBatchListInit"; export * from "./getApiConsumaMeterialMaterialBatchListInit";
export * from "./postApiConsumaMeterialMaterialBatchList"; export * from "./postApiConsumaMeterialMaterialBatchList";
export * from "./postApiConsumaMeterialMaterialBatchListExport";
export * from "./getApiConsumaMeterialMaterialBatchDelete"; export * from "./getApiConsumaMeterialMaterialBatchDelete";
export * from "./getApiConsumaMeterialPersonalLendRecordListInit"; export * from "./getApiConsumaMeterialPersonalLendRecordListInit";
export * from "./getApiConsumaMeterialPersonalLendRecordList"; export * from "./getApiConsumaMeterialPersonalLendRecordList";
export * from "./getApiConsumaMeterialLendRecordListInit"; export * from "./getApiConsumaMeterialLendRecordListInit";
export * from "./getApiConsumaMeterialLendRecordList"; export * from "./getApiConsumaMeterialLendRecordList";
export * from "./getApiConsumaMeterialLendRecordListOutPut";
export * from "./postApiConsumaMeterialMaterialBatchImport";
export * from "./getApiConsumaMeterialMaterialBatchImportBaseFile";
...@@ -17,7 +17,7 @@ export declare function postApiConsumaMeterialMaterialBatchList(input?: Material ...@@ -17,7 +17,7 @@ export declare function postApiConsumaMeterialMaterialBatchList(input?: Material
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAdminEquipmentLendList(params: GetApiEqui ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAdminEquipmentLendList(params: GetApiEqui
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentEquipmentLendLsit(params: GetApiEquipment ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentEquipmentLendLsit(params: GetApiEquipment
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentEquipmentSelect(params: GetApiEquipmentEq ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentEquipmentSelect(params: GetApiEquipmentEq
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -14,3 +14,4 @@ export * from "./getApiEquipmentEquipmentSelect"; ...@@ -14,3 +14,4 @@ export * from "./getApiEquipmentEquipmentSelect";
export * from "./getApiEquipmentEquipmentDelete"; export * from "./getApiEquipmentEquipmentDelete";
export * from "./getApiEquipmentGetEquipmentClassificationTree"; export * from "./getApiEquipmentGetEquipmentClassificationTree";
export * from "./getApiEquipmentEquipmentNotReturnReminder"; export * from "./getApiEquipmentEquipmentNotReturnReminder";
export * from "./postApiEquipmentEquipmentLendToPdf";
...@@ -14,3 +14,4 @@ export * from "./getApiEquipmentEquipmentSelect"; ...@@ -14,3 +14,4 @@ export * from "./getApiEquipmentEquipmentSelect";
export * from "./getApiEquipmentEquipmentDelete"; export * from "./getApiEquipmentEquipmentDelete";
export * from "./getApiEquipmentGetEquipmentClassificationTree"; export * from "./getApiEquipmentGetEquipmentClassificationTree";
export * from "./getApiEquipmentEquipmentNotReturnReminder"; export * from "./getApiEquipmentEquipmentNotReturnReminder";
export * from "./postApiEquipmentEquipmentLendToPdf";
...@@ -16,7 +16,7 @@ export declare function postApiEquipmentEquipmentList(params: PostApiEquipmentEq ...@@ -16,7 +16,7 @@ export declare function postApiEquipmentEquipmentList(params: PostApiEquipmentEq
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -17,7 +17,7 @@ export declare function postApiEquipmentEquipmentStoreInList(input?: EquipmentSt ...@@ -17,7 +17,7 @@ export declare function postApiEquipmentEquipmentStoreInList(input?: EquipmentSt
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function postApiEquipmentPersonalLendEquipmentList(params: PostAp ...@@ -16,7 +16,7 @@ export declare function postApiEquipmentPersonalLendEquipmentList(params: PostAp
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentApplicationApplicationList(params: GetApi ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentApplicationApplicationList(params: GetApi
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentApplicationPersonalApplicationList(params ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentApplicationPersonalApplicationList(params
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditList(params: GetApiEquipmentAud ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditList(params: GetApiEquipmentAud
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditPassList(params: GetApiEquipmen ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditPassList(params: GetApiEquipmen
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditRejectList(params: GetApiEquipm ...@@ -16,7 +16,7 @@ export declare function getApiEquipmentAuditAuditRejectList(params: GetApiEquipm
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -16,7 +16,7 @@ export declare function getApiPermissionQuery(params: GetApiPermissionQueryParam ...@@ -16,7 +16,7 @@ export declare function getApiPermissionQuery(params: GetApiPermissionQueryParam
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -2,3 +2,4 @@ export * from "./getApiRepairAddMiddleItem"; ...@@ -2,3 +2,4 @@ export * from "./getApiRepairAddMiddleItem";
export * from "./getApiRepairQueryById"; export * from "./getApiRepairQueryById";
export * from "./getApiRepairDeleteMiddleItem"; export * from "./getApiRepairDeleteMiddleItem";
export * from "./getApiRepairRegisterRepair"; export * from "./getApiRepairRegisterRepair";
export * from "./getApiRepairRepairList";
...@@ -2,3 +2,4 @@ export * from "./getApiRepairAddMiddleItem"; ...@@ -2,3 +2,4 @@ export * from "./getApiRepairAddMiddleItem";
export * from "./getApiRepairQueryById"; export * from "./getApiRepairQueryById";
export * from "./getApiRepairDeleteMiddleItem"; export * from "./getApiRepairDeleteMiddleItem";
export * from "./getApiRepairRegisterRepair"; export * from "./getApiRepairRegisterRepair";
export * from "./getApiRepairRepairList";
...@@ -16,7 +16,7 @@ export declare function getApiWarningWarningList(params: GetApiWarningWarningLis ...@@ -16,7 +16,7 @@ export declare function getApiWarningWarningList(params: GetApiWarningWarningLis
title: { title: {
field_id: string; field_id: string;
show_name: string; show_name: string;
show_type: number; show_type: string;
width: number; width: number;
order_by_flag: number; order_by_flag: number;
default_hide_flag: number; default_hide_flag: number;
......
...@@ -2,7 +2,7 @@ import { type Option } from "../../interface"; ...@@ -2,7 +2,7 @@ import { type Option } from "../../interface";
export interface TableTitle { export interface TableTitle {
field_id?: string; field_id?: string;
show_name?: string; show_name?: string;
show_type?: number; show_type?: string;
width?: number; width?: number;
order_by_flag?: number; order_by_flag?: number;
default_hide_flag?: number; default_hide_flag?: number;
......
...@@ -18,6 +18,8 @@ export * from "./apiTypes/VEcmsDept"; ...@@ -18,6 +18,8 @@ export * from "./apiTypes/VEcmsDept";
export * from "./apiTypes/VEcmsDeptMessageModel"; export * from "./apiTypes/VEcmsDeptMessageModel";
export * from "./apiTypes/EcmsLog"; export * from "./apiTypes/EcmsLog";
export * from "./apiTypes/EcmsLogMessageModel"; export * from "./apiTypes/EcmsLogMessageModel";
export * from "./apiTypes/Para";
export * from "./apiTypes/ParaTestRequest";
export * from "./apiTypes/EcmsSysConfig"; export * from "./apiTypes/EcmsSysConfig";
export * from "./apiTypes/EcmsSysConfigMessageModel"; export * from "./apiTypes/EcmsSysConfigMessageModel";
export * from "./apiTypes/MaterialNumViewModel"; export * from "./apiTypes/MaterialNumViewModel";
...@@ -101,6 +103,9 @@ export * from "./apiTypes/AdminAddRequest"; ...@@ -101,6 +103,9 @@ export * from "./apiTypes/AdminAddRequest";
export * from "./apiTypes/PermissionUpdateRequest"; export * from "./apiTypes/PermissionUpdateRequest";
export * from "./apiTypes/EcmsRepairMiddle"; export * from "./apiTypes/EcmsRepairMiddle";
export * from "./apiTypes/EcmsRepairMiddleMessageModel"; export * from "./apiTypes/EcmsRepairMiddleMessageModel";
export * from "./apiTypes/RepairListResponse";
export * from "./apiTypes/RepairListResponsePageModel";
export * from "./apiTypes/RepairListResponsePageModelMessageModel";
export * from "./apiTypes/Int32MessageModel"; export * from "./apiTypes/Int32MessageModel";
export * from "./apiTypes/StringInt32DictionaryMessageModel"; export * from "./apiTypes/StringInt32DictionaryMessageModel";
export * from "./apiTypes/GetMaterialUseCountResponse"; export * from "./apiTypes/GetMaterialUseCountResponse";
......
...@@ -18,6 +18,8 @@ export * from "./apiTypes/VEcmsDept"; ...@@ -18,6 +18,8 @@ export * from "./apiTypes/VEcmsDept";
export * from "./apiTypes/VEcmsDeptMessageModel"; export * from "./apiTypes/VEcmsDeptMessageModel";
export * from "./apiTypes/EcmsLog"; export * from "./apiTypes/EcmsLog";
export * from "./apiTypes/EcmsLogMessageModel"; export * from "./apiTypes/EcmsLogMessageModel";
export * from "./apiTypes/Para";
export * from "./apiTypes/ParaTestRequest";
export * from "./apiTypes/EcmsSysConfig"; export * from "./apiTypes/EcmsSysConfig";
export * from "./apiTypes/EcmsSysConfigMessageModel"; export * from "./apiTypes/EcmsSysConfigMessageModel";
export * from "./apiTypes/MaterialNumViewModel"; export * from "./apiTypes/MaterialNumViewModel";
...@@ -101,6 +103,9 @@ export * from "./apiTypes/AdminAddRequest"; ...@@ -101,6 +103,9 @@ export * from "./apiTypes/AdminAddRequest";
export * from "./apiTypes/PermissionUpdateRequest"; export * from "./apiTypes/PermissionUpdateRequest";
export * from "./apiTypes/EcmsRepairMiddle"; export * from "./apiTypes/EcmsRepairMiddle";
export * from "./apiTypes/EcmsRepairMiddleMessageModel"; export * from "./apiTypes/EcmsRepairMiddleMessageModel";
export * from "./apiTypes/RepairListResponse";
export * from "./apiTypes/RepairListResponsePageModel";
export * from "./apiTypes/RepairListResponsePageModelMessageModel";
export * from "./apiTypes/Int32MessageModel"; export * from "./apiTypes/Int32MessageModel";
export * from "./apiTypes/StringInt32DictionaryMessageModel"; export * from "./apiTypes/StringInt32DictionaryMessageModel";
export * from "./apiTypes/GetMaterialUseCountResponse"; export * from "./apiTypes/GetMaterialUseCountResponse";
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<template #action="{ row }"> <template #action="{ row }">
<div class="action-btns"> <div class="action-btns">
<a href="javascript:;" @click="details(row)">详情</a> <a href="javascript:;" @click="details(row)">详情</a>
<Divider v-if="row.audit_status === 0" type="vertical"/> <Divider v-if="row.audit_status === 0" type="vertical"/>
<Poptip <Poptip
v-if="row.audit_status === 0" v-if="row.audit_status === 0"
confirm confirm
...@@ -162,10 +162,11 @@ ...@@ -162,10 +162,11 @@
> >
<template #num="{row}"> <template #num="{row}">
<InputNumber @on-change="materialChange($event,row)" v-model="row.num" :min="1" controls-outside/> <InputNumber @on-change="materialChange($event,row)" v-model="row.num" :min="1" controls-outside/>
</template> </template>
<template #action="{row}"> <template #action="{row}">
<a href="javascript:;" @click="init.application.formData.material_num_list = init.application.formData.material_num_list.filter(cur=>cur.id !== row.id)">删除</a> <a href="javascript:;"
@click="init.application.formData.material_num_list = init.application.formData.material_num_list.filter(cur=>cur.id !== row.id)">删除</a>
<!-- <Poptip <!-- <Poptip
:transfer="true" :transfer="true"
...@@ -179,15 +180,15 @@ ...@@ -179,15 +180,15 @@
</template> </template>
</Table> </Table>
<div style="gap: 8px;width: 100%;display: flex;justify-content: center;"> <div style="gap: 8px;width: 100%;display: flex;justify-content: center;">
<Button <Button
style="width: 100%;" style="width: 100%;"
icon="md-add" icon="md-add"
type="dashed" type="dashed"
@click="showAddUser('选择耗材')" @click="showAddUser('选择耗材')"
> >
选择耗材 选择耗材
</Button> </Button>
</div> </div>
</FormItem> </FormItem>
</Col> </Col>
...@@ -212,7 +213,6 @@ ...@@ -212,7 +213,6 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
> >
<Button icon="ios-cloud-upload-outline">上传附件</Button> <Button icon="ios-cloud-upload-outline">上传附件</Button>
</Upload> </Upload>
<div <div
...@@ -374,7 +374,7 @@ import CTable from '@/components/CTable.vue' ...@@ -374,7 +374,7 @@ import CTable from '@/components/CTable.vue'
const DrawerDetails = defineAsyncComponent(() => import('@/components/drawerDetails')) const DrawerDetails = defineAsyncComponent(() => import('@/components/drawerDetails'))
const init = reactive({ const init = reactive({
pageKey:'', pageKey: '',
consumablesSelector: { consumablesSelector: {
batchMaintenance: { batchMaintenance: {
flag: 'add', flag: 'add',
...@@ -768,13 +768,15 @@ const init = reactive({ ...@@ -768,13 +768,15 @@ const init = reactive({
}, },
rules: { rules: {
material_num_list: [ material_num_list: [
{ required: true, type: 'array', validator:(rule, value, callback)=>{ {
if(init.application.formData.material_num_list.length>0){ required: true, type: 'array', validator: (rule, value, callback) => {
callback(); if (init.application.formData.material_num_list.length > 0) {
}else{ callback();
callback(new Error('请选择耗材')); } else {
} callback(new Error('请选择耗材'));
}, message: "请选择耗材", trigger: "change" } }
}, message: "请选择耗材", trigger: "change"
}
], ],
}, },
...@@ -859,7 +861,6 @@ const applyForDevices = () => { ...@@ -859,7 +861,6 @@ const applyForDevices = () => {
} }
// 耗材申请数量 // 耗材申请数量
const materialChange = (event, row) => { const materialChange = (event, row) => {
init.application.formData.material_num_list.forEach((cur => { init.application.formData.material_num_list.forEach((cur => {
if (cur.id === row.id) cur.num = event if (cur.id === row.id) cur.num = event
})) }))
...@@ -878,28 +879,26 @@ const handleSubmitDevice = () => { ...@@ -878,28 +879,26 @@ const handleSubmitDevice = () => {
// }) // })
// return // return
materialForm.value.validate(validate=>{ materialForm.value.validate(validate => {
if(validate){ if (validate) {
hooks.myEncapsulationFunction(() => { hooks.myEncapsulationFunction(() => {
return api.postApiConsumaMaterilaApplicationConsumaMaterilaApply({ return api.postApiConsumaMaterilaApplicationConsumaMaterilaApply({
usage: init.application.formData.usage, usage: init.application.formData.usage,
file_list: init.application.formData.file_list.map(cur => cur.id).join(';'), file_list: init.application.formData.file_list.map(cur => cur.id).join(';'),
material_num_list: init.application.formData.material_num_list.map(cur => ({ material_num_list: init.application.formData.material_num_list.map(cur => ({
"material_id": cur.id, "material_id": cur.id,
"num": cur.num "num": cur.num
})), })),
}).then(res => { }).then(res => {
if (res.code === 1) { if (res.code === 1) {
PersonalApplicationList() PersonalApplicationList()
init.application.show = false init.application.show = false
} }
}) return res
}, false, '正在提交中...') })
}, false, '正在提交中...')
} }
}) })
} }
/** /**
...@@ -1258,7 +1257,7 @@ function closeDrawer() { ...@@ -1258,7 +1257,7 @@ function closeDrawer() {
function cancelApplication(row) { function cancelApplication(row) {
hooks.myEncapsulationFunction(() => { hooks.myEncapsulationFunction(() => {
return api.postApiConsumaMaterilaApplicationConcelApplication({ return api.postApiConsumaMaterilaApplicationConcelApplication({
application_id:row.application_id application_id: row.application_id
}).then(res => { }).then(res => {
if (res.code === 1) { if (res.code === 1) {
PersonalApplicationList() PersonalApplicationList()
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
@on-reset="handleReset" @on-reset="handleReset"
/> />
<div style="display: flex;"> <div style="display: flex;">
<Button class="ivu-ml-8" type="primary" @click="init.importDuty.show = true"> <Button class="ivu-ml-8" type="primary" @click="importDutyFun">
<Icon type="ios-cloud-download-outline"/> <Icon type="ios-cloud-download-outline"/>
导出领用记录 导出领用记录
</Button> </Button>
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:transfer="true" :transfer="true"
:total="init.myBorrowingRecord.total" :total="init.myBorrowingRecord.total"
:current="init.myBorrowingRecord.params.page_index" :current="init.myBorrowingRecord.params.page_index"
...@@ -216,6 +217,7 @@ const departmentOptions = ref([]) ...@@ -216,6 +217,7 @@ const departmentOptions = ref([])
// 当前选中的角色 // 当前选中的角色
const currentRole = ref({}) const currentRole = ref({})
const init = reactive({ const init = reactive({
pageKey:'',
importDuty: { importDuty: {
loading: false, loading: false,
show: false, show: false,
...@@ -422,6 +424,7 @@ const handleReset = () => { ...@@ -422,6 +424,7 @@ const handleReset = () => {
page_size: 10, page_size: 10,
remark: "", remark: "",
} }
init.pageKey = Date.now()
PersonalLendRecordList() PersonalLendRecordList()
} }
// 分页改变 // 分页改变
...@@ -541,17 +544,12 @@ function closeDrawer(){ ...@@ -541,17 +544,12 @@ function closeDrawer(){
function importDutyFun() { function importDutyFun() {
//值班附件导出 //值班附件导出
init.importDuty.loading = true hooks.myEncapsulationFunction(()=>{
let date = { return api.getApiConsumaMeterialLendRecordListOutPut(init.myBorrowingRecord.params ).then(res => {
begin_time: dayjs(init.importDuty.date[0]).format('YYYY-MM-DD'), window.location.href = res.response
end_time: dayjs(init.importDuty.date[1]).format('YYYY-MM-DD'), return res
} })
return api.postApiActivityExport({...init.importDuty.formData, ...date}).then(res => { },false,'正在导出...')
window.location.href = res.response
init.importDuty.loading = false
}).finally(() => {
init.importDuty.loading = false
})
} }
onMounted(() => { onMounted(() => {
...@@ -702,4 +700,4 @@ onMounted(() => { ...@@ -702,4 +700,4 @@ onMounted(() => {
.duty-dept-select { .duty-dept-select {
margin-bottom: 16px; margin-bottom: 16px;
} }
</style> </style>
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<template #right> <template #right>
<div class="demo-split-pane-R"> <div class="demo-split-pane-R">
<Card ref="card" dis-hover> <Card ref="card" dis-hover>
<!-- 搜索条件--> <!--搜索条件-->
<initForm <initForm
ref="searchFormRef" ref="searchFormRef"
:searchCondList="init.searchList" :searchCondList="init.searchList"
...@@ -26,13 +26,30 @@ ...@@ -26,13 +26,30 @@
@on-reset="handleReset" @on-reset="handleReset"
/> />
<Button type="primary" class="ivu-ml-8" :disabled="params.classification_id==''" @click="add"> <div style="display: flex;gap: 10px;padding-top: 10px;">
<Icon type="md-add"/> <Button type="primary" class="ivu-ml-8" :disabled="params.classification_id==''" @click="add">
新增 <Icon type="md-add"/>
</Button> 新增
</Button>
<!-- 数据table -->
<Upload class="ivu-ml-8" :before-upload="beforeUpload">
<Button type="primary">
<Icon type="ios-cloud-upload-outline"/>
批量导入批次
</Button>
</Upload>
<Button class="ivu-ml-8" type="primary" @click="importDutyFun">
<Icon type="ios-cloud-download-outline"/>
导出批量批次模版
</Button>
</div>
<!--数据table -->
<CTable <CTable
:key="init.pageKey"
:tableBorder="true" :tableBorder="true"
:tableColumns="tableColumns.filter(a => a.show)" :tableColumns="tableColumns.filter(a => a.show)"
:tableData="tableData" :tableData="tableData"
...@@ -42,7 +59,6 @@ ...@@ -42,7 +59,6 @@
:pageIndex="params.page_index" :pageIndex="params.page_index"
:pageSize="params.page_size" :pageSize="params.page_size"
@switchChange="switchChange" @switchChange="switchChange"
@onPageChange="onPageChange" @onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange"> @onPageSizeChange="onPageSizeChange">
...@@ -69,8 +85,8 @@ ...@@ -69,8 +85,8 @@
<a type="text" @click="showBatchMaintenance(row)">批次维护</a> <a type="text" @click="showBatchMaintenance(row)">批次维护</a>
<Divider type="vertical"/> <Divider type="vertical"/>
<!-- <a type="text" @click="showEarlyWarning(row)">耗材预警</a>--> <!-- <a type="text" @click="showEarlyWarning(row)">耗材预警</a>-->
<!-- <Divider type="vertical"/>--> <!-- <Divider type="vertical"/>-->
<a type="text" @click="handleEdit(row)">编辑</a> <a type="text" @click="handleEdit(row)">编辑</a>
<Divider type="vertical"/> <Divider type="vertical"/>
<Poptip confirm transfer title="是否确认删除?" @on-ok="handleDelete(row)"> <Poptip confirm transfer title="是否确认删除?" @on-ok="handleDelete(row)">
...@@ -290,6 +306,10 @@ ...@@ -290,6 +306,10 @@
<Icon type="md-add"/> <Icon type="md-add"/>
新增 新增
</Button> </Button>
<Button class="ivu-ml-8" type="primary" @click="exportNearExpiryList">
<Icon type="ios-cloud-download-outline"/>
导出近效期清单
</Button>
</div> </div>
<Table <Table
:loading="init.batchMaintenance.loading" :loading="init.batchMaintenance.loading"
...@@ -597,6 +617,7 @@ ...@@ -597,6 +617,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination" style="margin-top: 16px"> <div class="pagination" style="margin-top: 16px">
<Page <Page
:total="init.earlyWarning.total" :total="init.earlyWarning.total"
:current="init.earlyWarning.params.page_index" :current="init.earlyWarning.params.page_index"
:page-size="init.earlyWarning.params.page_size" :page-size="init.earlyWarning.params.page_size"
...@@ -624,7 +645,7 @@ ...@@ -624,7 +645,7 @@
import CTable from '@/components/CTable.vue'; import CTable from '@/components/CTable.vue';
import CEditModal from '@/components/CEditModal.vue'; import CEditModal from '@/components/CEditModal.vue';
import SearchCondForm from '@/components/SearchCondForm.vue'; import SearchCondForm from '@/components/SearchCondForm.vue';
import {DatePicker, Divider, FormItem, Modal, Page, Tag} from "view-ui-plus"; import {DatePicker, Divider, FormItem, Modal, Page, Tag, Upload} from "view-ui-plus";
import * as api from '@/api/allApi/controller/index' import * as api from '@/api/allApi/controller/index'
import * as hooks from '@/hook/index' import * as hooks from '@/hook/index'
import initForm from "@/components/initForm"; import initForm from "@/components/initForm";
...@@ -634,6 +655,7 @@ import {deviceProjectStore} from "@/store/deviceProjectStoree"; ...@@ -634,6 +655,7 @@ import {deviceProjectStore} from "@/store/deviceProjectStoree";
export default { export default {
name: 'list', name: 'list',
components: { components: {
Upload,
DatePicker, DatePicker,
Modal, Page, Modal, Page,
FormItem, Tag, FormItem, Tag,
...@@ -646,6 +668,7 @@ export default { ...@@ -646,6 +668,7 @@ export default {
data() { data() {
return { return {
init: { init: {
pageKey: '',
earlyWarning: { earlyWarning: {
flag: 'add', flag: 'add',
show: false, show: false,
...@@ -1074,7 +1097,7 @@ export default { ...@@ -1074,7 +1097,7 @@ export default {
], ],
// 搜索条件 // 搜索条件
params: { params: {
is_under_safe:'0', is_under_safe: '0',
query: '', query: '',
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
...@@ -1200,7 +1223,6 @@ export default { ...@@ -1200,7 +1223,6 @@ export default {
// 获取物资树 // 获取物资树
this.tableLoading = true this.tableLoading = true
this.getTreeData().then(res => { this.getTreeData().then(res => {
console.log("🚀🚀🚀,", res.response)
this.init.consumables.formData.parent_name = res.response[0].name this.init.consumables.formData.parent_name = res.response[0].name
this.params.classification_id = res.response[0].id this.params.classification_id = res.response[0].id
this.getData() this.getData()
...@@ -1212,8 +1234,8 @@ export default { ...@@ -1212,8 +1234,8 @@ export default {
* 耗材预警 * 耗材预警
* @param {Object} row 当前行数据 * @param {Object} row 当前行数据
*/ */
showEarlyWarning(){ showEarlyWarning() {
this.init.earlyWarning.show = true this.init.earlyWarning.show = true
}, },
//提交批次 //提交批次
handleSubmitEarlyWarning() { handleSubmitEarlyWarning() {
...@@ -1514,9 +1536,9 @@ export default { ...@@ -1514,9 +1536,9 @@ export default {
"duty_tid": "", "duty_tid": "",
"duty_tids": [ "duty_tids": [
{ {
card_number:deviceProjectStore.state.userInfo.card, card_number: deviceProjectStore.state.userInfo.card,
name:deviceProjectStore.state.userInfo.name, name: deviceProjectStore.state.userInfo.name,
tid:deviceProjectStore.state.userInfo.tid, tid: deviceProjectStore.state.userInfo.tid,
} }
], ],
"storage_num": 0, "storage_num": 0,
...@@ -1663,6 +1685,16 @@ export default { ...@@ -1663,6 +1685,16 @@ export default {
this.init.batchMaintenance.loading = false; this.init.batchMaintenance.loading = false;
}); });
}, },
//导出批次进效清单
exportNearExpiryList() {
//值班附件导出
hooks.myEncapsulationFunction(() => {
return api.postApiConsumaMeterialMaterialBatchListExport(this.init.batchMaintenance.params).then(res => {
window.location.href = res.response
return res
})
}, false, '正在导出...')
},
/** /**
* 设备借用记录 * 设备借用记录
...@@ -1789,11 +1821,12 @@ export default { ...@@ -1789,11 +1821,12 @@ export default {
handleReset() { handleReset() {
this.params = { this.params = {
...this.params, ...this.params,
is_under_safe:'0', is_under_safe: '0',
query: '', query: '',
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
} }
this.init.pageKey = Date.now()
this.getData() this.getData()
}, },
//提交分类 //提交分类
...@@ -1919,9 +1952,9 @@ export default { ...@@ -1919,9 +1952,9 @@ export default {
//预警人员 //预警人员
this.init.consumables.formData.waring_person_tid_lists = [ this.init.consumables.formData.waring_person_tid_lists = [
{ {
card_number:deviceProjectStore.state.userInfo.card, card_number: deviceProjectStore.state.userInfo.card,
name:deviceProjectStore.state.userInfo.name, name: deviceProjectStore.state.userInfo.name,
tid:deviceProjectStore.state.userInfo.tid, tid: deviceProjectStore.state.userInfo.tid,
} }
] ]
this.init.consumables.flag = 'add' this.init.consumables.flag = 'add'
...@@ -1981,6 +2014,29 @@ export default { ...@@ -1981,6 +2014,29 @@ export default {
}) })
}, },
//导出批次模版
importDutyFun() {
//值班附件导出
hooks.myEncapsulationFunction(() => {
return api.getApiConsumaMeterialMaterialBatchImportBaseFile().then(res => {
window.location.href = res.response
return res
})
}, false, '正在导出...')
},
//批次导入附件上传
beforeUpload(file) {
let f = new FormData();
f.append('file', file)
hooks.myEncapsulationFunction(() => {
return api.postApiConsumaMeterialMaterialBatchImport(f, {headers: {'Content-Type': 'multipart/form-data'}}).then(res => {
this.getData()
return res
})
}, false, '正在导入...')
return false
}
} }
} }
</script> </script>
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:total="init.allBorrowingRecord.total" :total="init.allBorrowingRecord.total"
:current="init.allBorrowingRecord.params.page_index" :current="init.allBorrowingRecord.params.page_index"
:page-size="init.allBorrowingRecord.params.page_size" :page-size="init.allBorrowingRecord.params.page_size"
...@@ -437,6 +438,7 @@ import {deviceProjectStore} from "@/store/deviceProjectStoree"; ...@@ -437,6 +438,7 @@ import {deviceProjectStore} from "@/store/deviceProjectStoree";
const DrawerDetails = defineAsyncComponent(() => import('@/components/drawerDetails')) const DrawerDetails = defineAsyncComponent(() => import('@/components/drawerDetails'))
const init = reactive({ const init = reactive({
pageKey:'',
batchMaintenance: { batchMaintenance: {
flag: 'add', flag: 'add',
formDataShow: false, formDataShow: false,
...@@ -1365,6 +1367,7 @@ const handleReset = () => { ...@@ -1365,6 +1367,7 @@ const handleReset = () => {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
} }
init.pageKey = Date.now()
ApplicationList() ApplicationList()
} }
// 分页改变 // 分页改变
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:total="init.allBorrowingRecord.total" :total="init.allBorrowingRecord.total"
:current="init.allBorrowingRecord.params.page_index" :current="init.allBorrowingRecord.params.page_index"
:page-size="init.allBorrowingRecord.params.page_size" :page-size="init.allBorrowingRecord.params.page_size"
...@@ -281,6 +282,7 @@ const DrawerDetails = defineAsyncComponent(()=>import('@/components/drawerDetai ...@@ -281,6 +282,7 @@ const DrawerDetails = defineAsyncComponent(()=>import('@/components/drawerDetai
const init = reactive({ const init = reactive({
pageKey:'',
grid: { grid: {
xs: 24, xs: 24,
sm: 12, sm: 12,
...@@ -584,6 +586,7 @@ const handleReset = () => { ...@@ -584,6 +586,7 @@ const handleReset = () => {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
} }
init.pageKey = Date.now();
ApplicationList() ApplicationList()
} }
// 分页改变 // 分页改变
......
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
<Icon type="md-add"/> <Icon type="md-add"/>
新增设备 新增设备
</Button> </Button>
<Button @click="handleBatchNotify" type="success" style="margin-left: 5px">
下载出库单
</Button>
<!-- <Button class="ivu-ml-8" @click="handleImport"><Icon type="md-cloud-upload" /> 导入设备</Button>--> <!-- <Button class="ivu-ml-8" @click="handleImport"><Icon type="md-cloud-upload" /> 导入设备</Button>-->
<!-- <Button--> <!-- <Button-->
...@@ -30,7 +34,10 @@ ...@@ -30,7 +34,10 @@
</div> </div>
<!-- 设备表格 --> <!-- 设备表格 -->
<Table :loading="loading" :columns="userColumns" :data="userList" border> <Table :loading="loading" :columns="userColumns" :data="userList" border
@on-selection-change="handleSelectionChange"
>
<template #action="{ row }"> <template #action="{ row }">
<div class="action-btns" style="display: flex; align-items: center"> <div class="action-btns" style="display: flex; align-items: center">
<a href="javascript:;" @click="handleSubmit(row, 'borrow')" <a href="javascript:;" @click="handleSubmit(row, 'borrow')"
...@@ -88,6 +95,7 @@ ...@@ -88,6 +95,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:total="init.devices.total" :total="init.devices.total"
:current="init.devices.params.page_index" :current="init.devices.params.page_index"
:page-size="init.devices.params.page_size" :page-size="init.devices.params.page_size"
...@@ -639,7 +647,7 @@ ...@@ -639,7 +647,7 @@
label-width="100" label-width="100"
> >
<Row :gutter="16" type="flex" style="flex-wrap: wrap;"> <Row :gutter="16" type="flex" style="flex-wrap: wrap;">
<!-- 报修人 --> <!--报修人-->
<Col :xs="24" :sm="12"> <Col :xs="24" :sm="12">
<FormItem label="报修人" prop="name"> <FormItem label="报修人" prop="name">
<Input <Input
...@@ -669,7 +677,6 @@ ...@@ -669,7 +677,6 @@
placeholder="请选择报修区域" placeholder="请选择报修区域"
style="width: 100%;" style="width: 100%;"
:clearable="true" :clearable="true"
@on-change="handleAreaChange"
/> />
</FormItem> </FormItem>
</Col> </Col>
...@@ -695,7 +702,6 @@ ...@@ -695,7 +702,6 @@
placeholder="请选择报修项目" placeholder="请选择报修项目"
style="width: 100%;" style="width: 100%;"
:clearable="true" :clearable="true"
@on-change="handleItemChange"
/> />
<Spin v-if="init.repair.loading"></Spin> <Spin v-if="init.repair.loading"></Spin>
</div> </div>
...@@ -876,6 +882,11 @@ const formValues = ref({}); ...@@ -876,6 +882,11 @@ const formValues = ref({});
// 用户表格列定义 // 用户表格列定义
const userColumns = computed(() => { const userColumns = computed(() => {
const columns = [ const columns = [
{
type: 'selection',
width: 60,
align: "center",
},
{ {
title: "#", title: "#",
type: "index", type: "index",
...@@ -973,6 +984,7 @@ const loading = ref(false); ...@@ -973,6 +984,7 @@ const loading = ref(false);
const userList = ref([]); const userList = ref([]);
const init = reactive({ const init = reactive({
pageKey: '',
//报修 //报修
repair: { repair: {
loading: true, loading: true,
...@@ -1234,6 +1246,7 @@ const init = reactive({ ...@@ -1234,6 +1246,7 @@ const init = reactive({
list: [], list: [],
}, },
devices: { devices: {
deviceIdList:[],
flag: "add", flag: "add",
total: 0, total: 0,
params: { params: {
...@@ -1468,7 +1481,7 @@ function handleSubmit(row, type) { ...@@ -1468,7 +1481,7 @@ function handleSubmit(row, type) {
* 报修细项同步 * 报修细项同步
* */ * */
//变更报修系统细项 //变更报修系统细项
bxApi.setAreaItemStatus({"id":[responseInfo.repair_item_id],"use_flag":0}).then(_res=>{ bxApi.setAreaItemStatus({"id": [responseInfo.repair_item_id], "use_flag": 0}).then(_res => {
//删除中间表对应关系 //删除中间表对应关系
api.getApiRepairDeleteMiddleItem({classification_equipment_id: responseInfo.euqipment_id}) api.getApiRepairDeleteMiddleItem({classification_equipment_id: responseInfo.euqipment_id})
}) })
...@@ -1667,7 +1680,7 @@ const handleReset = () => { ...@@ -1667,7 +1680,7 @@ const handleReset = () => {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
}; };
init.pageKey = Date.now();
init.searchList.forEach((cur) => { init.searchList.forEach((cur) => {
if (cur.code === "classification_id") { if (cur.code === "classification_id") {
searchFormRef.value.searchCondObj.classification_id = cur.options[0].id; searchFormRef.value.searchCondObj.classification_id = cur.options[0].id;
...@@ -2195,21 +2208,21 @@ function setPeopleColumnsData() { ...@@ -2195,21 +2208,21 @@ function setPeopleColumnsData() {
function showRepair(row) { function showRepair(row) {
getRepairAreaTree() getRepairAreaTree()
getRepairItemTree() getRepairItemTree()
init.repair.formData ={ init.repair.formData = {
"name": "", "name": "",
"area_id": "", "area_id": "",
"area_text": "", "area_text": "",
"areaDetail": "", "areaDetail": "",
"item_id": "", "item_id": "",
"item_text": "", "item_text": "",
"itemDetail": "", "itemDetail": "",
"phone": "", "phone": "",
"detail": "", "detail": "",
"file_list": [], "file_list": [],
"relationContentId": "", "relationContentId": "",
"contentLinkId": "", "contentLinkId": "",
"key_file_list": [], "key_file_list": [],
"key_remark": "" "key_remark": ""
} }
init.repair.title = row.name init.repair.title = row.name
...@@ -2219,8 +2232,6 @@ function showRepair(row) { ...@@ -2219,8 +2232,6 @@ function showRepair(row) {
init.repair.loading = true init.repair.loading = true
//获取报修系统细项id //获取报修系统细项id
api.getApiRepairQueryById({classification_equipment_id: row.id}).then(res => { api.getApiRepairQueryById({classification_equipment_id: row.id}).then(res => {
init.repair.formData.item_id = String(res.response.repair_item_id) init.repair.formData.item_id = String(res.response.repair_item_id)
...@@ -2314,9 +2325,10 @@ function handleRepairSubmit() { ...@@ -2314,9 +2325,10 @@ function handleRepairSubmit() {
}).then(res => { }).then(res => {
// //
api.getApiRepairRegisterRepair({ api.getApiRepairRegisterRepair({
repair_item_id: init.repair.formData.item_id, repair_item_id: init.repair.formData.item_id,
repair_out_id: res.response} repair_out_id: res.response
).then(()=>{ }
).then(() => {
init.repair.show = false init.repair.show = false
EquipmentList() EquipmentList()
}) })
...@@ -2331,6 +2343,25 @@ function handleRepairSubmit() { ...@@ -2331,6 +2343,25 @@ function handleRepairSubmit() {
/** /**
* 设备报修 * 设备报修
* */ * */
//设备导出出库单
function handleSelectionChange(selection) {
init.devices.deviceIdList = selection.map(row => row.id);
}
//导出出库单
function handleBatchNotify() {
if (init.devices.deviceIdList.length === 0) {
Message.warning("请先选择设备");
return;
}
hooks.myEncapsulationFunction(()=>{
api.postApiEquipmentEquipmentLendToPdf(init.devices.deviceIdList).then(res=>{
EquipmentList();
init.devices.deviceIdList = []
})
},false, '正在导出中...')
}
onMounted(() => { onMounted(() => {
getRepairAreaTree() getRepairAreaTree()
getRepairItemTree() getRepairItemTree()
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:total="init.allBorrowingRecord.total" :total="init.allBorrowingRecord.total"
:current="init.allBorrowingRecord.params.page_index" :current="init.allBorrowingRecord.params.page_index"
:page-size="init.allBorrowingRecord.params.page_size" :page-size="init.allBorrowingRecord.params.page_size"
...@@ -291,6 +292,7 @@ const DrawerDetails = defineAsyncComponent(()=>import('@/components/drawerDetai ...@@ -291,6 +292,7 @@ const DrawerDetails = defineAsyncComponent(()=>import('@/components/drawerDetai
const init = reactive({ const init = reactive({
pageKey:'',
grid: { grid: {
xs: 24, xs: 24,
sm: 12, sm: 12,
...@@ -587,6 +589,7 @@ const handleReset = () => { ...@@ -587,6 +589,7 @@ const handleReset = () => {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
} }
init.pageKey = Date.now();
ApplicationList() ApplicationList()
} }
// 分页改变 // 分页改变
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination"> <div class="pagination">
<Page <Page
:key="init.pageKey"
:total="init.devices.total" :total="init.devices.total"
:current="init.devices.params.page_index" :current="init.devices.params.page_index"
:page-size="init.devices.params.page_size" :page-size="init.devices.params.page_size"
...@@ -695,8 +696,8 @@ const userColumns = computed(() => { ...@@ -695,8 +696,8 @@ const userColumns = computed(() => {
return h('span', params.row.storage_location || '-'); return h('span', params.row.storage_location || '-');
} }
}, },
]; ];
// 添加操作列 // 添加操作列
...@@ -712,6 +713,7 @@ const loading = ref(false); ...@@ -712,6 +713,7 @@ const loading = ref(false);
const userList = ref([]); const userList = ref([]);
const init = reactive({ const init = reactive({
pageKey:123 ,
// 借用记录相关数据 // 借用记录相关数据
equipmentBorrowingStatus: { equipmentBorrowingStatus: {
itemData: {}, itemData: {},
...@@ -1334,7 +1336,7 @@ const handleReset = () => { ...@@ -1334,7 +1336,7 @@ const handleReset = () => {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
}; };
init.pageKey = Date.now();
init.searchList.forEach((cur) => { init.searchList.forEach((cur) => {
if (cur.code === "classification_id") { if (cur.code === "classification_id") {
searchFormRef.value.searchCondObj.classification_id = cur.options[0].id; searchFormRef.value.searchCondObj.classification_id = cur.options[0].id;
......
<template> <template>
<!-- 系统配置 -->
<Card dis-hover style="width: 100%;height: 100%;"> <div>
<!-- 右侧人员列表 --> <div class="mainDiv">
<div class="role-content"> <Card class="bigCard" title="活动时间提醒">
<!-- 搜索和工具栏 --> <Form label-colon>
<div class="role-toolbar"> <Row>
<initForm <Col span="24">
ref="searchFormRef" <FormItem label="活动开始前提醒">
:searchCondList="init.searchList" <RadioGroup v-model="configData.before_activity">
@on-submit="handleSearch" <Radio label="5">5分钟</Radio>
@on-reset="handleReset" <Radio label="15">15分钟</Radio>
/> <Radio label="30">30分钟</Radio>
<div> </RadioGroup>
<Button type="primary" icon="md-add" @click="applyForDevices">分配权限</Button> <span>自定义:</span>
</div> <Input v-model="configData.before_activity" style="width: 60px;"/>&nbsp;
</div> <span>分钟</span>
</FormItem>
<!-- 人员表格 --> </Col>
<Table :loading="init.userRole.loading" :columns="init.userRole.columns" :data="init.userRole.data" <Col span="24">
border> <FormItem label="活动结束前提醒">
<!-- 照片列 --> <RadioGroup v-model="configData.before_end_activity">
<template #avatar="{ row }"> <Radio label="5">5分钟</Radio>
<div class="user-avatar"> <Radio label="15">15分钟</Radio>
<Avatar v-if="row.photo" size="large" :src="row.photo"/> <Radio label="30">30分钟</Radio>
<Avatar v-else icon="ios-person" size="large"/> </RadioGroup>
</div> <span>自定义:</span>
</template> <Input v-model="configData.before_end_activity" style="width: 60px;"/>&nbsp;
<span>分钟</span>
<!-- 负责部门列 --> </FormItem>
<template #duty_dept="{ row }"> </Col>
<Tag v-for="(item,index) in row.duty_dept" :key="index" color="blue" style="margin: 2px">{{item.dept_name}}</Tag> <Col span="24" style="text-align: right;">
</template> <Button type="primary" @click="saveBt('before_activity', 'before_end_activity')">保存</Button>
</Col>
<!-- 操作列 --> </Row>
<template #action="{ row }"> </Form>
<div class="action-btns"> </Card>
<a href="javascript:;" @click="edit(row)">编辑</a> <Card class="bigCard kjyyCard" title="评价快捷用语">
<Divider type="vertical"/> <template #extra>
<Poptip <a @click="fastContentAdd"><Icon type="md-add" /></a>
confirm
transfer
title="确定要删除该设备吗?"
@on-ok="deleteRole(row)"
>
<a href="javascript:;">删除</a>
</Poptip>
</div>
</template> </template>
</Table>
<!-- 分页 -->
<div class="pagination">
<Page
:transfer="true"
:total="init.userRole.total"
:current="init.userRole.params.page_index"
:page-size="init.userRole.params.page_size"
show-elevator
show-sizer
show-total
@on-change="handlePageChange"
@on-page-size-change="handlePageSizeChange"
/>
</div>
</div>
</Card>
<!-- 分配权限 -->
<Modal
v-model="init.userRole.show"
title="分配权限"
width="700"
:mask-closable="false"
>
<Form
ref="deviceForm"
:model="init.userRole.formData"
:rules="init.userRole.rules"
:label-width="100"
>
<Row>
<Col v-bind="init.grid">
<FormItem label="用户" prop="tid">
<Select
:disabled="init.userRole.flag == 'edit'"
filterable
clearable
:loading="addUserModal.loading"
v-model="init.userRole.formData.tid"
placeholder="请选择用户"
:remote-method="onQueryChange"
>
<Option v-for="(item,index) in init.userRole.formData.tids" :key="index" :value="item.tid" >{{item.name}}({{item.card_number}})</Option>
</Select>
</FormItem>
</Col>
<Col v-bind="init.grid">
<FormItem label="权限" prop="role">
<Select
clearable
v-model="init.userRole.formData.role"
placeholder="请输入申请原因"
>
<Option value="admin" label="管理员"></Option>
<Option value="dept" label="部门管理员"></Option>
</Select>
</FormItem>
</Col>
</Row>
<Row v-bind="init.grid">
<Col>
<FormItem label="部门信息" prop="duty_dept">
<CheckboxGroup v-model="init.userRole.formData.duty_dept">
<Checkbox v-for="(item,index) in init.userRole.duty_depts" :label="item.dept_id" :key="index">
{{ item.dept_name }}
</Checkbox>
</CheckboxGroup>
</FormItem>
</Col>
</Row>
</Form>
<template #footer>
<Button @click="init.userRole.show = false">取消</Button>
<Button type="primary" @click="handleSubmitDevice">确定</Button>
</template>
</Modal>
<!-- 用户数据对话框 --> <p v-for="item in fastContentList" :key="item.id" name="fastCP">
<Modal <span>{{ item.content }}</span>
v-model="addUserModal.show" <span>
:title="'选择用户'" <a><Icon type="md-create" @click="fastContentEditRow(item)"/></a>
width="700" <Poptip confirm transfer title="是否确认删除?" @on-ok="fastContentDelRow(item)">
:mask-closable="false" <a name="del"><Icon type="md-close"/></a>
> </Poptip>
<div class="add-user-search"> </span>
<Input </p>
v-model="addUserModal.keyword" </Card>
placeholder="输入用户名称搜索" <Card class="smallCard" title="加时配置">
search <Form label-colon label-position="top">
clearable <Row>
enter-button <Col span="24">
@on-search="searchAvailableUsers" <FormItem label="允许加时时间段个数">
/> <RadioGroup v-model="configData.add_to">
<Button style="margin-left: 10px" type="primary" @click="batchAddUser" <Radio label="1">1个</Radio>
>批量添加 <Radio label="2">2个</Radio>
</Button <Radio label="3">3个</Radio>
> <Radio label="4">4个</Radio>
<Radio label="5">5个</Radio>
</RadioGroup>
<span>自定义:</span>
<Input v-model="configData.add_to" style="width: 60px;"/>&nbsp;
<span>个</span>
</FormItem>
</Col>
<Col span="24">
<FormItem label="最多加时次数">
<RadioGroup v-model="configData.overtime_num">
<Radio label="1">1次</Radio>
<Radio label="2">2次</Radio>
<Radio label="3">3次</Radio>
<Radio label="4">4次</Radio>
<Radio label="5">5次</Radio>
</RadioGroup>
<span>自定义:</span>
<Input v-model="configData.overtime_num" style="width: 60px;"/>&nbsp;
<span>次</span>
</FormItem>
</Col>
<Col span="24" style="text-align: right;">
<Button type="primary" @click="saveBt('add_to', 'overtime_num')">保存</Button>
</Col>
</Row>
</Form>
</Card>
<Card class="smallCard cplhsCard" title="差评拉黑数">
<p>
<RadioGroup v-model="configData.black_num">
<Radio label="1">1个</Radio>
<Radio label="2">2个</Radio>
<Radio label="3">3个</Radio>
<Radio label="4">4个</Radio>
<Radio label="5">5个</Radio>
</RadioGroup>
</p>
<p>
<span>自定义:</span>
<Input v-model="configData.black_num" style="width: 60px;"/>&nbsp;
<span>个</span>
</p>
<p>&nbsp;</p>
<Button class="save-bt" type="primary" @click="saveBt('black_num')">保存</Button>
</Card>
<Card class="smallCard cplhsCard" title="活动邀请时间限制">
<p>
<RadioGroup v-model="configData.invite_time">
<Radio label="1">1小时</Radio>
<Radio label="2">2小时</Radio>
<Radio label="6">6小时</Radio>
<Radio label="12">12小时</Radio>
</RadioGroup>
</p>
<p>
<span>自定义:</span>
<Input v-model="configData.invite_time" style="width: 60px;"/>&nbsp;
<span>小时</span>
</p>
<p>&nbsp;</p>
<Button class="save-bt" type="primary" @click="saveBt('invite_time')">保存</Button>
</Card>
<Card class="smallCard" title="评价设置">
<Form label-colon>
<Row>
<Col span="24">
<FormItem label="自动好评时间">
<Input v-model="configData.auto_goodevaluate_day" style="width: 60px;"/>&nbsp;
<span>天</span>
</FormItem>
</Col>
<Col span="24">
<FormItem label="自动好评星数">
<Rate
v-model="configData.auto_goodevaluate_num"
allow-half
icon="md-star"/>
</FormItem>
</Col>
<Col span="24">
<FormItem label="催办评价时间">
<Input v-model="configData.urge_evaluate_day" style="width: 60px;"/>&nbsp;
<span>天</span>
</FormItem>
</Col>
<Col span="24" style="text-align: right;">
<Button type="primary" @click="saveBt('auto_goodevaluate_day', 'auto_goodevaluate_num', 'urge_evaluate_day')">保存</Button>
</Col>
</Row>
</Form>
</Card>
<Card class="smallCard cplhsCard" title="最多邀请次数">
<p style="text-align: center;">
<span>最多邀请</span>&nbsp;
<Input v-model="configData.invite_num" style="width: 60px;"/>&nbsp;
<span>次</span>
</p>
<p>&nbsp;</p>
<Button class="save-bt" type="primary" @click="saveBt('invite_num')">保存</Button>
</Card>
<Card class="smallCard cplhsCard" title="黑名单天数">
<p style="text-align: center;">
<span>黑名单</span>&nbsp;
<Input v-model="configData.black_day" style="width: 60px;"/>&nbsp;
<span>天</span>
</p>
<p>&nbsp;</p>
<Button class="save-bt" type="primary" @click="saveBt('black_day')">保存</Button>
</Card>
</div> </div>
<!-- 快捷用语新增修改Modal -->
<!-- 可添加用户列表 --> <CEditModal
<Table ref="ceditmodal"
@on-selection-change="onSelectionChange" v-model="fastContentModalShow"
:loading="addUserModal.loading" :formItem="formItem"
:columns="addUserModal.availableUserColumns" :loading="fastContentModalLoading"
:data="addUserModal.userList" :formLabelWidth="100"
border :width="800"
> @onSubmit="fastContentSubmit"
<!-- 照片列 --> @onClose="fastContentModalShow = false"></CEditModal>
<template #avatar="{ row }"> </div>
<div class="user-avatar">
<Avatar v-if="row.photo" size="large" :src="row.photo"/>
<Avatar v-else icon="ios-person" size="large"/>
</div>
</template>
<!-- 操作列 -->
<template #action="{ row }">
<div class="action-btns">
<Button type="primary" size="small" @click="confirmAddUser(row)"
>添加
</Button
>
</div>
</template>
</Table>
<!-- 分页 -->
<div class="pagination" style="margin-top: 16px">
<Page
:key="addUserModal.pageKey"
:total="addUserModal.total"
:current="addUserModal.params.page_index"
:page-size="addUserModal.params.page_size"
show-elevator
show-sizer
show-total
@on-change="handleAddUserPageChange"
@on-page-size-change="handleAddUserPageSizeChange"
/>
</div>
<template #footer>
<Button @click="addUserModal.show = false">关闭</Button>
</template>
</Modal>
</template> </template>
<script setup> <script>
import initForm from "@/components/initForm"; import CEditModal from '@/components/CEditModal.vue'
import {ref, onMounted, reactive, computed, nextTick, onBeforeUpdate} from 'vue' import { cloneDeep } from 'lodash'
import {
Checkbox,
CheckboxGroup,
FormItem,
Message,
Modal,
Modal as ModalConfirm,
Option,
Page,
Select,
Tag
} from 'view-ui-plus'
import * as api from "@/api/allApi/controller/index";
import * as hooks from "@/hook/index";
import dayjs from "dayjs";
const init = reactive({ export default {
grid: { name: 'list',
xs: 24, components: {
sm: 12, CEditModal,
md: 12,
lg: 12,
}, },
searchList: [], data(){
userRole: { return {
flag:'add', configData: {
loading: false, // 允许加时时间段个数
total: 0, add_to: '',
data: [], // 自动好评时间/天
columns: [ auto_goodevaluate_day: '',
{ // 自动好评星数
title: '#', auto_goodevaluate_num: 0,
type: 'index', // 活动开始前提醒/分钟
width: 60, before_activity: '',
fixed: 'left' // 活动结束前提醒/分钟
}, before_end_activity: '',
{ // 黑名单天数/天
title: '工号', black_day: '',
key: 'card', // 差评拉黑数
minWidth: 120, black_num: '',
render: (h, params) => { // 邀请次数/次
return h('span', params.row.card || '-'); invite_num: '',
} // 邀请限制时间/小时
}, invite_time: '',
{ // 是否申请占用
title: '用户姓名', is_occupy: '',
key: 'name', // 最多加时次数
minWidth: 120, overtime_num: '',
render: (h, params) => { // 催办评价时间/天
return h('span', params.row.name || '-'); urge_evaluate_day: '',
}
}, },
{ // 快捷用语
title: '权限', fastContentList: [],
key: 'role', // 快捷用语编辑Modal
minWidth: 100, fastContentModalShow: false,
render: (h, params) => { fastContentModalLoading: false,
// 可根据实际role值做映射 fastContentIsEdit: false,
const roleMap = { // 新增编辑表单项
'dept': '系部管理员', formItem: [
'user': '普通用户', { id: 'content', name: '快捷用语', type: 'input', disabled: false, require: false, optList: [] },
'admin': '管理员' { id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
}; ],
return h('span', roleMap[params.row.role] || params.row.role || '-'); defaultFormData: {
} id: "",
}, content: "",
{ createby: "",
title: '所属部门', createtime: "",
slot: 'duty_dept', is_enable: 0,
minWidth: 180, is_del: 0
}, },
{ }
title: '操作', },
slot: 'action', computed: {},
width: 120, created(){},
align: 'center', mounted(){
fixed: 'right' this.getData()
} this.getFastContent()
], },
params: { methods: {
query: '', getData() {
role: '', this.asc.getApiSysConfigGetSysConfigAll().then(res => {
page_index: 1, // console.log('获取系统配置', res)
page_size: 10, res.response.forEach(a => {
}, this.configData[a.id] = a.value
show: false, })
file_id_lists: [], })
equipment_id_lists: [],
equipmentOptions: [],
roles: [],
duty_depts: [],
formData: {
recordId:'',
tid: "",
tids: [],
role: "",
duty_dept: [],
}, },
rules: { // 获取快捷用语
tid: [ getFastContent() {
{required: true, type: "string", message: "请选择用户", trigger: "change"}, this.asc.getApiSysConfigGetCommentContentList().then(res => {
], // console.log('快捷用语', res)
duty_dept: [ this.fastContentList = res.response
{required: true, type: "array", message: "请选择部门", trigger: "change"}, })
],
role: [
{required: true, type: "string", message: "请选择权限", trigger: "change"},
],
}, },
},
downloadLoading: false
});
// 加载角色列表
const Query = () => {
init.userRole.loading = true
api.getApiPermissionQuery(init.userRole.params).then(res => {
init.userRole.data = res.response.data;
init.userRole.total = res.response.data_count
init.userRole.loading = false
}).finally(() => {
init.userRole.loading = false
})
}
// 保存按钮
// 搜索用户 async saveBt(...id) {
const handleSearch = (value) => { // console.log('保存按钮', id)
init.userRole.params = { for (var i = 0; i < id.length; i++) {
...init.userRole.params, let obj = {
...value, id: id[i],
page_index: 1 value: this.configData[id[i]],
} }
Query() const res = await this.asc.postApiSysConfigGetSysConfigSave(obj)
} if (res.code != 1) {
const handleReset = () => { this.$Message.error(res.msg_detail)
init.userRole.params = { return
query: '',
status: '',
audit_status: '0',
page_index: 1,
page_size: 10,
}
Query()
}
// 分页改变
const handlePageChange = (page) => {
init.userRole.params.page_index = page
Query()
}
// 页大小改变
const handlePageSizeChange = (size) => {
init.userRole.params.page_size = size
init.userRole.params.page_index = 1
Query()
}
// 申请申领
const applyForDevices = () => {
init.userRole.flag = 'add'
init.userRole.show = true
init.userRole.formData = {
...init.userRole.formData,
tid: "",
role: "",
duty_dept: [],
}
deviceForm.value.resetFields()
}
const deviceForm = ref();
// 提交权限
const handleSubmitDevice = () => {
console.log("🚀🚀🚀,",init.userRole.formData)
deviceForm.value.validate((validate) => {
if (validate) {
const strategy = {
'add':()=>{
hooks.myEncapsulationFunction(() => {
return api.postApiPermissionPermissionAdd({
tid:init.userRole.formData.tid,
role: init.userRole.formData.role,
duty_dept: init.userRole.formData.duty_dept.join(';')
}).then(res => {
if (res.code === 1) {
Query()
init.userRole.show = false
return res
}
})
}, false, '正在提交中...')
},
'edit':()=>{
hooks.myEncapsulationFunction(() => {
return api.postApiPermissionPermissionUpdate({
id:init.userRole.formData.recordId,
role: init.userRole.formData.role,
duty_dept: init.userRole.formData.duty_dept.join(';')
}).then(res => {
if (res.code === 1) {
Query()
init.userRole.show = false
return res
}
})
}, false, '正在提交中...')
} }
} }
strategy[init.userRole.flag]() this.$Message.success('修改成功')
}
})
}
//删除权限
function deleteRole(row){
hooks.myEncapsulationFunction(() => {
return api.getApiPermissionPermissionDelete({
id: row.id
}).then(res => {
if (res.code === 1) {
Query()
return res
}
})
}, false, '正在删除中...')
}
//编辑权限
async function edit(row) {
init.userRole.formData = {
...init.userRole.formData,
recordId: row.id,
tid: row.tid,
role: row.role,
duty_dept: row.duty_dept.map(cur => cur.dept_id),
tids: [{
...row,
card_number:row.card,
}]
}
console.log("🚀🚀🚀,", row)
init.userRole.flag = 'edit'
init.userRole.show = true;
}
/**人员选择器 */
// 人员选择器》添加用户对话框
const addUserModal = reactive({
flag: '',
pageKey: '',
params: {
page_index: 1,
page_size: 100,
query: "",
},
total: 0,
show: false,
loading: false,
keyword: "",
batchUserList: [],
userList: [],
dutyDepts: [],
availableUserColumns: [
{
align: "center",
type: "selection",
width: 60,
},
{
title: "照片",
slot: "avatar",
width: 80,
},
{
title: "工号",
key: "card_number",
width: 120,
}, },
{
title: "姓名",
key: "name", // 新增快捷用语
minWidth: 120, fastContentAdd() {
this.fastContentModalShow = true
this.fastContentIsEdit = false
this.$refs.ceditmodal.modalInit('add', this.defaultFormData)
}, },
{ // 编辑快捷用语
title: "部门", fastContentEditRow(row) {
key: "dept_name", // console.log(row)
minWidth: 150, this.fastContentModalShow = true
this.fastContentIsEdit = true
this.$refs.ceditmodal.modalInit('edit', row)
}, },
{ // 保存快捷用语
title: "性别", fastContentSubmit(val) {
key: "gender", this.$Modal.confirm({
width: 80, 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()
})
}
})
}, },
// { // 删除快捷用语
// title: '操作', fastContentDelRow(row) {
// slot: 'action', // console.log('删除快捷用语', row)
// width: 80, this.asc.getApiSysConfigCommentContentDel({id:row.id, is_del: 1}).then(res => {
// align: 'center' // console.log('删除快捷用语结果', res)
// } if (res.code == 1) {
], this.$Message.success(res.response)
}); this.getFastContent()
// 部门列表 } else {
const departmentOptions = ref([]); this.$Message.error(res.msg_detail)
// 人员选择器》搜索可添加的用户
const searchAvailableUsers = async () => {
UserListSelect();
};
//弹出人员选择器
function showAddUser(key) {
addUserModal.flag = key
addUserModal.params = {
page_index: 1,
page_size: 10,
query: "",
}
addUserModal.pageKey = new Date();
addUserModal.show = true;
addUserModal.batchUserList = [];
UserListSelect()
}
//批量提交选中人员
function batchAddUser() {
const strategy = {
'选择用户': () => {
const dataId = init.userRole.formData.tids.map(cur => cur.tid)
let data = []
//选中但未提交的数据
addUserModal.batchUserList.forEach((cur, index) => {
//不包含
if (!dataId.includes(cur.tid)) {
data.push(cur)
} }
}) })
init.userRole.formData.tids = init.userRole.formData.tids.concat(data);
addUserModal.show = false;
}, },
} }
strategy[addUserModal.flag]()
}
//选中人员
function onSelectionChange(e) {
console.log('e', e)
addUserModal.batchUserList = e;
}
// 人员选择器》确认添加用户
const confirmAddUser = async (user) => {
try {
} catch (error) {
console.error("添加用户失败:", error);
Message.error("添加用户失败");
}
};
// 加载人员选择器用户
const UserListSelect = () => {
addUserModal.loading = true;
try {
api.getApiCommonUserSelect({
...addUserModal.params,
query: addUserModal.keyword,
})
.then((res) => {
addUserModal.userList = res.response.data || [];
addUserModal.total = res.response.data_count;
})
.catch((error) => {
console.error("获取角色用户列表失败:", error);
Message.error("获取角色用户列表失败");
})
.finally(() => {
addUserModal.loading = false;
});
} catch (error) {
console.error("获取角色用户列表失败:", error);
Message.error("获取角色用户列表失败");
addUserModal.loading = false;
}
};
// 分页改变
const handleAddUserPageChange = (page) => {
addUserModal.params.page_index = page;
UserListSelect()
};
// 页大小改变
const handleAddUserPageSizeChange = (size) => {
addUserModal.params.page_size = size;
addUserModal.params.page_index = 1;
UserListSelect()
};
/**人员选择器 */
//获取查询字段
function Permission() {
api.getApiPermissionInit().then(res => {
init.searchList = res.response
})
}
//获取部门
function GetDept() {
api.postApiCommonGetDept().then(res => {
init.userRole.duty_depts = res.response
})
}
//获取人员下拉框数据
function GetUserData() {
addUserModal.loading = true
return api.getApiCommonUserSelect(addUserModal.params).then(res => {
init.userRole.formData.tids = res.response.data
addUserModal.loading = false
return res
})
} }
const timer = ref({})
//远程搜索
function onQueryChange(row) {
console.log("🚀🚀🚀,",row)
addUserModal.params.query =row
clearTimeout(timer.value)
timer.value = setTimeout(() => GetUserData(),100)
}
onMounted(() => {
GetUserData()
GetDept()
Permission()
Query()
})
</script> </script>
<style scoped> <style scoped lang="less">
.role-container { .mainDiv{
display: flex;
min-height: calc(100vh - 150px);
/* border: 1px solid #e8eaec; */
border-radius: 4px;
overflow: auto;
gap: 16px;
}
.role-sidebar {
width: 300px;
border-right: 1px solid #e8eaec;
background-color: #fff;
overflow-y: auto;
height: 200px;
}
.role-title {
padding: 16px;
font-size: 16px;
font-weight: bold;
border-bottom: 1px solid #e8eaec;
}
.role-list {
padding: 10px 0;
}
.role-item {
display: flex;
align-items: center;
padding: 12px 16px;
cursor: pointer;
transition: background-color 0.3s;
}
.role-item:hover {
background-color: #f0f0f0;
}
.role-item.active {
background-color: #e8f7ff;
color: #2d8cf0;
}
.role-item-icon {
width: 36px;
height: 36px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 12px;
color: #fff;
}
.role-admin {
background-color: #2d8cf0;
}
.role-party-office {
background-color: #19be6b;
}
.role-entrance-dept {
background-color: #ff9900;
}
.role-responsible-dept {
background-color: #ed4014;
}
.role-item-info {
flex: 1;
}
.role-name {
font-size: 14px;
margin-bottom: 4px;
}
.role-count {
font-size: 12px;
color: #808695;
}
.role-content {
display: flex;
flex-direction: column;
gap: 16px;
flex: 1;
}
.role-toolbar {
height: 100%;
display: flex;
flex-direction: column;
gap: 20px;
top: 0;
background-color: #fff;
z-index: 1;
}
.search-box {
width: 280px;
}
.pagination {
/* margin-top: 16px; */
text-align: center;
position: sticky;
bottom: 0;
background-color: #fff;
z-index: 1;
}
.action-btns {
display: flex;
justify-content: center;
}
.user-avatar {
display: flex;
justify-content: center;
align-items: center;
}
.user-avatar img {
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover;
}
.add-user-search {
margin-bottom: 16px;
display: flex; display: flex;
} flex-wrap: wrap;
justify-content: space-between;
.bigCard, .smallCard{
margin-bottom: 16px;
/deep/.ivu-card-body{
height: calc(~"100% - 51px");
.ivu-form-item{
margin-bottom: 12px;
}
}
}
.bigCard{
width: calc(~"(100% - 16px) / 2");
}
.smallCard{
width: calc(~"(100% - 32px) / 3");
// /deep/.ivu-card-body{
// height: calc(~"100% - 51px");
// }
}
.duty-dept-select { /deep/.kjyyCard{
margin-bottom: 16px; .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{
.ivu-card-body{
// height: calc(~"100% - 51px");
display: flex;
flex-direction: column;
justify-content: space-evenly;
}
}
/deep/ .save-bt{
text-align: right;
position: absolute;
bottom: 16px;
right: 16px;
}
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或