From 429081460a5abc9e8ba26decbce8eb1b03e350ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Wed, 24 Sep 2025 15:23:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gear-ui3/src/components/UserSelect/multi.vue | 14 ++--- gear-ui3/src/components/UserSelect/single.vue | 14 ++--- .../src/components/dvplanSelect/index.vue | 8 +-- .../src/components/dvsubjectSelect/multi.vue | 8 +-- .../src/components/dvsubjectSelect/single.vue | 8 +-- .../src/components/machinerySelect/index.vue | 16 ++---- .../src/components/machinerySelect/single.vue | 15 ++---- gear-ui3/src/views/dv/checkplan/index.vue | 14 ++--- gear-ui3/src/views/dv/checkplan/machinery.vue | 2 +- gear-ui3/src/views/dv/checkplan/subject.vue | 2 +- gear-ui3/src/views/dv/checkrecord/index.vue | 20 ++++--- gear-ui3/src/views/dv/checkrecord/line.vue | 4 +- .../dv/machinery/components/Checkplan.vue | 8 +-- .../views/dv/machinery/components/Repair.vue | 18 ++----- gear-ui3/src/views/dv/machinery/index.vue | 42 +++++++-------- gear-ui3/src/views/dv/machinerytype/index.vue | 53 +++++++++++++++---- gear-ui3/src/views/dv/maintenrecord/index.vue | 19 ++++--- gear-ui3/src/views/dv/maintenrecord/line.vue | 2 +- gear-ui3/src/views/dv/repair/index.vue | 12 ++--- gear-ui3/src/views/dv/repair/line.vue | 4 +- .../dv/specialEquipment/specialEquipment.vue | 14 ++--- gear-ui3/src/views/dv/subject/index.vue | 6 +-- 22 files changed, 163 insertions(+), 140 deletions(-) diff --git a/gear-ui3/src/components/UserSelect/multi.vue b/gear-ui3/src/components/UserSelect/multi.vue index 80febfd..4573156 100644 --- a/gear-ui3/src/components/UserSelect/multi.vue +++ b/gear-ui3/src/components/UserSelect/multi.vue @@ -57,7 +57,7 @@ 重置 - + @@ -79,13 +79,13 @@ {{ parseTime(scope.row.createTime) }} - + @@ -100,12 +100,12 @@ + + diff --git a/gear-ui3/src/views/sale/article/index.vue b/gear-ui3/src/views/sale/article/index.vue new file mode 100644 index 0000000..950fa23 --- /dev/null +++ b/gear-ui3/src/views/sale/article/index.vue @@ -0,0 +1,519 @@ + + + + + diff --git a/gear-ui3/src/views/sale/contact/index.vue b/gear-ui3/src/views/sale/contact/index.vue new file mode 100644 index 0000000..76c270b --- /dev/null +++ b/gear-ui3/src/views/sale/contact/index.vue @@ -0,0 +1,1139 @@ + + + + + + diff --git a/gear-ui3/src/views/sale/contact/templates/business.js b/gear-ui3/src/views/sale/contact/templates/business.js new file mode 100644 index 0000000..433edaf --- /dev/null +++ b/gear-ui3/src/views/sale/contact/templates/business.js @@ -0,0 +1,32 @@ +/** + * 商务邮件模板 + * 适用于商务合作、客户沟通等场景 + */ +export const businessTemplate = { + name: "商务模板", + description: "专业的商务合作邮件模板，适合客户沟通和商务洽谈", + category: "business", + html: ` + + + + + + + +
+

商务合作

+

Professional Business Communication

+
+
+

+ 尊敬的客户 +

+
+
+
+
+ ` +}; + +export default businessTemplate; \ No newline at end of file diff --git a/gear-ui3/src/views/sale/contact/templates/index.js b/gear-ui3/src/views/sale/contact/templates/index.js new file mode 100644 index 0000000..c9ec006 --- /dev/null +++ b/gear-ui3/src/views/sale/contact/templates/index.js @@ -0,0 +1,32 @@ +/** + * 邮件模板索引文件 + * 统一管理所有邮件模板 + */ +import { businessTemplate } from './business.js'; +import { marketingTemplate } from './marketing.js'; +import { notificationTemplate } from './notification.js'; +import { productTemplate } from './product.js'; + +// 所有模板集合 +export const emailTemplates = { + business: businessTemplate, + product: productTemplate, + marketing: marketingTemplate, + notification: notificationTemplate +}; + +// 根据模板键获取模板 +export function getTemplate(templateKey) { + return emailTemplates[templateKey] || null; +} + +// 获取所有模板 +export function getAllTemplates() { + return emailTemplates; +} + +export default { + emailTemplates, + getTemplate, + getAllTemplates +}; \ No newline at end of file diff --git a/gear-ui3/src/views/sale/contact/templates/marketing.js b/gear-ui3/src/views/sale/contact/templates/marketing.js new file mode 100644 index 0000000..a561e2c --- /dev/null +++ b/gear-ui3/src/views/sale/contact/templates/marketing.js @@ -0,0 +1,103 @@ +/** + * 营销邮件模板 + * 适用于产品推广、活动宣传等营销场景 + */ +export const marketingTemplate = { + name: "营销推广模板", + description: "专业的营销推广邮件模板，适合产品推广和活动宣传", + category: "marketing", + html: ` + + + + + + + + + + +
+

限时优惠

+

Special Offer

+
+ +
+

+ 🎉 特别优惠活动 +

+ + + + +
+

限时折扣

+

全场商品 8折优惠

+

活动时间：2024年1月1日 - 2024年1月31日

+
+
+ + +
+

🔥 热门推荐

+ + + + + +
+ + + + +
+
🏠
+

精品家具

+

现代简约风格，品质保证

+
+ 原价 ¥2999 现价 ¥2399 +
+
+ 		+ + + + +
+
🛋️
+

办公用品

+

专业办公环境解决方案

+
+ 原价 ¥1999 现价 ¥1599 +
+
+
+
+ + +
+ + + + +
+ + 🛒 立即购买 + +
+
+ + + + + + +
+

📧 详细信息

+
+ +
+
+
+ ` +}; \ No newline at end of file diff --git a/gear-ui3/src/views/sale/contact/templates/notification.js b/gear-ui3/src/views/sale/contact/templates/notification.js new file mode 100644 index 0000000..89a247c --- /dev/null +++ b/gear-ui3/src/views/sale/contact/templates/notification.js @@ -0,0 +1,82 @@ +/** + * 通知邮件模板 + * 适用于系统通知、状态更新等场景 + */ +export const notificationTemplate = { + name: "系统通知模板", + description: "简洁专业的系统通知邮件模板，适合状态更新和重要通知", + category: "notification", + html: ` + + + + + + + + + + +
+

系统通知

+

System Notification

+
+ +
+
📢
+
+ + +
+

+ 重要通知 +

+

+ 请仔细阅读以下内容 +

+
+ + + + + + +
+
+

+ 📋 通知详情 +

+
+ +
+
+
+ + + + + + +
+

⚠️ 重要提醒

+
    +
  • 请及时处理相关事项
    • +
  • 如有疑问请联系客服
    • +
  • 感谢您的配合与支持
    • +
+
+ + + + + + +
+

📞 联系我们

+

+ 客服电话：400-123-4567 | 邮箱：support@company.com +

+
+
+ ` +}; \ No newline at end of file diff --git a/gear-ui3/src/views/sale/contact/templates/product.js b/gear-ui3/src/views/sale/contact/templates/product.js new file mode 100644 index 0000000..89c7df2 --- /dev/null +++ b/gear-ui3/src/views/sale/contact/templates/product.js @@ -0,0 +1,94 @@ +/** + * 产品介绍邮件模板 + * 适用于产品展示、新品发布等场景 + */ +export const productTemplate = { + name: "产品介绍模板", + description: "现代化的产品展示邮件模板，适合产品介绍和新品发布", + category: "product", + html: ` + + + + + + + + + + +
+

产品展示

+

Product Showcase

+
+ +
+

+ 🚀 产品特色 +

+ + + + +
+

✨ 核心优势

+
    +
  • 高质量材料，确保产品耐用性
    • +
  • 创新设计，满足现代审美需求
    • +
  • 环保认证，符合国际标准
    • +
  • 专业服务，全程技术支持
    • +
+
+ + + + + + +
+

📧 详细信息

+
+ +
+
+
+ + + + + + +
+

📸 产品展示

+ + + + + +
+ + + + +
+
🏠
+

家居系列

+

现代简约风格

+
+ 		+ + + + +
+
🛋️
+

办公系列

+

专业办公环境

+
+
+
+
+ ` +}; + +export default productTemplate; \ No newline at end of file diff --git a/gear-ui3/src/views/sale/email/index.vue b/gear-ui3/src/views/sale/email/index.vue new file mode 100644 index 0000000..b485d55 --- /dev/null +++ b/gear-ui3/src/views/sale/email/index.vue @@ -0,0 +1,483 @@ + + + diff --git a/gear-ui3/src/views/sale/template/index.vue b/gear-ui3/src/views/sale/template/index.vue new file mode 100644 index 0000000..ac982fa --- /dev/null +++ b/gear-ui3/src/views/sale/template/index.vue @@ -0,0 +1,418 @@ + + + + + From 619fcdfaf73d43033f4760b22bb61fcf70abed3d Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Thu, 23 Oct 2025 11:22:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix(contact):=E4=BF=AE=E5=A4=8D=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=8F=8A=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8D=A0=E4=BD=8D=E7=AC=A6=E9=97=AE=E9=A2=98-=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BD=E5=AE=B6=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E7=9A=84=20placeholder=20=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E5=AE=B6=E5=B1=85=E2=80=9D=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98-=20=E6=9B=B4=E6=96=B0=E9=82=AE=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=AC=A1=E6=95=B0=E6=A0=87=E7=AD=BE=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=AC=A1=E6=95=B0=E2=80=9D=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8A=E6=AC=A1=E5=8F=91=E9=82=AE=E4=BB=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=87=E7=AD=BE=E4=B8=BA=E2=80=9C=E5=8F=91=E9=82=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E2=80=9D=20-=20=E7=A7=BB=E9=99=A4=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84=E6=98=BE=E9=9A=90?= =?UTF-8?q?=E5=88=97=E6=8E=A7=E5=88=B6=20div=20=E5=85=83=E7=B4=A0=20-=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E4=B8=8E?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B9=8B=E9=97=B4=E7=9A=84=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E9=97=AE=E9=A2=98=20-=20=E7=BB=9F=E4=B8=80=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=8A=B6=E6=80=81=E5=90=8D=E7=A7=B0=E5=88=97=E4=B8=BA?= =?UTF-8?q?=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA=20-=20=E6=9B=B4=E6=AD=A3?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=92=8C=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=A2=84=E8=A7=88=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84?= =?UTF-8?q?=20visible=20=E5=B1=9E=E6=80=A7=E4=B8=BA=20v-model=20=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/article/components/ArticlePreview.vue | 2 +- gear-ui3/src/views/sale/contact/index.vue | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gear-ui3/src/views/sale/article/components/ArticlePreview.vue b/gear-ui3/src/views/sale/article/components/ArticlePreview.vue index c27428d..f1f1cf9 100644 --- a/gear-ui3/src/views/sale/article/components/ArticlePreview.vue +++ b/gear-ui3/src/views/sale/article/components/ArticlePreview.vue @@ -7,7 +7,7 @@
- {{ article.category.categoryName || '未分类' }} + {{ article.category?.categoryName || '未分类' }} diff --git a/gear-ui3/src/views/sale/contact/index.vue b/gear-ui3/src/views/sale/contact/index.vue index 76c270b..0398c57 100644 --- a/gear-ui3/src/views/sale/contact/index.vue +++ b/gear-ui3/src/views/sale/contact/index.vue @@ -12,7 +12,7 @@ @@ -81,7 +81,7 @@ @keyup.enter.native="handleQuery" /> - + - + 导出 -
+ - + @@ -269,7 +269,7 @@ - + @@ -343,12 +343,12 @@ - + Date: Thu, 23 Oct 2025 17:03:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=A0=87=E9=A2=98=E5=92=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改开发、生产、预发布环境的应用标题 - 更新 favicon 图标路径- 替换 Logo 图片资源路径 - 更新项目描述信息为“首达特及巨峰外贸中心” --- gear-ui3/.env.development | 2 +- gear-ui3/.env.production | 4 ++-- gear-ui3/.env.staging | 4 ++-- gear-ui3/index.html | 6 +++--- gear-ui3/package.json | 2 +- gear-ui3/public/favicon1.png | Bin 0 -> 15080 bytes gear-ui3/src/assets/logo/sdtlogo.png | Bin 0 -> 15080 bytes gear-ui3/src/layout/components/Sidebar/Logo.vue | 4 ++-- gear-ui3/src/views/tool/build/index.vue | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 gear-ui3/public/favicon1.png create mode 100644 gear-ui3/src/assets/logo/sdtlogo.png diff --git a/gear-ui3/.env.development b/gear-ui3/.env.development index 9d908e7..2a4e7b5 100644 --- a/gear-ui3/.env.development +++ b/gear-ui3/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 创高综合办公系统 +VITE_APP_TITLE = 首达特及巨峰外贸中心 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/gear-ui3/.env.production b/gear-ui3/.env.production index 89fb524..c7b9fd1 100644 --- a/gear-ui3/.env.production +++ b/gear-ui3/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 创高综合办公系统 +VITE_APP_TITLE = 首达特及巨峰外贸中心 # 生产环境配置 VITE_APP_ENV = 'production' @@ -8,4 +8,4 @@ VITE_APP_ENV = 'production' VITE_APP_BASE_API = '/prod-api' # 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip \ No newline at end of file +VITE_BUILD_COMPRESS = gzip diff --git a/gear-ui3/.env.staging b/gear-ui3/.env.staging index 21ddc9f..febc7dc 100644 --- a/gear-ui3/.env.staging +++ b/gear-ui3/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = 创高综合办公系统 +VITE_APP_TITLE = 首达特及巨峰外贸中心 # 生产环境配置 VITE_APP_ENV = 'staging' @@ -8,4 +8,4 @@ VITE_APP_ENV = 'staging' VITE_APP_BASE_API = '/stage-api' # 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip \ No newline at end of file +VITE_BUILD_COMPRESS = gzip diff --git a/gear-ui3/index.html b/gear-ui3/index.html index 809c98f..01c4477 100644 --- a/gear-ui3/index.html +++ b/gear-ui3/index.html @@ -6,8 +6,8 @@ - - 创高综合办公系统 + + 首达特及巨峰钢铁外贸中心 \ No newline at end of file + diff --git a/gear-ui3/src/views/tool/build/index.vue b/gear-ui3/src/views/tool/build/index.vue index e630740..7ba13ac 100644 --- a/gear-ui3/src/views/tool/build/index.vue +++ b/gear-ui3/src/views/tool/build/index.vue @@ -99,7 +99,7 @@ import draggable from "vuedraggable/dist/vuedraggable.common" import ClipboardJS from 'clipboard' import beautifier from 'js-beautify' -import logo from '@/assets/logo/logo.png' +import logo from '@/assets/logo/sdtlogo.png' import { inputComponents, selectComponents, layoutComponents, formConf as formConfData } from '@/utils/generator/config' import { beautifierConf } from '@/utils/index' import drawingDefalut from '@/utils/generator/drawingDefalut' From e831af1c6b4602c6f773ac70ca5b108a7fa71871 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Tue, 28 Oct 2025 16:00:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E5=85=AC=E5=8F=B8=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= =?UTF-8?q?-=20=E5=9C=A8=20GearOrder=20=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=20company=20=E5=AD=97=E6=AE=B5-=20?= =?UTF-8?q?=E5=9C=A8=20GearOrderBo=20=E4=B8=9A=E5=8A=A1=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E4=B8=AD=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=20company=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20=E6=9B=B4=E6=96=B0=20GearOrderMapper.x?= =?UTF-8?q?ml=20=E6=98=A0=E5=B0=84=E6=96=87=E4=BB=B6=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20company=20=E5=AD=97=E6=AE=B5=E7=9A=84=E8=AF=BB?= =?UTF-8?q?=E5=86=99=20-=20=E5=9C=A8=20GearOrderVo=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=A2=9E=E5=8A=A0=20company=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E9=85=8D=E7=BD=AE=20Excel=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B1=9E=E6=80=A7=20-=20=E5=9C=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E7=BA=A6=E5=85=AC=E5=8F=B8=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=20-=20=E5=BC=95=E5=85=A5=E5=B9=B6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20order=5Fcompany=20=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=A8=E4=BA=8E=E7=AD=BE=E7=BA=A6=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E9=80=89=E9=A1=B9=20-=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=9A=84=20company=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=BA=20undefined=20-=20=E5=9C=A8=20Vue=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=B3=A8=E5=86=8C=20order=5Fcompany?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gear/oa/domain/GearOrder.java | 4 ++++ .../com/gear/oa/domain/bo/GearOrderBo.java | 5 ++++ .../com/gear/oa/domain/vo/GearOrderVo.java | 6 +++++ .../resources/mapper/oa/GearOrderMapper.xml | 3 +++ .../src/views/oms/order/panels/orderPage.vue | 24 +++++++++++++++---- gear-ui3/src/views/product/info/index.vue | 1 + 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java b/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java index 8b96679..0761b0c 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/GearOrder.java @@ -36,6 +36,10 @@ public class GearOrder extends BaseEntity { * 客户ID */ private Long customerId; + /** + * 签约公司（字典） + */ + private Integer company; /** * 销售经理 */ diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java index 3af6c8f..1f7d775 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOrderBo.java @@ -38,6 +38,11 @@ public class GearOrderBo extends BaseEntity { */ private Long customerId; + /** + * 签约公司（字典） + */ + private Integer company; + /** * 销售经理 */ diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java index c26b427..f24f775 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOrderVo.java @@ -43,6 +43,12 @@ public class GearOrderVo extends BaseEntity { @ExcelProperty(value = "客户ID") private Long customerId; + /** + * 签约公司（字典） + */ + @ExcelProperty(value = "签约公司") + private Integer company; + /** * 销售经理 */ diff --git a/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml index dcc0434..574d793 100644 --- a/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml +++ b/gear-oa/src/main/resources/mapper/oa/GearOrderMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -24,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select o.order_id, o.order_code, o.customer_id, + o.company, o.sales_manager, o.order_status, o.remark, @@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select o.order_id, o.order_code, o.customer_id, + o.company, o.sales_manager, o.order_status, o.remark, diff --git a/gear-ui3/src/views/oms/order/panels/orderPage.vue b/gear-ui3/src/views/oms/order/panels/orderPage.vue index eadfbc1..1c79f31 100644 --- a/gear-ui3/src/views/oms/order/panels/orderPage.vue +++ b/gear-ui3/src/views/oms/order/panels/orderPage.vue @@ -75,6 +75,13 @@ + + + + + + @@ -155,6 +162,14 @@ + + + + + + + @@ -219,12 +234,12 @@ export default { }, setup() { const { proxy } = getCurrentInstance(); - const { order_status } = proxy.useDict("order_status"); - - console.log(order_status); + const { order_status} = proxy.useDict("order_status"); + const { order_company } = proxy.useDict("order_company"); return { - order_status + order_status, + order_company } }, computed: { @@ -271,6 +286,7 @@ export default { orderId: undefined, orderCode: undefined, customerId: undefined, + company:undefined, salesManager: undefined, // tradeType: this.tradeType, noTaxAmount: undefined, diff --git a/gear-ui3/src/views/product/info/index.vue b/gear-ui3/src/views/product/info/index.vue index 75f0bad..0691e0c 100644 --- a/gear-ui3/src/views/product/info/index.vue +++ b/gear-ui3/src/views/product/info/index.vue @@ -185,6 +185,7 @@ export default { innerDiameter: undefined, isEnabled: undefined, }, + categoryList: [], // 表单参数 form: {}, // 表单校验 From 638af4c050b483aadb61f9c569401b1265b322de Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 7 Nov 2025 15:37:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=92=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在开发、生产、预发布环境配置中注释掉旧标题 - 在 index.html 中注释掉旧 favicon 和标题- 更新 Logo 组件和构建工具页面中的 logo 引入路径 - 使用新 logo 文件替换旧文件引用 --- gear-ui3/.env.development | 1 + gear-ui3/.env.production | 1 + gear-ui3/.env.staging | 1 + gear-ui3/index.html | 2 ++ gear-ui3/src/layout/components/Sidebar/Logo.vue | 1 + gear-ui3/src/views/tool/build/index.vue | 1 + 6 files changed, 7 insertions(+) diff --git a/gear-ui3/.env.development b/gear-ui3/.env.development index 2a4e7b5..f7467dc 100644 --- a/gear-ui3/.env.development +++ b/gear-ui3/.env.development @@ -1,5 +1,6 @@ # 页面标题 VITE_APP_TITLE = 首达特及巨峰外贸中心 +# VITE_APP_TITLE = 创高综合办公系统 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/gear-ui3/.env.production b/gear-ui3/.env.production index c7b9fd1..3c61a0f 100644 --- a/gear-ui3/.env.production +++ b/gear-ui3/.env.production @@ -1,5 +1,6 @@ # 页面标题 VITE_APP_TITLE = 首达特及巨峰外贸中心 +# VITE_APP_TITLE = 创高综合办公系统 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/gear-ui3/.env.staging b/gear-ui3/.env.staging index febc7dc..6def981 100644 --- a/gear-ui3/.env.staging +++ b/gear-ui3/.env.staging @@ -1,5 +1,6 @@ # 页面标题 VITE_APP_TITLE = 首达特及巨峰外贸中心 +# VITE_APP_TITLE = 创高综合办公系统 # 生产环境配置 VITE_APP_ENV = 'staging' diff --git a/gear-ui3/index.html b/gear-ui3/index.html index 01c4477..3ee9bae 100644 --- a/gear-ui3/index.html +++ b/gear-ui3/index.html @@ -8,6 +8,8 @@ 首达特及巨峰钢铁外贸中心 +