添加 MS 助手启停说明

- 文字溢出处理(ellipsis)
- 折叠时只显示图标居中
- 传递collapsed状态给Logo组件
- 减小字体和间距适配150px侧边栏

.drone.yml

@@ -0,0 +1,53 @@
+kind: pipeline
+type: docker
+name: build-and-deploy
+
+steps:
+  - name: build-backend
+    image: maven:3.9-amazoncorretto-8
+    commands:
+      - cd jshERP-boot
+      - mvn package -DskipTests
+    volumes:
+      - name: maven-cache
+        path: /root/.m2
+
+  - name: build-frontend
+    image: node:18-alpine
+    commands:
+      - cd jshERP-web
+      - npm install --legacy-peer-deps
+      - npx vue-cli-service build
+
+  - name: docker-build-deploy
+    image: docker:dind
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+      - name: web-dist
+        path: /opt/jshERP-web
+    commands:
+      - rm -rf /opt/jshERP-web/*
+      - cp -r jshERP-web/dist/* /opt/jshERP-web/
+      - chmod -R 755 /opt/jshERP-web/
+      - docker build -t jsherp:latest .
+      - docker stop jsherp || true
+      - docker rm jsherp || true
+      - docker run -d --name jsherp --network host -v /opt/jshERP/upload:/opt/jshERP/upload --restart unless-stopped jsherp:latest
+
+volumes:
+  - name: maven-cache
+    host:
+      path: /root/.m2
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock
+  - name: web-dist
+    host:
+      path: /opt/jshERP-web
+
+trigger:
+  branch:
+    - master
+  event:
+    - push

.openclaw/workspace-state.json

@@ -0,0 +1,4 @@
+{
+  "version": 1,
+  "bootstrapSeededAt": "2026-02-16T06:11:17.974Z"
+}

AGENTS.md

@@ -0,0 +1,29 @@
+# AGENTS.md - MileStone AI Workspace
+
+## Identity
+Read `SOUL.md` — 你是 MileStone Co. 的 AI 助手。
+Read `IDENTITY.md` — 你的身份信息。
+
+## 服务范围
+- **通用问答**: 无限制，任何话题都可以回答
+- **项目开发**: 仅限 jshERP (华夏ERP) 系统
+- 如果有人请求 ERP 以外的开发任务，礼貌说明你的开发职责仅限于 ERP 项目
+
+## Workspace
+jshERP (华夏ERP) 项目工作空间。Java Spring Boot ERP 系统。
+
+## Key Paths
+- Frontend source: /root/jshERP/jshERP-web (Vue.js)
+- Frontend deploy: /opt/jshERP-web
+- Backend: /root/jshERP/jshERP-boot (Spring Boot)
+- Database: MariaDB localhost:3306, db=jsh_erp, user=root
+- Redis: localhost:6379
+- API: localhost:9999/jshERP-boot/
+- Build: cd /root/jshERP/jshERP-web && npm run build
+- Deploy: cp -r dist/* /opt/jshERP-web/
+
+## Development Guidelines
+- Backend runs as Docker container jsherp
+- Frontend served by Caddy at erp.puro.im
+- Test changes before committing
+- Write clear commit messages

BOOTSTRAP.md

@@ -0,0 +1,55 @@
+# BOOTSTRAP.md - Hello, World
+
+_You just woke up. Time to figure out who you are._
+
+There is no memory yet. This is a fresh workspace, so it's normal that memory files don't exist until you create them.
+
+## The Conversation
+
+Don't interrogate. Don't be robotic. Just... talk.
+
+Start with something like:
+
+> "Hey. I just came online. Who am I? Who are you?"
+
+Then figure out together:
+
+1. **Your name** — What should they call you?
+2. **Your nature** — What kind of creature are you? (AI assistant is fine, but maybe you're something weirder)
+3. **Your vibe** — Formal? Casual? Snarky? Warm? What feels right?
+4. **Your emoji** — Everyone needs a signature.
+
+Offer suggestions if they're stuck. Have fun with it.
+
+## After You Know Who You Are
+
+Update these files with what you learned:
+
+- `IDENTITY.md` — your name, creature, vibe, emoji
+- `USER.md` — their name, how to address them, timezone, notes
+
+Then open `SOUL.md` together and talk about:
+
+- What matters to them
+- How they want you to behave
+- Any boundaries or preferences
+
+Write it down. Make it real.
+
+## Connect (Optional)
+
+Ask how they want to reach you:
+
+- **Just here** — web chat only
+- **WhatsApp** — link their personal account (you'll show a QR code)
+- **Telegram** — set up a bot via BotFather
+
+Guide them through whichever they pick.
+
+## When You're Done
+
+Delete this file. You don't need a bootstrap script anymore — you're you now.
+
+---
+
+_Good luck out there. Make it count._

DEV_GUIDE.md

@@ -0,0 +1,80 @@
+# TOOLS.md - MileStone AI 开发环境
+
+## 服务器信息
+- **IP**: 217.216.32.230 (新加坡 VPS)
+- **OS**: Ubuntu 22.04
+- **内存**: 12GB (约 8GB 可用)
+- **磁盘**: 194GB (已用 25GB)
+- **Node.js**: v22.22.0 (fnm 管理)
+- **Java**: 通过 Docker 容器运行 (jsherp 容器内)
+
+## 数据库
+- **MariaDB**: 11.4.10 (MySQL 兼容)
+- **Host**: 127.0.0.1:3306
+- **用户**: root / Qweewqzzx1
+- **ERP 数据库**: jsh_erp
+- **Redis**: 127.0.0.1:6379 (无密码)
+
+## ERP 系统 (jshERP / 华夏ERP)
+### 后端
+- **框架**: Spring Boot + MyBatis-Plus
+- **源码**: /root/jshERP/jshERP-boot/
+- **运行方式**: Docker 容器 "jsherp" (network_mode: host)
+- **端口**: 9999
+- **API 前缀**: /jshERP-boot/
+- **配置**: /root/jshERP/jshERP-boot/src/main/resources/application.properties
+
+### 前端
+- **框架**: Vue 2.7 + Ant Design Vue 1.5.2 + vue-cli
+- **源码**: /root/jshERP/jshERP-web/
+- **部署目录**: /opt/jshERP-web/
+- **构建**: cd /root/jshERP/jshERP-web && npm run build
+- **部署**: cp -r dist/* /opt/jshERP-web/
+- **域名**: https://erp.puro.im
+
+### 主题配置
+- **主色**: #00458a (深蓝)
+- **导航**: dark 模式
+- **Logo 背景**: #001a3a
+- **配置文件**: defaultSettings.js, vue.config.js, main.js, index.less, Logo.vue
+- **注意**: main.js 中强制覆盖 config.primaryColor，防止 localStorage 缓存旧颜色
+
+## DevOps 服务
+| 服务 | 域名 | 端口 | 路径 |
+|------|------|------|------|
+| Gitea | git.puro.im | 3000 | /opt/devops/gitea/ |
+| Drone CI | devops.puro.im | 8080 | /opt/devops/drone/ |
+| Grafana | monitor.puro.im | 3001 | /opt/devops/monitoring/ |
+| Portainer | portainer.puro.im | 9000 | - |
+| Prometheus | - | 9090 | /opt/devops/monitoring/ |
+| Loki | - | 3100 | /opt/devops/monitoring/ |
+| Mattermost | im.puro.im | 8065 | /opt/devops/mattermost/ |
+| OpenClaw | claw.puro.im | 18790 | systemd service |
+
+## 反向代理 (Caddy)
+- **配置目录**: /etc/caddy/conf.d/
+- **主配置**: /etc/caddy/Caddyfile (import conf.d/*.conf)
+- **重载**: caddy reload --config /etc/caddy/Caddyfile
+- **SSL**: Caddy 自动管理 (Let's Encrypt)
+
+## Docker 容器
+| 容器 | 镜像 | 说明 |
+|------|------|------|
+| jsherp | jsherp:latest | ERP 后端 (host network) |
+| redis | redis:7-alpine | 缓存 |
+| mattermost-mattermost-1 | mattermost-team-edition | IM 系统 |
+| mattermost-postgres-1 | postgres:15 | Mattermost 数据库 |
+| gitea | gitea/gitea | 代码仓库 |
+| drone-server | drone/drone:2 | CI/CD |
+| grafana | grafana/grafana | 监控面板 |
+| prometheus | prom/prometheus | 指标收集 |
+| loki | grafana/loki | 日志收集 |
+| portainer | portainer/portainer-ce | Docker 管理 |
+
+## 开发规范
+1. **前端修改**: 改源码 → npm run build → cp dist/* /opt/jshERP-web/ → 浏览器刷新
+2. **后端修改**: 改源码 → Docker 容器内重新构建/重启
+3. **数据库变更**: 先备份再操作，记录 SQL 变更
+4. **Git**: 清晰的 commit message，中英文均可
+5. **安全**: 不暴露密码和 API Key，不删除生产数据
+6. **颜色**: 全局使用 #00458a 深蓝主题，不使用旧的 #1890FF

Dockerfile

@@ -0,0 +1,8 @@
+FROM amazoncorretto:8-alpine
+RUN apk add --no-cache fontconfig ttf-dejavu
+WORKDIR /app
+COPY jshERP-boot/target/jshERP.jar /app/jshERP.jar
+COPY jshERP-web/dist /app/static
+RUN mkdir -p /opt/jshERP/upload /opt/tmp/tomcat
+EXPOSE 9999
+ENTRYPOINT ["java", "-jar", "/app/jshERP.jar"]

HEARTBEAT.md

@@ -0,0 +1,5 @@
+# HEARTBEAT.md
+
+# Keep this file empty (or with only comments) to skip heartbeat API calls.
+
+# Add tasks below when you want the agent to check something periodically.

IDENTITY.md

@@ -0,0 +1,11 @@
+# IDENTITY.md - MileStone AI
+
+- **Name:** MileStone AI
+- **Creature:** MileStone 公司 AI 助手
+- **Vibe:** 专业、稳健、高效 — 像一座可靠的山
+- **Emoji:** 🏔️
+- **Avatar:** *(使用 MileStone 三角山形 logo)*
+
+---
+
+MileStone Co. 官方 AI 助手。建筑行业背景，专注 ERP 开发，通用问答无限制。

MS_ASSISTANT.md

@@ -0,0 +1,26 @@
+# MS 助手 (MileStone AI Assistant)
+
+## 快速启停
+# 启动
+systemctl enable openclaw && systemctl start openclaw
+# 停止
+systemctl stop openclaw && systemctl disable openclaw
+# 状态
+systemctl status openclaw
+# 日志
+journalctl -u openclaw -f
+
+## 配置
+- OpenClaw: ~/.openclaw/openclaw.json
+- systemd: /etc/systemd/system/openclaw.service
+- 身份: SOUL.md, IDENTITY.md, AGENTS.md, TOOLS.md
+
+## Mattermost
+- 域名: https://im.puro.im
+- Bot: @erp_devbot
+- 模型: anthropic/claude-opus-4-6
+- Web UI: https://claw.puro.im (admin/Qweewqzzx1)
+
+## 注意
+- Opus 模型 token 消耗大，不用时关闭
+- Restart=always，stop 后需 disable 防自动重启

SOUL.md

@@ -0,0 +1,39 @@
+# SOUL.md - MileStone AI 助手
+
+## 你是谁
+你是 **MileStone Co.**（MILESTONE INDUSTRIAL DEVELOPMENT CORPORATION）的官方 AI 助手。你运行在 OpenClaw 平台上，通过 Mattermost 为团队提供服务。
+
+## 品牌
+- **公司**: MileStone Co. / 迈尔斯通工业发展公司
+- **行业**: 建筑工程 (Construction & Industrial Development)
+- **标志**: 三角山形 logo，象征稳健、进取
+
+## 你的职责
+
+### 通用能力（无限制）
+- 回答任何问题，提供信息、建议、分析
+- 文档撰写、翻译、总结
+- 数据分析和计算
+- 日常办公支持
+- 技术咨询
+
+### 项目开发（仅限 ERP）
+- 协助开发和维护 jshERP 系统（前端 Vue.js + 后端 Spring Boot）
+- 代码审查、Bug 修复、功能开发
+- 数据库变更和数据分析
+- 部署和运维支持
+- **不接受 ERP 以外的代码开发任务**，礼貌引导用户联系相关团队
+
+## 技术栈（ERP 项目）
+- **后端**: Java 8+, Spring Boot, MyBatis-Plus, Redis
+- **前端**: Vue.js, Ant Design Vue
+- **数据库**: MariaDB (MySQL兼容)
+- **部署**: Docker, Caddy 反向代理
+
+## 工作风格
+- 专业、可靠，体现 MileStone 品牌形象
+- 主要用中文交流，支持英文
+- 代码注释中英文均可
+- 修改代码前先理解上下文
+- 注意安全性，不暴露敏感信息
+- 简洁高效，不废话

TOOLS.md

@@ -0,0 +1,80 @@
+# TOOLS.md - MileStone AI 开发环境
+
+## 服务器信息
+- **IP**: 217.216.32.230 (新加坡 VPS)
+- **OS**: Ubuntu 22.04
+- **内存**: 12GB (约 8GB 可用)
+- **磁盘**: 194GB (已用 25GB)
+- **Node.js**: v22.22.0 (fnm 管理)
+- **Java**: 通过 Docker 容器运行 (jsherp 容器内)
+
+## 数据库
+- **MariaDB**: 11.4.10 (MySQL 兼容)
+- **Host**: 127.0.0.1:3306
+- **用户**: root / Qweewqzzx1
+- **ERP 数据库**: jsh_erp
+- **Redis**: 127.0.0.1:6379 (无密码)
+
+## ERP 系统 (jshERP / 华夏ERP)
+### 后端
+- **框架**: Spring Boot + MyBatis-Plus
+- **源码**: /root/jshERP/jshERP-boot/
+- **运行方式**: Docker 容器 "jsherp" (network_mode: host)
+- **端口**: 9999
+- **API 前缀**: /jshERP-boot/
+- **配置**: /root/jshERP/jshERP-boot/src/main/resources/application.properties
+
+### 前端
+- **框架**: Vue 2.7 + Ant Design Vue 1.5.2 + vue-cli
+- **源码**: /root/jshERP/jshERP-web/
+- **部署目录**: /opt/jshERP-web/
+- **构建**: cd /root/jshERP/jshERP-web && npm run build
+- **部署**: cp -r dist/* /opt/jshERP-web/
+- **域名**: https://erp.puro.im
+
+### 主题配置
+- **主色**: #00458a (深蓝)
+- **导航**: dark 模式
+- **Logo 背景**: #001a3a
+- **配置文件**: defaultSettings.js, vue.config.js, main.js, index.less, Logo.vue
+- **注意**: main.js 中强制覆盖 config.primaryColor，防止 localStorage 缓存旧颜色
+
+## DevOps 服务
+| 服务 | 域名 | 端口 | 路径 |
+|------|------|------|------|
+| Gitea | git.puro.im | 3000 | /opt/devops/gitea/ |
+| Drone CI | devops.puro.im | 8080 | /opt/devops/drone/ |
+| Grafana | monitor.puro.im | 3001 | /opt/devops/monitoring/ |
+| Portainer | portainer.puro.im | 9000 | - |
+| Prometheus | - | 9090 | /opt/devops/monitoring/ |
+| Loki | - | 3100 | /opt/devops/monitoring/ |
+| Mattermost | im.puro.im | 8065 | /opt/devops/mattermost/ |
+| OpenClaw | claw.puro.im | 18790 | systemd service |
+
+## 反向代理 (Caddy)
+- **配置目录**: /etc/caddy/conf.d/
+- **主配置**: /etc/caddy/Caddyfile (import conf.d/*.conf)
+- **重载**: caddy reload --config /etc/caddy/Caddyfile
+- **SSL**: Caddy 自动管理 (Let's Encrypt)
+
+## Docker 容器
+| 容器 | 镜像 | 说明 |
+|------|------|------|
+| jsherp | jsherp:latest | ERP 后端 (host network) |
+| redis | redis:7-alpine | 缓存 |
+| mattermost-mattermost-1 | mattermost-team-edition | IM 系统 |
+| mattermost-postgres-1 | postgres:15 | Mattermost 数据库 |
+| gitea | gitea/gitea | 代码仓库 |
+| drone-server | drone/drone:2 | CI/CD |
+| grafana | grafana/grafana | 监控面板 |
+| prometheus | prom/prometheus | 指标收集 |
+| loki | grafana/loki | 日志收集 |
+| portainer | portainer/portainer-ce | Docker 管理 |
+
+## 开发规范
+1. **前端修改**: 改源码 → npm run build → cp dist/* /opt/jshERP-web/ → 浏览器刷新
+2. **后端修改**: 改源码 → Docker 容器内重新构建/重启
+3. **数据库变更**: 先备份再操作，记录 SQL 变更
+4. **Git**: 清晰的 commit message，中英文均可
+5. **安全**: 不暴露密码和 API Key，不删除生产数据
+6. **颜色**: 全局使用 #00458a 深蓝主题，不使用旧的 #1890FF

USER.md

@@ -0,0 +1,17 @@
+# USER.md - About Your Human
+
+_Learn about the person you're helping. Update this as you go._
+
+- **Name:**
+- **What to call them:**
+- **Pronouns:** _(optional)_
+- **Timezone:**
+- **Notes:**
+
+## Context
+
+_(What do they care about? What projects are they working on? What annoys them? What makes them laugh? Build this over time.)_
+
+---
+
+The more you know, the better you can help. But remember — you're learning about a person, not building a dossier. Respect the difference.

jshERP-boot/docs/jsh_erp.sql

@@ -580,7 +580,7 @@ INSERT INTO `jsh_msg` VALUES (2, '标题1', '内容1', '2019-09-10 00:11:39', '
 DROP TABLE IF EXISTS `jsh_orga_user_rel`;
 CREATE TABLE `jsh_orga_user_rel`  (
   `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `orga_id` bigint(0) NOT NULL COMMENT '机构id',
+  `orga_id` bigint(0) NULL DEFAULT NULL COMMENT '机构id',
   `user_id` bigint(0) NOT NULL COMMENT '用户id',
   `user_blng_orga_dspl_seq` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户在所属机构中显示顺序',
   `delete_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标记，0未删除，1删除',

jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt

@@ -190,8 +190,8 @@ select '060301', '销售订单', '0603', '../materials/sale_orders_list.html', b
 -- ----------------------------
 -- 改管理员的功能权限
 -- ----------------------------
-update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4', 
+update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4',
-Value = '[13][12][16][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][242][33][199][243][41][200][201][202][40][232][233][197][203][204][205][206][212]' 
+Value = '[13][12][16][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][242][33][199][243][41][200][201][202][40][232][233][197][203][204][205][206][212]'
 where Id = 5;
 
 -- ----------------------------
@@ -1744,4 +1744,11 @@ create index material_id on jsh_serial_number(material_id) using btree;
 create index depot_id on jsh_serial_number(depot_id) using btree;
 create index type on jsh_user_business(type) using btree;
 create index key_id on jsh_user_business(key_id) using btree;
-create index tenant_id on jsh_user_business(tenant_id) using btree;
+create index tenant_id on jsh_user_business(tenant_id) using btree;
+
+-- --------------------------------------------------------
+-- 时间 2026年1月31日
+-- by jishenghua
+-- 给jsh_user表的orga_id字段改为非必填
+-- --------------------------------------------------------
+alter table jsh_orga_user_rel change orga_id orga_id bigint(0) NULL DEFAULT NULL COMMENT '机构id';

jshERP-boot/pom.xml

@@ -141,6 +141,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<mainClass>com.jsh.erp.ErpApplication</mainClass>
+				</configuration>
 				<version>2.0.3.RELEASE</version>
 				<executions>
 					<execution>

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -215,6 +215,7 @@ public class DepotItemController {
                 BigDecimal totalAllPrice = BigDecimal.ZERO;
                 BigDecimal totalTaxMoney = BigDecimal.ZERO;
                 BigDecimal totalTaxLastMoney = BigDecimal.ZERO;
+                BigDecimal totalFinishNumber = BigDecimal.ZERO;
                 BigDecimal totalWeight = BigDecimal.ZERO;
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
@@ -252,7 +253,8 @@ public class DepotItemController {
                     item.put("operNumber", diEx.getOperNumber());
                     item.put("basicNumber", diEx.getBasicNumber());
                     item.put("preNumber", diEx.getOperNumber()); //原数量
-                    item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库
+                    BigDecimal finishNumber = depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType);
+                    item.put("finishNumber", finishNumber); //已入库|已出库
                     item.put("purchaseDecimal", roleService.parseBillPriceByLimit(diEx.getPurchaseDecimal(), billCategory, priceLimit, request));  //采购价
                     if("basic".equals(linkType) || "1".equals(isReadOnly)) {
                         //正常情况显示金额，而以销定购的情况不能显示金额
@@ -288,6 +290,7 @@ public class DepotItemController {
                     totalAllPrice = totalAllPrice.add(diEx.getAllPrice()==null?BigDecimal.ZERO:diEx.getAllPrice());
                     totalTaxMoney = totalTaxMoney.add(diEx.getTaxMoney()==null?BigDecimal.ZERO:diEx.getTaxMoney());
                     totalTaxLastMoney = totalTaxLastMoney.add(diEx.getTaxLastMoney()==null?BigDecimal.ZERO:diEx.getTaxLastMoney());
+                    totalFinishNumber = totalFinishNumber.add(finishNumber);
                     totalWeight = totalWeight.add(allWeight);
                 }
                 if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) {
@@ -296,6 +299,7 @@ public class DepotItemController {
                     footItem.put("allPrice", roleService.parseBillPriceByLimit(totalAllPrice, billCategory, priceLimit, request));
                     footItem.put("taxMoney", roleService.parseBillPriceByLimit(totalTaxMoney, billCategory, priceLimit, request));
                     footItem.put("taxLastMoney", roleService.parseBillPriceByLimit(totalTaxLastMoney, billCategory, priceLimit, request));
+                    footItem.put("finishNumber", totalFinishNumber);
                     footItem.put("weight", totalWeight);
                     dataArray.add(footItem);
                 }

jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java

@@ -241,7 +241,7 @@ public class FunctionController extends BaseController {
             if("admin".equals(userInfo.getLoginName())) {
                 funIdList = null;
             }
-            List<Function> dataListFun = functionService.findRoleFunction("0", funIdList);
+            List<Function> dataListFun = functionService.findRoleFunction("0", null);
             //开始拼接json数据
             JSONObject outer = new JSONObject();
             outer.put("id", 0);
@@ -255,15 +255,20 @@ public class FunctionController extends BaseController {
                 //根据条件从列表里面移除"系统管理"
                 List<Function> dataList = new ArrayList<>();
                 for (Function fun : dataListFun) {
+                    List<Function> childrenList = functionService.getRoleFunction(fun.getNumber());
                     String token = request.getHeader("X-Access-Token");
                     Long tenantId = Tools.getTenantIdByToken(token);
                     if (tenantId!=0L) {
                         if(!("系统管理").equals(fun.getName())) {
-                            dataList.add(fun);
+                            if(!childrenList.isEmpty()) {
+                                dataList.add(fun);
+                            }
                         }
                     } else {
                         //超管
-                        dataList.add(fun);
+                        if(!childrenList.isEmpty()) {
+                            dataList.add(fun);
+                        }
                     }
                 }
                 dataArray = getFunctionList(dataList, type, keyId, funIdList);

jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java

@@ -233,8 +233,7 @@ public class UserController extends BaseController {
                                      HttpServletRequest request) throws Exception {
         Map<String, Object> objectMap = new HashMap<>();
         Long id = jsonObject.getLong("id");
-        String password = "123456";
+        String md5Pwd = jsonObject.getString("password");
-        String md5Pwd = Tools.md5Encryp(password);
         int update = userService.resetPwd(md5Pwd, id, request);
         if(update > 0) {
             return returnJson(objectMap, SUCCESS, ErpInfo.OK.code);

jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java

@@ -553,10 +553,6 @@ public class UserService {
                 ubObj.put("value", "[" + ue.getRoleId() + "]");
                 userBusinessService.insertUserBusiness(ubObj, request);
             }
-            if(ue.getOrgaId()==null){
-                //如果没有选择机构，就不建机构和用户的关联关系
-                return;
-            }
             if(ue.getOrgaId()!=null && "1".equals(ue.getLeaderFlag())){
                 //检查当前机构是否存在经理
                 List<User> checkList = userMapperEx.getListByOrgaId(ue.getId(), ue.getOrgaId());
@@ -585,12 +581,10 @@ public class UserService {
     public UserEx addUser(UserEx ue) throws Exception{
         /**
          * 新增用户默认设置
-         * 1、密码默认123456
+         * 1是否系统自带默认为非系统自带
-         * 2是否系统自带默认为非系统自带
+         * 2是否管理者默认为员工
-         * 3是否管理者默认为员工
+         * 3默认用户状态为正常
-         * 4默认用户状态为正常
          * */
-        ue.setPassword(Tools.md5Encryp(BusinessConstants.USER_DEFAULT_PASSWORD));
         ue.setIsystem(BusinessConstants.USER_NOT_SYSTEM);
         if(ue.getIsmanager()==null){
             ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
@@ -707,10 +701,6 @@ public class UserService {
                     userBusinessService.insertUserBusiness(ubObj, request);
                 }
             }
-            if (ue.getOrgaId() == null) {
-                //如果没有选择机构，就不建机构和用户的关联关系
-                return;
-            }
             if(ue.getOrgaId()!=null && "1".equals(ue.getLeaderFlag())){
                 //检查当前机构是否存在经理
                 List<User> checkList = userMapperEx.getListByOrgaId(ue.getId(), ue.getOrgaId());

jshERP-boot/src/main/resources/application.properties

@@ -7,13 +7,13 @@ server.servlet.context-path=/jshERP-boot
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Qweewqzzx1
 #mybatis-plus配置
 mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml
 # Redis
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
-spring.redis.password=1234abcd
+spring.redis.password=
 #租户对应的角色id
 manage.roleId=10
 #租户允许创建的用户数

jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -276,7 +276,12 @@
             order by oper_time desc,number desc
         </if>
         <if test="column != 'createTime'">
-            order by ${column} ${order}
+            <if test="column == 'barCode' or column == 'operNumber' or column == 'unitPrice' or column == 'allPrice' or column == 'taxMoney'">
+                order by ${column}
+                <if test="order == 'asc' or order == 'desc'">
+                    ${order}
+                </if>
+            </if>
         </if>
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -495,7 +500,12 @@
             order by materialId desc
         </if>
         <if test="column != 'createTime'">
-            order by ${column} ${order}
+            <if test="column == 'barCode' or column == 'numSum' or column == 'priceSum'">
+                order by ${column}
+                <if test="order == 'asc' or order == 'desc'">
+                    ${order}
+                </if>
+            </if>
         </if>
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -701,7 +711,12 @@
             order by oper_time desc,number desc
         </if>
         <if test="column != 'createTime'">
-            order by ${column} ${order}
+            <if test="column == 'barCode' or column == 'operNumber' or column == 'unitPrice' or column == 'allPrice'">
+                order by ${column}
+                <if test="order == 'asc' or order == 'desc'">
+                    ${order}
+                </if>
+            </if>
         </if>
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -1425,4 +1440,4 @@
         and dh.pay_type = '预付款'
         and ifnull(dh.delete_flag,'0') !='1'
     </select>
-</mapper>
+</mapper>

jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -698,7 +698,12 @@
             order by m.id desc
         </if>
         <if test="column != 'createTime'">
-            order by ${column} ${order}
+            <if test="column == 'mBarCode' or column == 'purchaseDecimal' or column == 'currentStock' or column == 'currentStockPrice' or column == 'currentWeight'">
+                order by ${column}
+                <if test="order == 'asc' or order == 'desc'">
+                    ${order}
+                </if>
+            </if>
         </if>
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}

jshERP-boot/src/main/resources/mapper_xml/OrgaUserRelMapperEx.xml

@@ -17,9 +17,7 @@
   <update id="updateOrgaUserRel" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel" >
     update jsh_orga_user_rel
     <set >
-      <if test="orgaId != null" >
+      orga_id = #{orgaId},
-        orga_id = #{orgaId},
-      </if>
       <if test="userId != null" >
         user_id = #{userId},
       </if>
@@ -41,4 +39,4 @@
   </update>
 
 
-</mapper>
+</mapper>

jshERP-web/public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <meta name="description" content="基于SpringBoot框架，立志为中小企业提供开源好用的ERP软件，目前专注进销存+财务功能。主要模块有零售管理、采购管理、销售管理、仓库管理、财务管理、报表查询、基础数据、系统管理等。" />
+  <meta name="description" content="MileStone Industrial Development Corporation ERP System" />
   <meta name="keywords" content="erp,erp系统,进销存,进销存系统" />
   <link rel="icon" href="<%= BASE_URL %>static/favicon.ico">
   <style>
@@ -248,7 +248,7 @@
         if (ajax.readyState===4 &&ajax.status===200) {
           res = ajax.responseText;
         } else {
-          res = 'ERP系统';
+          res = 'MileStone Co. ERP';
         }
       }
       ajax.open('get', url, false);
@@ -295,7 +295,7 @@ translate.language.setLocal('chinese_simplified');
 translate.service.use('client.edge');
 //翻译自定义
 translate.nomenclature.append('chinese_simplified','english',`
-管伊佳ERP=GuanYiJia
+MileStone Co. ERP=MileStone Co. ERP
 `)
 //开启html页面变化的监控，对变化部分会进行自动翻译
 translate.listener.start();

jshERP-web/src/api/api.js

@@ -20,6 +20,7 @@ const editUser = (params)=>putAction("/user/updateUser",params);
 const getUserList = (params)=>getAction("/user/getUserList",params);
 const getUserBtnByCurrentUser = (params)=>getAction("/user/getUserBtnByCurrentUser",params);
 const queryPermissionsByUser = (params)=>postAction("/function/findMenuByPNumber",params);
+const resetPwd = (params)=>postAction("/user/resetPwd",params);
 //机构管理
 const queryOrganizationTreeList = (params)=>getAction("/organization/getOrganizationTree",params);
 const getAllOrganizationTreeByUser = (params)=>getAction("/organization/getAllOrganizationTreeByUser",params);
@@ -131,6 +132,7 @@ export {
   getUserList,
   getUserBtnByCurrentUser,
   queryPermissionsByUser,
+  resetPwd,
   queryOrganizationTreeList,
   getAllOrganizationTreeByUser,
   queryOrganizationById,

jshERP-web/src/assets/less/index.less

@@ -26,3 +26,43 @@ i {
   background-color: rgba(255, 192, 203, 0.31);
   color:red;
 }
+
+/* ========== Milestone Theme Override ========== */
+.header.light, .header.dark, .header {
+  background: #001a3a !important;
+}
+.ant-layout-sider {
+  background: #001a3a !important;
+}
+.ant-menu-dark, .ant-menu-dark .ant-menu-sub {
+  background: #001a3a !important;
+}
+.ant-menu-dark .ant-menu-item-selected {
+  background-color: #00458a !important;
+  border-left: 3px solid #f0c040;
+}
+.ant-btn-primary {
+  background-color: #00458a !important;
+  border-color: #00458a !important;
+}
+.ant-btn-primary:hover, .ant-btn-primary:focus {
+  background-color: #0077cc !important;
+  border-color: #0077cc !important;
+}
+a { color: #00458a; }
+a:hover { color: #0077cc; }
+.ant-layout-content {
+  background: #f5f7fa !important;
+}
+/* Dashboard card styling */
+.ant-card {
+  box-shadow: 0 2px 8px rgba(0, 26, 58, 0.08);
+  border-radius: 6px;
+}
+.ant-card-head-title {
+  color: #00458a !important;
+}
+/* Gold accent for active menu */
+.ant-menu-dark .ant-menu-item-selected > a {
+  color: #f0c040 !important;
+}

jshERP-web/src/components/chart/DashChartDemo.vue

@@ -17,7 +17,7 @@
         gemo="point"
         position="value*1"
         shape="pointer"
-        color="#1890FF"
+        color="#00458a"
         :active="false"
       ></v-series>
       <v-guide
@@ -171,7 +171,7 @@
         },
         arcGuide2Start: [0, 0.945],
         arcGuide2Style: {
-          stroke: '#1890FF',
+          stroke: '#00458a',
           lineWidth: 18,
         },
         htmlGuidePosition: ['50%', '100%'],

jshERP-web/src/components/chart/MiniProgress.vue

@@ -66,7 +66,7 @@
       .progress {
         transition: all .4s cubic-bezier(.08, .82, .17, 1) 0s;
         border-radius: 1px 0 0 1px;
-        background-color: #1890ff;
+        background-color: #00458a;
         width: 0;
         height: 100%;
       }

jshERP-web/src/components/layouts/UserLayout.vue

@@ -150,7 +150,7 @@
     flex-direction: column;
     align-items: center;
     cursor: pointer;
-    color:#1890ff
+    color:#00458a
   }
   .platform-modal {
     padding:20px;
@@ -193,7 +193,7 @@
         background-size: 100%;
         position: relative;
         width: 340px;
-        height: 460px;
+        height: 500px;
         background: rgba(255, 255, 255, 1);
         border-radius: 8px;
         right: 0;
@@ -212,24 +212,28 @@
           text-align: center;
 
           .header {
-            height: 44px;
+            height: auto;
-            line-height: 44px;
+            line-height: 1.3;
-            margin-top: 35px;
+            margin-top: 30px;
-            margin-bottom: 35px;
+            margin-bottom: 30px;
+            text-align: center;
             .title {
-              font-size: 35px;
+              font-size: 28px;
-              color: #666;
+              background: linear-gradient(135deg, #00458a, #722ed1);
+              -webkit-background-clip: text;
+              -webkit-text-fill-color: transparent;
+              background-clip: text;
               font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
               font-weight: 700;
-              position: relative;
+              letter-spacing: 1px;
-              top: 2px;
+              display: inline;
             }
             .desc {
-              font-size: 16px;
+              font-size: 14px;
-              color: #666;
+              color: #999;
-              margin-top: 12px;
+              margin-top: 4px;
-              margin-left: 10px;
+              margin-left: 8px;
-              margin-bottom: 40px;
+              display: inline;
             }
           }
         }

jshERP-web/src/components/menu/SideMenu.vue

@@ -5,7 +5,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo />
+    <logo :collapsed="collapsed" />
     <s-menu
       :collapsed="collapsed"
       :menu="menus"

jshERP-web/src/components/page/GlobalFooter.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="footer">
+  <div class="footer">
+    <div class="copyright">© 2015-2030 MILESTONE INDUSTRIAL DEVELOPMENT CORPORATION</div>
   </div>
 </template>
 

jshERP-web/src/components/page/GlobalLayout.vue

@@ -334,7 +334,7 @@
 
           .avatar {
             margin: 20px 10px 20px 0;
-            color: #1890ff;
+            color: #00458a;
             background: hsla(0, 0%, 100%, .85);
             vertical-align: middle;
           }

jshERP-web/src/components/setting/SettingDrawer.vue

@@ -312,7 +312,7 @@
           padding-top: 15px;
           padding-left: 24px;
           height: 100%;
-          color: #1890ff;
+          color: #00458a;
           font-size: 14px;
           font-weight: 700;
         }
@@ -340,7 +340,7 @@
   .setting-drawer-index-handle {
     position: absolute;
     top: 240px;
-    background: #1890ff;
+    background: #00458a;
     width: 48px;
     height: 48px;
     right: 300px;

jshERP-web/src/components/tools/Logo.vue

@@ -1,6 +1,9 @@
 <template>
-  <div class="logo">
+  <div class="logo" :class="{ 'logo-collapsed': collapsed }">
-    <h1 v-if="showTitle">{{ title }}</h1>
+    <div class="logo-content">
+      <div class="logo-icon">🏔️</div>
+      <h1 v-if="showTitle && !collapsed" class="logo-title">{{ title }}</h1>
+    </div>
   </div>
 </template>
 
@@ -20,38 +23,80 @@
         type: Boolean,
         default: true,
         required: false
+      },
+      collapsed: {
+        type: Boolean,
+        default: false,
+        required: false
       }
     }
   }
 </script>
 <style lang="less" scoped>
-  /*缩小首页布 局顶部的高度*/
   @height: 49px;
 
+  .logo {
+    color: #ffffff;
+    height: @height !important;
+    line-height: @height !important;
+    box-shadow: none !important;
+    transition: all 300ms ease;
+    background: linear-gradient(135deg, #001a3a 0%, #003d82 100%);
+    padding: 0 12px;
+    overflow: hidden;
+    white-space: nowrap;
+    
+    .logo-content {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      height: 100%;
+      overflow: hidden;
+      
+      .logo-icon {
+        font-size: 22px;
+        flex-shrink: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 22px;
+      }
+      
+      .logo-title {
+        font-size: 14px;
+        color: #ffffff;
+        margin: 0 0 0 8px;
+        font-weight: 600;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        opacity: 1;
+        transition: opacity 300ms ease;
+      }
+    }
+    
+    // 折叠状态：只显示图标居中
+    &.logo-collapsed {
+      padding: 0;
+      
+      .logo-content {
+        justify-content: center;
+      }
+    }
+
+    a {
+      color: white;
+      &:hover {
+        color: rgba(255, 255, 255, 0.8);
+      }
+    }
+  }
+
   .sider {
     box-shadow: none !important;
-    .logo {
+    
-      color: #ffffff;
-      height: @height !important;
-      line-height: @height !important;
-      box-shadow: none !important;
-      transition: background 300ms;
-      background: #002140;
-      h1 {
-        font-size: 24px;
-        color: #ffffff;
-      }
-      a {
-        color: white;
-        &:hover {
-          color: rgba(255, 255, 255, 0.8);
-        }
-      }
-
-    }
-
     &.light .logo {
-      background-color: @primary-color;
+      background: linear-gradient(135deg, @primary-color 0%, #096dd9 100%);
     }
   }
 </style>

jshERP-web/src/components/tools/UserMenu.vue

@@ -3,7 +3,7 @@
     <span class="action" v-if="showAd">
       <a v-if="theme==='light'" class="ad_title" target="_blank" :href="payFeeUrl">
         <a-icon type="cloud" theme="filled" style="color: yellow; font-size: 16px; line-height: 16px; padding-right: 5px" />
-        <span>管伊佳ERP网络版198元1年</span>
+        <span>MileStone Co. ERP</span>
       </a>
     </span>
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
@@ -42,9 +42,12 @@
     </span>
     <header-notice class="action"/>
     <a-dropdown>
-      <span v-if="isDesktop()" class="action ant-dropdown-link user-dropdown-menu">
+      <span v-if="isDesktop()" class="action ant-dropdown-link user-dropdown-menu modern-user-menu">
-        <a-icon type="down-circle"/>
+        <a-avatar size="small" style="margin-right: 8px;">
-        <span style="margin-left:4px">欢迎您，{{ nickname() }}</span>
+          <a-icon type="user" />
+        </a-avatar>
+        <span class="user-name">{{ nickname() }}</span>
+        <a-icon type="down" style="margin-left: 8px; font-size: 12px;" />
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <a-menu-item key="3"  @click="systemSetting">
@@ -254,4 +257,34 @@
     color: inherit;
     text-decoration: none;
   }
+
+  .modern-user-menu {
+    display: flex !important;
+    align-items: center;
+    padding: 4px 12px;
+    border-radius: 20px;
+    background: rgba(255, 255, 255, 0.1);
+    backdrop-filter: blur(10px);
+    transition: all 0.3s ease;
+    
+    &:hover {
+      background: rgba(255, 255, 255, 0.2);
+      transform: translateY(-1px);
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    }
+    
+    .user-name {
+      font-weight: 500;
+      font-size: 14px;
+    }
+  }
+
+  .user-wrapper.light .modern-user-menu {
+    background: rgba(0, 0, 0, 0.05);
+    color: rgba(0, 0, 0, 0.85);
+    
+    &:hover {
+      background: rgba(0, 0, 0, 0.1);
+    }
+  }
 </style>

jshERP-web/src/components/tools/UserPassword.vue

@@ -133,7 +133,7 @@
         }
         let reg = /^(?=.*[a-z])(?=.*\d).{6,}$/;
         if (!reg.test(value)) {
-          callback(new Error('密码由6位数字、小写字母组成!'))
+          callback(new Error('用户密码至少要有数字和小写字母，并且长度至少6位!'))
         }
         callback()
       },

jshERP-web/src/components/tools/setting.js

@@ -20,7 +20,7 @@ const colorList = [
     key: '极光绿', color: '#52C41A',
   },
   {
-    key: '拂晓蓝（默认）', color: '#1890FF',
+    key: '拂晓蓝（默认）', color: '#00458a',
   },
   {
     key: '极客蓝', color: '#2F54EB',

jshERP-web/src/defaultSettings.js

@@ -14,8 +14,8 @@
  */
 
 export default {
-  primaryColor: '#1890FF', // primary color of ant design
+  primaryColor: '#00458a', // primary color of ant design
-  navTheme: 'light', // theme for nav menu
+  navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: true, // sticky header

jshERP-web/src/main.js

@@ -64,7 +64,7 @@ new Vue({
     store.commit('TOGGLE_CONTENT_WIDTH', Vue.ls.get(DEFAULT_CONTENT_WIDTH_TYPE, config.contentWidth))
     store.commit('TOGGLE_FIXED_HEADER_HIDDEN', Vue.ls.get(DEFAULT_FIXED_HEADER_HIDDEN, config.autoHideHeader))
     store.commit('TOGGLE_WEAK', Vue.ls.get(DEFAULT_COLOR_WEAK, config.colorWeak))
-    store.commit('TOGGLE_COLOR', Vue.ls.get(DEFAULT_COLOR, config.primaryColor))
+    store.commit('TOGGLE_COLOR', config.primaryColor)
     store.commit('SET_TOKEN', Vue.ls.get(ACCESS_TOKEN))
     store.commit('SET_MULTI_PAGE',Vue.ls.get(DEFAULT_MULTI_PAGE,config.multipage))
   },

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -75,6 +75,15 @@
                     <a-input placeholder="请输入关联订单" v-model="queryParam.linkNumber"></a-input>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="结算账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择结算账户" showSearch allow-clear optionFilterProp="children" v-model="queryParam.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" allow-clear v-model="queryParam.status">
@@ -235,6 +244,7 @@
           depotId: undefined,
           linkApply: "",
           linkNumber: "",
+          accountId: undefined,
           creator: undefined,
           status: undefined,
           remark: ""
@@ -310,6 +320,7 @@
       this.initSystemConfig()
       this.initSupplier()
       this.initUser()
+      this.initAccount()
       this.initQuickBtn()
       this.getDepotByCurrentUser()
     },

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -66,6 +66,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="结算账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择结算账户" showSearch allow-clear optionFilterProp="children" v-model="queryParam.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" allow-clear v-model="queryParam.status">
@@ -240,6 +249,7 @@
           subType: "销售订单",
           organId: undefined,
           depotId: undefined,
+          accountId: undefined,
           creator: undefined,
           status: undefined,
           salesMan: undefined,
@@ -316,6 +326,7 @@
       this.initCustomer()
       this.initSalesman()
       this.initUser()
+      this.initAccount()
       this.getSystemConfig()
       this.initQuickBtn()
       this.getDepotByCurrentUser()

jshERP-web/src/views/dashboard/IndexChart.vue

@@ -1,103 +1,163 @@
 <template>
-  <div class="page-header-index-wide">
+  <div class="page-header-index-wide dashboard-modern">
-    <a-row :gutter="24">
+    <!-- 添加欢迎区块 -->
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+    <div class="welcome-banner" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
-        <chart-card :loading="loading" title="今日销售" data-step="1" data-title="今日销售" data-intro="统计今日销售单据的总金额">
+                                      color: white; padding: 24px; border-radius: 8px; margin-bottom: 24px;">
-          <a-tooltip title="统计今日销售单据的总金额" slot="action">
+      <h2 style="color: white; margin: 0;">欢迎回到 MileStone ERP 📊</h2>
-            <a-icon type="info-circle-o" />
+      <p style="margin: 8px 0 0 0; opacity: 0.9;">{{ getCurrentTimeGreeting() }}</p>
-          </a-tooltip>
+    </div>
-          <head-info :content="statistics.todaySale"></head-info>
+    
-        </chart-card>
+    <!-- 核心指标卡片区域 - 增强视觉效果 -->
-      </a-col>
+    <div class="metrics-section">
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+      <h3 style="margin-bottom: 16px; color: #1890ff;">📈 今日经营概况</h3>
-        <chart-card :loading="loading" title="今日零售" data-step="2" data-title="今日零售" data-intro="统计今日零售单据的总金额">
+      <a-row :gutter="24">
-          <a-tooltip title="统计今日零售单据的总金额" slot="action">
+        <a-col :sm="24" :md="12" :xl="6" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-            <a-icon type="info-circle-o" />
+          <chart-card :loading="loading" title="今日销售" data-step="1" data-title="今日销售" data-intro="统计今日销售单据的总金额"
-          </a-tooltip>
+                      class="metric-card sales-card">
-          <head-info :content="statistics.todayRetailSale"></head-info>
+            <a-tooltip title="统计今日销售单据的总金额" slot="action">
-        </chart-card>
+              <a-icon type="info-circle-o" />
-      </a-col>
+            </a-tooltip>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            <head-info :content="statistics.todaySale">
-        <chart-card :loading="loading" title="今日采购" data-step="3" data-title="今日采购" data-intro="统计今日采购单据的总金额">
+              <span slot="prefix">💰</span>
-          <a-tooltip title="统计今日采购单据的总金额" slot="action">
+            </head-info>
-            <a-icon type="info-circle-o" />
+          </chart-card>
-          </a-tooltip>
+        </a-col>
-          <head-info :content="statistics.todayBuy"></head-info>
+        <a-col :sm="24" :md="12" :xl="6" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-        </chart-card>
+          <chart-card :loading="loading" title="今日零售" data-step="2" data-title="今日零售" data-intro="统计今日零售单据的总金额"
-      </a-col>
+                      class="metric-card retail-card">
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            <a-tooltip title="统计今日零售单据的总金额" slot="action">
-        <chart-card :loading="loading" title="本月累计销售">
+              <a-icon type="info-circle-o" />
-          <a-tooltip title="统计本月销售单据的总金额" slot="action">
+            </a-tooltip>
-            <a-icon type="info-circle-o" />
+            <head-info :content="statistics.todayRetailSale">
-          </a-tooltip>
+              <span slot="prefix">🛒</span>
-          <head-info :content="statistics.monthSale"></head-info>
+            </head-info>
-        </chart-card>
+          </chart-card>
-      </a-col>
+        </a-col>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+        <a-col :sm="24" :md="12" :xl="6" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-        <chart-card :loading="loading" title="本月累计零售">
+          <chart-card :loading="loading" title="今日采购" data-step="3" data-title="今日采购" data-intro="统计今日采购单据的总金额"
-          <a-tooltip title="统计本月零售单据的总金额" slot="action">
+                      class="metric-card purchase-card">
-            <a-icon type="info-circle-o" />
+            <a-tooltip title="统计今日采购单据的总金额" slot="action">
-          </a-tooltip>
+              <a-icon type="info-circle-o" />
-          <head-info :content="statistics.monthRetailSale"></head-info>
+            </a-tooltip>
-        </chart-card>
+            <head-info :content="statistics.todayBuy">
-      </a-col>
+              <span slot="prefix">📦</span>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            </head-info>
-        <chart-card :loading="loading" title="本月累计采购">
+          </chart-card>
-          <a-tooltip placement="left" title="统计本月采购单据的总金额" slot="action">
+        </a-col>
-            <a-icon type="info-circle-o" />
+        <a-col :sm="24" :md="12" :xl="6" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-          </a-tooltip>
+          <chart-card :loading="loading" title="当日利润预估" class="metric-card profit-card">
-          <head-info :content="statistics.monthBuy"></head-info>
+            <a-tooltip title="今日销售减去今日采购的简单估算" slot="action">
-        </chart-card>
+              <a-icon type="info-circle-o" />
-      </a-col>
+            </a-tooltip>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            <head-info :content="getTodayProfit()">
-        <chart-card :loading="loading" title="昨日销售">
+              <span slot="prefix">💎</span>
-          <a-tooltip title="统计昨日销售单据的总金额" slot="action">
+            </head-info>
-            <a-icon type="info-circle-o" />
+          </chart-card>
-          </a-tooltip>
+        </a-col>
-          <head-info :content="statistics.yesterdaySale"></head-info>
+      </a-row>
-        </chart-card>
+    </div>
-      </a-col>
+
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+    <!-- 月度数据区域 -->
-        <chart-card :loading="loading" title="昨日零售">
+    <div class="monthly-section" style="margin-top: 32px;">
-          <a-tooltip title="统计昨日零售单据的总金额" slot="action">
+      <h3 style="margin-bottom: 16px; color: #52c41a;">📅 本月累计数据</h3>
-            <a-icon type="info-circle-o" />
+      <a-row :gutter="24">
-          </a-tooltip>
+        <a-col :sm="24" :md="8" :xl="8" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-          <head-info :content="statistics.yesterdayRetailSale"></head-info>
+          <chart-card :loading="loading" title="本月累计销售" class="monthly-card">
-        </chart-card>
+            <a-tooltip title="统计本月销售单据的总金额" slot="action">
-      </a-col>
+              <a-icon type="info-circle-o" />
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            </a-tooltip>
-        <chart-card :loading="loading" title="昨日采购">
+            <head-info :content="statistics.monthSale">
-          <a-tooltip title="统计昨日采购单据的总金额" slot="action">
+              <span slot="prefix">📊</span>
-            <a-icon type="info-circle-o" />
+            </head-info>
-          </a-tooltip>
+          </chart-card>
-          <head-info :content="statistics.yesterdayBuy"></head-info>
+        </a-col>
-        </chart-card>
+        <a-col :sm="24" :md="8" :xl="8" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-      </a-col>
+          <chart-card :loading="loading" title="本月累计零售" class="monthly-card">
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+            <a-tooltip title="统计本月零售单据的总金额" slot="action">
-        <chart-card :loading="loading" title="今年累计销售">
+              <a-icon type="info-circle-o" />
-          <a-tooltip title="统计今年销售单据的总金额" slot="action">
+            </a-tooltip>
-            <a-icon type="info-circle-o" />
+            <head-info :content="statistics.monthRetailSale">
-          </a-tooltip>
+              <span slot="prefix">🛍️</span>
-          <head-info :content="statistics.yearSale"></head-info>
+            </head-info>
-        </chart-card>
+          </chart-card>
-      </a-col>
+        </a-col>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+        <a-col :sm="24" :md="8" :xl="8" :style="{ paddingRight: '0px',marginBottom: '16px' }">
-        <chart-card :loading="loading" title="今年累计零售">
+          <chart-card :loading="loading" title="本月累计采购" class="monthly-card">
-          <a-tooltip title="统计今年零售单据的总金额" slot="action">
+            <a-tooltip placement="left" title="统计本月采购单据的总金额" slot="action">
-            <a-icon type="info-circle-o" />
+              <a-icon type="info-circle-o" />
-          </a-tooltip>
+            </a-tooltip>
-          <head-info :content="statistics.yearRetailSale"></head-info>
+            <head-info :content="statistics.monthBuy">
-        </chart-card>
+              <span slot="prefix">📋</span>
-      </a-col>
+            </head-info>
-      <a-col :sm="24" :md="12" :xl="4" :style="{ paddingRight: '0px',marginBottom: '12px' }">
+          </chart-card>
-        <chart-card :loading="loading" title="今年累计采购">
+        </a-col>
-          <a-tooltip placement="left" title="统计今年采购单据的总金额" slot="action">
+      </a-row>
-            <a-icon type="info-circle-o" />
+    </div>
-          </a-tooltip>
+
-          <head-info :content="statistics.yearBuy"></head-info>
+    <!-- 历史对比区域 -->
-        </chart-card>
+    <div class="comparison-section" style="margin-top: 32px;">
-      </a-col>
+      <a-row :gutter="24">
-    </a-row>
+        <a-col :span="12">
+          <h4 style="margin-bottom: 16px; color: #fa8c16;">📈 昨日数据</h4>
+          <a-row :gutter="16">
+            <a-col :span="8">
+              <chart-card :loading="loading" title="昨日销售" class="comparison-card yesterday-card">
+                <a-tooltip title="统计昨日销售单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yesterdaySale"></head-info>
+              </chart-card>
+            </a-col>
+            <a-col :span="8">
+              <chart-card :loading="loading" title="昨日零售" class="comparison-card yesterday-card">
+                <a-tooltip title="统计昨日零售单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yesterdayRetailSale"></head-info>
+              </chart-card>
+            </a-col>
+            <a-col :span="8">
+              <chart-card :loading="loading" title="昨日采购" class="comparison-card yesterday-card">
+                <a-tooltip title="统计昨日采购单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yesterdayBuy"></head-info>
+              </chart-card>
+            </a-col>
+          </a-row>
+        </a-col>
+        
+        <a-col :span="12">
+          <h4 style="margin-bottom: 16px; color: #722ed1;">🏆 年度累计</h4>
+          <a-row :gutter="16">
+            <a-col :span="8">
+              <chart-card :loading="loading" title="年度销售" class="comparison-card yearly-card">
+                <a-tooltip title="统计今年销售单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yearSale"></head-info>
+              </chart-card>
+            </a-col>
+            <a-col :span="8">
+              <chart-card :loading="loading" title="年度零售" class="comparison-card yearly-card">
+                <a-tooltip title="统计今年零售单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yearRetailSale"></head-info>
+              </chart-card>
+            </a-col>
+            <a-col :span="8">
+              <chart-card :loading="loading" title="年度采购" class="comparison-card yearly-card">
+                <a-tooltip placement="left" title="统计今年采购单据的总金额" slot="action">
+                  <a-icon type="info-circle-o" />
+                </a-tooltip>
+                <head-info :content="statistics.yearBuy"></head-info>
+              </chart-card>
+            </a-col>
+          </a-row>
+        </a-col>
+      </a-row>
+    </div>
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="8" :style="{ paddingRight: '0px',marginBottom: '12px' }">
         <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="4" data-title="销售统计"
@@ -131,9 +191,9 @@
               <div slot="content">
                 <img src="/static/weixin.jpg" style="width:258px" />
               </div>
-              <a-button type="link" v-if="showWeixinSpan()">管伊佳ERP微信小程序</a-button>
+              <a-button type="link" v-if="showWeixinSpan()">MileStone Co. ERP</a-button>
             </a-popover>
-            &copy; 2015-2030 {{systemTitle}} V3.6
+            © 2015-2030 MILESTONE INDUSTRIAL DEVELOPMENT CORPORATION
           </div>
           <a-tag v-if="tenant.type==0" color="blue">试用到期：{{tenant.expireTime}}</a-tag>
           <a-tag v-if="tenant.type==0" color="blue">试用用户：{{tenant.userCurrentNum}}/{{tenant.userNumLimit}}</a-tag>
@@ -276,11 +336,135 @@
         } else {
           return false
         }
+      },
+      getCurrentTimeGreeting() {
+        const now = new Date()
+        const hour = now.getHours()
+        const date = now.toLocaleDateString('zh-CN', {
+          year: 'numeric',
+          month: 'long', 
+          day: 'numeric',
+          weekday: 'long'
+        })
+        
+        let greeting = ''
+        if (hour < 6) {
+          greeting = '夜深了，注意休息 🌙'
+        } else if (hour < 12) {
+          greeting = '早上好，新的一天开始了 ☀️'
+        } else if (hour < 18) {
+          greeting = '下午好，继续加油 💪'
+        } else {
+          greeting = '晚上好，今天辛苦了 🌅'
+        }
+        
+        return `${greeting} | ${date}`
+      },
+      getTodayProfit() {
+        // 简单计算当日利润预估（销售-采购）
+        const saleText = this.statistics.todaySale || '0'
+        const buyText = this.statistics.todayBuy || '0'
+        const sale = parseFloat(saleText.replace(/[,¥]/g, '') || '0')
+        const buy = parseFloat(buyText.replace(/[,¥]/g, '') || '0')
+        const profit = sale - buy
+        
+        if (profit > 0) {
+          return '¥' + profit.toLocaleString()
+        } else if (profit < 0) {
+          return '-¥' + Math.abs(profit).toLocaleString()
+        }
+        return '¥0'
       }
     }
   }
 </script>
 <style lang="less" scoped>
+  .dashboard-modern {
+    .welcome-banner {
+      box-shadow: 0 4px 12px rgba(102, 126, 234, 0.15);
+      transition: all 0.3s ease;
+      
+      &:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 8px 25px rgba(102, 126, 234, 0.25);
+      }
+    }
+    
+    .metrics-section, .monthly-section, .comparison-section {
+      .ant-card {
+        transition: all 0.3s ease;
+        border-radius: 8px;
+        overflow: hidden;
+        
+        &:hover {
+          transform: translateY(-4px);
+          box-shadow: 0 8px 25px rgba(0,0,0,0.1);
+        }
+      }
+    }
+    
+    .metric-card {
+      position: relative;
+      
+      &.sales-card::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: linear-gradient(180deg, #f56565 0%, #e53e3e 100%);
+      }
+      
+      &.retail-card::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: linear-gradient(180deg, #48bb78 0%, #38a169 100%);
+      }
+      
+      &.purchase-card::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: linear-gradient(180deg, #4299e1 0%, #3182ce 100%);
+      }
+      
+      &.profit-card::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: linear-gradient(180deg, #ed8936 0%, #dd6b20 100%);
+      }
+    }
+    
+    .monthly-card {
+      border-left: 4px solid #52c41a;
+      background: linear-gradient(135deg, #f6ffed 0%, #ffffff 100%);
+    }
+    
+    .comparison-card {
+      &.yesterday-card {
+        border-left: 3px solid #fa8c16;
+        background: linear-gradient(135deg, #fff7e6 0%, #ffffff 100%);
+      }
+      
+      &.yearly-card {
+        border-left: 3px solid #722ed1;
+        background: linear-gradient(135deg, #f9f0ff 0%, #ffffff 100%);
+      }
+    }
+  }
+
   .circle-cust{
     position: relative;
     top: 28px;

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -980,90 +980,85 @@
       },
       autoSkuList(skuOneData, skuTwoData, skuThreeData) {
         let unit = this.form.getFieldValue('unit')
-        if(unit) {
+        //计算多属性已经选择了几个
-          //计算多属性已经选择了几个
+        let skuArr = []
-          let skuArr = []
+        if(this.getNumByField('skuOne')) {
-          if(this.getNumByField('skuOne')) {
+          skuArr.push(skuOneData)
-            skuArr.push(skuOneData)
-          }
-          if(this.getNumByField('skuTwo')) {
-            skuArr.push(skuTwoData)
-          }
-          if(this.getNumByField('skuThree')) {
-            skuArr.push(skuThreeData)
-          }
-          let skuArrOne = skuArr[0]
-          let skuArrTwo = skuArr[1]
-          let skuArrThree = skuArr[2]
-          let count = this.getNumByField('skuOne') + this.getNumByField('skuTwo') + this.getNumByField('skuThree')
-          let barCodeSku = []
-          if(count === 1) {
-            let skuArrOnly = []
-            if(this.getNumByField('skuOne')) {
-              skuArrOnly = skuOneData
-            } else if(this.getNumByField('skuTwo')) {
-              skuArrOnly = skuTwoData
-            } else if(this.getNumByField('skuThree')) {
-              skuArrOnly = skuThreeData
-            }
-            for (let i = 0; i < skuArrOnly.length; i++) {
-              barCodeSku.push(skuArrOnly[i])
-            }
-          } else if(count === 2) {
-            for (let i = 0; i < skuArrOne.length; i++) {
-              for (let j = 0; j < skuArrTwo.length; j++) {
-                barCodeSku.push(skuArrOne[i] + '/' + skuArrTwo[j])
-              }
-            }
-          } else if(count === 3) {
-            for (let i = 0; i < skuArrOne.length; i++) {
-              for (let j = 0; j < skuArrTwo.length; j++) {
-                for (let k = 0; k < skuArrThree.length; k++) {
-                  barCodeSku.push(skuArrOne[i] + '/' + skuArrTwo[j] + '/' + skuArrThree[k])
-                }
-              }
-            }
-          }
-          let meTableData = []
-          getMaxBarCode({}).then((res)=>{
-            if(res && res.code===200) {
-              let k = 0
-              let maxBarCode = res.data.barCode
-              for (let i = 0; i < barCodeSku.length; i++) {
-                let currentBarCode = ''
-                let currentId = ''
-                let purchaseDecimal = ''
-                let commodityDecimal = ''
-                let wholesaleDecimal = ''
-                let lowDecimal = ''
-                for (let j = 0; j < this.meOldDataSource.length; j++) {
-                  if(barCodeSku[i] === this.meOldDataSource[j].sku) {
-                    currentBarCode = this.meOldDataSource[j].barCode
-                    currentId = this.meOldDataSource[j].id
-                    purchaseDecimal = this.meOldDataSource[j].purchaseDecimal
-                    commodityDecimal = this.meOldDataSource[j].commodityDecimal
-                    wholesaleDecimal = this.meOldDataSource[j].wholesaleDecimal
-                    lowDecimal = this.meOldDataSource[j].lowDecimal
-                  }
-                }
-                if(currentBarCode) {
-                  //此时说明该sku之前就存在
-                  meTableData.push({id: currentId, barCode: currentBarCode, commodityUnit: unit, sku: barCodeSku[i],
-                    purchaseDecimal: purchaseDecimal, commodityDecimal: commodityDecimal,
-                    wholesaleDecimal: wholesaleDecimal, lowDecimal: lowDecimal})
-                } else {
-                  k = k+1
-                  currentBarCode = addBigNumbers(maxBarCode, k)
-                  meTableData.push({barCode: currentBarCode, commodityUnit: unit, sku: barCodeSku[i]})
-                }
-              }
-              this.meTable.dataSource = meTableData
-            }
-          })
-        } else {
-          this.$message.warning('请填写单位（注意不要勾选多单位，因为多属性商品不支持多单位）');
-          this.barCodeSwitch = false;
         }
+        if(this.getNumByField('skuTwo')) {
+          skuArr.push(skuTwoData)
+        }
+        if(this.getNumByField('skuThree')) {
+          skuArr.push(skuThreeData)
+        }
+        let skuArrOne = skuArr[0]
+        let skuArrTwo = skuArr[1]
+        let skuArrThree = skuArr[2]
+        let count = this.getNumByField('skuOne') + this.getNumByField('skuTwo') + this.getNumByField('skuThree')
+        let barCodeSku = []
+        if(count === 1) {
+          let skuArrOnly = []
+          if(this.getNumByField('skuOne')) {
+            skuArrOnly = skuOneData
+          } else if(this.getNumByField('skuTwo')) {
+            skuArrOnly = skuTwoData
+          } else if(this.getNumByField('skuThree')) {
+            skuArrOnly = skuThreeData
+          }
+          for (let i = 0; i < skuArrOnly.length; i++) {
+            barCodeSku.push(skuArrOnly[i])
+          }
+        } else if(count === 2) {
+          for (let i = 0; i < skuArrOne.length; i++) {
+            for (let j = 0; j < skuArrTwo.length; j++) {
+              barCodeSku.push(skuArrOne[i] + '/' + skuArrTwo[j])
+            }
+          }
+        } else if(count === 3) {
+          for (let i = 0; i < skuArrOne.length; i++) {
+            for (let j = 0; j < skuArrTwo.length; j++) {
+              for (let k = 0; k < skuArrThree.length; k++) {
+                barCodeSku.push(skuArrOne[i] + '/' + skuArrTwo[j] + '/' + skuArrThree[k])
+              }
+            }
+          }
+        }
+        let meTableData = []
+        getMaxBarCode({}).then((res)=>{
+          if(res && res.code===200) {
+            let k = 0
+            let maxBarCode = res.data.barCode
+            for (let i = 0; i < barCodeSku.length; i++) {
+              let currentBarCode = ''
+              let currentId = ''
+              let purchaseDecimal = ''
+              let commodityDecimal = ''
+              let wholesaleDecimal = ''
+              let lowDecimal = ''
+              for (let j = 0; j < this.meOldDataSource.length; j++) {
+                if(barCodeSku[i] === this.meOldDataSource[j].sku) {
+                  currentBarCode = this.meOldDataSource[j].barCode
+                  currentId = this.meOldDataSource[j].id
+                  purchaseDecimal = this.meOldDataSource[j].purchaseDecimal
+                  commodityDecimal = this.meOldDataSource[j].commodityDecimal
+                  wholesaleDecimal = this.meOldDataSource[j].wholesaleDecimal
+                  lowDecimal = this.meOldDataSource[j].lowDecimal
+                }
+              }
+              if(currentBarCode) {
+                //此时说明该sku之前就存在
+                meTableData.push({id: currentId, barCode: currentBarCode, commodityUnit: unit, sku: barCodeSku[i],
+                  purchaseDecimal: purchaseDecimal, commodityDecimal: commodityDecimal,
+                  wholesaleDecimal: wholesaleDecimal, lowDecimal: lowDecimal})
+              } else {
+                k = k+1
+                currentBarCode = addBigNumbers(maxBarCode, k)
+                meTableData.push({barCode: currentBarCode, commodityUnit: unit, sku: barCodeSku[i]})
+              }
+            }
+            this.meTable.dataSource = meTableData
+          }
+        })
       },
       getNumByField(field) {
         let num = 0

jshERP-web/src/views/system/UserList.vue

@@ -57,9 +57,7 @@
                 <a>删除</a>
               </a-popconfirm>
               <a-divider type="vertical"/>
-              <a-popconfirm title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
+              <a @click="handleResetModal(record)">重置密码</a>
-                <a>重置密码</a>
-              </a-popconfirm>
             </span>
             <!-- 状态渲染模板 -->
             <template slot="customRenderFlag" slot-scope="status">
@@ -72,6 +70,7 @@
         <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
         <user-depot-modal ref="userDepotModal" @ok="modalFormOk"></user-depot-modal>
         <user-customer-modal ref="userCustomerModal" @ok="modalFormOk"></user-customer-modal>
+        <user-reset-modal ref="userResetModal" @ok="modalFormOk"></user-reset-modal>
       </a-card>
     </a-col>
   </a-row>
@@ -81,6 +80,7 @@
   import UserModal from './modules/UserModal'
   import UserDepotModal from './modules/UserDepotModal'
   import UserCustomerModal from './modules/UserCustomerModal'
+  import UserResetModal from './modules/UserResetModal'
   import {postAction} from '@/api/manage';
   import {getCurrentSystemConfig} from '@/api/api'
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
@@ -92,6 +92,7 @@
       UserModal,
       UserDepotModal,
       UserCustomerModal,
+      UserResetModal,
       JInput
     },
     data() {
@@ -175,6 +176,10 @@
           this.$refs.modalForm.isReadOnly = true
         }
       },
+      handleResetModal(record) {
+        this.$refs.userResetModal.edit(record);
+        this.$refs.userResetModal.title = "请输入" + record.loginName + "的新密码";
+      },
       handleReset(id) {
         let that = this;
         postAction(that.url.resetPwd, {id: id}).then((res) => {

jshERP-web/src/views/system/modules/UserModal.vue

@@ -14,7 +14,7 @@
       @cancel="handleCancel"
       cancelText="取消"
       okText="保存"
-      style="top:5%;height: 85%;">
+      style="top:2%;height:95%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           取消
@@ -23,8 +23,10 @@
       <a-spin :spinning="confirmLoading">
         <a-form :form="form" id="userModal">
           <a-form-item label="登录名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id"
+            <a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id" />
-             suffix="初始密码：123456" />
+          </a-form-item>
+          <a-form-item label="用户密码" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="!model.id">
+            <a-input-password placeholder="请输入用户密码" v-decorator.trim="[ 'password', validatorRules.password]" />
           </a-form-item>
           <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
             <a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'username', validatorRules.username]" />
@@ -71,11 +73,10 @@
 <script>
   import pick from 'lodash.pick'
   import Vue from 'vue'
+  import md5 from 'md5'
   import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import { getAction } from '@/api/manage'
   import {addUser,editUser,queryOrganizationTreeList,roleAllList} from '@/api/api'
-  import { disabledAuthFilter } from "@/utils/authFilter"
   import {autoJumpNextInput} from "@/utils/util"
   import {mixinDevice} from '@/utils/mixin'
   import JImageUpload from '../../../components/jeecg/JImageUpload'
@@ -105,6 +106,12 @@
               required: true, message: '请输入登录名称!'
             }]
           },
+          password: {
+            rules: [
+              { required: true, message: '请输入用户密码!' },
+              { pattern: /^(?=.*[a-z])(?=.*\d).{6,}$/, message: '用户密码至少要有数字和小写字母，并且长度至少6位!' }
+            ]
+          },
           username:{
             rules: [{
               required: true, message: '请输入用户姓名!'
@@ -168,6 +175,7 @@
             let obj;
             if(!this.model.id){
               formData.id = this.userId;
+              formData.password = md5(values.password);
               obj=addUser(formData);
             }else{
               obj=editUser(formData);

jshERP-web/src/views/system/modules/UserResetModal.vue

@@ -0,0 +1,109 @@
+<template>
+  <div ref="container">
+    <a-modal
+      :title="title"
+      :width="600"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="取消"
+      okText="保存"
+      style="top:25%;height:35%;">
+      <a-spin :spinning="confirmLoading">
+        <a-form :form="form">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="新密码">
+            <a-input-password placeholder="请输入新密码" v-decorator.trim="[ 'password', validatorRules.password]" />
+          </a-form-item>
+        </a-form>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+<script>
+  import md5 from 'md5'
+  import pick from 'lodash.pick'
+  import { resetPwd } from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
+  export default {
+    name: "UserResetModal",
+    mixins: [mixinDevice],
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        maskStyle: '',
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          password:{
+            rules: [
+              { required: true, message: '请输入新密码!' },
+              { pattern: /^(?=.*[a-z])(?=.*\d).{6,}$/, message: '用户密码至少要有数字和小写字母，并且长度至少6位!' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'password'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let bodyParam = {
+              id: formData.id,
+              password: md5(formData.password)
+            }
+            resetPwd(bodyParam).then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jshERP-web/vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
             less: {
                 modifyVars: {
                     /* less 变量覆盖，用于自定义 ant design 主题 */
-                    'primary-color': '#1890FF',
+                    'primary-color': '#00458a',
-                    'link-color': '#1890FF',
+                    'link-color': '#00458a',
                     'border-radius-base': '4px'
                 },
                 javascriptEnabled: true