1900 Commits (45d1099458eeb2c8a48a992fae00c61eeffe6b64)

Author SHA1 Message Date
chenshuichuan da225628c0 Add 维保 2 years ago
chenshuichuan 957429b52f fix 备件管理 2 years ago
chenshuichuan 96cce934a4 add 备件 2 years ago
sunshine a35128d235 登录页背景图修改,快捷入口路由跳转 2 years ago
chenshuichuan 5f39ee3d7c add mold record 2 years ago
chenyuan b04205bde4 add mold record 2 years ago
chenyuan 875abf306b add mold product 2 years ago
chenshuichuan 34f569d747 fix stock 2 years ago
chenshuichuan 8ca45da883 add mqtt data 2 years ago
chenshuichuan d26149b897 fix woker 2 years ago
chenshuichuan 8d8a7f29cf fix 2 years ago
chenshuichuan ccdbf74a77 fix user exprience 2 years ago
chenshuichuan c8b3f089f3 fix bugs 2 years ago
chenshuichuan 639fe0887a fix bug 2 years ago
chenshuichuan 82a42a4210 fix some bugs 2 years ago
chenshuichuan 779898f608 fix erp 2 years ago
chenshuichuan 5d42c99f20 fix bug 2 years ago
chenshuichuan 1322489d52 fix bug 2 years ago
chenshuichuan 09c8a305b2 fix plan 2 years ago
chenshuichuan 620979b84b fix bugs 2 years ago
chenshuichuan e6a88d23d3 fix bugs 2 years ago
chenshuichuan 15f0877a99 fix bom 2 years ago
chenshuichuan 57f7bb071c fix energy 2 years ago
chenshuichuan 20cac1cbf8 fix task plan 2 years ago
chenshuichuan 42760dff79 add energy device 2 years ago
chenshuichuan 004fcbecd2 fix record 2 years ago
chenshuichuan 84a521bbf8 fix show 2 years ago
chenshuichuan 0e3db55c03 fix report 2 years ago
chenshuichuan 5ab6394ac5 add report 2 years ago
chenshuichuan 4246955cc2 add produce report 2 years ago
chenshuichuan bc980dbbe5 fix some bug 2 years ago
chenshuichuan 78dd856558 add daily report 2 years ago
chenshuichuan 14afad7cd4 fix work report 2 years ago
chenshuichuan 1a7cefbad9 fix mes bug 2 years ago
chenshuichuan 38d7799b13 fix show bug 2 years ago
chenshuichuan 37fd069908 FIX some bug 2 years ago
chenshuichuan 6aa15b1829 fix work report 2 years ago
chenshuichuan 03ee877f9b fix 生产流程 2 years ago
chenshuichuan 15ed1efaf8 add report to plan 2 years ago
chenshuichuan 101f800e1e fix produce report 2 years ago
chenshuichuan 5c9fa846bb fix orgWorker 2 years ago
chenshuichuan 64b539c8f2 git fix orgWorker 2 years ago
chenshuichuan cbf3816814 fix worker org 2 years ago
chenshuichuan 1115fab85c add org worker 2 years ago
chenshuichuan 6f431ead4b fix org and machine 2 years ago
chenshuichuan 3cab8d3ca6 add plan progress 2 years ago
chenshuichuan fb89b36055 fix task 2 years ago
chenshuichuan 356b099889 fix stock in 2 years ago
chenshuichuan 77292d5c88 add error record and stockin detail 2 years ago
chenshuichuan 7c4ab845b1 fix mes stock in and out type 2 years ago
chenshuichuan 7623da29e0 add feedback 2 years ago
chenshuichuan d13a7083b4 fix workteam 2 years ago
chenshuichuan 57d615dda6 fix tab default value 2 years ago
chenshuichuan 94a5c1e2cb fix home page 2 years ago
chenshuichuan 93ee24b7ce fix bug 2 years ago
chenshuichuan 27a84369c7 fix mqtt 2 years ago
chenshuichuan d638022f25 fix mes some status 2 years ago
chenshuichuan f39176d2a6 fix query 2 years ago
chenshuichuan c707ebafa8 fix feeding 2 years ago
chenshuichuan 7d72b51689 fix some thing 2 years ago
chenshuichuan b5a4c4677b fix feeding record 2 years ago
chenshuichuan 49312f12a7 add feeding record 2 years ago
chenshuichuan f8395e245d add feeding record 2 years ago
chenshuichuan 70c0bbca6e fix mes stock workshop 2 years ago
chenshuichuan 3e799c4535 fix item requisition 2 years ago
chenshuichuan fd1bfb88c2 fix item need and purchase order 2 years ago
chenshuichuan 70ed143d1c handle batch plan 2 years ago
chenshuichuan 9db47424dd fix order task 2 years ago
chenshuichuan e15cfec38b add item nedd 2 years ago
chenshuichuan 73153ffad9 add task and plan 2 years ago
chenshuichuan e30bac4cde fix prod env and push device 2 years ago
chenshuichuan 15512e8203 add iot and stock workshop 2 years ago
chenshuichuan bd7c44ffbf add fix filed 2 years ago
chenshuichuan a7a7e99607 fix oper 2 years ago
chenshuichuan 898d0f1e98 fix mqtt record 2 years ago
chenshuichuan 405c327944 add iot record 2 years ago
chenshuichuan cd891c15a6 fix show 2 years ago
chenshuichuan 6aabd2586f add iot and machine 2 years ago
chenshuichuan ee7ea361f3 fix task 2 years ago
chenshuichuan 66779370f2 fix product 2 years ago
chenshuichuan 1b9f4b30b4 fix unit 2 years ago
chenshuichuan b73f1e7b0c add report 2 years ago
chenyuan 62a483141d add records 2 years ago
chenyuan c0e0076e71 add record 2 years ago
chenyuan 28e9815f11 add task plan 2 years ago
chenyuan a2b463794e add bom 2 years ago
chenyuan cefd170c22 fix mold 2 years ago
chenyuan ac5cbf75a1 add autoCode 2 years ago
chenyuan ca62648a5a add mold 2 years ago
chenyuan 5d77d039c1 remove doc-alert 2 years ago
chenyuan 6404ed1575 add all 2 years ago
syubun e8f1b411ba 修改流程流转类型判断错误的问题 2 years ago
syubun 657ad506a4 oa请假,修复列表展示的状态字段取值错误 2 years ago
YunaiV 760bab7d29 【修复】全局:id=0导致sqlserver的insert失败 2 years ago
YunaiV 3976e49e35 【新增】AI:新增 chat 对话界面(草稿状态) 2 years ago
YunaiV 9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
dhb52 0fb70607d9 fix: id=0导致sqlserver的insert失败 2 years ago
芋道源码 a60826529b
!440 fix: id=0导致sqlserver新增菜单失败
Merge pull request !440 from dhb52/N/A
2 years ago
YunaiV 0222eef6b5 【优化】全局:动态表单的注释、error log 打印 2 years ago
dhb52 c350fc466e
fix: id=0导致sqlserver新增菜单失败
Signed-off-by: dhb52 <dhb52@126.com>
2 years ago
山野羡民 2101731f0b
update src/views/mall/statistics/product/components/ProductSummary.vue.
商品统计计数显示有问题,数量显示成价格了

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
2 years ago
puhui999 bcf2f7a5dc Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2 years ago
puhui999 9f704fb8ff form-create: 字体图标扩展 2 years ago
puhui999 7c158af3cc form-create: 字典选择器分离,重新封装 api 选择器 2 years ago
YunaiV 66c6463f44 【修复】商城:seckill 导致打包失败的问题 2 years ago
YunaiV f4705ad4e1 【发版】全局:2.1.0 发版 2 years ago
YunaiV bbf009e15d 【优化】首页增加“项目说明” 2 years ago
YunaiV ecf9052452 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
芋道源码 869cae0675
!437 update src/views/infra/webSocket/index.vue. #434
Merge pull request !437 from AhJindeg/N/A
2 years ago
YunaiV dd36bbce42 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
芋道源码 939ceb32ce
!436 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题
Merge pull request !436 from Khalid/master
2 years ago
YunaiV e2fe04749b 【修复】商城系统:管理后台的商城订单统计数据有问题 2 years ago
YunaiV 20a9780654 【修复】商城:秒杀时段点击编辑报错 2 years ago
puhui999 c77526e8c5 form-create: 封装通用选择器 hook 2 years ago
puhui999 1434d7ddad Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2 years ago
puhui999 b4d85b782e form-create: 封装通用选择器 hook 2 years ago
YunaiV f75e8d1fd4 【新增】在菜单管理中,可通过“路由地址”添加 `?` 拼接参数 2 years ago
puhui999 c1c21d826d form-create: 封装通用选择器 hook 2 years ago
puhui999 51e6887bde Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2 years ago
AhJindeg de967a0160
update src/views/infra/webSocket/index.vue. #434
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2 years ago
YunaiV 9527b41b62 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
puhui999 1f1ac1f246 使用 tsx 封装 form-create 通用选择组件 2 years ago
khalidlife ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2 years ago
puhui999 769b63d9ca form-create:移除自带的下拉选择器组件,使用 currencySelectRule 替代 2 years ago
YunaiV 500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2 years ago
puhui999 0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2 years ago
puhui999 ae53ca6f4f feat:文件上传组件的文件列表拓展一个下载 2 years ago
puhui999 9a36d9d663 fix: import FunnelChart from echarts 2 years ago
YunaiV f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
puhui999 6ff31b90c7 CRM: 修复客户导入 2 years ago
YunaiV a0996bd0cf 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 2 years ago
YunaiV f405ac3293 【优化】新增 sslEnable 字段,支持 outlook 邮箱 2 years ago
YunaiV 1d533e49e4 crm:bugfix FunnelBusiness.vue 导致打包失败的问题 2 years ago
YunaiV dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
YunaiV 715f37eb0b crm:code review 员工业绩统计 2 years ago
YunaiV 56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2 years ago
YunaiV 7f3950018e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
2 years ago
芋道源码 d26e0976db
!430 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题
Merge pull request !430 from limz/bugfix-pull
2 years ago
YunaiV 0925253a9d 【移除】敏感词的管理,简化项目的复杂度 2 years ago
YunaiV 98bf5a102e 【移除】错误码的管理,简化项目的复杂度 2 years ago
YunaiV ff0c12c551 【移除】数据库文档,简化项目的复杂度 2 years ago
puhui999 243da124a8 fix: 调整价格弹窗不出来问题 2 years ago
puhui999 deb4585d4b fix: 适配 echarts map 的地名 2 years ago
puhui999 afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则,使用 editorRule 替代 2 years ago
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2 years ago
limingz d96f951113 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题 2 years ago
YunaiV f5d013187b crm:code review 销售漏斗 2 years ago
芋道源码 50ab864698
!428 CRM: 新增商机赢单转化率分析
Merge pull request !428 from puhui999/dev-crm
2 years ago
AhJindeg ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2 years ago
AhJindeg decdd1b25d fix: 🐞 fix post hasPermi value 2 years ago