Skip to content

W
wangxiaolu-sfa-ui
提交 295335da authored 作者: lidongxu's avatar lidongxu
浏览文件
操作

Merge branch 'dev' into release

上级 1c659d8b 62050bd8
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 149 行增加 和 40 行删除
.env.development
浏览文件 @ 295335da
......@@ -24,4 +24,8 @@ VITE_APP_REPORT_SHARE_PREVIEW_URL = '#/report'
VITE_APP_REPORT_EDIT_URL = '#/report/jmreport/index'
# 促销计划上报模板表格
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
\ No newline at end of file
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
# 阿里云 OSS 自定义域名
VITE_APP_OSS_ORIGIN_DOMAIN = 'link-promotion-dev.oss-cn-shanghai.aliyuncs.com'
VITE_APP_OSS_CUSTOM_DOMAIN = 'oss-dev.wxl66.cn'
\ No newline at end of file
.env.production
浏览文件 @ 295335da
......@@ -23,4 +23,8 @@ VITE_APP_REPORT_SHARE_PREVIEW_URL = '#/report'
VITE_APP_REPORT_EDIT_URL = '#/report/jmreport/index'
# 促销计划上报模板表格
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
\ No newline at end of file
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
# 阿里云 OSS 自定义域名
VITE_APP_OSS_ORIGIN_DOMAIN = 'link-promotion.oss-cn-shanghai.aliyuncs.com'
VITE_APP_OSS_CUSTOM_DOMAIN = 'oss.wxl66.cn'
\ No newline at end of file
.env.staging
浏览文件 @ 295335da
......@@ -22,4 +22,8 @@ VITE_APP_REPORT_SHARE_PREVIEW_URL = '#/report'
VITE_APP_REPORT_EDIT_URL = '#/report/jmreport/index'
# 促销计划上报模板表格
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
\ No newline at end of file
VITE_APP_PLAN_TEMPLATE_EXCEL = 'https://link-promotion.oss-cn-shanghai.aliyuncs.com/file/%E6%96%B0%E5%A2%9E%E6%88%96%E4%BF%AE%E6%94%B9%E8%AE%A1%E5%88%92-%E6%A8%A1%E6%9D%BF4.0.xlsx'
# 阿里云 OSS 自定义域名
VITE_APP_OSS_ORIGIN_DOMAIN = 'link-promotion-dev.oss-cn-shanghai.aliyuncs.com'
VITE_APP_OSS_CUSTOM_DOMAIN = 'oss-dev.wxl66.cn'
\ No newline at end of file
CHANGELOG.md
浏览文件 @ 295335da
......@@ -2,6 +2,52 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
## [1.6.0](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/compare/v1.5.1...v1.6.0) (2025-11-03)
### 💄 Styles | 样式调整
* **xlmobileupload:** 调整：勤策移动端_售点稽查_上传照片组件大小设置 ([0bb1309](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/0bb1309966b655d64e18f271a2023114acdbcaeb))
### ✅ Tests | 测试相关
* **1:** 测试：拍摄视频 ([411632e](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/411632ee0c99df17b424c45440b998e5bdea255c))
* **inspection/index.vue:** 测试：勤策移动端_售点稽查_安卓单独判断需要如何拍照 ([f18eb38](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/f18eb3898b5528a12c558e39da72294f361b65f9))
* **inspectiontask/index.vue:** 测试：勤策移动端_售点稽查_拍照测试安卓手机是否视频可用 ([83bcf68](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/83bcf68a2625839727d3788d031ee311c40024cb))
* **inspectiontask/index.vue:** 测试：勤策移动端_售点稽查_视频自动播放问题 ([95a8ca8](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/95a8ca8e2bfa052a3e144665c2fa922086ad1252))
* **inspectiontask:** 测试：勤策移动端_售点稽查_视频播放 ([d575040](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/d575040060639838b51065828cc86e8a0849e37f))
* **inspectiontask:** 测试：勤策移动端_售点稽查_自动播放全屏视频问题 ([229c1f3](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/229c1f30ef0e9b3d26e73bb6e1b7ff8b0ab1c403))
* **inspectiontask:** 测试：App 内是否能打开手机浏览器 ([5d4b4bc](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/5d4b4bcc9ae10648f2b22bdfb1239cb728cd8ce2))
* **inspectiontast/index.vue:** 测试：勤策移动端_售点稽查_拍摄视频 ([5442cb5](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/5442cb58a4d189a23638c86896eb472d26272f4a))
### ✨ Features | 新增功能
* **inspectiontask:** 新增：勤策移动端_售点稽查_支持陈列补差区域照片支持视频拍摄并增加到 5 张最大上限 ([9d8c8e7](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/9d8c8e7c3685d2a5dd315ee8a7a4f77da9a8a475))
* **licenses/qualityins/index.vue:** 新增：证照中间/质检管理页面 ([58ff97b](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/58ff97b3d826900e3521d3009c1f0d5b65787044))
* **mobile/inspectiontask/tabs/*:** 修改：勤策内置 App_售点稽查：修改常规陈列，档期陈列，档期补差的分组最多只能是三组 ([c4fdce9](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/c4fdce9fbbebf59627d1ff0eb5708cea87a73282))
* **promotion/plan/detail/tasklist.vue:** 新增：勤策移动端_内置网页_促销管理_增加促销员手机号显示和拨打/复制功能 ([5c8653f](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/5c8653fb852fcd2159a4a9c460a3f794e371f91d))
* **views/licenses/qualityins:** 新增：证照中心/质检报告_管理功能模块 ([778b82d](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/778b82db7c3d0e1e7df667ea78538f99a39b44ba))
### 💄 Styles | 功能调整
* **inspectiontask:** 修改：勤策移动端_售点稽查_手动复制网址到浏览器中绕过勤策 App 限制 ([a87d39f](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/a87d39ffd640107a10614ac05ed4200803d5950b))
* **inspectiontask:** 修改：取消右上角复制地址功能 ([31a19c4](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/31a19c40cbb4bbea226fae31203083b4ea3e7170))
* **licenses/qualityins:** 修改：质检报告_增加搜索条件并添加新增时表单验证与取消按钮 ([34ed930](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/34ed930ef5dec279080a14f539c11a0e94115354))
* **mobile/pages/cp_activity/promotion/plan/detail/tasklist.vue:** 修改：勤策 App 内嵌网页_促销详情_手机号标题不变蓝色 ([007656a](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/007656a5c0f18d035ec16ef22e26e470ba46082e))
### 🐛 Bug Fixes | 问题修复
* **all:** 修复：项目自动生成 ts 类型说明文件 ([032778c](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/032778cca0bc48992280f7eb7e9eb96ef92bd8fe))
* **inspectiontask:** 修复：勤策移动端_售点稽查_支持拍摄视频上传功能 ([e2b9f08](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/e2b9f08754ff806d1c9ef60946ca6d0fc3bcfb04))
* **licenses/qualityins:** 修复：证照中心支持覆盖式上传文件以及文件名称显示不全问题修复 ([8ca54ea](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/8ca54ead00971e244f2f7b97aedcd7ae0ae97a76))
* **main.js:** 调试：开启调试模式 vsconsole 在开发环境和测试环境 ([d2b2162](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/d2b2162c043226d97af05d28b32ed2f37c17a6a1))
* **xlmobileupload:** 修复：勤策移动端_售点稽查_安卓手机拍视频功能修复 ([02d2d15](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/02d2d151b778bc081d16cc6b81ccc0ca60b557ac))
* **xlmobileupload:** 修改：勤策移动端_售点稽查_上传视频和照片大小不能超过 50 MB ([f1f4771](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/commit/f1f477145a423ac2e0a2e46021ebfe80469b7812))
### [1.5.1](http://192.168.100.51/sfa/wangxiaolu-sfa-ui/compare/v1.5.0...v1.5.1) (2025-09-08)
......
package.json
浏览文件 @ 295335da
{
"name": "wangxiaolu",
"version": "1.5.1",
"version": "1.6.0",
"description": "王小卤",
"author": "王小卤",
"license": "MIT",
......
src/api/index.js
浏览文件 @ 295335da
......@@ -16,6 +16,7 @@ export * from './jimu/design'
export * from './jimu/ext'
export * from './jimu/list'
export * from './jimu/manager'
export * from './licenses/qualityIns'
export * from './mobile/audit_activity/sales_point_inspection'
export * from './mobile/cp_activity/examine/index'
export * from './other/logistics'
......
src/api/licenses/qualityIns.js 0 → 100644
浏览文件 @ 295335da
import request from '@/utils/request'
// 质检报告分页查询
export const getQualityInsPageList = (params) => {
return request({
url: '/operation/zzhao/query/proQuality/page',
params
})
}
// 录入，质检报告
export const postQualityIns = (data) => {
return request({
url: '/operation/zzhao/core/proQuality/add',
method: 'POST',
data
})
}
// 料号查询品名
export const getProductNameByCode = (prdCode) => {
return request({
url: `/operation/base/product/${prdCode}`
})
}
src/api/other/logistics.js
浏览文件 @ 295335da
......@@ -2,7 +2,6 @@ import request from '@/utils/request'
// 查询物流轨迹
export function getLogisticsListAPI(queryParams) {
console.log(queryParams)
return request({
url: '/schedule/sent/query_p', // 不会走 token 校验后台
params: queryParams
......
src/components/CategoryTree/index.vue
浏览文件 @ 295335da
......@@ -203,6 +203,15 @@ const getPageList = () => {
const handleClick = () => {
hideSideBar.value = !hideSideBar.value
}
// 重置选中 key
const setCurrentKey = (key) => {
treeRef.value.setCurrentKey(key)
queryParams.searchKey = ''
}
defineExpose({
setCurrentKey
})
</script>
<style scoped
......
src/layout/components/Navbar.vue
浏览文件 @ 295335da
......@@ -14,21 +14,42 @@
<div class="right-menu">
<template v-if="appStore.device !== 'mobile'">
<!-- 新版本 -->
<div class="right-menu-item hover-effect new-version"
@click="showVersionFn">
<svg-icon icon-class="new-version" />
</div>
<el-tooltip content="版本说明"
effect="dark"
placement="bottom">
<div class="right-menu-item hover-effect new-version"
@click="showVersionFn">
<svg-icon icon-class="new-version" />
</div>
</el-tooltip>
<version-notice v-model="showVersionNoticeVisible"
:nowVersion="nowVersion"
:versionList="showVersionList"
@confirm="saveNowVersion" />
<header-search id="header-search"
class="right-menu-item" />
<el-tooltip content="帮助文档"
effect="dark"
placement="bottom">
<div class="right-menu-item hover-effect question"
@click="handleHelpClick">
<svg-icon icon-class="question" />
</div>
</el-tooltip>
<screenfull id="screenfull"
class="right-menu-item hover-effect" />
<el-tooltip content="搜索菜单"
effect="dark"
placement="bottom">
<header-search id="header-search"
class="right-menu-item" />
</el-tooltip>
<el-tooltip content="全屏模式"
effect="dark"
placement="bottom">
<screenfull id="screenfull"
class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="主题模式"
effect="dark"
......@@ -131,6 +152,11 @@ const saveNowVersion = () => {
showVersionNoticeVisible.value = false
}
// 帮助文档跳转打开
const handleHelpClick = () => {
window.open('https://wangxiaolu.feishu.cn/docx/CHsWdujGroT3U8xwKmycnSWbnxh', '_blank')
}
function toggleSideBar() {
appStore.toggleSideBar()
}
......@@ -219,6 +245,14 @@ function toggleTheme() {
padding-top: 2px !important;
}
.question {
padding-top: 2px !important;
svg {
font-size: 22px;
}
}
&:focus {
outline: none;
}
......
src/utils/dict.js
浏览文件 @ 295335da
......@@ -14,7 +14,6 @@ export function useDict(...args) {
res.value[dictType] = dicts;
} else {
getDicts(dictType).then(resp => {
console.log('字典数据', resp.data)
res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))
useDictStore().setDict(dictType, res.value[dictType]);
})
......
src/views/jimureport/entry.vue
浏览文件 @ 295335da
......@@ -18,7 +18,6 @@ if (route.fullPath.includes(reportViewURL.substring(1)) || route.fullPath.includ
} else {
openUrl += `?${queryStr}`
}
console.log(openUrl)
</script>
<style scoped
......
src/views/jimureport/manager/index.vue
浏览文件 @ 295335da
......@@ -294,7 +294,6 @@
reportId: obj.id,
pageSize: 100
})
console.log('查询到', res)
selUserList.value = res.data || []
showSelUser.value = true
if (obj.id) {
......@@ -341,8 +340,6 @@
selUserList.value.splice(index, 1)
}
}
console.log(selUserList.value.map(o => o.userId), '当前')
}
// 全选反选用户
const handleSelectAll = (selection) => {
......@@ -364,7 +361,6 @@
})
}
console.log(selUserList.value, '当前')
}
// 确定分配给用户
......
src/views/licenses/qualityIns/index.vue 0 → 100644
浏览文件 @ 295335da
差异被折叠。
src/views/login.vue
浏览文件 @ 295335da
......@@ -176,7 +176,6 @@ async function loginByType(type, data) {
router.push({ path: redirect.value || "/", query: param2Obj(redirect.value) });
}
}).catch((err) => {
console.log(err)
accountPassLoading.value = false;
autoLoginLoading.value = false;
})
......
src/views/mobile/components/XLMobileUpload/index.vue
浏览文件 @ 295335da
......@@ -114,7 +114,6 @@ const supportedTypes = computed(() => {
if (getMobileType() === 'ios') {
return 'image/*,video/*'
} else {
console.log('anzhuo2')
if (selectedMediaType.value === 'image') {
return 'image/*'
} else {
......@@ -136,7 +135,6 @@ const customUploadClick = () => {
})
} else {
// 安卓设备：显示拍照/录像方式确认菜单
console.log('anzhuo1')
show.value = true
}
}
......
src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/categoryInformation.vue
浏览文件 @ 295335da
......@@ -325,7 +325,6 @@ const handlePriceChange = async () => {
}
// 口味生产日期设置
const handleTasteChange = async (index) => {
console.log(selectedTypeObj.value)
const prop = typeMap[selectedTypeObj.value.label].tasteDateKey
await createInspectionTaskDetailAPI({
taskDetail: {
......
src/views/mobile/pages/audit_activity/sales_point_inspection/examine/taskList.vue
浏览文件 @ 295335da
......@@ -97,7 +97,6 @@ const finished = ref(true);
const refreshLoading = ref(false)
const getInspectionTaskListFn = async () => {
const res = await getInspectionTaskListAPI(query)
console.log(res, 'res')
resultList.value = [...resultList.value, ...res.data.rows]
finished.value = res.data.total <= resultList.value.length
}
......@@ -154,13 +153,11 @@ const handleClickStore = (item) => {
const search = () => {
query.pageNum = 1
resultList.value = []
console.log('zoulema')
getInspectionTaskListFn()
}
// 删除任务
const deleteFn = async (item, index) => {
// console.log(item)
// await deleteInspectionTaskAPI({
// rstdId: item.rstId
// })
......
src/views/mobile/pages/cp_activity/promotion/plan/editing/index.vue
浏览文件 @ 295335da
......@@ -283,7 +283,6 @@ const errorTemWlSctMessage = ref('')
const errorPrdClassMessage = ref('')
// 校验午休结束时间
const validatorNoonInTime = (value, obj) => {
console.log(form.noonOutTime.length > 0, '午休结束判断该')
if (form.noonOutTime.length > 0) {
if (!value) {
errorNoonInTimeMessage.value = '请选择午休结束时间'
......
src/views/mobile/pages/cp_activity/promotion/plan/index/index.vue
浏览文件 @ 295335da
......@@ -106,7 +106,6 @@ const showSearch = ref(false)
// 从新增页面跳转回来需要刷新列表
watch(() => route.path, (newPath, oldPath) => {
if (oldPath.includes('/promotion_plan_editing') && newPath === '/promotion_plan') {
console.log('刷新页面？')
planSearch.value.resetFn()
}
});
......
src/views/promotion/display_schedule/tabs/schedule.vue
浏览文件 @ 295335da
......@@ -1063,7 +1063,6 @@
// 关联的公式计算列，需要特殊处理
for (const str of col.requestKey) {
const obj = tableColumns.value.find(item => item.prop == str)
console.log(obj, str, 'y')
if (obj.type === 'formula') {
obj.func(row)
}
......
src/views/promotion/display_schedule/tabs/schedule_dis.vue
浏览文件 @ 295335da
......@@ -768,7 +768,6 @@
// 关联的公式计算列，需要特殊处理
for (const str of col.requestKey) {
const obj = tableColumns.value.find(item => item.prop === str)
console.log('obj', obj)
if (obj.type === 'formula') {
obj.func(row)
}
......
src/views/promotion/display_schedule/tabs/snack.vue
浏览文件 @ 295335da
......@@ -503,7 +503,6 @@
// 关联的公式计算列，需要特殊处理
for (const str of col.requestKey) {
const obj = tableColumns.value.find(item => item.prop === str)
console.log('obj', obj)
if (obj.type === 'formula') {
obj.func(row)
}
......
src/views/scm/logistics_receipt/index.vue
浏览文件 @ 295335da
......@@ -254,7 +254,6 @@ const columns = ref([
// return 0
// }
// }))
// console.log(maxPhotos, 'maxphotos')
// // 计算需要的列数，每列最多2张图片
// const columns = Math.ceil(maxPhotos / 2)
// if (columns === 0) return 200
......@@ -359,7 +358,6 @@ getLogisticsReceiptList()
// 查看物流轨迹
const handleLogisticsTrack = (row) => {
const obj = logisticsTrack.value.find(item => item.code.includes(row.transport * 1))
console.log(obj)
if (isExternal(obj?.url)) {
window.open(obj.url + row[obj.dataKey], '_blank')
} else {
......
src/views/system/dept/index.vue
浏览文件 @ 295335da
......@@ -143,7 +143,7 @@
<el-form-item label="部门编码"
prop="deptCode">
<el-input v-model="form.deptCode"
placeholder="请输入 WB 字符开头后面 4 位数字格式"
placeholder="请输入 WB 字符开头数字字母组合字符"
maxlength="20" />
</el-form-item>
</el-col>
......@@ -230,10 +230,13 @@
parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
deptCode: [{ required: true, message: "部门编码不能为空", trigger: "blur" }, {
min: 3, max: 10, message: "部门编码长度必须在 3-10 位之间", trigger: "blur"
},
{
validator: (rule, value, callback) => {
// 部门编码只能是 WB 字符开头，后面 4 位数字格式
if (!/^WB[0-9]{4}$/.test(value)) {
callback(new Error("部门编码只能是 6 位 WB 字符开头后面 4 位数字格式"));
// 部门编码只能是 WB 字符开头数字字母组合的 1-10 位字符
if (!/^WB[0-9a-zA-Z-_]{1,8}$/.test(value)) {
callback(new Error("部门编码只能是 WB 字符开头，数字字母组合的字符"));
} else {
callback();
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论