diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java index d524901..62ce2fa 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java @@ -10,6 +10,8 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; +import java.util.Objects; + /** * Redis 配置类 */ diff --git a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/AuthController.java b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/AuthController.java index 916f265..8fc1f13 100644 --- a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/AuthController.java +++ b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/AuthController.java @@ -7,6 +7,8 @@ import com.yanzhu.framework.common.enums.UserTypeEnum; import com.yanzhu.framework.common.pojo.CommonResult; import com.yanzhu.framework.security.config.SecurityProperties; import com.yanzhu.framework.security.core.util.SecurityFrameworkUtils; +import com.yanzhu.framework.tenant.core.aop.TenantIgnore; +import com.yanzhu.framework.tenant.core.context.TenantContextHolder; import com.yanzhu.module.system.controller.admin.auth.vo.*; import com.yanzhu.module.system.convert.auth.AuthConvert; import com.yanzhu.module.system.dal.dataobject.permission.MenuDO; @@ -42,6 +44,7 @@ import static com.yanzhu.framework.security.core.util.SecurityFrameworkUtils.get @Tag(name = "管理后台 - 认证") @RestController @RequestMapping("/system/auth") +@TenantIgnore @Validated @Slf4j public class AuthController { @@ -66,6 +69,11 @@ public class AuthController { @PermitAll @Operation(summary = "使用账号密码登录") public CommonResult login(@RequestBody @Valid AuthLoginReqVO reqVO) { + // 先根据用户名查询用户,获取租户ID + AdminUserDO user = userService.getUserByUsername(reqVO.getUsername()); + if (user != null && user.getTenantId() != null) { + TenantContextHolder.setTenantId(user.getTenantId()); + } return success(authService.login(reqVO)); } @@ -127,9 +135,12 @@ public class AuthController { @PostMapping("/sms-login") @PermitAll @Operation(summary = "使用短信验证码登录") - // 可按需开启限流:https://github.com/YunaiV/ruoyi-vue-pro/issues/851 - // @RateLimiter(time = 60, count = 6, keyResolver = ExpressionRateLimiterKeyResolver.class, keyArg = "#reqVO.mobile") public CommonResult smsLogin(@RequestBody @Valid AuthSmsLoginReqVO reqVO) { + // 先根据手机号查询用户,获取租户ID + AdminUserDO user = userService.getUserByMobile(reqVO.getMobile()); + if (user != null && user.getTenantId() != null) { + TenantContextHolder.setTenantId(user.getTenantId()); + } return success(authService.smsLogin(reqVO)); } @@ -137,6 +148,11 @@ public class AuthController { @PermitAll @Operation(summary = "发送手机验证码") public CommonResult sendLoginSmsCode(@RequestBody @Valid AuthSmsSendReqVO reqVO) { + // 先根据手机号查询用户,获取租户ID + AdminUserDO user = userService.getUserByMobile(reqVO.getMobile()); + if (user != null && user.getTenantId() != null) { + TenantContextHolder.setTenantId(user.getTenantId()); + } authService.sendSmsCode(reqVO); return success(true); } diff --git a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/vo/AuthLoginRespVO.java b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/vo/AuthLoginRespVO.java index 30b409f..6554c1b 100644 --- a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/vo/AuthLoginRespVO.java +++ b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/controller/admin/auth/vo/AuthLoginRespVO.java @@ -15,6 +15,9 @@ import java.time.LocalDateTime; @Builder public class AuthLoginRespVO { + @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long tenantId; + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long userId; diff --git a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImpl.java b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImpl.java index 41ef3e7..6e22b9a 100644 --- a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImpl.java @@ -8,6 +8,7 @@ import com.yanzhu.framework.common.util.object.BeanUtils; import com.yanzhu.framework.common.util.servlet.ServletUtils; import com.yanzhu.framework.common.util.validation.ValidationUtils; import com.yanzhu.framework.datapermission.core.annotation.DataPermission; +import com.yanzhu.framework.tenant.core.context.TenantContextHolder; import com.yanzhu.module.system.api.logger.dto.LoginLogCreateReqDTO; import com.yanzhu.module.system.api.sms.SmsCodeApi; import com.yanzhu.module.system.api.sms.dto.code.SmsCodeUseReqDTO; @@ -216,7 +217,10 @@ public class AdminAuthServiceImpl implements AdminAuthService { OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, getUserType().getValue(), OAuth2ClientConstants.CLIENT_ID_DEFAULT, null); // 构建返回结果 - return BeanUtils.toBean(accessTokenDO, AuthLoginRespVO.class); + AuthLoginRespVO respVO = BeanUtils.toBean(accessTokenDO, AuthLoginRespVO.class); + // 设置租户编号 + respVO.setTenantId(TenantContextHolder.getTenantId()); + return respVO; } @Override diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env b/yanzhu-ui/yanzhu-ui-admin-vue3/.env index 5e9e81e..e9f933b 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env @@ -20,9 +20,13 @@ VITE_APP_DOCALERT_ENABLE=true VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 -VITE_APP_DEFAULT_LOGIN_TENANT = 研筑科技 -VITE_APP_DEFAULT_LOGIN_USERNAME = admin -VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 +#VITE_APP_DEFAULT_LOGIN_TENANT = 研筑科技 +#VITE_APP_DEFAULT_LOGIN_USERNAME = admin +#VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 + +VITE_APP_DEFAULT_LOGIN_TENANT = +VITE_APP_DEFAULT_LOGIN_USERNAME = +VITE_APP_DEFAULT_LOGIN_PASSWORD = # API 加解密 VITE_APP_API_ENCRYPT_ENABLE = true diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.local b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.local index 59f5136..8e2eca9 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.local +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.local @@ -37,9 +37,14 @@ VITE_APP_CAPTCHA_ENABLE=true VITE_APP_TENANT_ENABLE=true # 默认账户密码 -VITE_APP_DEFAULT_LOGIN_TENANT = 研筑科技 -VITE_APP_DEFAULT_LOGIN_USERNAME = admin -VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 +# 默认账户密码 +#VITE_APP_DEFAULT_LOGIN_TENANT = 研筑科技 +#VITE_APP_DEFAULT_LOGIN_USERNAME = admin +#VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 + +VITE_APP_DEFAULT_LOGIN_TENANT = +VITE_APP_DEFAULT_LOGIN_USERNAME = +VITE_APP_DEFAULT_LOGIN_PASSWORD = # GoView域名 VITE_GOVIEW_URL='http://127.0.0.1:3000' diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/styles/index.scss b/yanzhu-ui/yanzhu-ui-admin-vue3/src/styles/index.scss index 7607941..172a772 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/styles/index.scss +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/styles/index.scss @@ -35,3 +35,6 @@ border-left-color: var(--el-color-primary); } } +.hidden{ + display: none; +} diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/utils/auth.ts b/yanzhu-ui/yanzhu-ui-admin-vue3/src/utils/auth.ts index ad67440..086634f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/utils/auth.ts +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/utils/auth.ts @@ -38,7 +38,6 @@ export const formatToken = (token: string): string => { // ========== 账号相关 ========== export type LoginFormType = { - tenantName: string username: string password: string rememberMe: boolean diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/403.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/403.vue index a3ec487..ad3c8f7 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/403.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/403.vue @@ -3,6 +3,5 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/404.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/404.vue index f6a08de..9ec8926 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/404.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/404.vue @@ -4,4 +4,4 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/500.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/500.vue index 998487d..ad92276 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/500.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Error/500.vue @@ -4,4 +4,4 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index.vue index 7a043fc..9f905da 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index.vue @@ -55,7 +55,6 @@ - @@ -107,7 +106,6 @@ - @@ -184,15 +182,12 @@ import { set } from 'lodash-es' import { EChartsOption } from 'echarts' import { formatTime } from '@/utils' - import { useUserStore } from '@/store/modules/user' // import { useWatermark } from '@/hooks/web/useWatermark' import type { WorkplaceTotal, Project, Notice, Shortcut } from './types' import { pieOptions, barOptions } from './echarts-data' import { useRouter } from 'vue-router' - defineOptions({ name: 'Index' }) - const { t } = useI18n() const router = useRouter() const userStore = useUserStore() @@ -207,7 +202,6 @@ let totalSate = reactive({ access: 0, todo: 0 }) - const getCount = async () => { const data = { project: 40, @@ -216,7 +210,6 @@ const getCount = async () => { } totalSate = Object.assign(totalSate, data) } - // 获取项目数 let projects = reactive([]) const getProject = async () => { @@ -272,7 +265,6 @@ const getProject = async () => { ] projects = Object.assign(projects, data) } - // 获取通知公告 let notice = reactive([]) const getNotice = async () => { @@ -304,10 +296,8 @@ const getNotice = async () => { ] notice = Object.assign(notice, data) } - // 获取快捷入口 let shortcut = reactive([]) - const getShortcut = async () => { const data = [ { @@ -349,7 +339,6 @@ const getShortcut = async () => { ] shortcut = Object.assign(shortcut, data) } - // 用户来源 const getUserAccessSource = async () => { const data = [ @@ -372,7 +361,6 @@ const getUserAccessSource = async () => { }) } const barOptionsData = reactive(barOptions) as EChartsOption - // 周活跃量 const getWeeklyUserActivity = async () => { const data = [ @@ -397,7 +385,6 @@ const getWeeklyUserActivity = async () => { } ]) } - const getAllApi = async () => { await Promise.all([ getCount(), @@ -409,14 +396,11 @@ const getAllApi = async () => { ]) loading.value = false } - const handleProjectClick = (message: string) => { window.open(`https://${message}`, '_blank') } - const handleShortcutClick = (url: string) => { router.push(url) } - getAllApi() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index2.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index2.vue index c9429ab..423d1f2 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index2.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Home/Index2.vue @@ -28,7 +28,6 @@ - @@ -57,7 +56,6 @@ - @@ -86,7 +84,6 @@ - @@ -143,26 +140,21 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/Login.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/Login.vue index 30af14f..cd61075 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/Login.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/Login.vue @@ -69,28 +69,21 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/SocialLogin.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/SocialLogin.vue index a37d072..0a0a635 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/SocialLogin.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/SocialLogin.vue @@ -148,17 +148,13 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/ForgetPasswordForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/ForgetPasswordForm.vue index f47b229..f21d09e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/ForgetPasswordForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/ForgetPasswordForm.vue @@ -120,9 +120,7 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/LoginForm.vue index f8c98b8..fe1758c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/LoginForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/Login/components/LoginForm.vue @@ -15,17 +15,6 @@ - - - - - - + - {{ t('login.otherLogin') }} - + + - @@ -105,16 +104,13 @@ /> - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/chat/manager/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/chat/manager/index.vue index 9cb0006..20bd90e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/chat/manager/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/chat/manager/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageCard.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageCard.vue index 9a5632e..4b81b86 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageCard.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageCard.vue @@ -74,39 +74,31 @@ import { ImageVO, ImageMidjourneyButtonsVO } from '@/api/ai/image' import { PropType } from 'vue' import { ElLoading, LoadingOptionsResolved } from 'element-plus' import { AiImageStatusEnum } from '@/views/ai/utils/constants' - const message = useMessage() // 消息 - const props = defineProps({ detail: { type: Object as PropType, require: true } }) - const cardImageRef = ref() // 卡片 image ref const cardImageLoadingInstance = ref() // 卡片 image ref - /** 处理点击事件 */ const handleButtonClick = async (type, detail: ImageVO) => { emits('onBtnClick', type, detail) } - /** 处理 Midjourney 按钮点击事件 */ const handleMidjourneyBtnClick = async (button: ImageMidjourneyButtonsVO) => { // 确认窗体 await message.confirm(`确认操作 "${button.label} ${button.emoji}" ?`) emits('onMjBtnClick', button, props.detail) } - const emits = defineEmits(['onBtnClick', 'onMjBtnClick']) // emits - /** 监听详情 */ const { detail } = toRefs(props) watch(detail, async (newVal, oldVal) => { await handleLoading(newVal.status as string) }) - /** 处理加载状态 */ const handleLoading = async (status: number) => { // 情况一:如果是生成中,则设置加载中的 loading @@ -123,9 +115,8 @@ const handleLoading = async (status: number) => { } } } - /** 初始化 */ onMounted(async () => { await handleLoading(props.detail.status as string) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageDetail.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageDetail.vue index d4f8dc6..86c0bdb 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageDetail.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageDetail.vue @@ -15,7 +15,6 @@ fit="contain" /> - @@ -34,7 +33,6 @@
{{ detail.picUrl }}
- - item.key === detail?.options?.style)?.name }} - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageList.vue index 5169e45..6d20714 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/ImageList.vue @@ -33,7 +33,6 @@ /> - () // 生成中的 image 定时器,轮询生 // 图片详情相关的参数 const isShowImageDetail = ref(false) // 图片详情是否展示 const showImageDetailId = ref(0) // 图片详情的图片编号 - /** 处理查看绘图作品 */ const handleViewPublic = () => { router.push({ name: 'AiImageSquare' }) } - /** 查看图片的详情 */ const handleDetailOpen = async () => { isShowImageDetail.value = true } - /** 关闭图片的详情 */ const handleDetailClose = async () => { isShowImageDetail.value = false } - /** 获得 image 图片列表 */ const getImageList = async () => { try { @@ -101,7 +94,6 @@ const getImageList = async () => { const { list, total } = await ImageApi.getImagePageMy(queryParams) imageList.value = list pageTotal.value = total - // 2. 计算需要轮询的图片 const newWatImages = {} imageList.value.forEach((item) => { @@ -118,7 +110,6 @@ const getImageList = async () => { } } } - /** 轮询生成中的 image 列表 */ const refreshWatchImages = async () => { const imageIds = Object.keys(inProgressImageMap.value).map(Number) @@ -140,7 +131,6 @@ const refreshWatchImages = async () => { }) inProgressImageMap.value = newWatchImages } - /** 图片的点击事件 */ const handleImageButtonClick = async (type: string, imageDetail: ImageVO) => { // 详情 @@ -168,7 +158,6 @@ const handleImageButtonClick = async (type: string, imageDetail: ImageVO) => { return } } - /** 处理 Midjourney 按钮点击事件 */ const handleImageMidjourneyButtonClick = async ( button: ImageMidjourneyButtonsVO, @@ -184,11 +173,8 @@ const handleImageMidjourneyButtonClick = async ( // 3. 刷新列表 await getImageList() } - defineExpose({ getImageList }) // 暴露组件方法 - const emits = defineEmits(['onRegeneration']) - /** 组件挂在的时候 */ onMounted(async () => { // 获取 image 列表 @@ -198,11 +184,10 @@ onMounted(async () => { await refreshWatchImages() }, 1000 * 3) }) - /** 组件取消挂在的时候 */ onUnmounted(async () => { if (inProgressTimer.value) { clearInterval(inProgressTimer.value) } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/common/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/common/index.vue index 6af1caf..02c240a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/common/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/common/index.vue @@ -93,9 +93,7 @@ import { ImageApi, ImageDrawReqVO, ImageVO } from '@/api/ai/image' import { AiPlatformEnum, ImageHotWords, OtherPlatformEnum } from '@/views/ai/utils/constants' import { ModelVO } from '@/api/ai/model/model' - const message = useMessage() // 消息弹窗 - // 接收父组件传入的模型列表 const props = defineProps({ models: { @@ -104,7 +102,6 @@ const props = defineProps({ } }) const emits = defineEmits(['onDrawStart', 'onDrawComplete']) // 定义 emits - // 定义属性 const drawIn = ref(false) // 生成中 const selectHotWord = ref('') // 选中的热词 @@ -115,7 +112,6 @@ const height = ref(512) // 图片高度 const otherPlatform = ref(AiPlatformEnum.TONG_YI) // 平台 const platformModels = ref([]) // 模型列表 const modelId = ref() // 选中的模型 - /** 选择热词 */ const handleHotWordClick = async (hotWord: string) => { // 情况一:取消选中 @@ -123,12 +119,10 @@ const handleHotWordClick = async (hotWord: string) => { selectHotWord.value = '' return } - // 情况二:选中 selectHotWord.value = hotWord // 选中 prompt.value = hotWord // 替换提示词 } - /** 图片生成 */ const handleGenerateImage = async () => { // 二次确认 @@ -155,19 +149,16 @@ const handleGenerateImage = async () => { drawIn.value = false } } - /** 填充值 */ const settingValues = async (detail: ImageVO) => { prompt.value = detail.prompt width.value = detail.width height.value = detail.height } - /** 平台切换 */ const handlerPlatformChange = async (platform: string) => { // 根据选择的平台筛选模型 platformModels.value = props.models.filter((item: ModelVO) => item.platform === platform) - // 切换平台,默认选择一个模型 if (platformModels.value.length > 0) { modelId.value = platformModels.value[0].id // 使用 model 属性作为值 @@ -175,7 +166,6 @@ const handlerPlatformChange = async (platform: string) => { modelId.value = undefined } } - /** 监听 models 变化 */ watch( () => props.models, @@ -186,4 +176,4 @@ watch( ) /** 暴露组件方法 */ defineExpose({ settingValues }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/dall3/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/dall3/index.vue index 07a35e8..3d9ff17 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/dall3/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/dall3/index.vue @@ -106,9 +106,7 @@ import { ImageSizeVO } from '@/views/ai/utils/constants' import { ModelVO } from '@/api/ai/model/model' - const message = useMessage() // 消息弹窗 - // 接收父组件传入的模型列表 const props = defineProps({ models: { @@ -117,7 +115,6 @@ const props = defineProps({ } }) const emits = defineEmits(['onDrawStart', 'onDrawComplete']) // 定义 emits - // 定义属性 const prompt = ref('') // 提示词 const drawIn = ref(false) // 生成中 @@ -125,7 +122,6 @@ const selectHotWord = ref('') // 选中的热词 const selectModel = ref('dall-e-3') // 模型 const selectSize = ref('1024x1024') // 选中 size const style = ref('vivid') // style 样式 - /** 选择热词 */ const handleHotWordClick = async (hotWord: string) => { // 情况一:取消选中 @@ -133,12 +129,10 @@ const handleHotWordClick = async (hotWord: string) => { selectHotWord.value = '' return } - // 情况二:选中 selectHotWord.value = hotWord prompt.value = hotWord } - /** 选择 model 模型 */ const handleModelClick = async (model: ImageModelVO) => { selectModel.value = model.key @@ -151,7 +145,6 @@ const handleModelClick = async (model: ImageModelVO) => { // DALL-E-2 模型特定的处理 style.value = 'natural' // 如果有其他DALL-E-2适合的默认风格 } - // 更新其他相关参数 // 例如可以默认选择最适合当前模型的尺寸 const recommendedSize = Dall3SizeList.find( @@ -159,22 +152,18 @@ const handleModelClick = async (model: ImageModelVO) => { (model.key === 'dall-e-3' && size.key === '1024x1024') || (model.key === 'dall-e-2' && size.key === '512x512') ) - if (recommendedSize) { selectSize.value = recommendedSize.key } } - /** 选择 style 样式 */ const handleStyleClick = async (imageStyle: ImageModelVO) => { style.value = imageStyle.key } - /** 选择 size 大小 */ const handleSizeClick = async (imageSize: ImageSizeVO) => { selectSize.value = imageSize.key } - /** 图片生产 */ const handleGenerateImage = async () => { // 从 models 中查找匹配的模型 @@ -185,7 +174,6 @@ const handleGenerateImage = async () => { message.error('该模型不可用,请选择其它模型') return } - // 二次确认 await message.confirm(`确认生成内容?`) try { @@ -214,7 +202,6 @@ const handleGenerateImage = async () => { drawIn.value = false } } - /** 填充值 */ const settingValues = async (detail: ImageVO) => { prompt.value = detail.prompt @@ -225,8 +212,6 @@ const settingValues = async (detail: ImageVO) => { ) as ImageSizeVO await handleSizeClick(imageSize) } - /** 暴露组件方法 */ defineExpose({ settingValues }) - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/midjourney/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/midjourney/index.vue index d59a83a..a783f0c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/midjourney/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/midjourney/index.vue @@ -119,9 +119,7 @@ import { NijiVersionList } from '@/views/ai/utils/constants' import { ModelVO } from '@/api/ai/model/model' - const message = useMessage() // 消息弹窗 - // 接收父组件传入的模型列表 const props = defineProps({ models: { @@ -130,7 +128,6 @@ const props = defineProps({ } }) const emits = defineEmits(['onDrawStart', 'onDrawComplete']) // 定义 emits - // 定义属性 const drawIn = ref(false) // 生成中 const selectHotWord = ref('') // 选中的热词 @@ -141,7 +138,6 @@ const selectModel = ref('midjourney') // 选中的模型 const selectSize = ref('1:1') // 选中 size const selectVersion = ref('6.0') // 选中的 version const versionList = ref(MidjourneyVersions) // version 列表 - /** 选择热词 */ const handleHotWordClick = async (hotWord: string) => { // 情况一:取消选中 @@ -149,17 +145,14 @@ const handleHotWordClick = async (hotWord: string) => { selectHotWord.value = '' return } - // 情况二:选中 selectHotWord.value = hotWord // 选中 prompt.value = hotWord // 设置提示次 } - /** 点击 size 尺寸 */ const handleSizeClick = async (imageSize: ImageSizeVO) => { selectSize.value = imageSize.key } - /** 点击 model 模型 */ const handleModelClick = async (model: ImageModelVO) => { selectModel.value = model.key @@ -170,7 +163,6 @@ const handleModelClick = async (model: ImageModelVO) => { } selectVersion.value = versionList.value[0].value } - /** 图片生成 */ const handleGenerateImage = async () => { // 从 models 中查找匹配的模型 @@ -181,7 +173,6 @@ const handleGenerateImage = async () => { message.error('该模型不可用,请选择其它模型') return } - // 二次确认 await message.confirm(`确认生成内容?`) try { @@ -209,7 +200,6 @@ const handleGenerateImage = async () => { drawIn.value = false } } - /** 填充值 */ const settingValues = async (detail: ImageVO) => { // 提示词 @@ -229,8 +219,6 @@ const settingValues = async (detail: ImageVO) => { // image referImageUrl.value = detail.options.referImageUrl } - /** 暴露组件方法 */ defineExpose({ settingValues }) - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/stableDiffusion/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/stableDiffusion/index.vue index 1fa68d5..615aff4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/stableDiffusion/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/components/stableDiffusion/index.vue @@ -151,9 +151,7 @@ import { StableDiffusionStylePresets } from '@/views/ai/utils/constants' import { ModelVO } from '@/api/ai/model/model' - const message = useMessage() // 消息弹窗 - // 接收父组件传入的模型列表 const props = defineProps({ models: { @@ -162,7 +160,6 @@ const props = defineProps({ } }) const emits = defineEmits(['onDrawStart', 'onDrawComplete']) // 定义 emits - // 定义属性 const drawIn = ref(false) // 生成中 const selectHotWord = ref('') // 选中的热词 @@ -176,7 +173,6 @@ const seed = ref(42) // 控制生成图像的随机性 const scale = ref(7.5) // 引导系数 const clipGuidancePreset = ref('NONE') // 文本提示相匹配的图像(clip_guidance_preset) 简称 CLIP const stylePreset = ref('3d-model') // 风格 - /** 选择热词 */ const handleHotWordClick = async (hotWord: string) => { // 情况一:取消选中 @@ -184,12 +180,10 @@ const handleHotWordClick = async (hotWord: string) => { selectHotWord.value = '' return } - // 情况二:选中 selectHotWord.value = hotWord // 选中 prompt.value = hotWord // 替换提示词 } - /** 图片生成 */ const handleGenerateImage = async () => { // 从 models 中查找匹配的模型 @@ -201,14 +195,12 @@ const handleGenerateImage = async () => { message.error('该模型不可用,请选择其它模型') return } - // 二次确认 if (hasChinese(prompt.value)) { message.alert('暂不支持中文!') return } await message.confirm(`确认生成内容?`) - try { // 加载中 drawIn.value = true @@ -237,7 +229,6 @@ const handleGenerateImage = async () => { drawIn.value = false } } - /** 填充值 */ const settingValues = async (detail: ImageVO) => { prompt.value = detail.prompt @@ -250,8 +241,6 @@ const settingValues = async (detail: ImageVO) => { clipGuidancePreset.value = detail.options?.clipGuidancePreset stylePreset.value = detail.options?.stylePreset } - /** 暴露组件方法 */ defineExpose({ settingValues }) - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/index.vue index 1550db8..56911fa 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/index/index.vue @@ -41,7 +41,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/manager/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/manager/index.vue index 6250e58..0e1d29e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/manager/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/manager/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/square/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/square/index.vue index 0f82c48..83fe01d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/square/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/image/square/index.vue @@ -29,7 +29,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/ProcessStep.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/ProcessStep.vue index 4b290ea..7e3f47f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/ProcessStep.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/ProcessStep.vue @@ -12,7 +12,6 @@ {{ file.name }} -
-
分段数量:{{ file.count ? file.count : '-' }}
-
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/SplitStep.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/SplitStep.vue index 5b28ce3..6efcea8 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/SplitStep.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/SplitStep.vue @@ -18,7 +18,6 @@ -
@@ -27,11 +26,9 @@
-
分段预览
-
@@ -60,7 +57,6 @@
暂无上传文件
-
@@ -81,7 +77,6 @@
-
@@ -95,47 +90,39 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/UploadStep.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/UploadStep.vue index 5a4d700..16cebc0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/UploadStep.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/UploadStep.vue @@ -34,7 +34,6 @@
-
-
@@ -66,23 +64,19 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/index.vue index 722f57c..4075b4f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/form/index.vue @@ -12,7 +12,6 @@ {{ formData.id ? '编辑知识库文档' : '创建知识库文档' }}
-
@@ -40,23 +39,19 @@
-
-
-
-
@@ -65,7 +60,6 @@
- - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/index.vue index e8ba711..d455de9 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/document/index.vue @@ -41,7 +41,6 @@ - @@ -106,11 +105,9 @@ @pagination="getList" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/KnowledgeForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/KnowledgeForm.vue index d72f37c..ce673e4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/KnowledgeForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/KnowledgeForm.vue @@ -72,13 +72,10 @@ import { KnowledgeApi, KnowledgeVO } from '@/api/ai/knowledge/knowledge' import { CommonStatusEnum } from '@/utils/constants' import { ModelApi, ModelVO } from '@/api/ai/model/model' import { AiModelTypeEnum } from '../../utils/constants' - /** AI 知识库表单 */ defineOptions({ name: 'KnowledgeForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -101,7 +98,6 @@ const formRules = reactive({ }) const formRef = ref() // 表单 Ref const modelList = ref([]) // 向量模型选项 - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -121,7 +117,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -145,7 +140,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -159,4 +153,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/index.vue index a768c6b..846a188 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/retrieval/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/retrieval/index.vue index aca521a..35986af 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/retrieval/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/knowledge/retrieval/index.vue @@ -37,7 +37,6 @@
- @@ -84,18 +83,15 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/KnowledgeSegmentForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/KnowledgeSegmentForm.vue index 4818de0..8214d99 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/KnowledgeSegmentForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/KnowledgeSegmentForm.vue @@ -24,13 +24,10 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/index.vue index e2f8a67..e87a6e5 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/knowledge/segment/index.vue @@ -46,7 +46,6 @@
- @@ -131,11 +130,9 @@ @pagination="getList" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Left.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Left.vue index 5c3dbf0..3c376d4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Left.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Left.vue @@ -48,10 +48,8 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Right.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Right.vue index b1d04de..282e7df 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Right.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/index/components/Right.vue @@ -12,13 +12,11 @@ -
-
@@ -26,17 +24,14 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/manager/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/manager/index.vue index 09182f3..bdc6343 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/manager/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/mindmap/manager/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/ApiKeyForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/ApiKeyForm.vue index 2d3d4bf..1cf9acf 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/ApiKeyForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/ApiKeyForm.vue @@ -48,13 +48,10 @@ import { getIntDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { ApiKeyApi, ApiKeyVO } from '@/api/ai/model/apiKey' import { CommonStatusEnum } from '@/utils/constants' - /** AI API 密钥 表单 */ defineOptions({ name: 'ApiKeyForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -74,7 +71,6 @@ const formRules = reactive({ status: [{ required: true, message: '状态不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -92,7 +88,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -116,7 +111,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -129,4 +123,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/index.vue index c4c9f3c..db99b81 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/apiKey/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/ChatRoleForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/ChatRoleForm.vue index 8f5c0ef..fea26c0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/ChatRoleForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/ChatRoleForm.vue @@ -98,13 +98,10 @@ import { FormRules } from 'element-plus' import { AiModelTypeEnum } from '@/views/ai/utils/constants' import { KnowledgeApi, KnowledgeVO } from '@/api/ai/knowledge/knowledge' import { ToolApi, ToolVO } from '@/api/ai/model/tool' - /** AI 聊天角色 表单 */ defineOptions({ name: 'ChatRoleForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -128,12 +125,10 @@ const formRef = ref() // 表单 Ref const models = ref([] as ModelVO[]) // 聊天模型列表 const knowledgeList = ref([] as KnowledgeVO[]) // 知识库列表 const toolList = ref([] as ToolVO[]) // 工具列表 - /** 是否【我】自己创建,私有角色 */ const isUser = computed(() => { return formType.value === 'my-create' || formType.value === 'my-update' }) - const formRules = reactive({ name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '角色头像不能为空', trigger: 'blur' }], @@ -143,7 +138,6 @@ const formRules = reactive({ systemMessage: [{ required: true, message: '角色设定不能为空', trigger: 'blur' }], publicStatus: [{ required: true, message: '是否公开不能为空', trigger: 'blur' }] }) - /** 打开弹窗 */ // TODO @fan:title 是不是收敛到 type 判断生成 title,会更合理 const open = async (type: string, id?: number, title?: string) => { @@ -168,7 +162,6 @@ const open = async (type: string, id?: number, title?: string) => { toolList.value = await ToolApi.getToolSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -200,7 +193,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -220,4 +212,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/index.vue index 0ba0d79..f1cb7ce 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/chatRole/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/ModelForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/ModelForm.vue index 32b2c94..91484cd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/ModelForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/ModelForm.vue @@ -115,13 +115,10 @@ import { ApiKeyApi, ApiKeyVO } from '@/api/ai/model/apiKey' import { CommonStatusEnum } from '@/utils/constants' import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' import { AiModelTypeEnum } from '@/views/ai/utils/constants' - /** API 模型的表单 */ defineOptions({ name: 'ModelForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -153,7 +150,6 @@ const formRules = reactive({ }) const formRef = ref() // 表单 Ref const apiKeyList = ref([] as ApiKeyVO[]) // API 密钥列表 - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -173,7 +169,6 @@ const open = async (type: string, id?: number) => { apiKeyList.value = await ApiKeyApi.getApiKeySimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -202,7 +197,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -220,4 +214,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/index.vue index b86bee2..403d0e4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/model/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/ToolForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/ToolForm.vue index bec5961..095474e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/ToolForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/ToolForm.vue @@ -35,13 +35,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { ToolApi, ToolVO } from '@/api/ai/model/tool' import { CommonStatusEnum } from '@/utils/constants' - /** AI 工具表单 */ defineOptions({ name: 'ToolForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -56,7 +53,6 @@ const formRules = reactive({ name: [{ required: true, message: '工具名称不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -74,7 +70,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -98,7 +93,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -109,4 +103,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/index.vue index 583b3e1..a5798fc 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/model/tool/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/index.vue index 413792a..8da8d16 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/index.vue @@ -6,15 +6,11 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/audioBar/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/audioBar/index.vue index db7f767..a651658 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/audioBar/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/audioBar/index.vue @@ -8,7 +8,6 @@
{{currentSong.singer}}
-
@@ -24,7 +23,6 @@
-
@@ -32,15 +30,11 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/index.vue index 6c33f56..c538606 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/index.vue @@ -11,7 +11,6 @@ - @@ -28,26 +27,19 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songCard/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songCard/index.vue index 0534251..19a36ae 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songCard/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songCard/index.vue @@ -14,23 +14,17 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songInfo/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songInfo/index.vue index 8d67c4d..b7f559b 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songInfo/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/list/songInfo/index.vue @@ -12,11 +12,7 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/desc.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/desc.vue index 4488461..498c1d8 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/desc.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/desc.vue @@ -11,13 +11,11 @@ placeholder="一首关于糟糕分手的欢快歌曲" /> - <template #extra> <el-switch v-model="formData.pure" size="small"/> </template> - <el-select v-model="formData.version" placeholder="请选择"> <el-option @@ -36,20 +34,15 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/index.vue index 32cad7e..bb2eff3 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/index.vue @@ -4,26 +4,18 @@ 描述模式 歌词模式 - - 创作音乐 - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/lyric.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/lyric.vue index f774003..3bd8195 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/lyric.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/mode/lyric.vue @@ -11,12 +11,10 @@ placeholder="请输入您自己的歌词" /> - <el-space class="flex-wrap"> <el-tag v-for="tag in tags" :key="tag" round class="mb-8px">{{tag}}</el-tag> </el-space> - <el-button :type="showCustom ? 'primary': 'default'" round @@ -26,7 +24,6 @@ >自定义风格 </el-button> - <el-input v-model="formData.style" @@ -38,11 +35,9 @@ placeholder="输入音乐风格(英文)" /> - <el-input v-model="formData.name" placeholder="请输入音乐/歌曲名称"/> - <el-select v-model="formData.version" placeholder="请选择"> <el-option @@ -61,23 +56,18 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/title/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/title/index.vue index a065802..370a475 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/title/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/index/title/index.vue @@ -10,10 +10,8 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/manager/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/manager/index.vue index 27daf13..2cb3863 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/manager/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/music/manager/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/BasicInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/BasicInfo.vue index 6b5426c..bd7cc87 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/BasicInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/BasicInfo.vue @@ -34,16 +34,13 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/WorkflowDesign.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/WorkflowDesign.vue index 1346f9c..612c65e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/WorkflowDesign.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/WorkflowDesign.vue @@ -13,7 +13,6 @@ 测试 -
@@ -59,17 +58,14 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/index.vue index dddb7a5..b1942fd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/form/index.vue @@ -12,7 +12,6 @@ {{ formData.name || '创建流程' }} -
@@ -41,20 +40,17 @@
-
保 存
-
- - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/index.vue index 6a874c7..6e9c27e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/workflow/index.vue @@ -61,7 +61,6 @@ - @@ -109,21 +108,16 @@ @pagination="getList" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Left.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Left.vue index 74e5d58..c5438ff 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Left.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Left.vue @@ -23,7 +23,6 @@ -
@@ -59,7 +58,6 @@ type="textarea" /> - - @@ -90,7 +86,6 @@ -
重置 生成 @@ -99,7 +94,6 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Right.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Right.vue index 1eb66a0..5143f3f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Right.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Right.vue @@ -12,7 +12,6 @@ -
@@ -40,13 +39,10 @@
- - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Tag.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Tag.vue index 8c0ad79..feec79f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Tag.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/components/Tag.vue @@ -12,7 +12,6 @@
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/index.vue index 0079eed..7ad644a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/index/index.vue @@ -16,25 +16,20 @@ />
- + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/manager/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/manager/index.vue index f220108..7e06e2a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/manager/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/ai/write/manager/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/CategoryForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/CategoryForm.vue index defd760..4afad71 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/CategoryForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/CategoryForm.vue @@ -46,13 +46,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { CategoryApi, CategoryVO } from '@/api/bpm/category' import { CommonStatusEnum } from '@/utils/constants' - /** BPM 流程分类 表单 */ defineOptions({ name: 'CategoryForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -72,7 +69,6 @@ const formRules = reactive({ sort: [{ required: true, message: '分类排序不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -90,7 +86,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -114,7 +109,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -127,4 +121,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/index.vue index 085b371..ab50753 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/category/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/editor/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/editor/index.vue index 4165fcc..ec85afd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/editor/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/editor/index.vue @@ -14,7 +14,6 @@
- @@ -51,16 +50,13 @@ import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate' import { useTagsViewStore } from '@/store/modules/tagsView' import { useFormCreateDesigner } from '@/components/FormCreate' import { useRoute } from 'vue-router' - defineOptions({ name: 'BpmFormEditor' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息 const route = useRoute() // 路由 const { push, currentRoute } = useRouter() // 路由 const { query } = useRoute() // 路由信息 const { delView } = useTagsViewStore() // 视图操作 - // 表单设计器配置 const designerConfig = ref({ switchType: [], // 是否可以切换组件类型,或者可以相互切换的字段 @@ -104,12 +100,10 @@ const formRules = reactive({ status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 处理保存按钮 */ const handleSave = () => { dialogVisible.value = true } - /** 提交表单 */ const submitForm = async () => { // 校验表单 @@ -140,7 +134,6 @@ const close = () => { delView(unref(currentRoute)) push('/bpm/manager/form') } - /** 初始化 **/ onMounted(async () => { // 场景一:新增表单 @@ -152,7 +145,6 @@ onMounted(async () => { const data = await FormApi.getForm(id) formData.value = data setConfAndFields(designer, data.conf, data.fields) - if (route.query.type !== 'copy') { return } @@ -162,7 +154,6 @@ onMounted(async () => { formData.value.name += '_copy' }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/index.vue index 57b44a3..d2dac79 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/form/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/UserGroupForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/UserGroupForm.vue index 3c825eb..751e618 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/UserGroupForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/UserGroupForm.vue @@ -46,12 +46,9 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { CommonStatusEnum } from '@/utils/constants' import * as UserGroupApi from '@/api/bpm/userGroup' import * as UserApi from '@/api/system/user' - defineOptions({ name: 'UserGroupForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -71,7 +68,6 @@ const formRules = reactive({ }) const formRef = ref() // 表单 Ref const userList = ref([]) // 用户列表 - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -91,7 +87,6 @@ const open = async (type: string, id?: number) => { userList.value = await UserApi.getSimpleUserList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -117,7 +112,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -129,4 +123,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/index.vue index 62785a9..e2d6baf 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/group/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/CategoryDraggableModel.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/CategoryDraggableModel.vue index 003e46f..118adcd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/CategoryDraggableModel.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/CategoryDraggableModel.vue @@ -64,7 +64,6 @@ -
@@ -251,7 +250,6 @@
- - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/definition/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/definition/index.vue index 2b061f4..39b0e4e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/definition/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/definition/index.vue @@ -1,6 +1,4 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/BasicInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/BasicInfo.vue index b937b61..236d4a1 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/BasicInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/BasicInfo.vue @@ -143,7 +143,6 @@
- @@ -154,13 +153,11 @@ @confirm="handleDeptSelectConfirm" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ExtraSettings.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ExtraSettings.vue index e250eec..684c021 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ExtraSettings.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ExtraSettings.vue @@ -253,7 +253,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/FormDesign.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/FormDesign.vue index e1ca27f..190402c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/FormDesign.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/FormDesign.vue @@ -63,25 +63,20 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/Index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/Index.vue index 8459466..82a3529 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/Index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/Index.vue @@ -2,9 +2,7 @@ import { Editor, Toolbar } from '@wangeditor-next/editor-for-vue' import { IDomEditor } from '@wangeditor-next/editor' import MentionModal from './MentionModal.vue' - const emit = defineEmits(['confirm']) - // @mention 相关 const isShowModal = ref(false) const showModal = () => { @@ -28,7 +26,6 @@ const insertMention = (id: any, name: any) => { editor.move(1) } } - // Dialog 相关 const dialogVisible = ref(false) const open = async (template: string) => { @@ -40,7 +37,6 @@ const handleConfirm = () => { emit('confirm', valueHtml.value) dialogVisible.value = false } - // Editor 相关 const editorRef = shallowRef() const editorId = ref('wangEditor-1') @@ -64,7 +60,6 @@ const valueHtml = ref() const handleCreated = (editor: IDomEditor) => { editorRef.value = editor } - /** 初始化 */ onBeforeUnmount(() => { const editor = editorRef.value @@ -74,7 +69,6 @@ onBeforeUnmount(() => { editor.destroy() }) - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/MentionModal.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/MentionModal.vue index badeb42..6057e48 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/MentionModal.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/PrintTemplate/MentionModal.vue @@ -1,6 +1,5 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ProcessDesign.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ProcessDesign.vue index 172e042..ce52efd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ProcessDesign.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/ProcessDesign.vue @@ -9,7 +9,6 @@ @success="handleDesignSuccess" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/editor/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/editor/index.vue index 93c7261..eea1c7f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/editor/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/form/editor/index.vue @@ -26,7 +26,6 @@ /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/index.vue index d272dcd..8b30ad0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/model/index.vue @@ -56,9 +56,7 @@ 保存排序 - -
- @@ -92,7 +89,6 @@
- - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/create.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/create.vue index b64f4ca..6d8e2ad 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/create.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/create.vue @@ -48,7 +48,6 @@ - @@ -66,21 +65,17 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import * as LeaveApi from '@/api/bpm/leave' import { useTagsViewStore } from '@/store/modules/tagsView' - // 审批相关:import import * as DefinitionApi from '@/api/bpm/definition' import ProcessInstanceTimeline from '@/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue' import * as ProcessInstanceApi from '@/api/bpm/processInstance' import { CandidateStrategy, NodeId } from '@/components/SimpleProcessDesignerV2/src/consts' import { ApprovalNodeInfo } from '@/api/bpm/processInstance' - defineOptions({ name: 'BpmOALeaveCreate' }) - const message = useMessage() // 消息弹窗 const { delView } = useTagsViewStore() // 视图操作 const { push, currentRoute } = useRouter() // 路由 const { query } = useRoute() // 查询参数 - const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const formData = ref({ type: undefined, @@ -95,7 +90,6 @@ const formRules = reactive({ endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'change' }] }) const formRef = ref() // 表单 Ref - // 审批相关:变量 const processDefineKey = 'oa_leave' // 流程定义 Key const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表 @@ -103,7 +97,6 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const tempStartUserSelectAssignees = ref({}) // 历史发起人选择审批人的数据,用于每次表单变更时,临时保存 const activityNodes = ref([]) // 审批节点信息 const processDefinitionId = ref('') - /** 提交表单 */ const submitForm = async () => { // 1.1 校验表单 @@ -121,7 +114,6 @@ const submitForm = async () => { } } } - // 2. 提交请求 formLoading.value = true try { @@ -139,7 +131,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 审批相关:获取审批详情 */ const getApprovalDetail = async () => { try { @@ -149,14 +140,12 @@ const getApprovalDetail = async () => { activityId: NodeId.START_USER_NODE_ID, processVariablesStr: JSON.stringify({ day: daysDifference() }) // 解决 GET 无法传递对象的问题,后端 String 再转 JSON }) - if (!data) { message.error('查询不到审批详情信息!') return } // 获取审批节点,显示 Timeline 的数据 activityNodes.value = data.activityNodes - // 获取发起人自选的任务 startUserSelectTasks.value = data.activityNodes?.filter( (node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy @@ -177,12 +166,10 @@ const getApprovalDetail = async () => { } finally { } } - /** 审批相关:选择发起人 */ const selectUserConfirm = (id: string, userList: any[]) => { startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id) } - // 计算天数差 // TODO @小北:可以搞到 formatTime 里面去,然后看看 dayjs 里面有没有现成的方法,或者辅助计算的方法。 const daysDifference = () => { @@ -190,7 +177,6 @@ const daysDifference = () => { const diffTime = Math.abs(Number(formData.value.endTime) - Number(formData.value.startTime)) return Math.floor(diffTime / oneDay) } - /** 获取请假数据,用于重新发起时自动填充 */ const getDetail = async (id: number) => { try { @@ -210,7 +196,6 @@ const getDetail = async (id: number) => { formLoading.value = false } } - /** 初始化 */ onMounted(async () => { // TODO @小北:这里可以简化,统一通过 getApprovalDetail 处理么? @@ -218,23 +203,19 @@ onMounted(async () => { undefined, processDefineKey ) - if (!processDefinitionDetail) { message.error('OA 请假的流程模型未配置,请检查!') return } processDefinitionId.value = processDefinitionDetail.id startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks - // 如果有业务编号,说明是重新发起,需要加载原有数据 if (query.id) { await getDetail(Number(query.id)) } - // 审批相关:加载最新的审批详情,主要用于节点预测 await getApprovalDetail() }) - /** 审批相关:预测流程节点会因为输入的参数值而产生新的预测结果值,所以需重新预测一次, formData.value可改成实际业务中的特定字段 */ watch( formData.value, @@ -254,4 +235,4 @@ watch( immediate: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue index 87036d8..e9c6944 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/detail.vue @@ -21,18 +21,14 @@ import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' import { propTypes } from '@/utils/propTypes' import * as LeaveApi from '@/api/bpm/leave' - defineOptions({ name: 'BpmOALeaveDetail' }) - const { query } = useRoute() // 查询参数 - const props = defineProps({ id: propTypes.number.def(undefined) }) const detailLoading = ref(false) // 表单的加载中 const detailData = ref({}) // 详情数据 const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号 - /** 获得数据 */ const getInfo = async () => { detailLoading.value = true @@ -43,9 +39,8 @@ const getInfo = async () => { } } defineExpose({ open: getInfo }) // 提供 open 方法,用于打开弹窗 - /** 初始化 **/ onMounted(() => { getInfo() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/index.vue index 9fab923..62c9fdb 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/oa/leave/index.vue @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/PrintDialog.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/PrintDialog.vue index fb8cd8b..879117e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/PrintDialog.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/PrintDialog.vue @@ -4,18 +4,14 @@ import { useUserStore } from '@/store/modules/user' import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getDictLabel } from '@/utils/dict' import { decodeFields } from '@/utils/formCreate' - const userStore = useUserStore() - const visible = ref(false) const loading = ref(false) - const printData = ref() const userName = computed(() => userStore.user.nickname ?? '') const printTime = ref(formatDate(new Date(), 'YYYY-MM-DD HH:mm')) const formFields = ref() const printDataMap = ref({}) - const open = async (id: string) => { loading.value = true try { @@ -28,10 +24,8 @@ const open = async (id: string) => { visible.value = true } defineExpose({ open }) - const parseFormFields = () => { if (!printData.value) return - const formFieldsObj = decodeFields( printData.value.processInstance.processDefinition?.formFields || [] ) @@ -71,7 +65,6 @@ const parseFormFields = () => { } formFields.value = res } - const initPrintDataMap = () => { printDataMap.value['startUser'] = printData.value.processInstance.startUser.nickname printDataMap.value['startUserDept'] = printData.value.processInstance.startUser.deptName @@ -86,7 +79,6 @@ const initPrintDataMap = () => { printDataMap.value['printUser'] = userName.value printDataMap.value['printTime'] = printTime.value } - const getPrintTemplateHTML = () => { const parser = new DOMParser() let doc = parser.parseFromString(printData.value.printTemplateHtml, 'text/html') @@ -134,7 +126,6 @@ const getPrintTemplateHTML = () => { // 返回 html return doc.body.innerHTML } - const printObj = ref({ id: 'printDivTag', popTitle: ' ', @@ -143,7 +134,6 @@ const printObj = ref({ zIndex: 20003 }) - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue index 781263d..382b3b6 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue @@ -6,20 +6,15 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue index 87f8119..97d3160 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue @@ -13,7 +13,6 @@ import { TaskStatusEnum } from '@/api/bpm/task' import { SimpleFlowNode, NodeType } from '@/components/SimpleProcessDesignerV2/src/consts' import { SimpleProcessViewer } from '@/components/SimpleProcessDesignerV2/src/' defineOptions({ name: 'BpmProcessInstanceSimpleViewer' }) - const props = defineProps({ loading: propTypes.bool.def(false), // 是否加载中 modelView: propTypes.object, @@ -24,7 +23,6 @@ const simpleModel = ref({}) const tasks = ref([]) // 流程实例 const processInstance = ref() - /** 监控模型视图 包括任务列表、进行中的活动节点编号等 */ watch( () => props.modelView, @@ -125,7 +123,6 @@ const setSimpleModelNodeTaskStatus = ( simpleModel.activityStatus = TaskStatusEnum.NOT_START } } - // 条件节点对应 SequenceFlow if (simpleModel.type === NodeType.CONDITION_NODE) { // 条件节点,只有通过和未执行状态 @@ -159,7 +156,6 @@ const setSimpleModelNodeTaskStatus = ( ) }) } - setSimpleModelNodeTaskStatus( simpleModel.childNode, processStatus, @@ -170,5 +166,4 @@ const setSimpleModelNodeTaskStatus = ( ) } - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue index 8690e58..6314d72 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue @@ -44,7 +44,6 @@ - () // form-create 的 API 操作类 const taskForm = ref({ @@ -90,7 +86,6 @@ const handleFormDetail = async (row: any) => { fApi.value?.fapi?.resetBtn.show(false) fApi.value?.fapi?.disabled(true) } - /** 只有 loading 完成时,才去加载流程列表 */ watch( () => props.loading, @@ -100,4 +95,4 @@ watch( } } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue index 91f333e..6bbea39 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue @@ -162,7 +162,6 @@ {{ user.nickname.substring(0, 1) }} {{ user.nickname }} -
- - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/SignDialog.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/SignDialog.vue index 744a355..dcb2a8c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/SignDialog.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/SignDialog.vue @@ -21,21 +21,17 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/index.vue index aec1473..277fda5 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/detail/index.vue @@ -21,7 +21,6 @@ :value="processInstance.status" />
-
{{ formatDate(processInstance.startTime) }} 提交
- @@ -74,7 +72,6 @@
-
@@ -94,7 +91,6 @@ />
-
@@ -103,7 +99,6 @@
-
@@ -111,7 +106,6 @@
-
- @@ -153,7 +146,6 @@ import approveSvg from '@/assets/svgs/bpm/approve.svg' import rejectSvg from '@/assets/svgs/bpm/reject.svg' import cancelSvg from '@/assets/svgs/bpm/cancel.svg' import PrintDialog from './PrintDialog.vue' - defineOptions({ name: 'BpmProcessInstanceDetail' }) const props = defineProps<{ id: string // 流程实例的编号 @@ -172,7 +164,6 @@ const auditIconsMap = { [TaskStatusEnum.REJECT]: rejectSvg, [TaskStatusEnum.CANCEL]: cancelSvg } - // ========== 申请信息 ========== const fApi = ref() // const detailForm = ref({ @@ -180,9 +171,7 @@ const detailForm = ref({ option: {}, value: {} }) // 流程实例的表单详情 - const writableFields: Array = [] // 表单可以编辑的字段 - /** 获得详情 */ const getDetail = () => { // 获得审批详情 @@ -190,7 +179,6 @@ const getDetail = () => { // 获得流程模型视图 getProcessModelView() } - /** 加载流程实例 */ const BusinessFormComponent = ref(null) // 异步组件 /** 获取审批详情 */ @@ -214,7 +202,6 @@ const getApprovalDetail = async () => { } processInstance.value = data.processInstance processDefinition.value = data.processDefinition - // 设置表单信息 if (processDefinition.value.formType === BpmModelFormType.NORMAL) { // 获取表单字段权限 @@ -248,17 +235,14 @@ const getApprovalDetail = async () => { // 注意:data.processDefinition.formCustomViewPath 是组件的全路径,例如说:/crm/contract/detail/index.vue BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath) } - // 获取审批节点,显示 Timeline 的数据 activityNodes.value = data.activityNodes - // 获取待办任务显示操作按钮 operationButtonRef.value?.loadTodoTask(data.todoTask) } finally { processInstanceLoading.value = false } } - /** 获取流程模型视图*/ const getProcessModelView = async () => { if (BpmModelType.BPMN === processDefinition.value?.modelType) { @@ -272,7 +256,6 @@ const getProcessModelView = async () => { processModelView.value = data } } - /** 设置表单权限 */ const setFieldPermission = (field: string, permission: string) => { if (permission === FieldPermissionType.READ) { @@ -290,22 +273,18 @@ const setFieldPermission = (field: string, permission: string) => { fApi.value?.hidden(true, field) } } - /** 操作成功后刷新 */ const refresh = () => { // 重新获取详情 getDetail() } - /** 处理打印 */ const printRef = ref() const handlePrint = async () => { printRef.value.open(props.id) } - /** 当前的 Tab */ const activeTab = ref('form') - /** 初始化 */ const userOptions = ref([]) // 用户列表 onMounted(async () => { @@ -314,13 +293,11 @@ onMounted(async () => { userOptions.value = await UserApi.getSimpleUserList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/index.vue index 1a8ef89..7d2f60c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/bpm/processInstance/index.vue @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivableAuditList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivableAuditList.vue index 2831d45..55c1485 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivableAuditList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivableAuditList.vue @@ -130,16 +130,13 @@ /> - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivablePlanRemindList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivablePlanRemindList.vue index 9a3cf0c..25ea80e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivablePlanRemindList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/components/ReceivablePlanRemindList.vue @@ -27,7 +27,6 @@ - @@ -148,11 +147,9 @@ @pagination="getList" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/index.vue index 49a1d4c..cadef44 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/backlog/index.vue @@ -1,6 +1,4 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessForm.vue index 4af1abe..d43df88 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessForm.vue @@ -143,10 +143,8 @@ import * as UserApi from '@/api/system/user' import { useUserStore } from '@/store/modules/user' import BusinessProductForm from './components/BusinessProductForm.vue' import { erpPriceMultiply, erpPriceInputFormatter } from '@/utils' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -176,11 +174,9 @@ const formRef = ref() // 表单 Ref const userOptions = ref([]) // 用户列表 const statusTypeList = ref([]) // 商机状态类型列表 const customerList = ref([]) // 客户列表的数据 - /** 子表的表单 */ const subTabsName = ref('product') const productFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -200,7 +196,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number, customerId?: number, contactId?: number) => { dialogVisible.value = true @@ -237,7 +232,6 @@ const open = async (type: string, id?: number, customerId?: number, contactId?: } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -264,7 +258,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -284,4 +277,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessUpdateStatusForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessUpdateStatusForm.vue index 4f2f761..1964a77 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessUpdateStatusForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/BusinessUpdateStatusForm.vue @@ -33,10 +33,8 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessList.vue index f990606..7a10712 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessList.vue @@ -20,7 +20,6 @@ 解除关联 - - @@ -73,9 +71,7 @@ import BusinessForm from './../BusinessForm.vue' import { BizTypeEnum } from '@/api/crm/permission' import BusinessListModal from './BusinessListModal.vue' import { erpPriceTableColumnFormatter } from '@/utils' - const message = useMessage() // 消息 - defineOptions({ name: 'CrmBusinessList' }) const props = defineProps<{ bizType: number // 业务类型 @@ -83,7 +79,6 @@ const props = defineProps<{ customerId?: number // 关联联系人与商机时,需要传入 customerId 进行筛选 contactId?: number // 特殊:联系人编号;在【联系人】详情中,可以传递联系人编号,默认新建的商机关联到该联系人 }>() - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -93,7 +88,6 @@ const queryParams = reactive({ customerId: undefined as unknown, // 允许 undefined + number contactId: undefined as unknown // 允许 undefined + number }) - /** 查询列表 */ const getList = async () => { loading.value = true @@ -121,25 +115,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 添加操作 */ const formRef = ref() const openForm = () => { formRef.value.open('create', null, props.customerId, props.contactId) } - /** 打开联系人详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmBusinessDetail', params: { id } }) } - /** 打开联系人与商机的关联弹窗 */ const businessModalRef = ref() const openBusinessModal = () => { @@ -158,7 +148,6 @@ const createContactBusinessList = async (businessIds: number[]) => { message.success('关联商机成功') handleQuery() } - /** 解除联系人与商机的关联 */ const businessRef = ref() const deleteContactBusinessList = async () => { @@ -174,7 +163,6 @@ const deleteContactBusinessList = async () => { message.success('取关商机成功') handleQuery() } - /** 监听打开的 bizId + bizType,从而加载最新的列表 */ watch( () => [props.bizId, props.bizType], @@ -183,4 +171,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessListModal.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessListModal.vue index 3c21f06..897d41e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessListModal.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessListModal.vue @@ -27,7 +27,6 @@ - 确 定 取 消 - @@ -76,13 +74,11 @@ import * as BusinessApi from '@/api/crm/business' import BusinessForm from '../BusinessForm.vue' import { erpPriceTableColumnFormatter } from '@/utils' - const message = useMessage() // 消息弹窗 const props = defineProps<{ customerId: number }>() defineOptions({ name: 'BusinessListModal' }) - const dialogVisible = ref(false) // 弹窗的是否展示 const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 @@ -95,7 +91,6 @@ const queryParams = reactive({ name: undefined, customerId: props.customerId }) - /** 打开弹窗 */ const open = async () => { dialogVisible.value = true @@ -103,7 +98,6 @@ const open = async () => { await getList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 查询列表 */ const getList = async () => { loading.value = true @@ -115,25 +109,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 添加操作 */ const formRef = ref() const openForm = () => { formRef.value.open('create') } - /** 关联商机提交 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const businessRef = ref() @@ -147,10 +137,9 @@ const submitForm = async () => { dialogVisible.value = false emit('success', businessIds, businessRef.value.getSelectionRows()) } - /** 打开商机详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmBusinessDetail', params: { id } }) } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessProductForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessProductForm.vue index fbba065..c628e96 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessProductForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/components/BusinessProductForm.vue @@ -97,7 +97,6 @@ import * as ProductApi from '@/api/crm/product' import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import { DICT_TYPE } from '@/utils/dict' - const props = defineProps<{ products: undefined disabled: false @@ -111,7 +110,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置产品项 */ watch( () => props.products, @@ -120,7 +118,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -139,7 +136,6 @@ watch( }, { deep: true } ) - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -153,12 +149,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -169,15 +163,13 @@ const onChangeProduct = (productId, row) => { row.businessPrice = product.price } } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsHeader.vue index 50d1efe..402e07a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsHeader.vue @@ -32,6 +32,5 @@ import * as BusinessApi from '@/api/crm/business' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { business } = defineProps<{ business: BusinessApi.BusinessVO }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsInfo.vue index a2c9ce1..de433fd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessDetailsInfo.vue @@ -51,11 +51,9 @@ import * as BusinessApi from '@/api/crm/business' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { business } = defineProps<{ business: BusinessApi.BusinessVO }>() - // 展示的折叠面板 const activeNames = ref(['basicInfo', 'systemInfo']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessProductList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessProductList.vue index 9a31665..fcc9125 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessProductList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/BusinessProductList.vue @@ -59,8 +59,7 @@ import * as BusinessApi from '@/api/crm/business' import { erpPriceInputFormatter, erpPriceTableColumnFormatter } from '@/utils' import { DICT_TYPE } from '@/utils/dict' - const { business } = defineProps<{ business: BusinessApi.BusinessVO }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/index.vue index dbab819..cae571e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/detail/index.vue @@ -51,7 +51,6 @@
- @@ -73,16 +72,12 @@ import ContactList from '@/views/crm/contact/components/ContactList.vue' import BusinessUpdateStatusForm from '@/views/crm/business/BusinessUpdateStatusForm.vue' import ContractList from '@/views/crm/contract/components/ContractList.vue' import BusinessProductList from '@/views/crm/business/detail/BusinessProductList.vue' - defineOptions({ name: 'CrmBusinessDetail' }) - const message = useMessage() - const businessId = ref(0) // 线索编号 const loading = ref(true) // 加载中 const business = ref({} as BusinessApi.BusinessVO) // 商机详情 const permissionListRef = ref>() // 团队成员列表 Ref - /** 获取详情 */ const getBusiness = async () => { loading.value = true @@ -93,25 +88,21 @@ const getBusiness = async () => { loading.value = false } } - /** 编辑 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } - /** 变更商机状态 */ const statusFormRef = ref() const openStatusForm = () => { statusFormRef.value.open(business.value) } - /** 联系人转移 */ const transferFormRef = ref>() // 联系人转移表单 ref const transfer = () => { transferFormRef.value?.open(business.value.id) } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async (contactId: number) => { @@ -124,14 +115,12 @@ const getOperateLog = async (contactId: number) => { }) logList.value = data.list } - /** 关闭窗口 */ const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 const close = () => { delView(unref(currentRoute)) } - /** 初始化 */ const { params } = useRoute() onMounted(async () => { @@ -143,4 +132,4 @@ onMounted(async () => { businessId.value = params.id as unknown as number await getBusiness() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/index.vue index 84e447c..51be933 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/BusinessStatusForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/BusinessStatusForm.vue index d6a4d6f..b8742cd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/BusinessStatusForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/BusinessStatusForm.vue @@ -91,10 +91,8 @@ import * as BusinessStatusApi from '@/api/crm/business/status' import { defaultProps, handleTree } from '@/utils/tree' import * as DeptApi from '@/api/system/dept' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -112,7 +110,6 @@ const formRef = ref() // 表单 Ref const deptList = ref([]) // 树形结构 const treeRef = ref() // 菜单树组件 Ref const checkStrictly = ref(true) // 是否严格模式,即父子不关联 - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -138,7 +135,6 @@ const open = async (type: string, id?: number) => { deptList.value = handleTree(await DeptApi.getSimpleDeptList()) } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -163,7 +159,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { checkStrictly.value = true @@ -176,7 +171,6 @@ const resetForm = () => { treeRef.value?.setCheckedNodes([]) formRef.value?.resetFields() } - /** 添加状态 */ const addStatus = () => { const data = formData.value @@ -185,10 +179,9 @@ const addStatus = () => { percent: undefined }) } - /** 删除状态 */ const deleteStatusArea = (index: number) => { const data = formData.value data.statuses.splice(index, 1) } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/index.vue index ef51488..db384b9 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/business/status/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/ClueForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/ClueForm.vue index 3562c1c..48b8930 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/ClueForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/ClueForm.vue @@ -151,10 +151,8 @@ import * as AreaApi from '@/api/system/area' import { defaultProps } from '@/utils/tree' import * as UserApi from '@/api/system/user' import { useUserStore } from '@/store/modules/user' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -183,7 +181,6 @@ const formRules = reactive({ ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -209,7 +206,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -235,7 +231,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -257,4 +252,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsHeader.vue index 41552c7..a203347 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsHeader.vue @@ -34,10 +34,9 @@ import { DICT_TYPE } from '@/utils/dict' import * as ClueApi from '@/api/crm/clue' import { formatDate } from '@/utils/formatTime' - defineOptions({ name: 'CrmClueDetailsHeader' }) defineProps<{ clue: ClueApi.ClueVO // 线索信息 loading: boolean // 加载中 }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsInfo.vue index 5a1d01f..85ec8e6 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/ClueDetailsInfo.vue @@ -61,12 +61,10 @@ import * as ClueApi from '@/api/crm/clue' import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' - defineOptions({ name: 'CrmClueDetailsInfo' }) const { clue } = defineProps<{ clue: ClueApi.ClueVO // 线索明细 }>() - const activeNames = ref(['basicInfo', 'systemInfo']) // 展示的折叠面板 - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/index.vue index 4c211e6..e1776b6 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/detail/index.vue @@ -42,7 +42,6 @@ - @@ -59,17 +58,13 @@ import FollowUpList from '@/views/crm/followup/index.vue' import { BizTypeEnum } from '@/api/crm/permission' import type { OperateLogVO } from '@/api/system/operatelog' import { getOperateLogPage } from '@/api/crm/operateLog' - defineOptions({ name: 'CrmClueDetail' }) - const clueId = ref(0) // 线索编号 const loading = ref(true) // 加载中 const message = useMessage() // 消息弹窗 const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 - const permissionListRef = ref>() // 团队成员列表 Ref - /** 获取详情 */ const clue = ref({} as ClueApi.ClueVO) // 线索详情 const getClue = async () => { @@ -81,19 +76,16 @@ const getClue = async () => { loading.value = false } } - /** 编辑线索 */ const formRef = ref>() // 线索表单 Ref const openForm = () => { formRef.value?.open('update', clueId.value) } - /** 线索转移 */ const transferFormRef = ref>() // 线索转移表单 ref const transfer = () => { transferFormRef.value?.open(clueId.value) } - /** 转化为客户 */ const handleTransform = async () => { await message.confirm(`确定将【${clue.value.name}】转化为客户吗?`) @@ -101,7 +93,6 @@ const handleTransform = async () => { message.success(`转化客户【${clue.value.name}】成功`) await getClue() } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async () => { @@ -111,11 +102,9 @@ const getOperateLog = async () => { }) logList.value = data.list } - const close = () => { delView(unref(currentRoute)) } - /** 初始化 */ const { params } = useRoute() onMounted(() => { @@ -127,4 +116,4 @@ onMounted(() => { clueId.value = params.id as unknown as number getClue() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/index.vue index f90d497..995d76e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/clue/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/ContactForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/ContactForm.vue index 81813e6..541f5ca 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/ContactForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/ContactForm.vue @@ -178,10 +178,8 @@ import * as CustomerApi from '@/api/crm/customer' import * as AreaApi from '@/api/system/area' import { defaultProps } from '@/utils/tree' import { useUserStore } from '@/store/modules/user' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -217,7 +215,6 @@ const formRef = ref() // 表单 Ref const userOptions = ref([]) // 用户列表 const customerList = ref([]) // 客户列表 const contactList = ref([]) // 联系人列表 - /** 打开弹窗 */ const open = async (type: string, id?: number, customerId?: number, businessId?: number) => { dialogVisible.value = true @@ -256,7 +253,6 @@ const open = async (type: string, id?: number, customerId?: number, businessId?: } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -282,7 +278,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -308,4 +303,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactList.vue index 1c12ca8..c5835a5 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactList.vue @@ -22,7 +22,6 @@ 解除关联 - - @@ -74,7 +72,6 @@ import ContactForm from './../ContactForm.vue' import { DICT_TYPE } from '@/utils/dict' import { BizTypeEnum } from '@/api/crm/permission' import ContactListModal from './ContactListModal.vue' - defineOptions({ name: 'CrmContactList' }) const props = defineProps<{ bizType: number // 业务类型 @@ -82,7 +79,6 @@ const props = defineProps<{ customerId?: number // 特殊:客户编号;在【商机】详情中,可以传递客户编号,默认新建的联系人关联到该客户 businessId?: number // 特殊:商机编号;在【商机】详情中,可以传递商机编号,默认新建的联系人关联到该商机 }>() - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -93,7 +89,6 @@ const queryParams = reactive({ businessId: undefined as unknown // 允许 undefined + number }) const message = useMessage() - /** 查询列表 */ const getList = async () => { loading.value = true @@ -120,25 +115,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 添加操作 */ const formRef = ref() const openForm = () => { formRef.value.open('create', undefined, props.customerId, props.businessId) } - /** 打开联系人详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmContactDetail', params: { id } }) } - /** 打开联系人与商机的关联弹窗 */ const contactModalRef = ref() const openBusinessModal = () => { @@ -157,7 +148,6 @@ const createContactBusinessList = async (contactIds: number[]) => { message.success('关联联系人成功') handleQuery() } - /** 解除联系人与商机的关联 */ const contactRef = ref() const deleteContactBusinessList = async () => { @@ -173,7 +163,6 @@ const deleteContactBusinessList = async () => { message.success('取关联系人成功') handleQuery() } - /** 监听打开的 bizId + bizType,从而加载最新的列表 */ watch( () => [props.bizId, props.bizType], @@ -182,4 +171,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactListModal.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactListModal.vue index 8b655c1..aacb761 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactListModal.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/components/ContactListModal.vue @@ -34,7 +34,6 @@ - 确 定 取 消 - @@ -82,13 +80,11 @@ import * as ContactApi from '@/api/crm/contact' import ContactForm from '../ContactForm.vue' import { DICT_TYPE } from '@/utils/dict' - const message = useMessage() // 消息弹窗 const props = defineProps<{ customerId: number }>() defineOptions({ name: 'ContactListModal' }) - const dialogVisible = ref(false) // 弹窗的是否展示 const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 @@ -101,7 +97,6 @@ const queryParams = reactive({ name: undefined, customerId: props.customerId }) - /** 打开弹窗 */ const open = async () => { dialogVisible.value = true @@ -109,7 +104,6 @@ const open = async () => { await getList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 查询列表 */ const getList = async () => { loading.value = true @@ -121,25 +115,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 添加操作 */ const formRef = ref() const openForm = () => { formRef.value.open('create') } - /** 关联联系人提交 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const contactRef = ref() @@ -151,10 +141,9 @@ const submitForm = async () => { dialogVisible.value = false emit('success', contactIds, contactRef.value.getSelectionRows()) } - /** 打开联系人详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmContactDetail', params: { id } }) } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsHeader.vue index 12fb3bc..5a4330b 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsHeader.vue @@ -28,6 +28,5 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsInfo.vue index 9e8bfff..1cf443f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/ContactDetailsInfo.vue @@ -59,11 +59,9 @@ import * as ContactApi from '@/api/crm/contact' import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' - const { contact } = defineProps<{ contact: ContactApi.ContactVO }>() - // 展示的折叠面板 const activeNames = ref(['basicInfo', 'systemInfo']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/index.vue index 7989d56..9e30d52 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/detail/index.vue @@ -54,16 +54,12 @@ import { getOperateLogPage } from '@/api/crm/operateLog' import ContactForm from '@/views/crm/contact/ContactForm.vue' import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue' import FollowUpList from '@/views/crm/followup/index.vue' - defineOptions({ name: 'CrmContactDetail' }) - const message = useMessage() - const contactId = ref(0) // 线索编号 const loading = ref(true) // 加载中 const contact = ref({} as ContactApi.ContactVO) // 联系人详情 const permissionListRef = ref>() // 团队成员列表 Ref - /** 获取详情 */ const getContact = async () => { loading.value = true @@ -74,19 +70,16 @@ const getContact = async () => { loading.value = false } } - /** 编辑 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } - /** 联系人转移 */ const transferFormRef = ref>() // 联系人转移表单 ref const transfer = () => { transferFormRef.value?.open(contact.value.id) } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async (contactId: number) => { @@ -99,14 +92,12 @@ const getOperateLog = async (contactId: number) => { }) logList.value = data.list } - /** 关闭窗口 */ const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 const close = () => { delView(unref(currentRoute)) } - /** 初始化 */ const { params } = useRoute() onMounted(async () => { @@ -118,4 +109,4 @@ onMounted(async () => { contactId.value = params.id as unknown as number await getContact() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/index.vue index ec26f1e..3196cf7 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contact/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/ContractForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/ContractForm.vue index db2eec9..6cccfca 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/ContractForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/ContractForm.vue @@ -202,10 +202,8 @@ import * as BusinessApi from '@/api/crm/business' import { erpPriceMultiply, erpPriceInputFormatter } from '@/utils' import { useUserStore } from '@/store/modules/user' import ContractProductForm from '@/views/crm/contract/components/ContractProductForm.vue' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -238,11 +236,9 @@ const userOptions = ref([]) // 用户列表 const customerList = ref([]) // 客户列表的数据 const businessList = ref([]) const contactList = ref([]) - /** 子表的表单 */ const subTabsName = ref('product') const productFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -262,7 +258,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -292,7 +287,6 @@ const open = async (type: string, id?: number) => { businessList.value = await BusinessApi.getSimpleBusinessList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -319,7 +313,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -341,14 +334,12 @@ const resetForm = () => { } formRef.value?.resetFields() } - /** 处理切换客户 */ const handleCustomerChange = () => { formData.value.businessId = undefined formData.value.signContactId = undefined formData.value.products = [] } - /** 处理商机变化 */ const handleBusinessChange = async (businessId: number) => { const business = await BusinessApi.getBusiness(businessId) @@ -357,7 +348,6 @@ const handleBusinessChange = async (businessId: number) => { }) formData.value.products = business.products } - /** 动态获取客户联系人 */ const getContactOptions = computed(() => contactList.value.filter((item) => item.customerId == formData.value.customerId) @@ -366,4 +356,4 @@ const getContactOptions = computed(() => const getBusinessOptions = computed(() => businessList.value.filter((item) => item.customerId == formData.value.customerId) ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractList.vue index f693c9a..168e244 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractList.vue @@ -6,7 +6,6 @@ 创建合同 - @@ -53,7 +52,6 @@ @pagination="getList" /> - @@ -64,13 +62,11 @@ import { BizTypeEnum } from '@/api/crm/permission' import { dateFormatter } from '@/utils/formatTime' import { DICT_TYPE } from '@/utils/dict' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'CrmContractList' }) const props = defineProps<{ bizType: number // 业务类型 bizId: number // 业务编号 }>() - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -79,7 +75,6 @@ const queryParams = reactive({ pageSize: 10, customerId: undefined as unknown // 允许 undefined + number }) - /** 查询列表 */ const getList = async () => { loading.value = true @@ -106,25 +101,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 添加 */ const formRef = ref() const openForm = () => { formRef.value.open('create') } - /** 打开合同详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmContractDetail', params: { id } }) } - /** 监听打开的 bizId + bizType,从而加载最新的列表 */ watch( () => [props.bizId, props.bizType], @@ -133,4 +124,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractProductForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractProductForm.vue index c33b996..64a1858 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractProductForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/components/ContractProductForm.vue @@ -97,7 +97,6 @@ import * as ProductApi from '@/api/crm/product' import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import { DICT_TYPE } from '@/utils/dict' - const props = defineProps<{ products: undefined disabled: false @@ -111,7 +110,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置产品项 */ watch( () => props.products, @@ -120,7 +118,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -139,7 +136,6 @@ watch( }, { deep: true } ) - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -153,12 +149,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -169,15 +163,13 @@ const onChangeProduct = (productId, row) => { row.contractPrice = product.price } } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/config/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/config/index.vue index c592123..36e36cf 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/config/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/contract/config/index.vue @@ -1,7 +1,4 @@ @@ -89,14 +88,10 @@ import * as CustomerLimitConfigApi from '@/api/crm/customer/limitConfig' import CustomerLimitConfigForm from './CustomerLimitConfigForm.vue' import { DICT_TYPE } from '@/utils/dict' import { LimitConfType } from '@/api/crm/customer/limitConfig' - defineOptions({ name: 'CustomerLimitConfigList' }) - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 - const { confType } = defineProps<{ confType: LimitConfType }>() - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -105,7 +100,6 @@ const queryParams = reactive({ pageSize: 10, type: confType }) - /** 查询列表 */ const getList = async () => { loading.value = true @@ -117,13 +111,11 @@ const getList = async () => { loading.value = false } } - /** 添加/修改操作 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, confType, id) } - /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { @@ -136,15 +128,13 @@ const handleDelete = async (id: number) => { await getList() } catch {} } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 初始化 **/ onMounted(() => { getList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/customer/limitConfig/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/customer/limitConfig/index.vue index 01f3ef6..3349f2e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/customer/limitConfig/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/customer/limitConfig/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/components/FollowUpRecordContactForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/components/FollowUpRecordContactForm.vue index b3b5d3a..6999fd3 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/components/FollowUpRecordContactForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/components/FollowUpRecordContactForm.vue @@ -22,15 +22,12 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/index.vue index 720af86..6d5447a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/followup/index.vue @@ -115,35 +115,29 @@ @pagination="getList" /> - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionForm.vue index 632a347..7c1833c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionForm.vue @@ -51,12 +51,9 @@ import * as UserApi from '@/api/system/user' import * as PermissionApi from '@/api/crm/permission' import { BizTypeEnum, PermissionLevelEnum } from '@/api/crm/permission' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' - defineOptions({ name: 'CrmPermissionForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -68,7 +65,6 @@ const formRules = reactive({ level: [{ required: true, message: '权限级别不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: 'create' | 'update', bizType: number, bizId: number, ids?: number[]) => { dialogVisible.value = true @@ -97,7 +93,6 @@ const open0 = async ( formData.value.ids = [id] } defineExpose({ open, open0 }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -123,7 +118,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = (bizType: number, bizId: number) => { formRef.value?.resetFields() @@ -134,4 +128,4 @@ onMounted(async () => { // 获得用户列表 userOptions.value = await UserApi.getSimpleUserList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionList.vue index 39c7aab..e489abb 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/PermissionList.vue @@ -38,7 +38,6 @@ - @@ -49,11 +48,8 @@ import * as PermissionApi from '@/api/crm/permission' import { useUserStoreWithOut } from '@/store/modules/user' import CrmPermissionForm from './PermissionForm.vue' import { DICT_TYPE } from '@/utils/dict' - defineOptions({ name: 'CrmPermissionList' }) - const message = useMessage() // 消息 - const props = defineProps<{ bizType: number // 模块类型 bizId: number | undefined // 模块数据编号 @@ -65,7 +61,6 @@ const formData = ref({ ownerUserId: 0 }) const userStore = useUserStoreWithOut() // 用户信息缓存 - /** 查询列表 */ const getList = async () => { loading.value = true @@ -97,7 +92,6 @@ const handleSelectionChange = (val: PermissionApi.PermissionVO[]) => { } multipleSelection.value = val } - /** 编辑团队成员 */ const formRef = ref>() // 权限表单 Ref const handleUpdate = () => { @@ -117,7 +111,6 @@ const handleUpdate = () => { multipleSelection.value[0].level ) } - /** 移除团队成员 */ const handleDelete = async () => { if (multipleSelection.value?.length === 0) { @@ -130,12 +123,10 @@ const handleDelete = async () => { message.success('移除团队成员成功!') await getList() } - /** 添加团队成员 */ const openForm = () => { formRef.value?.open('create', props.bizType, props.bizId!) } - // 校验负责人权限和编辑权限 const validateOwnerUser = ref(false) const validateWrite = ref(false) @@ -169,7 +160,6 @@ watch( immediate: true } ) - defineExpose({ openForm, validateOwnerUser, validateWrite, isPool }) const emits = defineEmits<{ (e: 'quitTeam'): void @@ -192,7 +182,6 @@ const handleQuit = async () => { message.success('退出团队成员成功!') emits('quitTeam') } - watch( () => props.bizId, (bizId) => { @@ -203,4 +192,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/TransferForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/TransferForm.vue index 43d5af7..354b7a4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/TransferForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/permission/components/TransferForm.vue @@ -59,13 +59,10 @@ import * as CustomerApi from '@/api/crm/customer' import * as ContractApi from '@/api/crm/contract' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { BizTypeEnum, PermissionLevelEnum, TransferReqVO } from '@/api/crm/permission' - defineOptions({ name: 'CrmTransferForm' }) - const props = defineProps<{ bizType: number }>() - const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 @@ -80,7 +77,6 @@ const formRules = reactive({ ] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (bizId: number) => { dialogVisible.value = true @@ -149,7 +145,6 @@ const getDialogTitle = () => { return '转移' } } - /** 重置表单 */ const resetForm = () => { formRef.value?.resetFields() @@ -159,4 +154,4 @@ onMounted(async () => { // 获得用户列表 userOptions.value = await UserApi.getSimpleUserList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/ProductForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/ProductForm.vue index 1bc5aac..dc7fb50 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/ProductForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/ProductForm.vue @@ -104,12 +104,9 @@ import * as ProductCategoryApi from '@/api/crm/product/category' import { defaultProps, handleTree } from '@/utils/tree' import { getSimpleUserList, UserVO } from '@/api/system/user' import { useUserStore } from '@/store/modules/user' - defineOptions({ name: 'CrmProductForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -134,9 +131,7 @@ const formRules = reactive({ ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }], price: [{ required: true, message: '价格不能为空', trigger: 'blur' }] }) - const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -156,7 +151,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -182,7 +176,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -198,7 +191,6 @@ const resetForm = () => { } formRef.value?.resetFields() } - /** 初始化 */ const productCategoryList = ref([]) // 产品分类树 const userList = ref([]) // 系统用户 @@ -209,4 +201,4 @@ onMounted(async () => { // 系统用户列表 userList.value = await getSimpleUserList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/ProductCategoryForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/ProductCategoryForm.vue index 0373fc3..e50eaa8 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/ProductCategoryForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/ProductCategoryForm.vue @@ -30,12 +30,9 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/index.vue index 631c170..8ac2c48 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/category/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsHeader.vue index 11286d6..4f0e0c0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsHeader.vue @@ -36,11 +36,10 @@ import ProductForm from '@/views/crm/product/ProductForm.vue' import { DICT_TYPE } from '@/utils/dict' import { erpPriceInputFormatter } from '@/utils' import * as ProductApi from '@/api/crm/product' - // 操作修改 const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } const { product } = defineProps<{ product: ProductApi.ProductVO }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsInfo.vue index 52a11e9..8af68ba 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/ProductDetailsInfo.vue @@ -28,11 +28,9 @@ import { DICT_TYPE } from '@/utils/dict' import * as ProductApi from '@/api/crm/product' import { erpPriceInputFormatter } from '@/utils' - const { product } = defineProps<{ product: ProductApi.ProductVO }>() - // 展示的折叠面板 const activeNames = ref(['basicInfo']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/index.vue index 65fdd0f..63e67d2 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/detail/index.vue @@ -19,15 +19,12 @@ import ProductDetailsHeader from '@/views/crm/product/detail/ProductDetailsHeade import ProductDetailsInfo from '@/views/crm/product/detail/ProductDetailsInfo.vue' import { BizTypeEnum } from '@/api/crm/permission' import { getOperateLogPage } from '@/api/crm/operateLog' - defineOptions({ name: 'CrmProductDetail' }) - const route = useRoute() const message = useMessage() const id = route.params.id // 编号 const loading = ref(true) // 加载中 const product = ref({} as ProductApi.ProductVO) // 详情 - /** 获取详情 */ const getProductData = async (id: number) => { loading.value = true @@ -38,7 +35,6 @@ const getProductData = async (id: number) => { loading.value = false } } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async (productId: number) => { @@ -51,7 +47,6 @@ const getOperateLog = async (productId: number) => { }) logList.value = data.list } - /** 初始化 */ const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 @@ -63,4 +58,4 @@ onMounted(async () => { } await getProductData(id) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/index.vue index 5d656df..55c677f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/product/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/ReceivableForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/ReceivableForm.vue index 61fac08..94f4d2c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/ReceivableForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/ReceivableForm.vue @@ -152,7 +152,6 @@ import * as CustomerApi from '@/api/crm/customer' import * as ContractApi from '@/api/crm/contract' import { useUserStore } from '@/store/modules/user' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const userOptions = ref([]) // 用户列表 @@ -171,7 +170,6 @@ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const contractList = ref([]) // 合同列表 const receivablePlanList = ref([]) // 回款计划列表 - /** 打开弹窗 */ const open = async ( type: string, @@ -216,7 +214,6 @@ const open = async ( } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -242,13 +239,11 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = {} as ReceivableApi.ReceivableVO formRef.value?.resetFields() } - /** 处理切换客户 */ const handleCustomerChange = async (customerId: number) => { // 重置合同编号 @@ -259,7 +254,6 @@ const handleCustomerChange = async (customerId: number) => { contractList.value = await ContractApi.getContractSimpleList(customerId) } } - /** 处理切换合同 */ const handleContractChange = async (contractId: number) => { // 重置回款计划编号 @@ -278,7 +272,6 @@ const handleContractChange = async (contractId: number) => { } } } - /** 处理切换回款计划 */ const handleReceivablePlanChange = (planId: number) => { if (!planId) { @@ -291,4 +284,4 @@ const handleReceivablePlanChange = (planId: number) => { formData.value.price = receivablePlan.price formData.value.returnType = receivablePlan.returnType } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/components/ReceivableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/components/ReceivableList.vue index 67287ea..d54824c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/components/ReceivableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/components/ReceivableList.vue @@ -6,7 +6,6 @@ 创建回款 - @@ -62,7 +61,6 @@ @pagination="getList" /> - @@ -73,13 +71,11 @@ import ReceivableForm from './../ReceivableForm.vue' import { dateFormatter2 } from '@/utils/formatTime' import { DICT_TYPE } from '@/utils/dict' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'CrmReceivableList' }) const props = defineProps<{ customerId?: number // 客户编号 contractId?: number // 合同编号 }>() - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 @@ -91,7 +87,6 @@ const queryParams = reactive({ customerId: undefined as unknown, // 允许 undefined + number contractId: undefined as unknown // 允许 undefined + number }) - /** 查询列表 */ const getList = async () => { loading.value = true @@ -110,7 +105,6 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 @@ -119,7 +113,6 @@ const handleQuery = () => { queryParams.contractId = undefined getList() } - /** 添加/修改操作 */ const formRef = ref() const openForm = (type: string, id?: number) => { @@ -128,7 +121,6 @@ const openForm = (type: string, id?: number) => { contractId: props.contractId }) } - /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { @@ -141,14 +133,12 @@ const handleDelete = async (id: number) => { await getList() } catch {} } - /** 从回款计划创建回款 */ const createReceivable = (planData: any) => { const data = planData as unknown as ReceivablePlanApi.ReceivablePlanVO formRef.value.open('create', undefined, data) } defineExpose({ createReceivable }) - /** 监听打开的 customerId + contractId,从而加载最新的列表 */ watch( () => [props.customerId, props.contractId], @@ -161,4 +151,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue index 62201de..d6f6902 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue @@ -38,6 +38,5 @@ import * as ReceivableApi from '@/api/crm/receivable' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { receivable } = defineProps<{ receivable: ReceivableApi.ReceivableVO }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue index 003029f..8f37cef 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue @@ -52,11 +52,9 @@ import * as ReceivableApi from '@/api/crm/receivable' import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { receivable } = defineProps<{ receivable: ReceivableApi.ReceivableVO }>() - // 展示的折叠面板 const activeNames = ref(['basicInfo', 'systemInfo']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/index.vue index 3603572..2ad492e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/detail/index.vue @@ -23,7 +23,6 @@ - @@ -37,17 +36,14 @@ import { BizTypeEnum } from '@/api/crm/permission' import { OperateLogVO } from '@/api/system/operatelog' import { getOperateLogPage } from '@/api/crm/operateLog' import ReceivableForm from '@/views/crm/receivable/ReceivableForm.vue' - defineOptions({ name: 'CrmReceivablePlanDetail' }) const props = defineProps<{ id?: number }>() - const route = useRoute() const message = useMessage() const receivableId = ref(0) // 回款编号 const loading = ref(true) // 加载中 const receivable = ref({} as ReceivableApi.ReceivableVO) // 回款详情 const permissionListRef = ref>() // 团队成员列表 Ref - /** 获取详情 */ const getReceivable = async (id: number) => { loading.value = true @@ -58,13 +54,11 @@ const getReceivable = async (id: number) => { loading.value = false } } - /** 编辑 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async (receivableId: number) => { @@ -77,14 +71,12 @@ const getOperateLog = async (receivableId: number) => { }) logList.value = data.list } - /** 关闭窗口 */ const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 const close = () => { delView(unref(currentRoute)) } - /** 初始化 */ const { params } = useRoute() onMounted(async () => { @@ -97,4 +89,4 @@ onMounted(async () => { receivableId.value = id await getReceivable(receivableId.value) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/index.vue index 6928942..67a30d3 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/index.vue @@ -1,7 +1,4 @@ @@ -213,9 +208,7 @@ import ReceivableForm from './ReceivableForm.vue' import * as CustomerApi from '@/api/crm/customer' import { TabsPaneContext } from 'element-plus' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'Receivable' }) - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 @@ -232,13 +225,11 @@ const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 const activeName = ref('1') // 列表 tab const customerList = ref([]) // 客户列表 - /** tab 切换 */ const handleTabClick = (tab: TabsPaneContext) => { queryParams.sceneType = tab.paneName handleQuery() } - /** 查询列表 */ const getList = async () => { loading.value = true @@ -250,25 +241,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 添加/修改操作 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } - /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { @@ -281,7 +268,6 @@ const handleDelete = async (id: number) => { await getList() } catch {} } - /** 提交审核 **/ const handleSubmit = async (row: ReceivableApi.ReceivableVO) => { await message.confirm(`您确定提交编号为【${row.no}】的回款审核吗?`) @@ -289,28 +275,23 @@ const handleSubmit = async (row: ReceivableApi.ReceivableVO) => { message.success('提交审核成功!') await getList() } - /** 查看审批 */ const handleProcessDetail = (row: ReceivableApi.ReceivableVO) => { push({ name: 'BpmProcessInstanceDetail', query: { id: row.processInstanceId } }) } - /** 打开回款详情 */ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmReceivableDetail', params: { id } }) } - /** 打开客户详情 */ const openCustomerDetail = (id: number) => { push({ name: 'CrmCustomerDetail', params: { id } }) } - /** 打开合同详情 */ const openContractDetail = (id: number) => { push({ name: 'CrmContractDetail', params: { id } }) } - /** 导出按钮操作 */ const handleExport = async () => { try { @@ -325,11 +306,10 @@ const handleExport = async () => { exportLoading.value = false } } - /** 初始化 **/ onMounted(async () => { await getList() // 获得客户列表 customerList.value = await CustomerApi.getCustomerSimpleList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/ReceivablePlanForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/ReceivablePlanForm.vue index f321592..2990321 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/ReceivablePlanForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/ReceivablePlanForm.vue @@ -138,7 +138,6 @@ import * as ContractApi from '@/api/crm/contract' import { useUserStore } from '@/store/modules/user' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { cloneDeep } from 'lodash-es' - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const userOptions = ref([]) // 用户列表 @@ -157,7 +156,6 @@ const formRules = reactive({ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const contractList = ref([]) // 合同列表 - /** 打开弹窗 */ const open = async (type: string, id?: number, customerId?: number, contractId?: number) => { dialogVisible.value = true @@ -194,7 +192,6 @@ const open = async (type: string, id?: number, customerId?: number, contractId?: } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -220,13 +217,11 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = {} as ReceivablePlanApi.ReceivablePlanVO formRef.value?.resetFields() } - /** 处理切换客户 */ const handleCustomerChange = async (customerId: number) => { // 重置合同编号 @@ -237,4 +232,4 @@ const handleCustomerChange = async (customerId: number) => { contractList.value = await ContractApi.getContractSimpleList(customerId) } } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/components/ReceivablePlanList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/components/ReceivablePlanList.vue index 3b80526..f921684 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/components/ReceivablePlanList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/components/ReceivablePlanList.vue @@ -6,7 +6,6 @@ 创建回款计划 - @@ -75,7 +74,6 @@ @pagination="getList" /> - @@ -84,13 +82,11 @@ import * as ReceivablePlanApi from '@/api/crm/receivable/plan' import ReceivableForm from './../ReceivablePlanForm.vue' import { dateFormatter2 } from '@/utils/formatTime' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'CrmReceivablePlanList' }) const props = defineProps<{ customerId?: number // 客户编号 contractId?: number // 合同编号 }>() - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 @@ -102,7 +98,6 @@ const queryParams = reactive({ customerId: undefined as unknown, // 允许 undefined + number contractId: undefined as unknown // 允许 undefined + number }) - /** 查询列表 */ const getList = async () => { loading.value = true @@ -121,7 +116,6 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 @@ -130,13 +124,11 @@ const handleQuery = () => { queryParams.contractId = undefined getList() } - /** 添加/修改操作 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id, props.customerId, props.contractId) } - /** 创建回款 */ const emits = defineEmits<{ (e: 'createReceivable', v: ReceivablePlanApi.ReceivablePlanVO) @@ -144,7 +136,6 @@ const emits = defineEmits<{ const createReceivable = (row: ReceivablePlanApi.ReceivablePlanVO) => { emits('createReceivable', row) } - /** 删除按钮操作 */ const handleDelete = async (id: number) => { try { @@ -157,7 +148,6 @@ const handleDelete = async (id: number) => { await getList() } catch {} } - /** 监听打开的 customerId + contractId,从而加载最新的列表 */ watch( () => [props.customerId, props.contractId], @@ -170,4 +160,4 @@ watch( }, { immediate: true, deep: true } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsHeader.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsHeader.vue index b0e0044..f0c8d81 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsHeader.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsHeader.vue @@ -39,6 +39,5 @@ import * as ReceivablePlanApi from '@/api/crm/receivable/plan' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { receivablePlan } = defineProps<{ receivablePlan: ReceivablePlanApi.ReceivablePlanVO }>() - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsInfo.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsInfo.vue index c25259b..1b5fc97 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsInfo.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/ReceivablePlanDetailsInfo.vue @@ -73,11 +73,9 @@ import * as ReceivablePlanApi from '@/api/crm/receivable/plan' import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' import { erpPriceInputFormatter } from '@/utils' - const { receivablePlan } = defineProps<{ receivablePlan: ReceivablePlanApi.ReceivablePlanVO }>() - // 展示的折叠面板 const activeNames = ref(['basicInfo', 'systemInfo']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/index.vue index fba8694..696c26a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/detail/index.vue @@ -26,7 +26,6 @@ - @@ -40,18 +39,14 @@ import { BizTypeEnum } from '@/api/crm/permission' import { OperateLogVO } from '@/api/system/operatelog' import { getOperateLogPage } from '@/api/crm/operateLog' import ReceivablePlanForm from '@/views/crm/receivable/plan/ReceivablePlanForm.vue' - defineOptions({ name: 'CrmReceivablePlanDetail' }) - const message = useMessage() - const receivablePlanId = ref(0) // 回款计划编号 const loading = ref(true) // 加载中 const receivablePlan = ref( {} as ReceivablePlanApi.ReceivablePlanVO ) // 回款计划详情 const permissionListRef = ref>() // 团队成员列表 Ref - /** 获取详情 */ const getReceivablePlan = async (id: number) => { loading.value = true @@ -62,13 +57,11 @@ const getReceivablePlan = async (id: number) => { loading.value = false } } - /** 编辑 */ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } - /** 获取操作日志 */ const logList = ref([]) // 操作日志列表 const getOperateLog = async (receivablePlanId: number) => { @@ -81,14 +74,12 @@ const getOperateLog = async (receivablePlanId: number) => { }) logList.value = data.list } - /** 关闭窗口 */ const { delView } = useTagsViewStore() // 视图操作 const { currentRoute } = useRouter() // 路由 const close = () => { delView(unref(currentRoute)) } - /** 初始化 */ const { params } = useRoute() onMounted(async () => { @@ -100,4 +91,4 @@ onMounted(async () => { receivablePlanId.value = params.id as unknown as number await getReceivablePlan(receivablePlanId.value) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/index.vue index 43abe15..4104e84 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/receivable/plan/index.vue @@ -1,7 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerConversionStat.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerConversionStat.vue index 4f5c50c..af00809 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerConversionStat.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerConversionStat.vue @@ -6,7 +6,6 @@ - @@ -72,14 +71,10 @@ import { EChartsOption } from 'echarts' import { dateFormatter } from '@/utils/formatTime' import { erpPriceTableColumnFormatter } from '@/utils' import { DICT_TYPE } from '@/utils/dict' - defineOptions({ name: 'CustomerConversionStat' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -123,7 +118,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -150,7 +144,6 @@ const fetchAndFill = async () => { // 2.2 更新列表数据 list.value = contractSummary } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -160,11 +153,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByArea.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByArea.vue index 9aa6d5e..befb5d9 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByArea.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByArea.vue @@ -6,7 +6,6 @@ - @@ -28,14 +27,10 @@ import { CrmStatisticsCustomerDealCycleByAreaRespVO } from '@/api/crm/statistics/customer' import { EChartsOption } from 'echarts' - defineOptions({ name: 'CustomerDealCycleByArea' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -102,7 +97,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -134,7 +128,6 @@ const fetchAndFill = async () => { // 2.2 更新列表数据 list.value = customerDealCycleByArea } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -145,9 +138,8 @@ const loadData = async () => { } } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByProduct.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByProduct.vue index 74558d1..7993eeb 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByProduct.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByProduct.vue @@ -6,7 +6,6 @@ - @@ -28,14 +27,10 @@ import { CrmStatisticsCustomerDealCycleByProductRespVO } from '@/api/crm/statistics/customer' import { EChartsOption } from 'echarts' - defineOptions({ name: 'CustomerDealCycleByProduct' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -102,7 +97,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -134,7 +128,6 @@ const fetchAndFill = async () => { // 2.2 更新列表数据 list.value = customerDealCycleByProduct } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -145,9 +138,8 @@ const loadData = async () => { } } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByUser.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByUser.vue index e3d877e..58a9bdf 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByUser.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerDealCycleByUser.vue @@ -6,7 +6,6 @@ - @@ -29,14 +28,10 @@ import { CrmStatisticsCustomerSummaryByDateRespVO } from '@/api/crm/statistics/customer' import { EChartsOption } from 'echarts' - defineOptions({ name: 'CustomerDealCycleByUser' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -103,7 +98,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -135,7 +129,6 @@ const fetchAndFill = async () => { // 2.2 更新列表数据 list.value = customerDealCycleByUser } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -146,9 +139,8 @@ const loadData = async () => { } } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpSummary.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpSummary.vue index eeb0ff0..d067b99 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpSummary.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpSummary.vue @@ -6,7 +6,6 @@ - @@ -30,14 +29,10 @@ import { } from '@/api/crm/statistics/customer' import Echart from '@/components/Echart/src/Echart.vue' import { EChartsOption } from 'echarts' - defineOptions({ name: 'CustomerFollowupSummary' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -107,7 +102,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -137,7 +131,6 @@ const fetchAndFill = async () => { // 2.2 更新列表数据 list.value = followUpSummaryByUser } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -148,9 +141,8 @@ const loadData = async () => { } } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpType.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpType.vue index 3d8d873..d741b51 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpType.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerFollowUpType.vue @@ -6,7 +6,6 @@ - @@ -30,14 +29,10 @@ import { EChartsOption } from 'echarts' import { sumBy } from 'lodash-es' import { DICT_TYPE, getDictLabel } from '@/utils/dict' import { erpCalculatePercentage } from '@/utils' - defineOptions({ name: 'CustomerFollowupType' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 饼图配置 */ const echartsOption = reactive({ title: { @@ -73,7 +68,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -100,7 +94,6 @@ const fetchAndFill = async () => { } }) } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -110,11 +103,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerPoolSummary.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerPoolSummary.vue index 5f0606a..ffc7eca 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerPoolSummary.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerPoolSummary.vue @@ -6,7 +6,6 @@ - @@ -34,14 +33,10 @@ import { CrmStatisticsPoolSummaryByUserRespVO } from '@/api/crm/statistics/customer' import { EChartsOption } from 'echarts' - defineOptions({ name: 'CustomerPoolSummary' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -108,7 +103,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -130,11 +124,9 @@ const fetchAndFill = async () => { (s: CrmStatisticsPoolSummaryByDateRespVO) => s.customerTakeCount ) } - // 2.2 更新列表数据 list.value = poolSummaryByUser } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -144,11 +136,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerSummary.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerSummary.vue index d1429c2..50f5080 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerSummary.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/components/CustomerSummary.vue @@ -6,7 +6,6 @@ - @@ -59,14 +58,10 @@ import { } from '@/api/crm/statistics/customer' import { EChartsOption } from 'echarts' import { erpCalculatePercentage, erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'CustomerSummary' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -133,7 +128,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -159,11 +153,9 @@ const fetchAndFill = async () => { (s: CrmStatisticsCustomerSummaryByDateRespVO) => s.customerDealCount ) } - // 2.2 更新列表数据 list.value = customerSummaryByUser } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -173,11 +165,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/index.vue index 207dc35..ea009df 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/customer/index.vue @@ -77,7 +77,6 @@ - @@ -114,7 +113,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessInversionRateSummary.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessInversionRateSummary.vue index 541d6fc..54012b4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessInversionRateSummary.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessInversionRateSummary.vue @@ -6,7 +6,6 @@ - @@ -107,9 +106,7 @@ import { import { EChartsOption } from 'echarts' import { erpCalculatePercentage, erpPriceTableColumnFormatter } from '@/utils' import { dateFormatter } from '@/utils/formatTime' - defineOptions({ name: 'BusinessSummary' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 const queryParams0 = reactive({ pageNo: 1, @@ -238,7 +235,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -267,7 +263,6 @@ const fetchAndFill = async () => { (s: CrmStatisticsBusinessInversionRateSummaryByDateRespVO) => s.businessWinCount ) } - // 2.2 更新列表数据 await getList() } @@ -282,12 +277,10 @@ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmBusinessDetail', params: { id } }) } - /** 打开客户详情 */ const openCustomerDetail = (id: number) => { push({ name: 'CrmCustomerDetail', params: { id } }) } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -297,11 +290,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessSummary.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessSummary.vue index 942a712..e5681a6 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessSummary.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/BusinessSummary.vue @@ -6,7 +6,6 @@ - @@ -107,9 +106,7 @@ import { import { EChartsOption } from 'echarts' import { erpPriceTableColumnFormatter } from '@/utils' import { dateFormatter } from '@/utils/formatTime' - defineOptions({ name: 'BusinessSummary' }) - const props = defineProps<{ queryParams: any }>() // 搜索参数 const queryParams0 = reactive({ pageNo: 1, @@ -198,7 +195,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取数据并填充图表 */ const fetchAndFill = async () => { // 1. 加载统计数据 @@ -219,7 +215,6 @@ const fetchAndFill = async () => { (s: CrmStatisticsBusinessSummaryByDateRespVO) => s.totalPrice ) } - // 2.2 更新列表数据 await getList() } @@ -234,12 +229,10 @@ const { push } = useRouter() const openDetail = (id: number) => { push({ name: 'CrmBusinessDetail', params: { id } }) } - /** 打开客户详情 */ const openCustomerDetail = (id: number) => { push({ name: 'CrmCustomerDetail', params: { id } }) } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -249,11 +242,9 @@ const loadData = async () => { loading.value = false } } - defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/FunnelBusiness.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/FunnelBusiness.vue index c4e4bf6..4cf39cb 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/FunnelBusiness.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/components/FunnelBusiness.vue @@ -14,7 +14,6 @@ - @@ -33,14 +32,11 @@ import { CrmStatisticFunnelRespVO, StatisticFunnelApi } from '@/api/crm/statistics/funnel' import { EChartsOption } from 'echarts' import { DICT_TYPE } from '@/utils/dict' - defineOptions({ name: 'FunnelBusiness' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const active = ref(true) const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 销售漏斗 */ const echartsOption = reactive({ title: { @@ -102,12 +98,10 @@ const echartsOption = reactive({ } ] }) as EChartsOption - const handleActive = async (val: boolean) => { active.value = val await loadData() } - /** 获取统计数据 */ const loadData = async () => { loading.value = true @@ -133,7 +127,6 @@ const loadData = async () => { list.push({ value: data.businessCount || 0, name: `商机-${data.businessCount || 0}个` }) list.push({ value: data.businessWinCount || 0, name: `赢单-${data.businessWinCount || 0}个` }) } - echartsOption.series[0]['data'] = list } // 2.2 获取商机结束状态统计 @@ -141,9 +134,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/index.vue index 804cb49..378316d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/funnel/index.vue @@ -77,7 +77,6 @@ - @@ -96,7 +95,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractCountPerformance.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractCountPerformance.vue index fa5a897..0b2a1f3 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractCountPerformance.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractCountPerformance.vue @@ -6,7 +6,6 @@ - @@ -30,13 +29,10 @@ import { StatisticsPerformanceApi, StatisticsPerformanceRespVO } from '@/api/crm/statistics/performance' - defineOptions({ name: 'ContractCountPerformance' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -149,7 +145,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -157,7 +152,6 @@ const loadData = async () => { const performanceList = await StatisticsPerformanceApi.getContractCountPerformance( props.queryParams ) - // 2.1 更新 Echarts 数据 if (echartsOption.xAxis && echartsOption.xAxis['data']) { echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time) @@ -187,13 +181,11 @@ const loadData = async () => { : 'NULL' ) } - // 2.2 更新列表数据 list.value = performanceList convertListData() loading.value = false } - // 初始化数据 const columnsData = reactive([]) const tableData = reactive([ @@ -203,13 +195,11 @@ const tableData = reactive([ { title: '环比增长率(%)' }, { title: '同比增长率(%)' } ]) - // 定义 convertListData 方法,数据行列转置,展示每月数据 const convertListData = () => { const columnObj = { label: '日期', prop: 'title' } columnsData.splice(0, columnsData.length) //清空数组 columnsData.push(columnObj) - list.value.forEach((item, index) => { const columnObj = { label: item.time, prop: 'prop' + index } columnsData.push(columnObj) @@ -226,11 +216,9 @@ const convertListData = () => { : 'NULL' }) } - defineExpose({ loadData }) - /** 初始化 */ onMounted(async () => { await loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractPricePerformance.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractPricePerformance.vue index dd52d9f..1104416 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractPricePerformance.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ContractPricePerformance.vue @@ -6,7 +6,6 @@ - @@ -30,13 +29,10 @@ import { StatisticsPerformanceApi, StatisticsPerformanceRespVO } from '@/api/crm/statistics/performance' - defineOptions({ name: 'ContractPricePerformance' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -149,7 +145,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -157,7 +152,6 @@ const loadData = async () => { const performanceList = await StatisticsPerformanceApi.getContractPricePerformance( props.queryParams ) - // 2.1 更新 Echarts 数据 if (echartsOption.xAxis && echartsOption.xAxis['data']) { echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time) @@ -187,13 +181,11 @@ const loadData = async () => { : 'NULL' ) } - // 2.2 更新列表数据 list.value = performanceList convertListData() loading.value = false } - // 初始化数据 const columnsData = reactive([]) const tableData = reactive([ @@ -203,13 +195,11 @@ const tableData = reactive([ { title: '环比增长率(%)' }, { title: '同比增长率(%)' } ]) - // 定义 init 方法 const convertListData = () => { const columnObj = { label: '日期', prop: 'title' } columnsData.splice(0, columnsData.length) //清空数组 columnsData.push(columnObj) - list.value.forEach((item, index) => { const columnObj = { label: item.time, prop: 'prop' + index } columnsData.push(columnObj) @@ -226,11 +216,9 @@ const convertListData = () => { : 'NULL' }) } - defineExpose({ loadData }) - /** 初始化 */ onMounted(async () => { await loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue index 169f074..d44eb8a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue @@ -6,7 +6,6 @@ - @@ -30,13 +29,10 @@ import { StatisticsPerformanceApi, StatisticsPerformanceRespVO } from '@/api/crm/statistics/performance' - defineOptions({ name: 'ContractPricePerformance' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:纵向 */ const echartsOption = reactive({ grid: { @@ -149,7 +145,6 @@ const echartsOption = reactive({ data: [] } }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -157,7 +152,6 @@ const loadData = async () => { const performanceList = await StatisticsPerformanceApi.getReceivablePricePerformance( props.queryParams ) - // 2.1 更新 Echarts 数据 if (echartsOption.xAxis && echartsOption.xAxis['data']) { echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time) @@ -187,13 +181,11 @@ const loadData = async () => { : 'NULL' ) } - // 2.2 更新列表数据 list.value = performanceList convertListData() loading.value = false } - // 初始化数据 const columnsData = reactive([]) const tableData = reactive([ @@ -203,13 +195,11 @@ const tableData = reactive([ { title: '环比增长率(%)' }, { title: '同比增长率(%)' } ]) - // 定义 init 方法 const convertListData = () => { const columnObj = { label: '日期', prop: 'title' } columnsData.splice(0, columnsData.length) //清空数组 columnsData.push(columnObj) - list.value.forEach((item, index) => { const columnObj = { label: item.time, prop: 'prop' + index } columnsData.push(columnObj) @@ -226,11 +216,9 @@ const convertListData = () => { : 'NULL' }) } - defineExpose({ loadData }) - /** 初始化 */ onMounted(async () => { await loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/index.vue index 822afec..decf9dd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/performance/index.vue @@ -46,7 +46,6 @@ - @@ -68,7 +67,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerArea.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerArea.vue index 513936c..119d656 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerArea.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerArea.vue @@ -25,16 +25,12 @@ import { StatisticsPortraitApi } from '@/api/crm/statistics/portrait' import { areaReplace } from '@/utils' - defineOptions({ name: 'PortraitCustomerArea' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - // 注册地图 echarts?.registerMap('china', china as any) - const loading = ref(false) // 加载中 const areaStatisticsList = ref([]) // 列表的数据 - /** 地图配置(全部客户) */ const echartsOption = reactive({ title: { @@ -66,7 +62,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 地图配置(成交客户) */ const echartsOption2 = reactive({ title: { @@ -98,7 +93,6 @@ const echartsOption2 = reactive({ } ] }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -115,7 +109,6 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - const buildLeftMap = () => { let min = 0 let max = 0 @@ -127,7 +120,6 @@ const buildLeftMap = () => { echartsOption.visualMap!['min'] = min echartsOption.visualMap!['max'] = max } - const buildRightMap = () => { let min = 0 let max = 0 @@ -139,9 +131,8 @@ const buildRightMap = () => { echartsOption2.visualMap!['min'] = min echartsOption2.visualMap!['max'] = max } - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerIndustry.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerIndustry.vue index d426993..98b4a61 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerIndustry.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerIndustry.vue @@ -15,7 +15,6 @@ - @@ -41,13 +40,10 @@ import { EChartsOption } from 'echarts' import { DICT_TYPE, getDictLabel } from '@/utils/dict' import { erpCalculatePercentage, getSumValue } from '@/utils' import { isEmpty } from '@/utils/is' - defineOptions({ name: 'PortraitCustomerIndustry' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 饼图配置(全部客户) */ const echartsOption = reactive({ title: { @@ -95,7 +91,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 饼图配置(成交客户) */ const echartsOption2 = reactive({ title: { @@ -143,7 +138,6 @@ const echartsOption2 = reactive({ } ] }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -173,7 +167,6 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 计算比例 */ const calculateProportion = (sourceList: CrmStatisticCustomerIndustryRespVO[]) => { if (isEmpty(sourceList)) { @@ -190,9 +183,8 @@ const calculateProportion = (sourceList: CrmStatisticCustomerIndustryRespVO[]) = item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount) }) } - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerLevel.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerLevel.vue index 653feef..7b7be50 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerLevel.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerLevel.vue @@ -15,7 +15,6 @@ - @@ -41,13 +40,10 @@ import { EChartsOption } from 'echarts' import { DICT_TYPE, getDictLabel } from '@/utils/dict' import { erpCalculatePercentage, getSumValue } from '@/utils' import { isEmpty } from '@/utils/is' - defineOptions({ name: 'PortraitCustomerLevel' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 饼图配置(全部客户) */ const echartsOption = reactive({ title: { @@ -95,7 +91,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 饼图配置(成交客户) */ const echartsOption2 = reactive({ title: { @@ -143,7 +138,6 @@ const echartsOption2 = reactive({ } ] }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -173,7 +167,6 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 计算比例 */ const calculateProportion = (levelList: CrmStatisticCustomerLevelRespVO[]) => { if (isEmpty(levelList)) { @@ -190,9 +183,8 @@ const calculateProportion = (levelList: CrmStatisticCustomerLevelRespVO[]) => { item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount) }) } - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerSource.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerSource.vue index ade6445..1972c32 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerSource.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/components/PortraitCustomerSource.vue @@ -15,7 +15,6 @@ - @@ -41,13 +40,10 @@ import { EChartsOption } from 'echarts' import { DICT_TYPE, getDictLabel } from '@/utils/dict' import { isEmpty } from '@/utils/is' import { erpCalculatePercentage, getSumValue } from '@/utils' - defineOptions({ name: 'PortraitCustomerSource' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 饼图配置(全部客户) */ const echartsOption = reactive({ title: { @@ -95,7 +91,6 @@ const echartsOption = reactive({ } ] }) as EChartsOption - /** 饼图配置(成交客户) */ const echartsOption2 = reactive({ title: { @@ -143,7 +138,6 @@ const echartsOption2 = reactive({ } ] }) as EChartsOption - /** 获取统计数据 */ const loadData = async () => { // 1. 加载统计数据 @@ -173,7 +167,6 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 计算比例 */ const calculateProportion = (sourceList: CrmStatisticCustomerSourceRespVO[]) => { if (isEmpty(sourceList)) { @@ -190,9 +183,8 @@ const calculateProportion = (sourceList: CrmStatisticCustomerSourceRespVO[]) => item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount) }) } - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/index.vue index 71807e1..6e9a3b2 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/portrait/index.vue @@ -55,7 +55,6 @@ - @@ -78,7 +77,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContactCountRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContactCountRank.vue index 5edc118..315ec74 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContactCountRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContactCountRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'ContactCountRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '创建人' } }) as EChartsOption - /** 获取新增联系人数排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractCountRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractCountRank.vue index fc50a6d..ee0d62c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractCountRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractCountRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'ContractCountRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '签订人' } }) as EChartsOption - /** 获取签约合同排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractPriceRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractPriceRank.vue index b69ebd2..cdad481 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractPriceRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ContractPriceRank.vue @@ -6,7 +6,6 @@ - @@ -28,13 +27,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/ra import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'ContractPriceRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -82,7 +78,6 @@ const echartsOption = reactive({ name: '签订人' } }) as EChartsOption - /** 获取合同金额排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -97,9 +92,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/CustomerCountRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/CustomerCountRank.vue index b66a681..8fec288 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/CustomerCountRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/CustomerCountRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'CustomerCountRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '创建人' } }) as EChartsOption - /** 获取新增客户数排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCountRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCountRank.vue index 43352ab..4316147 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCountRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCountRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'FollowCountRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '员工' } }) as EChartsOption - /** 获取跟进次数排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue index 92a2205..73b71d3 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'FollowCustomerCountRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '员工' } }) as EChartsOption - /** 获取跟进客户数排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ProductSalesRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ProductSalesRank.vue index e2a02b7..4e03210 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ProductSalesRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ProductSalesRank.vue @@ -6,7 +6,6 @@ - @@ -21,13 +20,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank' import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' - defineOptions({ name: 'ProductSalesRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -75,7 +71,6 @@ const echartsOption = reactive({ name: '员工' } }) as EChartsOption - /** 获取产品销量排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -90,9 +85,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue index 06d7d9f..2504de0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue @@ -6,7 +6,6 @@ - @@ -28,13 +27,10 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/ra import { EChartsOption } from 'echarts' import { clone } from 'lodash-es' import { erpPriceTableColumnFormatter } from '@/utils' - defineOptions({ name: 'ReceivablePriceRank' }) const props = defineProps<{ queryParams: any }>() // 搜索参数 - const loading = ref(false) // 加载中 const list = ref([]) // 列表的数据 - /** 柱状图配置:横向 */ const echartsOption = reactive({ dataset: { @@ -83,7 +79,6 @@ const echartsOption = reactive({ nameGap: 30 } }) as EChartsOption - /** 获取回款金额排行 */ const loadData = async () => { // 1. 加载排行数据 @@ -98,9 +93,8 @@ const loadData = async () => { loading.value = false } defineExpose({ loadData }) - /** 初始化 */ onMounted(() => { loadData() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/index.vue index 98340cc..6b20c46 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/crm/statistics/rank/index.vue @@ -38,7 +38,6 @@ - @@ -90,9 +89,7 @@ import { defaultProps, handleTree } from '@/utils/tree' import * as DeptApi from '@/api/system/dept' import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime' import { useUserStore } from '@/store/modules/user' - defineOptions({ name: 'CrmStatisticsRank' }) - const queryParams = reactive({ deptId: useUserStore().getUser.deptId, times: [ @@ -101,7 +98,6 @@ const queryParams = reactive({ formatDate(endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24))) ] }) - const queryFormRef = ref() // 搜索的表单 const deptList = ref([]) // 树形结构 const activeTab = ref('contractPriceRank') @@ -113,7 +109,6 @@ const customerCountRankRef = ref() // CustomerCountRank 组件的引用 const contactCountRankRef = ref() // ContactCountRank 组件的引用 const followCountRankRef = ref() // FollowCountRank 组件的引用 const followCustomerCountRankRef = ref() // FollowCustomerCountRank 组件的引用 - /** 搜索按钮操作 */ const handleQuery = () => { switch (activeTab.value) { @@ -143,21 +138,18 @@ const handleQuery = () => { break } } - // 当 activeTab 改变时,刷新当前活动的 tab watch(activeTab, () => { handleQuery() }) - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - // 加载部门树 onMounted(async () => { deptList.value = handleTree(await DeptApi.getSimpleDeptList()) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/AccountForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/AccountForm.vue index bde4bd2..3f0049c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/AccountForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/AccountForm.vue @@ -40,13 +40,10 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/index.vue index 8d85ef3..b9fe77f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/account/index.vue @@ -1,9 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/FinancePaymentForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/FinancePaymentForm.vue index 3da2e6e..4739fef 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/FinancePaymentForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/FinancePaymentForm.vue @@ -151,13 +151,10 @@ import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier' import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import * as UserApi from '@/api/system/user' import { AccountApi, AccountVO } from '@/api/erp/finance/account' - /** ERP 付款单表单 */ defineOptions({ name: 'FinancePaymentForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -185,11 +182,9 @@ const formRef = ref() // 表单 Ref const supplierList = ref([]) // 供应商列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -203,7 +198,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -231,7 +225,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -256,7 +249,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -275,4 +267,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue index ea0e085..c394a85 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/components/FinancePaymentItemForm.vue @@ -61,7 +61,6 @@ + 添加采购入库单 + 添加采购退货单 - () const message = useMessage() - const formLoading = ref(false) // 表单的加载中 const formData = ref([]) const formRules = reactive({ @@ -96,7 +93,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置入库项 */ watch( () => props.items, @@ -105,7 +101,6 @@ watch( }, { immediate: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -124,7 +119,6 @@ const getSummaries = (param: SummaryMethodProps) => { }) return sums } - /** 新增【采购入库】按钮操作 */ const purchaseInPaymentEnableListRef = ref() const handleOpenPurchaseIn = () => { @@ -146,7 +140,6 @@ const handleAddPurchaseIn = (rows: PurchaseInVO[]) => { }) }) } - /** 新增【采购退货】按钮操作 */ const purchaseReturnRefundEnableListRef = ref() const handleOpenPurchaseReturn = () => { @@ -168,15 +161,13 @@ const handleAddPurchaseReturn = (rows: PurchaseReturnVO[]) => { }) }) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/index.vue index a449ca5..a8c26ae 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/payment/index.vue @@ -1,9 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/FinanceReceiptForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/FinanceReceiptForm.vue index 96826eb..e6270cd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/FinanceReceiptForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/FinanceReceiptForm.vue @@ -151,13 +151,10 @@ import { erpPriceInputFormatter } from '@/utils' import * as UserApi from '@/api/system/user' import { AccountApi, AccountVO } from '@/api/erp/finance/account' import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer' - /** ERP 收款单表单 */ defineOptions({ name: 'FinanceReceiptForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -185,11 +182,9 @@ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -203,7 +198,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -231,7 +225,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -256,7 +249,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -275,4 +267,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue index 1a48b41..b850881 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/components/FinanceReceiptItemForm.vue @@ -61,7 +61,6 @@ + 添加销售出库单 + 添加销售退货单 - @@ -75,14 +74,12 @@ import SaleReturnRefundEnableList from '@/views/erp/sale/return/components/SaleR import { SaleOutVO } from '@/api/erp/sale/out' import { ErpBizType } from '@/utils/constants' import { SaleReturnVO } from '@/api/erp/sale/return' - const props = defineProps<{ items: undefined customerId: undefined disabled: false }>() const message = useMessage() - const formLoading = ref(false) // 表单的加载中 const formData = ref([]) const formRules = reactive({ @@ -90,7 +87,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置出库项 */ watch( () => props.items, @@ -99,7 +95,6 @@ watch( }, { immediate: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -118,7 +113,6 @@ const getSummaries = (param: SummaryMethodProps) => { }) return sums } - /** 新增【销售出库】按钮操作 */ const saleOutReceiptEnableListRef = ref() const handleOpenSaleOut = () => { @@ -140,7 +134,6 @@ const handleAddSaleOut = (rows: SaleOutVO[]) => { }) }) } - /** 新增【销售退货】按钮操作 */ const saleReturnRefundEnableListRef = ref() const handleOpenSaleReturn = () => { @@ -162,15 +155,13 @@ const handleAddSaleReturn = (rows: SaleReturnVO[]) => { }) }) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/index.vue index d754c46..e7a41f2 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/finance/receipt/index.vue @@ -1,9 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/SummaryCard.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/SummaryCard.vue index 21a02e2..a4aca98 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/SummaryCard.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/SummaryCard.vue @@ -10,12 +10,10 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/TimeSummaryChart.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/TimeSummaryChart.vue index 127fa87..79bb406 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/TimeSummaryChart.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/components/TimeSummaryChart.vue @@ -12,15 +12,12 @@ import { EChartsOption } from 'echarts' import { formatDate } from '@/utils/formatTime' import { CardTitle } from '@/components/Card' import { propTypes } from '@/utils/propTypes' - /** 会员用户统计卡片 */ defineOptions({ name: 'MemberStatisticsCard' }) - const props = defineProps({ title: propTypes.string.def('').isRequired, value: propTypes.object.isRequired }) - /** 折线图配置 */ const lineChartOptions = reactive({ dataset: { @@ -70,7 +67,6 @@ const lineChartOptions = reactive({ } } }) as EChartsOption - watch( () => props.value, (val) => { @@ -83,4 +79,4 @@ watch( } } ) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/index.vue index e399f9a..24c9b28 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/home/index.vue @@ -1,6 +1,4 @@ - ([]) // 供应商列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -226,7 +220,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -254,13 +247,11 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 打开【可入库的订单列表】弹窗 */ const purchaseOrderInEnableListRef = ref() // 可入库的订单列表 Ref const openPurchaseOrderInEnableList = () => { purchaseOrderInEnableListRef.value.open() } - const handlePurchaseOrderChange = (order: PurchaseOrderVO) => { // 将订单设置到入库单 formData.value.orderId = order.id @@ -279,7 +270,6 @@ const handlePurchaseOrderChange = (order: PurchaseOrderVO) => { }) formData.value.items = order.items.filter((item) => item.count > 0) } - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -304,7 +294,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -322,4 +311,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInItemForm.vue index da54e05..d5706cd 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInItemForm.vue @@ -172,7 +172,6 @@ import { getSumValue } from '@/utils' import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse' - const props = defineProps<{ items: undefined disabled: false @@ -187,7 +186,6 @@ const formRules = reactive({ const formRef = ref([]) // 表单 Ref const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置入库项 */ watch( () => props.items, @@ -204,7 +202,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -225,7 +222,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -243,10 +239,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -265,12 +259,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -279,16 +271,14 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { warehouseList.value = await WarehouseApi.getWarehouseSimpleList() defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInPaymentEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInPaymentEnableList.vue index afaa644..ff00b10 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInPaymentEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/components/PurchaseInPaymentEnableList.vue @@ -58,7 +58,6 @@ - ([]) // 列表的数据 const total = ref(0) // 列表的总页数 const loading = ref(false) // 列表的加载中 @@ -140,13 +137,11 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const productList = ref([]) // 产品列表 - /** 选中操作 */ const selectionList = ref([]) const handleSelectionChange = (rows: PurchaseInVO[]) => { selectionList.value = rows } - /** 打开弹窗 */ const open = async (supplierId: number) => { dialogVisible.value = true @@ -158,7 +153,6 @@ const open = async (supplierId: number) => { productList.value = await ProductApi.getProductSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交选择 */ const emits = defineEmits<{ (e: 'success', value: PurchaseInVO[]): void @@ -171,7 +165,6 @@ const submitForm = () => { dialogVisible.value = false } } - /** 加载列表 */ const getList = async () => { loading.value = true @@ -183,17 +176,15 @@ const getList = async () => { loading.value = false } } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 selectionList.value = [] getList() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/index.vue index b1277d4..8b5675e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/in/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/PurchaseOrderForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/PurchaseOrderForm.vue index a7a6eec..064f923 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/PurchaseOrderForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/PurchaseOrderForm.vue @@ -141,13 +141,10 @@ import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier' import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import * as UserApi from '@/api/system/user' import { AccountApi, AccountVO } from '@/api/erp/finance/account' - /** ERP 销售订单表单 */ defineOptions({ name: 'PurchaseOrderForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -175,11 +172,9 @@ const formRef = ref() // 表单 Ref const supplierList = ref([]) // 供应商列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -195,7 +190,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -223,7 +217,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -248,7 +241,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -266,4 +258,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue index f3df953..8cb87ed 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderInEnableList.vue @@ -58,7 +58,6 @@ - @@ -128,9 +127,7 @@ import { PurchaseOrderApi, PurchaseOrderVO } from '@/api/erp/purchase/order' import { dateFormatter2 } from '@/utils/formatTime' import { erpCountTableColumnFormatter, erpPriceTableColumnFormatter } from '@/utils' import { ProductApi, ProductVO } from '@/api/erp/product/product' - defineOptions({ name: 'ErpPurchaseOrderOutEnableList' }) - const list = ref([]) // 列表的数据 const total = ref(0) // 列表的总页数 const loading = ref(false) // 列表的加载中 @@ -145,14 +142,12 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const productList = ref([]) // 产品列表 - /** 选中行 */ const currentRowValue = ref(undefined) // 选中行的 value const currentRow = ref(undefined) // 选中行 const handleCurrentChange = (row) => { currentRow.value = row } - /** 打开弹窗 */ const open = async () => { dialogVisible.value = true @@ -163,7 +158,6 @@ const open = async () => { productList.value = await ProductApi.getProductSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交选择 */ const emits = defineEmits<{ (e: 'success', value: PurchaseOrderVO): void @@ -176,7 +170,6 @@ const submitForm = () => { dialogVisible.value = false } } - /** 加载列表 */ const getList = async () => { loading.value = true @@ -188,13 +181,11 @@ const getList = async () => { loading.value = false } } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 @@ -202,4 +193,4 @@ const handleQuery = () => { currentRow.value = undefined getList() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue index 70a2433..29f6aad 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue @@ -148,7 +148,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -162,7 +161,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置入库项 */ watch( () => props.items, @@ -171,7 +169,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -192,7 +189,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -210,10 +206,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -232,12 +226,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -249,7 +241,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -258,13 +249,11 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -273,4 +262,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue index 17e59db..673e433 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/components/PurchaseOrderReturnEnableList.vue @@ -58,7 +58,6 @@ - @@ -128,16 +127,13 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/index.vue index 1417761..7fb637d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/order/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/PurchaseReturnForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/PurchaseReturnForm.vue index e37fa09..4006b82 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/PurchaseReturnForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/PurchaseReturnForm.vue @@ -158,7 +158,6 @@ 取 消 - ([]) // 供应商列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -230,7 +224,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -258,13 +251,11 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 打开【可退货的订单列表】弹窗 */ const purchaseOrderReturnEnableListRef = ref() // 可退货的订单列表 Ref const openPurchaseOrderReturnEnableList = () => { purchaseOrderReturnEnableListRef.value.open() } - const handlePurchaseOrderChange = (order: PurchaseOrderVO) => { // 将订单设置到退货单 formData.value.orderId = order.id @@ -282,7 +273,6 @@ const handlePurchaseOrderChange = (order: PurchaseOrderVO) => { }) formData.value.items = order.items.filter((item) => item.count > 0) } - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -307,7 +297,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -325,4 +314,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue index 2d3e8c5..9c7de2d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnItemForm.vue @@ -178,7 +178,6 @@ import { getSumValue } from '@/utils' import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse' - const props = defineProps<{ items: undefined disabled: false @@ -193,7 +192,6 @@ const formRules = reactive({ const formRef = ref([]) // 表单 Ref const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置出库项 */ watch( () => props.items, @@ -210,7 +208,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -231,7 +228,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -249,10 +245,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -271,12 +265,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -285,16 +277,14 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { warehouseList.value = await WarehouseApi.getWarehouseSimpleList() defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnRefundEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnRefundEnableList.vue index a95749e..97e928f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnRefundEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/components/PurchaseReturnRefundEnableList.vue @@ -58,7 +58,6 @@ - ([]) // 列表的数据 const total = ref(0) // 列表的总页数 const loading = ref(false) // 列表的加载中 @@ -141,13 +138,11 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const productList = ref([]) // 产品列表 - /** 选中操作 */ const selectionList = ref([]) const handleSelectionChange = (rows: SaleReturnVO[]) => { selectionList.value = rows } - /** 打开弹窗 */ const open = async (supplierId: number) => { dialogVisible.value = true @@ -159,7 +154,6 @@ const open = async (supplierId: number) => { productList.value = await ProductApi.getProductSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交选择 */ const emits = defineEmits<{ (e: 'success', value: SaleReturnVO[]): void @@ -172,7 +166,6 @@ const submitForm = () => { dialogVisible.value = false } } - /** 加载列表 */ const getList = async () => { loading.value = true @@ -184,17 +177,15 @@ const getList = async () => { loading.value = false } } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 selectionList.value = [] getList() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/index.vue index cdf8411..abb7c32 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/return/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/SupplierForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/SupplierForm.vue index 3225df7..42e1993 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/SupplierForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/SupplierForm.vue @@ -109,13 +109,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier' import { CommonStatusEnum } from '@/utils/constants' - /** ERP 表单 */ defineOptions({ name: 'SupplierForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -143,7 +140,6 @@ const formRules = reactive({ sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -161,7 +157,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -185,7 +180,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -207,4 +201,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/index.vue index 4d3a405..87c379a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/purchase/supplier/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/CustomerForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/CustomerForm.vue index ce63cbb..31c9695 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/CustomerForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/CustomerForm.vue @@ -109,13 +109,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer' import { CommonStatusEnum } from '@/utils/constants' - /** ERP 客户 表单 */ defineOptions({ name: 'CustomerForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -143,7 +140,6 @@ const formRules = reactive({ sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -161,7 +157,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -185,7 +180,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -207,4 +201,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/index.vue index c79bbe8..3078fd6 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/customer/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/SaleOrderForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/SaleOrderForm.vue index 30b2b30..b3a88e7 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/SaleOrderForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/SaleOrderForm.vue @@ -159,13 +159,10 @@ import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer' import { AccountApi, AccountVO } from '@/api/erp/finance/account' import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import * as UserApi from '@/api/system/user' - /** ERP 销售订单表单 */ defineOptions({ name: 'SaleOrderForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -194,11 +191,9 @@ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -214,7 +209,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -242,7 +236,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -267,7 +260,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -286,4 +278,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderItemForm.vue index 817775f..f9477fe 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderItemForm.vue @@ -144,7 +144,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -157,7 +156,6 @@ const formRules = reactive({ }) const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 - /** 初始化设置出库项 */ watch( () => props.items, @@ -166,7 +164,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -187,7 +184,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -205,10 +201,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -227,12 +221,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -244,7 +236,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -253,13 +244,11 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -268,4 +257,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue index 38dcac4..fc67257 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue @@ -58,7 +58,6 @@ - @@ -122,16 +121,13 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue index 75d925d..5f16cc4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue @@ -58,7 +58,6 @@ - @@ -128,16 +127,13 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/index.vue index 4d151b7..537f557 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/order/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/SaleOutForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/SaleOutForm.vue index 7d47713..624109c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/SaleOutForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/SaleOutForm.vue @@ -172,7 +172,6 @@ 取 消 - @@ -185,13 +184,10 @@ import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import SaleOrderOutEnableList from '@/views/erp/sale/order/components/SaleOrderOutEnableList.vue' import { SaleOrderVO } from '@/api/erp/sale/order' import * as UserApi from '@/api/system/user' - /** ERP 销售出库表单 */ defineOptions({ name: 'SaleOutForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -221,11 +217,9 @@ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -242,7 +236,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -270,13 +263,11 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 打开【可出库的订单列表】弹窗 */ const saleOrderOutEnableListRef = ref() // 可出库的订单列表 Ref const openSaleOrderOutEnableList = () => { saleOrderOutEnableListRef.value.open() } - const handleSaleOrderChange = (order: SaleOrderVO) => { // 将订单设置到出库单 formData.value.orderId = order.id @@ -296,7 +287,6 @@ const handleSaleOrderChange = (order: SaleOrderVO) => { }) formData.value.items = order.items.filter((item) => item.count > 0) } - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -321,7 +311,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -340,4 +329,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutItemForm.vue index 15cbef0..76a2236 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutItemForm.vue @@ -178,7 +178,6 @@ import { getSumValue } from '@/utils' import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse' - const props = defineProps<{ items: undefined disabled: false @@ -193,7 +192,6 @@ const formRules = reactive({ const formRef = ref([]) // 表单 Ref const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置出库项 */ watch( () => props.items, @@ -210,7 +208,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -231,7 +228,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -249,10 +245,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -271,12 +265,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -285,16 +277,14 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { warehouseList.value = await WarehouseApi.getWarehouseSimpleList() defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue index 0c4a21d..674a62f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue @@ -58,7 +58,6 @@ - ([]) // 列表的数据 const total = ref(0) // 列表的总页数 const loading = ref(false) // 列表的加载中 @@ -140,13 +137,11 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const productList = ref([]) // 产品列表 - /** 选中操作 */ const selectionList = ref([]) const handleSelectionChange = (rows: SaleOutVO[]) => { selectionList.value = rows } - /** 打开弹窗 */ const open = async (customerId: number) => { dialogVisible.value = true @@ -158,7 +153,6 @@ const open = async (customerId: number) => { productList.value = await ProductApi.getProductSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交选择 */ const emits = defineEmits<{ (e: 'success', value: SaleOutVO[]): void @@ -171,7 +165,6 @@ const submitForm = () => { dialogVisible.value = false } } - /** 加载列表 */ const getList = async () => { loading.value = true @@ -183,17 +176,15 @@ const getList = async () => { loading.value = false } } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 selectionList.value = [] getList() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/index.vue index fdc7f71..1d8c706 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/out/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/SaleReturnForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/SaleReturnForm.vue index b10403b..73a3157 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/SaleReturnForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/SaleReturnForm.vue @@ -172,7 +172,6 @@ 取 消 - @@ -185,13 +184,10 @@ import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils' import SaleOrderReturnEnableList from '@/views/erp/sale/order/components/SaleOrderReturnEnableList.vue' import { SaleOrderVO } from '@/api/erp/sale/order' import * as UserApi from '@/api/system/user' - /** ERP 销售退货表单 */ defineOptions({ name: 'SaleReturnForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -221,11 +217,9 @@ const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 const accountList = ref([]) // 账户列表 const userList = ref([]) // 用户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 计算 discountPrice、totalPrice 价格 */ watch( () => formData.value, @@ -241,7 +235,6 @@ watch( }, { deep: true } ) - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -269,13 +262,11 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 打开【可退货的订单列表】弹窗 */ const saleOrderReturnEnableListRef = ref() // 可退货的订单列表 Ref const openSaleOrderReturnEnableList = () => { saleOrderReturnEnableListRef.value.open() } - const handleSaleOrderChange = (order: SaleOrderVO) => { // 将订单设置到退货单 formData.value.orderId = order.id @@ -294,7 +285,6 @@ const handleSaleOrderChange = (order: SaleOrderVO) => { }) formData.value.items = order.items.filter((item) => item.count > 0) } - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -319,7 +309,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -338,4 +327,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnItemForm.vue index adb9fd4..03f0387 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnItemForm.vue @@ -178,7 +178,6 @@ import { getSumValue } from '@/utils' import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse' - const props = defineProps<{ items: undefined disabled: false @@ -193,7 +192,6 @@ const formRules = reactive({ const formRef = ref([]) // 表单 Ref const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置出库项 */ watch( () => props.items, @@ -210,7 +208,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -231,7 +228,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -249,10 +245,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -271,12 +265,10 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index: number) => { formData.value.splice(index, 1) } - /** 加载库存 */ const setStockCount = async (row: any) => { if (!row.productId) { @@ -285,16 +277,14 @@ const setStockCount = async (row: any) => { const count = await StockApi.getStockCount(row.productId) row.stockCount = count || 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { warehouseList.value = await WarehouseApi.getWarehouseSimpleList() defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue index dc875e6..4441013 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue @@ -58,7 +58,6 @@ - ([]) // 列表的数据 const total = ref(0) // 列表的总页数 const loading = ref(false) // 列表的加载中 @@ -140,13 +137,11 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const productList = ref([]) // 产品列表 - /** 选中操作 */ const selectionList = ref([]) const handleSelectionChange = (rows: SaleReturnVO[]) => { selectionList.value = rows } - /** 打开弹窗 */ const open = async (customerId: number) => { dialogVisible.value = true @@ -158,7 +153,6 @@ const open = async (customerId: number) => { productList.value = await ProductApi.getProductSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交选择 */ const emits = defineEmits<{ (e: 'success', value: SaleReturnVO[]): void @@ -171,7 +165,6 @@ const submitForm = () => { dialogVisible.value = false } } - /** 加载列表 */ const getList = async () => { loading.value = true @@ -183,17 +176,15 @@ const getList = async () => { loading.value = false } } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 selectionList.value = [] getList() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/index.vue index be0b174..d69191f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/sale/return/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/StockCheckForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/StockCheckForm.vue index 9e7f673..a63607f 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/StockCheckForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/StockCheckForm.vue @@ -61,13 +61,10 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/components/StockCheckItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/components/StockCheckItemForm.vue index 6036311..18e5639 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/components/StockCheckItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/components/StockCheckItemForm.vue @@ -151,7 +151,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -168,7 +167,6 @@ const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置盘点项 */ watch( () => props.items, @@ -177,7 +175,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -197,7 +194,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -215,10 +211,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -236,18 +230,15 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index) => { formData.value.splice(index, 1) } - /** 处理仓库变更 */ const onChangeWarehouse = (warehouseId, row) => { // 加载库存 setStockCount(row) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -259,7 +250,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row) => { if (!row.productId || !row.warehouseId) { @@ -269,13 +259,11 @@ const setStockCount = async (row) => { row.stockCount = stock ? stock.count : 0 row.actualCount = row.stockCount } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -286,4 +274,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/index.vue index f661ab7..69583dc 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/check/index.vue @@ -1,9 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/StockInForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/StockInForm.vue index f36bbb6..ca0c8c7 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/StockInForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/StockInForm.vue @@ -80,13 +80,10 @@ import { StockInApi, StockInVO } from '@/api/erp/stock/in' import StockInItemForm from './components/StockInItemForm.vue' import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier' - /** ERP 其它入库单 表单 */ defineOptions({ name: 'StockInForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -105,11 +102,9 @@ const formRules = reactive({ const disabled = computed(() => formType.value === 'detail') const formRef = ref() // 表单 Ref const supplierList = ref([]) // 供应商列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -129,7 +124,6 @@ const open = async (type: string, id?: number) => { supplierList.value = await SupplierApi.getSupplierSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -154,7 +148,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -167,4 +160,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/components/StockInItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/components/StockInItemForm.vue index 53a2fd2..2b07021 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/components/StockInItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/components/StockInItemForm.vue @@ -136,7 +136,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -153,7 +152,6 @@ const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置入库项 */ watch( () => props.items, @@ -162,7 +160,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -177,7 +174,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -195,10 +191,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -215,18 +209,15 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index) => { formData.value.splice(index, 1) } - /** 处理仓库变更 */ const onChangeWarehouse = (warehouseId, row) => { // 加载库存 setStockCount(row) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -238,7 +229,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row) => { if (!row.productId || !row.warehouseId) { @@ -247,13 +237,11 @@ const setStockCount = async (row) => { const stock = await StockApi.getStock2(row.productId, row.warehouseId) row.stockCount = stock ? stock.count : 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -264,4 +252,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/index.vue index ca697e9..6715dd1 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/in/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/StockMoveForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/StockMoveForm.vue index df942c6..1d4337c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/StockMoveForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/StockMoveForm.vue @@ -61,13 +61,10 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/components/StockMoveItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/components/StockMoveItemForm.vue index 8971956..49c61af 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/components/StockMoveItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/components/StockMoveItemForm.vue @@ -159,7 +159,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -177,7 +176,6 @@ const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置调度项 */ watch( () => props.items, @@ -186,7 +184,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -201,7 +198,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -219,10 +215,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -240,18 +234,15 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index) => { formData.value.splice(index, 1) } - /** 处理仓库变更 */ const onChangeWarehouse = (warehouseId, row) => { // 加载库存 setStockCount(row) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -263,7 +254,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row) => { if (!row.productId || !row.fromWarehouseId) { @@ -272,13 +262,11 @@ const setStockCount = async (row) => { const stock = await StockApi.getStock2(row.productId, row.fromWarehouseId) row.stockCount = stock ? stock.count : 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -289,4 +277,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/index.vue index 76ea653..fc0bf63 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/move/index.vue @@ -1,9 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/StockOutForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/StockOutForm.vue index 8ae8d63..15276bc 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/StockOutForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/StockOutForm.vue @@ -80,13 +80,10 @@ import { StockOutApi, StockOutVO } from '@/api/erp/stock/out' import StockOutItemForm from './components/StockOutItemForm.vue' import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer' - /** ERP 其它出库单表单 */ defineOptions({ name: 'StockOutForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -105,11 +102,9 @@ const formRules = reactive({ const disabled = computed(() => formType.value === 'detail') const formRef = ref() // 表单 Ref const customerList = ref([]) // 客户列表 - /** 子表的表单 */ const subTabsName = ref('item') const itemFormRef = ref() - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -129,7 +124,6 @@ const open = async (type: string, id?: number) => { customerList.value = await CustomerApi.getCustomerSimpleList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -154,7 +148,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -167,4 +160,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/components/StockOutItemForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/components/StockOutItemForm.vue index b09a569..7c9902b 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/components/StockOutItemForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/components/StockOutItemForm.vue @@ -136,7 +136,6 @@ import { erpPriceMultiply, getSumValue } from '@/utils' - const props = defineProps<{ items: undefined disabled: false @@ -153,7 +152,6 @@ const formRef = ref([]) // 表单 Ref const productList = ref([]) // 产品列表 const warehouseList = ref([]) // 仓库列表 const defaultWarehouse = ref(undefined) // 默认仓库 - /** 初始化设置出库项 */ watch( () => props.items, @@ -162,7 +160,6 @@ watch( }, { immediate: true } ) - /** 监听合同产品变化,计算合同产品总价 */ watch( () => formData.value, @@ -177,7 +174,6 @@ watch( }, { deep: true } ) - /** 合计 */ const getSummaries = (param: SummaryMethodProps) => { const { columns, data } = param @@ -195,10 +191,8 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = '' } }) - return sums } - /** 新增按钮操作 */ const handleAdd = () => { const row = { @@ -215,18 +209,15 @@ const handleAdd = () => { } formData.value.push(row) } - /** 删除按钮操作 */ const handleDelete = (index) => { formData.value.splice(index, 1) } - /** 处理仓库变更 */ const onChangeWarehouse = (warehouseId, row) => { // 加载库存 setStockCount(row) } - /** 处理产品变更 */ const onChangeProduct = (productId, row) => { const product = productList.value.find((item) => item.id === productId) @@ -238,7 +229,6 @@ const onChangeProduct = (productId, row) => { // 加载库存 setStockCount(row) } - /** 加载库存 */ const setStockCount = async (row) => { if (!row.productId || !row.warehouseId) { @@ -247,13 +237,11 @@ const setStockCount = async (row) => { const stock = await StockApi.getStock2(row.productId, row.warehouseId) row.stockCount = stock ? stock.count : 0 } - /** 表单校验 */ const validate = () => { return formRef.value.validate() } defineExpose({ validate }) - /** 初始化 */ onMounted(async () => { productList.value = await ProductApi.getProductSimpleList() @@ -264,4 +252,4 @@ onMounted(async () => { handleAdd() } }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/index.vue index 555b985..72e9eff 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/out/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/record/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/record/index.vue index 35b58ca..662ed8d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/record/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/record/index.vue @@ -1,7 +1,5 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/stock/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/stock/index.vue index 4d80117..82d73f4 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/stock/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/stock/index.vue @@ -1,7 +1,5 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/WarehouseForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/WarehouseForm.vue index f65cea6..2336178 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/WarehouseForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/WarehouseForm.vue @@ -68,13 +68,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse' import { CommonStatusEnum } from '@/utils/constants' - /** ERP 仓库表单 */ defineOptions({ name: 'WarehouseForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -96,7 +93,6 @@ const formRules = reactive({ status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -114,7 +110,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -138,7 +133,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -154,4 +148,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/index.vue index 40bdebe..0b5c273 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/erp/stock/warehouse/index.vue @@ -1,7 +1,5 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue index 314fd26..8dff5da 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue @@ -51,18 +51,14 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue index 570f579..97735f9 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiAccessLog/index.vue @@ -1,6 +1,4 @@ @@ -152,11 +148,8 @@ import download from '@/utils/download' import { formatDate } from '@/utils/formatTime' import * as ApiAccessLogApi from '@/api/infra/apiAccessLog' import ApiAccessLogDetail from './ApiAccessLogDetail.vue' - defineOptions({ name: 'InfraApiAccessLog' }) - const message = useMessage() // 消息弹窗 - const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 @@ -173,7 +166,6 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 - /** 查询列表 */ const getList = async () => { loading.value = true @@ -185,25 +177,21 @@ const getList = async () => { loading.value = false } } - /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() } - /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } - /** 详情操作 */ const detailRef = ref() const openDetail = (data: ApiAccessLogApi.ApiAccessLogVO) => { detailRef.value.open(data) } - /** 导出按钮操作 */ const handleExport = async () => { try { @@ -218,9 +206,8 @@ const handleExport = async () => { exportLoading.value = false } } - /** 初始化 **/ onMounted(() => { getList() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue index 41153a2..4d4d34d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue @@ -59,13 +59,10 @@ import { DICT_TYPE } from '@/utils/dict' import { formatDate } from '@/utils/formatTime' import * as ApiErrorLog from '@/api/infra/apiErrorLog' - defineOptions({ name: 'ApiErrorLogDetail' }) - const dialogVisible = ref(false) // 弹窗的是否展示 const detailLoading = ref(false) // 表单的加载中 const detailData = ref({} as ApiErrorLog.ApiErrorLogVO) // 详情数据 - /** 打开弹窗 */ const open = async (data: ApiErrorLog.ApiErrorLogVO) => { dialogVisible.value = true @@ -78,4 +75,4 @@ const open = async (data: ApiErrorLog.ApiErrorLogVO) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue index ca145a7..369ea7e 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue @@ -1,6 +1,4 @@ - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/build/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/build/index.vue index 191fc90..a9cbdda 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/build/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/build/index.vue @@ -13,7 +13,6 @@ -
@@ -32,18 +31,14 @@ import { useFormCreateDesigner } from '@/components/FormCreate' import { useClipboard } from '@vueuse/core' import { isString } from '@/utils/is' - import hljs from 'highlight.js' // 导入代码高亮文件 import 'highlight.js/styles/github.css' // 导入代码高亮样式 import xml from 'highlight.js/lib/languages/java' import json from 'highlight.js/lib/languages/json' import formCreate from '@form-create/element-ui' - defineOptions({ name: 'InfraBuild' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息 - // 表单设计器配置 const designerConfig = ref({ switchType: [], // 是否可以切换组件类型,或者可以相互切换的字段 @@ -79,34 +74,29 @@ const dialogTitle = ref('') // 弹窗的标题 const formType = ref(-1) // 表单的类型:0 - 生成 JSON;1 - 生成 Options;2 - 生成组件 const formData = ref('') // 表单数据 useFormCreateDesigner(designer) // 表单设计器增强 - /** 打开弹窗 */ const openModel = (title: string) => { dialogVisible.value = true dialogTitle.value = title } - /** 生成 JSON */ const showJson = () => { openModel('生成 JSON') formType.value = 0 formData.value = designer.value.getRule() } - /** 生成 Options */ const showOption = () => { openModel('生成 Options') formType.value = 1 formData.value = designer.value.getOption() } - /** 生成组件 */ const showTemplate = () => { openModel('生成组件') formType.value = 2 formData.value = makeTemplate() } - const makeTemplate = () => { const rule = designer.value.getRule() const opt = designer.value.getOption() @@ -132,7 +122,6 @@ const makeTemplate = () => { init() <\/script>` } - /** 复制 **/ const copy = async (text: string) => { const textToCopy = JSON.stringify(text, null, 2) @@ -146,7 +135,6 @@ const copy = async (text: string) => { } } } - /** * 代码高亮 */ @@ -164,7 +152,6 @@ const highlightedCode = (code: string) => { const result = hljs.highlight(code, { language: language, ignoreIllegals: true }) return result.value || ' ' } - /** 初始化 **/ onMounted(async () => { // 注册代码高亮的各种语言 @@ -172,7 +159,6 @@ onMounted(async () => { hljs.registerLanguage('json', json) }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/EditTable.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/EditTable.vue index f8473e3..6a3ab9a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/EditTable.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/EditTable.vue @@ -27,15 +27,12 @@ import { useTagsViewStore } from '@/store/modules/tagsView' import { BasicInfoForm, ColumInfoForm, GenerateInfoForm } from './components' import * as CodegenApi from '@/api/infra/codegen' - defineOptions({ name: 'InfraCodegenEditTable' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { push, currentRoute } = useRouter() // 路由 const { query } = useRoute() // 查询参数 const { delView } = useTagsViewStore() // 视图操作 - const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const activeName = ref('colum') // Tag 激活的窗口 const basicInfoRef = ref>() @@ -45,7 +42,6 @@ const formData = ref({ table: {}, columns: [] }) - /** 获得详情 */ const getDetail = async () => { const id = query.id as unknown as number @@ -59,7 +55,6 @@ const getDetail = async () => { formLoading.value = false } } - /** 提交按钮 */ const submitForm = async () => { // 参数校验 @@ -73,15 +68,13 @@ const submitForm = async () => { close() } catch {} } - /** 关闭按钮 */ const close = () => { delView(unref(currentRoute)) push('/infra/codegen') } - /** 初始化 */ onMounted(() => { getDetail() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/ImportTable.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/ImportTable.vue index 132a602..f772a8d 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/ImportTable.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/ImportTable.vue @@ -77,11 +77,8 @@ import * as CodegenApi from '@/api/infra/codegen' import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig' import { ElTable } from 'element-plus' - defineOptions({ name: 'InfraCodegenImportTable' }) - const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dbTableLoading = ref(true) // 数据源的加载中 const dbTableList = ref([]) // 表的列表 @@ -92,7 +89,6 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const dataSourceConfigList = ref([]) // 数据源列表 - /** 查询表数据 */ const getList = async () => { dbTableLoading.value = true @@ -102,7 +98,6 @@ const getList = async () => { dbTableLoading.value = false } } - /** 重置操作 */ const resetQuery = async () => { queryParams.name = undefined @@ -110,7 +105,6 @@ const resetQuery = async () => { queryParams.dataSourceConfigId = dataSourceConfigList.value[0].id as number await getList() } - /** 打开弹窗 */ const open = async () => { // 加载数据源的列表 @@ -121,26 +115,21 @@ const open = async () => { await getList() } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 关闭弹窗 */ const close = () => { dialogVisible.value = false tableList.value = [] } - const tableRef = ref() // 表格的 Ref const tableList = ref([]) // 选中的表名 - /** 处理某一行的点击 */ const handleRowClick = (row) => { unref(tableRef)?.toggleRowSelection(row) } - /** 多选框选中数据 */ const handleSelectionChange = (selection) => { tableList.value = selection.map((item) => item.name) } - /** 导入按钮操作 */ const handleImportTable = async () => { dbTableLoading.value = true @@ -157,4 +146,4 @@ const handleImportTable = async () => { } } const emit = defineEmits(['success']) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/PreviewCode.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/PreviewCode.vue index 819fca6..4ca0e64 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/PreviewCode.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/PreviewCode.vue @@ -58,7 +58,6 @@ import { useClipboard } from '@vueuse/core' import { handleTree2 } from '@/utils/tree' import * as CodegenApi from '@/api/infra/codegen' - import hljs from 'highlight.js' // 导入代码高亮文件 import 'highlight.js/styles/github.css' // 导入代码高亮样式 import java from 'highlight.js/lib/languages/java' @@ -66,12 +65,9 @@ import xml from 'highlight.js/lib/languages/java' import javascript from 'highlight.js/lib/languages/javascript' import sql from 'highlight.js/lib/languages/sql' import typescript from 'highlight.js/lib/languages/typescript' - defineOptions({ name: 'InfraCodegenPreviewCode' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const loading = ref(false) // 加载中的状态 const preview = reactive({ @@ -79,7 +75,6 @@ const preview = reactive({ activeName: '' // 激活的文件名 }) const previewCodegen = ref() - /** 点击文件 */ const handleNodeClick = async (data, node) => { if (node && !node.isLeaf) { @@ -87,14 +82,12 @@ const handleNodeClick = async (data, node) => { } preview.activeName = data.id } - /** 生成 files 目录 **/ interface filesType { id: string label: string parentId: string } - /** 打开弹窗 */ const open = async (id: number) => { dialogVisible.value = true @@ -113,7 +106,6 @@ const open = async (id: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 处理文件 */ const handleFiles = (datas: CodegenApi.CodegenPreviewVO[]) => { let exists = {} // key:file 的 id;value:true @@ -177,7 +169,6 @@ const handleFiles = (datas: CodegenApi.CodegenPreviewVO[]) => { } return files } - /** 复制 **/ const copy = async (text: string) => { const { copy, copied, isSupported } = useClipboard({ legacy: true, source: text }) @@ -190,7 +181,6 @@ const copy = async (text: string) => { message.success(t('common.copySuccess')) } } - /** * 代码高亮 */ @@ -199,7 +189,6 @@ const highlightedCode = (item) => { const result = hljs.highlight(language, item.code || '', true) return result.value || ' ' } - /** 初始化 **/ onMounted(async () => { // 注册代码高亮的各种语言 @@ -219,4 +208,4 @@ onMounted(async () => { white-space: nowrap; } } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue index 1859300..41fd324 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue @@ -43,16 +43,13 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/ColumInfoForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/ColumInfoForm.vue index 2be931f..bba5e57 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/ColumInfoForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/ColumInfoForm.vue @@ -130,25 +130,20 @@ import { PropType } from 'vue' import { Refresh } from '@element-plus/icons-vue' import * as CodegenApi from '@/api/infra/codegen' import * as DictDataApi from '@/api/system/dict/dict.type' - defineOptions({ name: 'InfraCodegenColumInfoForm' }) - const props = defineProps({ columns: { type: Array as unknown as PropType, default: () => null } }) - const formData = ref([]) const tableHeight = document.documentElement.scrollHeight - 350 + 'px' - /** 查询字典下拉列表 */ const dictOptions = ref() const getDictOptions = async () => { dictOptions.value = await DictDataApi.getSimpleDictTypeList() } - watch( () => props.columns, (columns) => { @@ -160,8 +155,7 @@ watch( immediate: true } ) - onMounted(async () => { await getDictOptions() }) - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/GenerateInfoForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/GenerateInfoForm.vue index aaf176f..b3704c2 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/GenerateInfoForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/codegen/components/GenerateInfoForm.vue @@ -25,7 +25,6 @@ - @@ -58,7 +57,6 @@ /> - @@ -70,7 +68,6 @@ - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/Demo03StudentForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/Demo03StudentForm.vue index ecdae97..878a242 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/Demo03StudentForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/Demo03StudentForm.vue @@ -53,13 +53,10 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { Demo03Student, Demo03StudentApi } from '@/api/infra/demo/demo03/inner' import Demo03CourseForm from './components/Demo03CourseForm.vue' import Demo03GradeForm from './components/Demo03GradeForm.vue' - /** 学生 表单 */ defineOptions({ name: 'Demo03StudentForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -78,12 +75,10 @@ const formRules = reactive({ description: [{ required: true, message: '简介不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref - /** 子表的表单 */ const subTabsName = ref('demo03Course') const demo03CourseFormRef = ref() const demo03GradeFormRef = ref() - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -101,7 +96,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -141,7 +135,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -153,4 +146,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue index bde79b5..2f1904a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseForm.vue @@ -36,7 +36,6 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue index cfad83f..3300b8c 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03CourseList.vue @@ -24,13 +24,11 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue index a15bf51..3c80d61 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeForm.vue @@ -16,7 +16,6 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue index ffd66a6..46343cc 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/components/Demo03GradeList.vue @@ -24,13 +24,11 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/index.vue index 30ddc76..8393ade 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/inner/index.vue @@ -70,7 +70,6 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue index 46cf6e9..fc91afa 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/Demo03StudentForm.vue @@ -53,13 +53,10 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { Demo03StudentApi, Demo03Student } from '@/api/infra/demo/demo03/normal' import Demo03CourseForm from './components/Demo03CourseForm.vue' import Demo03GradeForm from './components/Demo03GradeForm.vue' - /** 学生 表单 */ defineOptions({ name: 'Demo03StudentForm' }) - const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 @@ -78,12 +75,10 @@ const formRules = reactive({ description: [{ required: true, message: '简介不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref - /** 子表的表单 */ const subTabsName = ref('demo03Course') const demo03CourseFormRef = ref() const demo03GradeFormRef = ref() - /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true @@ -101,7 +96,6 @@ const open = async (type: string, id?: number) => { } } defineExpose({ open }) // 提供 open 方法,用于打开弹窗 - /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 const submitForm = async () => { @@ -141,7 +135,6 @@ const submitForm = async () => { formLoading.value = false } } - /** 重置表单 */ const resetForm = () => { formData.value = { @@ -153,4 +146,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue index 23766ba..9dcef18 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue @@ -36,7 +36,6 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue index df64a7f..0aa706b 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue @@ -16,7 +16,6 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/index.vue index f64e21c..55808e0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/demo/demo03/normal/index.vue @@ -75,7 +75,6 @@ - - - + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/druid/index.vue b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/druid/index.vue index 2ac99d2..8bf60ae 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/druid/index.vue +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/src/views/infra/druid/index.vue @@ -1,19 +1,13 @@