From ddeb9d11d6aa38c82ea0b7407848c5fc8d3d59ba Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 17:09:21 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 2 ++ env/.env.dev | 4 ++-- src/views/user/contract-manage/index.vue | 15 ++++++++++----- src/views/user/goodsManagement/index.vue | 13 +++++++++++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/components.d.ts b/components.d.ts index d3abe98..b0bbef1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -29,6 +29,7 @@ declare module 'vue' { ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -36,6 +37,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/env/.env.dev b/env/.env.dev index 90b71b2..5e37dcb 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -9,8 +9,8 @@ VITE_API_URL = '/proxyApi' # VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 # VITE_proxyTarget = 'http://192.168.2.122:28080' # 梁超 -VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 -# VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 +# VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 +VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 # VITE_proxyTarget = 'http://192.168.2.75:28080' # 盛旭 # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) diff --git a/src/views/user/contract-manage/index.vue b/src/views/user/contract-manage/index.vue index dc7ba55..a9c1e08 100644 --- a/src/views/user/contract-manage/index.vue +++ b/src/views/user/contract-manage/index.vue @@ -60,10 +60,7 @@ 合同新建 - + 编辑 - + 删除 @@ -350,6 +352,7 @@ import { QuillEditor } from '@vueup/vue-quill' import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' +const uploadUrlTemp = ref('') const store2 = mainStore() const isViewForm = ref(false) @@ -685,6 +688,8 @@ const onEditorReady = (editor) => { } onMounted(() => { getContractListData() + + uploadUrlTemp.value = window.location.origin + '/mall-view/contract-template.docx' // getEquipmentTypeApi().then((res: any) => { // deviceTypeTree.value = res.data }) diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 817c626..4e5d82e 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -103,6 +103,8 @@ const queryParams: any = ref({ typeId: '', pageSize: 10, pageNum: 1, + startTime: '', + endTime: '', }) const queryFormRef = ref() const total: any = ref(0) @@ -117,6 +119,8 @@ const resetTableList = (formEl: FormInstance | undefined) => { if (!formEl) return formEl.resetFields() dateRange.value = [] + queryParams.value.startTime = '' + queryParams.value.endTime = '' deviceTypeList.value = [] queryParams.value.typeId = null queryTableList() @@ -124,6 +128,11 @@ const resetTableList = (formEl: FormInstance | undefined) => { // 获取数据列表 const getList = async () => { console.log(queryParams.value.pageNum, '***9999', queryParams.value.pageSize) + + if (dateRange.value.length > 0) { + queryParams.value.startTime = dateRange.value[0] + queryParams.value.endTime = dateRange.value[1] + } const res: any = await getEquipmentListApi(queryParams.value) console.log(res, '列表数据**--**') total.value = res.total @@ -1323,7 +1332,7 @@ const changeDate = (row: any, index: number) => { style="width: 100%" v-model="dateRange" type="datetimerange" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="YYYY-MM-DD" range-separator="至" start-placeholder="更新开始日期" end-placeholder="更新结束日期" @@ -1404,7 +1413,7 @@ const changeDate = (row: any, index: number) => { - +