From d675006ed1d6d0583abd7ffa3f85b4a119b8aa81 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Wed, 13 Aug 2025 16:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=B7=A5=E5=8D=95=E5=BD=A2?=
=?UTF-8?q?=E6=88=90=E9=97=AD=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 3 +-
.env.prod | 2 +-
.../mettingList/components/EditDialog.vue | 4 +-
.../pages/mettingMgt/mettingYuYue/index.vue | 115 +++++++++++-------
src/views/pages/workOrder/orderList/index.vue | 52 ++++++--
5 files changed, 124 insertions(+), 52 deletions(-)
diff --git a/.env.dev b/.env.dev
index 6dc7127..a402490 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,7 +12,8 @@ VITE_ROUTER_BASE=/
VITE_ROUTER_HISTORY=hash
# api
-VITE_API_BASIC=http://10.10.1.6:8071
+VITE_API_BASIC=https://jinshan.nantong.info
+# VITE_API_BASIC=http://10.10.1.6:8071
VITE_API_HTTP=/api/v1/
# storage
VITE_STORAGE_NAMESPACE = gin-admin_local_
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 1af1d6e..5fc0520 100644
--- a/.env.prod
+++ b/.env.prod
@@ -11,7 +11,7 @@ VITE_PERMISSION=true
VITE_ROUTER_HISTORY=hash
# api
-VITE_API_BASIC=/
+VITE_API_BASIC=https://jinshan.nantong.info
VITE_API_HTTP=/api/v1/
# storage
diff --git a/src/views/pages/mettingMgt/mettingList/components/EditDialog.vue b/src/views/pages/mettingMgt/mettingList/components/EditDialog.vue
index d2da9b3..cc3c34d 100644
--- a/src/views/pages/mettingMgt/mettingList/components/EditDialog.vue
+++ b/src/views/pages/mettingMgt/mettingList/components/EditDialog.vue
@@ -117,7 +117,9 @@ function handleOk() {
const params = {
...values,
status:1,
- imgs:formData.value.imgs.length>0?formData.value.imgs.map(item=>spliceUrl(item)):[]
+ imgs:formData.value.imgs.length>0?formData.value.imgs.map(item=>spliceUrl(item)):[],
+ num:formData.value.num||0,
+ roomType:formData.value.roomType||1,
}
let result = null
switch (modal.value.type) {
diff --git a/src/views/pages/mettingMgt/mettingYuYue/index.vue b/src/views/pages/mettingMgt/mettingYuYue/index.vue
index 781fdb4..9c331ef 100644
--- a/src/views/pages/mettingMgt/mettingYuYue/index.vue
+++ b/src/views/pages/mettingMgt/mettingYuYue/index.vue
@@ -1,4 +1,28 @@
+
+
+
+
+
+
+
+ 个人申请
+ 企业申请
+
+
+
+
+
+ {{ $t('button.reset') }}
+
+ {{ $t('button.search') }}
+
+
+
+
+
+
+
@@ -9,12 +33,20 @@
{{ dayjs(record.startAt).format('YYYY-MM-DD HH:mm:ss') + ' - ' +
dayjs(record.endAt).format('YYYY-MM-DD HH:mm:ss') }}
-
- 个人
- 企业
- 未知
+
+ {{ record.startTime + ' - ' + record.endTime }}
-
+
+ 个人申请
+ 企业申请
+
+
+ 审核通过
+ 待审核
+ 审核不通过
+
+
+
{{ applyThemeMap[record.applyTheme] || '未知' }}
@@ -24,25 +56,24 @@
- 查看承诺报表
+ rel="noopener noreferrer">
+ 查看承诺报表
无
- 查看申请报表
+ 查看申请报表
无
-
+
- 下载
-
-
+ 审核
+
@@ -56,7 +87,7 @@
+ :options="[{ value: 3, label: '通过' }, { value: 99, label: '驳回' }]">
@@ -82,34 +113,38 @@ defineOptions({
})
const { t } = useI18n() // 解构出t方法
const columns = [
- { title: '会议室名称', dataIndex: 'roomName' },
- { title: '负责人', dataIndex: 'concatName' },
- { title: '负责人手机号', dataIndex: 'concatPhone' },
- { title: '申请类型', dataIndex: 'roomType' },
- { title: '申请主题', dataIndex: 'applyTheme' },
- { title: '申请人', dataIndex: 'userName' },
- { title: '申请人手机号', dataIndex: 'userPhone' },
- { title: '申请人身份证', dataIndex: 'userCardId', width: 120 },
+ { title: '会议室', dataIndex: 'roomName' },
+ { title: '申请状态', dataIndex: 'status' },
+ // { title: '负责人', dataIndex: 'concatName' },
+ // { title: '负责人手机号', dataIndex: 'concatPhone' },
+ { title: '申请类型', dataIndex: 'applyType', width: 100 },
+ { title: '申请主题', dataIndex: 'applyTheme', width: 100 },
+ { title: '申请人', dataIndex: 'userName', width: 100 },
+ // { title: '申请人手机号', dataIndex: 'userPhone' },
+ // { title: '申请人身份证', dataIndex: 'userCardId', width: 120 },
{ title: '申请人地址', dataIndex: 'userAddress' },
- { title: '公司名字', dataIndex: 'companyName' },
+ // { title: '公司名字', dataIndex: 'companyName' },
{ title: '申请理由', dataIndex: 'reason' },
{ title: '场次', dataIndex: 'counter' },
{ title: '人数', dataIndex: 'num' },
- { title: '开始时间', dataIndex: 'startTime' },
- { title: '结束时间', dataIndex: 'endTime' },
+ { title: '预约时间', dataIndex: 'startTime' },
+ // { title: '结束时间', dataIndex: 'endTime' },
{ title: '申请签名', dataIndex: 'applySign' },
- { title: '备注', dataIndex: 'remark' },
- { title: '回执申请报表', dataIndex: 'rebackCovenantPdf' },
- { title: '回执承诺报表', dataIndex: 'rebackApplyPdf' },
- // { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' },
+ // { title: '备注', dataIndex: 'remark' },
+ { title: '申请报表', dataIndex: 'rebackCovenantPdf' },
+ { title: '承诺报表', dataIndex: 'rebackApplyPdf' },
+ { title: t('button.action'), key: 'action', fixed: 'right', width: 80, align: 'center' },
]
const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination()
+searchFormData.value = {
+ applyType: 1,
+}
const remark = ref('')
const currentInfo = ref({})
-const auditStatus = ref(2)
+const auditStatus = ref(3)
const editDialogRef = ref()
const open = ref(false)
-const imgOpen = ref(false)
+const currentForm = ref({})
const applyThemeMap = {
1: '开会',
2: '学术报告',
@@ -127,6 +162,7 @@ async function getPageList() {
const { pageSize, current } = paginationState
const { success, data, total } = await apis.mettingYuYue
.getDataList({
+ applyType: searchFormData.value.applyType,
pageSize,
current: current,
})
@@ -145,14 +181,10 @@ async function getPageList() {
hideLoading()
}
}
-const auditHandleEdit = (obj = {}, type) => {
- currentInfo.value = obj
- if (type === 'audit') {
- open.value = true
- } else {
- imgOpen.value = true
- }
-
+const auditHandleEdit = (obj = {}) => {
+ currentForm.value = obj
+ open.value = true
+
}
const handleClick = async () => {
try {
@@ -181,9 +213,10 @@ const handleAuditEdit = async () => {
const params = {
...currentForm.value,
status: auditStatus.value,
- remark: remark.value
+ remark: remark.value,
+ // num: currentForm.value.num || 0,
}
- const result = await apis.mettingRoom.updateMenu(currentForm.value.id, params).catch(() => {
+ const result = await apis.mettingYuYue.updateMenu(currentForm.value.id, params).catch(() => {
throw new Error()
})
if (config('http.code.success') === result?.success) {
diff --git a/src/views/pages/workOrder/orderList/index.vue b/src/views/pages/workOrder/orderList/index.vue
index 84f7e64..a3a8e4e 100644
--- a/src/views/pages/workOrder/orderList/index.vue
+++ b/src/views/pages/workOrder/orderList/index.vue
@@ -22,7 +22,13 @@
-
+
+
+ {{ '完成' }}
+
+
+
+
撤销
@@ -59,7 +65,7 @@
暂无
-
+
@@ -80,7 +86,7 @@ import apis from '@/apis'
import { config } from '@/config'
import { usePagination } from '@/hooks'
import EditDialog from './components/EditDialog.vue'
-import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
+import { PlusOutlined, CheckCircleOutlined, DeleteOutlined } from '@ant-design/icons-vue'
import { useI18n } from 'vue-i18n'
import { orderStatus } from '@/enums/index.js'
import dayjs from 'dayjs'
@@ -109,7 +115,7 @@ const currentInfo = ref({})
const auditStatus = ref(2)
const editDialogRef = ref()
const open = ref(false)
-const imgOpen=ref(false)
+const imgOpen = ref(false)
getPageList()
/**
* 获取用户列表
@@ -160,7 +166,7 @@ const handleClick = async () => {
})
if (config('http.code.success') === result?.success) {
message.success('已审核')
- open.value=false
+ open.value = false
getPageList()
}
} catch (error) {
@@ -168,6 +174,36 @@ const handleClick = async () => {
hideLoading()
}
}
+function auditHandleFinish(params){
+ Modal.confirm({
+ title: '确定完成该工单吗',
+ content: t('button.confirm'),
+ okText: t('button.confirm'),
+ onOk: () => {
+ return new Promise((resolve, reject) => {
+ ; (async () => {
+ try {
+ const updateParams = {
+ ...params,
+ status: 3
+ }
+ console.log(updateParams)
+ const { success } = await apis.orderList.updateMenu(params.id, updateParams).catch(() => {
+ throw new Error()
+ })
+ if (config('http.code.success') === success) {
+ resolve()
+ message.success('操作成功')
+ await getPageList()
+ }
+ } catch (error) {
+ reject()
+ }
+ })()
+ })
+ },
+ })
+}
/**
* 删除
*/
@@ -180,12 +216,12 @@ function handleDelete(value) {
return new Promise((resolve, reject) => {
; (async () => {
try {
- const params={
+ const params = {
...value,
- status:98
+ status: 98
}
console.log(params)
- const { success } = await apis.orderList.updateMenu(value.id, params).catch(() => {
+ const { success } = await apis.orderList.updateMenu(value.id, params).catch(() => {
throw new Error()
})
if (config('http.code.success') === success) {