qiushanhe/ss-crm-manage-web
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Browse Source
This commit is contained in:
caolin
2024-09-23 21:45:29 +08:00
parent 696e96a0c0 a89bd1b59c
commit dd049320f6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/permission.js
View File

@@ -45,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
const dictStore = useDictStoreWithOut() const dictStore = useDictStoreWithOut()
const userStore = useUserStoreWithOut() const userStore = useUserStoreWithOut()
const permissionStore = usePermissionStoreWithOut() const permissionStore = usePermissionStoreWithOut()
if (!dictStore.getIsSetDict) { if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
await dictStore.setDictMap() await dictStore.setDictMap()
} }
if (!userStore.getIsSetUser) { if (!userStore.getIsSetUser) {

4
src/views/Clue/Order/Comp/DialogAfterSale.vue
View File

@@ -45,7 +45,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item label="是否退货" prop="isReturns"> <el-form-item label="是否退货" prop="isReturns">
<el-radio-group v-model="form.isReturns"> <el-radio-group v-model="form.isReturns">
<el-radio :label="true"> 退货 </el-radio> <el-radio :label="true"> 退货 </el-radio>
@@ -79,7 +79,9 @@
<script setup name="DialogAfterSale"> <script setup name="DialogAfterSale">
import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale' import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
import { useAppStore } from '@/store/modules/app'
const appStore = useAppStore()
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const show = ref(false) const show = ref(false)

4
src/views/Profile/NotifyMessageDetail.vue
View File

@@ -7,7 +7,7 @@
--> -->
<template> <template>
<div class="container"> <div class="container">
<ContentWrap style="max-width: 1000px; margin: 0 auto"> <ContentWrap style="max-width: 1000px; margin: 0 auto; overflow-x: auto">
<div class="text-center"> <div class="text-center">
<div class="mb-10px" style="font-size: 24px; letter-spacing: 2px"> <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
{{ info.title }} {{ info.title }}
@@ -82,6 +82,8 @@ onMounted(() => {
text-align: left; text-align: left;
border-width: 1px; border-width: 1px;
box-sizing: border-box; box-sizing: border-box;
min-width: 44px;
word-break: break-all;
} }
:deep(.el-card__body) { :deep(.el-card__body) {
padding: 20px 10px; padding: 20px 10px;