vJuRvLW^eWp+MDfBg76c_@1c%$z{BqQU?u}=%JjoQbk zQP{%Gf($rq_XP>_+$DZhG1|`V#s%njZSrGJBI4T+}7S0`>gW zc*~1MWcmxxnj2VRJ>@>h-Ei@l3sFlv)vEr~^;RN3na~Bt{5dDNaKUL!4?w062mEFN zA;2#YLfx}`XyENy;bFnRr;3yCp#JQ*&ETk6zKZlmA%~}FR*BolbXr2t{OvJI&xR7> zdJy|$2TR4R2WD9PLhufLq2ZfvJ*%)dI6oBm)d?eP_|waYRorK9V}3N-*uz-w>Jiy3 zwCwP*&;K1X{qqELdUTo~E~v1mG^hZ^Vl&jMwGk!Uk_c^*)+b9;(~Qr8QXNoV^gJ;3 z6F@WBo*X9#x%sn&1Yc?)RfHZcB6w1;`N2a3G}Gb5gg5{q33u^t!>O%>LTHn~mID$` zWDhs7k#AJ=pElv?>F<@?HJ@^xUUFh{v(lA(rOXO+Y*l^ysH66Vo5Ytq#YPL|nEJVq zbwGX!U+$MkD{`x4MrnnQlFkN{^)^z4-iaEMgQ(Rzjz+tj?>t$-m=a~cRxcM6mU>0W zq7Pig=r^ta{ev2-{c$bO|7dhMR`xg98syY592iB_2q^-Z%QNtW-ZK$f?2;0mnez&9 zs7Ui@+9lJ>Rk4BZi!ua`xPuN|XeVQB3&=RA840Nj!R%xi$2Ld_biGp!g9Xbjg;YjP z6#{6y=@9<*?lD5t!dy=3S$4d_kcA_KRGx#n6m+gCds5iz6H0-|95OgZQai}S4ZyY6 zWPlhvvBr?Ml9DA7jU5?lisu#5_N8uP3$|Ug^m0?A$Wfw+HoE9zh%u&^O;-WT)L&MC zo|jRLl$UBwfEE<%`LTppDXeGOB%g($S43E)#ZrSK#>prq%zDYR61QXoT10LY%bg7p O0%lZ4lEBdG0RRB>BWafa diff --git a/src/enums/index.js b/src/enums/index.js index 8811e43..bcbe82b 100644 --- a/src/enums/index.js +++ b/src/enums/index.js @@ -54,4 +54,18 @@ const userStatus = new EnumManager([ { value: 1, name: '启用', color: '#52c41a' }, // 黄色(警告色) { value: 2, name: '禁用', color: '#ff4d4f' } // 红色(错误色) ]) -export {activatyStatus,enumsStatus,orderStatus,announcementStatus,nbdMutualStatus,workTypeStatus,mettingStatus,userStatus} \ No newline at end of file +//门店列表类型状态 +const storeStatus = new EnumManager([ + { value: 1, name: '待审核', color: '#faad14' }, // 黄色(警告色) + { value: 2, name: '启用', color: '#52c41a' }, // 绿色(进行中) + // { value: 98, name: '禁用', color: '#bfbfbf' }, // 灰色(失效色) + { value: 99, name: '审核不通过', color: '#ff4d4f' } // 红色(错误色) +]) +//门店列表类型状态 +const homeStatus = new EnumManager([ + { value: 1, name: '待审核', color: '#faad14' }, // 黄色(警告色) + { value: 2, name: '启用', color: '#52c41a' }, // 绿色(进行中) + // { value: 98, name: '禁用', color: '#bfbfbf' }, // 灰色(失效色) + { value: 99, name: '审核不通过', color: '#ff4d4f' } // 红色(错误色) +]) +export {activatyStatus,enumsStatus,orderStatus,announcementStatus,nbdMutualStatus,workTypeStatus,mettingStatus,userStatus,storeStatus,homeStatus} \ No newline at end of file diff --git a/src/router/routes/pages.js b/src/router/routes/pages.js index 96c056b..44763ef 100644 --- a/src/router/routes/pages.js +++ b/src/router/routes/pages.js @@ -168,7 +168,7 @@ export default [ name: 'mettingMgt', component: 'RouteViewLayout', meta: { - icon: 'icon-zhoubian', + icon: 'icon-huiyishi1', title: '会议室管理', isMenu: true, keepAlive: true, @@ -206,7 +206,7 @@ export default [ name: 'customer', component: 'pages/user/index.vue', meta: { - icon: HomeOutlined, + icon: 'icon-yonghu', title: '用户管理', isMenu: true, keepAlive: true, diff --git a/src/views/pages/activity/components/EditDialog.vue b/src/views/pages/activity/components/EditDialog.vue index c1a3a3e..6cc4558 100644 --- a/src/views/pages/activity/components/EditDialog.vue +++ b/src/views/pages/activity/components/EditDialog.vue @@ -1,6 +1,6 @@ + :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel" > -@@ -135,7 +135,8 @@ function handleOk() { const params = { ...values, cover: formData.value.cover?spliceUrl(formData.value.cover[0]):'', - images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [] + images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [], + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/activity/index.vue b/src/views/pages/activity/index.vue index 4415837..06a56c0 100644 --- a/src/views/pages/activity/index.vue +++ b/src/views/pages/activity/index.vue @@ -144,6 +144,7 @@ const columns = [ { title: '活动标题', dataIndex: 'title' }, { title: '活动时间', dataIndex: 'openAt', align: 'center' }, { title: '活动内容', dataIndex: 'content', align: 'center', width: 100 }, + { title: '备注', dataIndex: 'remark'}, { title: '状态', dataIndex: 'status', align: 'center', width: 100 }, { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] diff --git a/src/views/pages/announcementList/components/AddDialog.vue b/src/views/pages/announcementList/components/AddDialog.vue index a1de2b4..b53241c 100644 --- a/src/views/pages/announcementList/components/AddDialog.vue +++ b/src/views/pages/announcementList/components/AddDialog.vue @@ -1,6 +1,6 @@ + :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel"> - --> + -->@@ -118,15 +118,13 @@ function handleOk() { formRef.value .validateFields() .then(async (values) => { - console.log(2222) try { showLoading() const params = { ...values, - cover:formData.value.cover?spliceUrl(formData.value.cover[0]):'' - } - console.log(params); - + cover:formData.value.cover?spliceUrl(formData.value.cover[0]):'', + status:1 + } let result = null switch (modal.value.type) { case 'create': diff --git a/src/views/pages/announcementList/index.vue b/src/views/pages/announcementList/index.vue index 9bc021b..c6f4ae4 100644 --- a/src/views/pages/announcementList/index.vue +++ b/src/views/pages/announcementList/index.vue @@ -121,6 +121,8 @@ const columns = [ { title: '简介', dataIndex: 'desc', ellipsis: true }, { title: '排序', dataIndex: 'sequence', width: 80, align: 'center' }, { title: '状态', key: 'status', dataIndex: 'status', width: 120, align: 'center' }, + { title: '备注', dataIndex: 'remark', ellipsis: true }, + { title: '创建时间', dataIndex: 'createdAt', width: 200, align: 'center' }, { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] diff --git a/src/views/pages/homeBanner/components/EditDialog.vue b/src/views/pages/homeBanner/components/EditDialog.vue index 744b5c0..cbee751 100644 --- a/src/views/pages/homeBanner/components/EditDialog.vue +++ b/src/views/pages/homeBanner/components/EditDialog.vue @@ -18,7 +18,7 @@ @@ -45,7 +45,7 @@ import { useI18n } from 'vue-i18n' import dayjs from 'dayjs' import { createMenu, getMenu, updateMenu } from '@/apis/modules/imgmgt' import {spliceUrl} from '@/utils/util' -import { enumsStatus } from '@/enums/index.js' +import { homeStatus } from '@/enums/index.js' const emit = defineEmits(['ok']) const { t } = useI18n() // 解构出t方法 const { modal, showModal, hideModal, showLoading, hideLoading } = useModal() @@ -108,6 +108,7 @@ function handleOk() { ...values, img: spliceUrl(formData.value?.img[0]), scene: 1 , + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/homeBanner/index.vue b/src/views/pages/homeBanner/index.vue index 3e0ed5d..f77aa72 100644 --- a/src/views/pages/homeBanner/index.vue +++ b/src/views/pages/homeBanner/index.vue @@ -11,7 +11,7 @@ - + @@ -27,7 +27,7 @@ - {{ item.label + {{ item.label }} @@ -47,14 +47,20 @@ {{ enumsStatus.getName(record.status) - }} +{{ homeStatus.getName(record.status) + }} + {{ $t('pages.system.user.edit') }} + + {{ '审核' }} + + +@@ -82,17 +99,22 @@ import EditDialog from './components/EditDialog.vue' import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue' import { useI18n } from 'vue-i18n' import { delMenu, getDataList } from '@/apis/modules/imgmgt' -import { enumsStatus } from '@/enums/index.js' +import { homeStatus } from '@/enums/index.js' defineOptions({ name: 'homeBanner', }) +const currentForm = ref({}) +const open = ref(false) +const auditStatus = ref(2) +const remark = ref('') const { t } = useI18n() // 解构出t方法 const columns = [ { title: '图片', dataIndex: 'img', width: 100, align: 'center' }, { title: '名称', dataIndex: 'title', key: 'name' }, { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, + { title: '备注', dataIndex: 'remark', align: 'center' }, { title: '顺序', dataIndex: 'sequence', width: 100, align: 'center' }, - { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, + { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() @@ -128,7 +150,29 @@ async function getPageList() { hideLoading() } } - +const auditHandleEdit = (params) => { + currentForm.value = params + open.value = true +} +const handleAuditEdit = async () => { + try { + const params = { + ...currentForm.value, + status: auditStatus.value, + remark: remark.value + } + const result = await apis.imgmgt.updateMenu(currentForm.value.id, params).catch(() => { + throw new Error() + }) + if (config('http.code.success') === result?.success) { + getPageList() + open.value = false + message.success('审核成功') + } + } catch (error) { + message.error(error.message) + } +} /** * 删除 */ diff --git a/src/views/pages/nbdMutual/nbdMutualAid/components/CommentItem.js b/src/views/pages/nbdMutual/nbdMutualAid/components/CommentItem.js index a911280..00f09cc 100644 --- a/src/views/pages/nbdMutual/nbdMutualAid/components/CommentItem.js +++ b/src/views/pages/nbdMutual/nbdMutualAid/components/CommentItem.js @@ -13,6 +13,10 @@ export const CommentItem = { type: Number, default: 0, }, + parentName:{ + type:String, + default:'' + } }, setup(props) { // 日期格式化函数 @@ -22,7 +26,7 @@ export const CommentItem = { // 返回渲染函数 return () => { - const { comment, depth } = props + const { comment, depth,parentName } = props // 创建子评论元素(递归部分) let childComments = null if (comment.children?.length && depth < 10) { @@ -35,21 +39,22 @@ export const CommentItem = { comment: child, key: child.id, depth: depth + 1, // 传递增加后的深度 + parentName:comment.pusherName||'' }) ) ) } // 构建主组件结构 - return h('div', { class: 'comment' }, [ + return h('div', { class: 'comment'}, [ // 评论头部 - h('div', { class: 'comment-header' }, [ - h('span', { class: 'username' }, comment.pusherName), - h('span', { class: 'time' }, formatDate(comment.createdAt)), + h('div', { class: 'comment-header',style:{display:'flex',justifyContent: 'space-between'} }, [ + h('div', { class: 'username' }, parentName&&depth!==0?`${comment.pusherName}@${parentName}`:comment.pusherName), + h('span', { class: 'time',style:{color:'#999999'} }, formatDate(comment.createdAt)), ]), // 评论内容 - h('div', { class: 'comment-content' }, comment.content), + h('div', { class: 'comment-content',style:{color:'#999999',marginBottom:'5px'} }, comment.content), // 子评论容器 childComments, diff --git a/src/views/pages/nbdMutual/nbdMutualAid/index.vue b/src/views/pages/nbdMutual/nbdMutualAid/index.vue index e1d1bb7..af00d2c 100644 --- a/src/views/pages/nbdMutual/nbdMutualAid/index.vue +++ b/src/views/pages/nbdMutual/nbdMutualAid/index.vue @@ -98,14 +98,14 @@ - {{ $t('pages.system.delete') }} @@ -65,7 +71,18 @@ - + + + ++ ++ + ++ + - {{ nbdMutualAidInfo.content }}
--+ {{ nbdMutualAidInfo.content }}
++- 暂无记录... + 暂无评论记录...diff --git a/src/views/pages/neighborhood/components/EditDialog.vue b/src/views/pages/neighborhood/components/EditDialog.vue index 3fa5fa9..152af80 100644 --- a/src/views/pages/neighborhood/components/EditDialog.vue +++ b/src/views/pages/neighborhood/components/EditDialog.vue @@ -19,7 +19,7 @@+ :options="homeStatus.getAll()" disabled> @@ -43,7 +43,7 @@ import { useForm, useModal, useSpining } from '@/hooks' import { message } from 'ant-design-vue' import { useI18n } from 'vue-i18n' import dayjs from 'dayjs' -import { enumsStatus } from '@/enums/index.js' +import { homeStatus } from '@/enums/index.js' import { spliceUrl } from '@/utils/util' const emit = defineEmits(['ok']) const { t } = useI18n() // 解构出t方法 @@ -107,6 +107,7 @@ function handleOk() { ...values, img: spliceUrl(formData.value?.img[0]), scene: 2, + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/neighborhood/index.vue b/src/views/pages/neighborhood/index.vue index 2180599..9759286 100644 --- a/src/views/pages/neighborhood/index.vue +++ b/src/views/pages/neighborhood/index.vue @@ -11,7 +11,7 @@ - +@@ -26,7 +26,7 @@ - --> + --> - {{ item.label }} +{{ item.label }} - + @@ -39,20 +39,27 @@ + :pagination="paginationState" :scroll="{ x: 1000 }" @change="onTableChange"> - + - {{ enumsStatus.getName(record.status) }} +{{ homeStatus.getName(record.status) + }} + {{ $t('pages.system.user.edit') }} + + {{ '审核' }} + + +{{ $t('pages.system.delete') }} @@ -63,7 +70,18 @@ + + ++ ++ + ++ @@ -80,17 +98,22 @@ import EditDialog from './components/EditDialog.vue' import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue' import { useI18n } from 'vue-i18n' import { delMenu, getDataList } from '@/apis/modules/imgmgt' -import { enumsStatus } from '@/enums/index.js' +import { homeStatus } from '@/enums/index.js' defineOptions({ - name: 'homeBanner', + name: 'neighBanner', }) +const currentForm = ref({}) +const open = ref(false) +const auditStatus = ref(2) +const remark = ref('') const { t } = useI18n() // 解构出t方法 const columns = [ { title: '图片', dataIndex: 'img', width: 100, align: 'center' }, { title: '名称', dataIndex: 'title', key: 'name' }, { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, + { title: '备注', dataIndex: 'remark',align: 'center' }, { title: '顺序', dataIndex: 'sequence', width: 100, align: 'center' }, - { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, + { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() @@ -109,7 +132,7 @@ async function getPageList() { const { success, data, total } = await apis.imgmgt .getDataList({ pageSize, - current:current, + current: current, scene: 2, ...searchFormData.value, }) @@ -126,7 +149,29 @@ async function getPageList() { hideLoading() } } - +const auditHandleEdit = (params) => { + currentForm.value = params + open.value = true +} +const handleAuditEdit = async () => { + try { + const params = { + ...currentForm.value, + status: auditStatus.value, + remark: remark.value + } + const result = await apis.imgmgt.updateMenu(currentForm.value.id, params).catch(() => { + throw new Error() + }) + if (config('http.code.success') === result?.success) { + getPageList() + open.value = false + message.success('审核成功') + } + } catch (error) { + message.error(error.message) + } +} /** * 删除 */ diff --git a/src/views/pages/server/serverList/components/EditDialog.vue b/src/views/pages/server/serverList/components/EditDialog.vue index 97704c7..bb98e65 100644 --- a/src/views/pages/server/serverList/components/EditDialog.vue +++ b/src/views/pages/server/serverList/components/EditDialog.vue @@ -40,7 +40,7 @@ + :options="storeStatus.getAll()" disabled> @@ -104,7 +104,7 @@ import apis from '@/apis' import { useForm, useModal, useSpining } from '@/hooks' import { message } from 'ant-design-vue' import { useI18n } from 'vue-i18n' -import { enumsStatus } from '@/enums/index.js' +import { storeStatus } from '@/enums/index.js' import { spliceUrl } from '@/utils/util' import { init } from 'echarts' const areaFormRef = ref() @@ -166,8 +166,8 @@ async function handleEdit(record = {}) { return } formData.value = { ...data } - formData.value.storeCover=data.storeCover?[config('http.apiBasic')+data.storeCover]:'' - formData.value.img=data.img?[config('http.apiBasic')+data.img]:'' + formData.value.storeCover=data.storeCover?[config('http.apiBasic')+data.storeCover]:[] + formData.value.img=data.img?[config('http.apiBasic')+data.img]:[] initData() } /** @@ -183,7 +183,8 @@ function handleOk() { storeCover: formData.value.storeCover ? spliceUrl(formData.value.storeCover[0]) : '', img: formData.value.img ? spliceUrl(formData.value.img[0]) : '', latitude: parseFloat(formData.value.latitude), - longitude: parseFloat(formData.value.longitude) + longitude: parseFloat(formData.value.longitude), + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/server/serverList/index.vue b/src/views/pages/server/serverList/index.vue index ed64dce..019ac75 100644 --- a/src/views/pages/server/serverList/index.vue +++ b/src/views/pages/server/serverList/index.vue @@ -14,7 +14,7 @@ :pagination="paginationState" @change="onTableChange"> - - +{{ enumsStatus.getName(record.status) + @@ -22,17 +22,36 @@{{ storeStatus.getName(record.status) }} 编辑 -+ ++ 审核 + + + - 撤销 - + + 删除 + ++ + + ++ ++ + ++ @@ -45,7 +64,7 @@ import { usePagination } from '@/hooks' import EditDialog from './components/EditDialog.vue' import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue' import { useI18n } from 'vue-i18n' -import { enumsStatus } from '@/enums/index.js' +import { storeStatus } from '@/enums/index.js' defineOptions({ name: 'serverList', }) @@ -59,11 +78,14 @@ const columns = [ { title: '详细地址', dataIndex: 'storeAddress', ellipsis: true }, { title: '营业时间', dataIndex: 'openAt' }, { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, - { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, + { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() - +const currentForm = ref({}) +const open = ref(false) +const auditStatus = ref(2) +const remark = ref('') const editDialogRef = ref() getPageList() /** @@ -94,7 +116,29 @@ async function getPageList() { hideLoading() } } - +const auditHandleEdit = (params) => { + currentForm.value = params + open.value = true +} +const handleAuditEdit = async () => { + try { + const params = { + ...currentForm.value, + status: auditStatus.value, + remark: remark.value + } + const result = await apis.serverList.updateMenu(currentForm.value.id, params).catch(() => { + throw new Error() + }) + if (config('http.code.success') === result?.success) { + getPageList() + open.value = false + message.success('审核成功') + } + } catch (error) { + message.error(error.message) + } +} /** * 删除 */ diff --git a/src/views/pages/server/serverType/components/EditDialog.vue b/src/views/pages/server/serverType/components/EditDialog.vue index 2b98fe7..54a0f70 100644 --- a/src/views/pages/server/serverType/components/EditDialog.vue +++ b/src/views/pages/server/serverType/components/EditDialog.vue @@ -85,7 +85,8 @@ function handleOk() { showLoading() const params = { ...values, - iconUrl:formData.value.iconUrl?spliceUrl(formData.value.iconUrl[0]):'' + iconUrl:formData.value.iconUrl?spliceUrl(formData.value.iconUrl[0]):'', + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/server/serverType/index.vue b/src/views/pages/server/serverType/index.vue index ecb320d..6eb1053 100644 --- a/src/views/pages/server/serverType/index.vue +++ b/src/views/pages/server/serverType/index.vue @@ -13,21 +13,30 @@ - - + + - {{ orderStatus.getName(record.status)}} +{{ + orderStatus.getName(record.status)}} - 编辑分类 - + ++ + + ++ 审核 + + +@@ -36,7 +45,18 @@ {{ $t('pages.system.delete') }} - + + + ++ ++ + ++ @@ -54,13 +74,17 @@ import errImg from '@/assets/blankSpace.png' defineOptions({ name: 'serverType', }) +const currentForm = ref({}) +const open = ref(false) +const auditStatus = ref(2) +const remark = ref('') const { t } = useI18n() // 解构出t方法 const columns = [ { title: '分类名称', dataIndex: 'label' }, // { title: '图标', dataIndex: 'iconUrl' }, { title: '分类排序', dataIndex: 'sequence' }, - // { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, - { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, + { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, + { title: t('button.action'), key: 'action', fixed: 'right', width: 140, align: 'center' }, ] const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() @@ -95,7 +119,29 @@ async function getPageList() { hideLoading() } } - +const auditHandleEdit = (params) => { + currentForm.value = params + open.value = true +} +const handleAuditEdit = async () => { + try { + const params = { + ...currentForm.value, + status: auditStatus.value, + remark: remark.value + } + const result = await apis.serverType.updateMenu(currentForm.value.id, params).catch(() => { + throw new Error() + }) + if (config('http.code.success') === result?.success) { + getPageList() + open.value = false + message.success('审核成功') + } + } catch (error) { + message.error(error.message) + } +} /** * 删除 */ diff --git a/src/views/pages/workOrder/orderList/index.vue b/src/views/pages/workOrder/orderList/index.vue index e639050..03fbf41 100644 --- a/src/views/pages/workOrder/orderList/index.vue +++ b/src/views/pages/workOrder/orderList/index.vue @@ -149,12 +149,13 @@ const handleClick = async () => { status: auditStatus.value, remark: remark.value } - const result = await apis.orderList.updateMenu(formData.value.id, params).catch(() => { + const result = await apis.orderList.updateMenu(currentInfo.value.id, params).catch(() => { throw new Error(error) }) if (config('http.code.success') === result?.success) { message.success('已审核') open.value=false + getPageList() } } catch (error) { message.error({ content: error.message }) diff --git a/src/views/pages/workOrder/orderType/components/EditDialog.vue b/src/views/pages/workOrder/orderType/components/EditDialog.vue index 61eecb7..933df4c 100644 --- a/src/views/pages/workOrder/orderType/components/EditDialog.vue +++ b/src/views/pages/workOrder/orderType/components/EditDialog.vue @@ -97,6 +97,7 @@ function handleOk() { showLoading() const params = { ...values, + status:1 } let result = null switch (modal.value.type) { diff --git a/src/views/pages/workOrder/orderType/index.vue b/src/views/pages/workOrder/orderType/index.vue index 4194d88..6a092e9 100644 --- a/src/views/pages/workOrder/orderType/index.vue +++ b/src/views/pages/workOrder/orderType/index.vue @@ -72,6 +72,7 @@ const { t } = useI18n() // 解构出t方法 const columns = [ { title: '分类名称', dataIndex: 'label' }, { title: '分类排序', dataIndex: 'sequence' }, + { title: '备注', dataIndex: 'remark' }, { title: '状态', dataIndex: 'status', width: 120, align: 'center' }, { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, ]