Commit Graph

845 Commits (2305e04d2c3755738ffec91b1d5930df58a44da0)

Author SHA1 Message Date
Lei OT 8c16e0503e Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 7c3bfdfefe fix: docx: 人等匹配问题; # 浙江中青旅数据无法导出 1 year ago
Jimmy Liow 6b396633cb feat: 增加获取合同备注异常提示 1 year ago
Ycc 1407d05f43 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Ycc c6283f0cc2 新增航班和删除航班功能 1 year ago
Lei OT e66597d4fa fix: 产品管理: 编辑: 语种信息的编辑状态, 保存后更新 1 year ago
Lei OT 5d56479f35 fix: 产品管理: 绑定项目: 搜索的参数travel agency id 1 year ago
Lei OT df1a1f43bf fix: 产品管理: 编辑: 推荐指数, 自由输入 1-1000 1 year ago
Lei OT 3bf491d8ad fix: 产品管理: 编辑: 推荐指数, 自由输入 1 year ago
Lei OT f182ded513 fix: 产品管理: 编辑: 推荐指数 1 year ago
Lei OT 78793d3ddf Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 4dca7ee290 fix: 产品管: 审核人名称 1 year ago
Jimmy Liow 596dcbd5b0 fix: 增加合同备注表单 1 year ago
Jimmy Liow 6cb61a850a Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow 2e535eedfb feat: 完成合同备注功能 1 year ago
Lei OT 903efaead2 perf: docx: 附加项目: `不分人等` 1 year ago
Lei OT 65f2b996aa perf: docx: 人等最大值 1 year ago
Lei OT 592d396d78 perf: 产品编辑: 基本信息, 语种信息的编辑状态 1 year ago
YCC 741e2e17d4 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Lei OT d0af7acae3 perf: 产品管理: 编辑: 表格样式 1 year ago
Lei OT 9ebab45035 perf: 产品编辑: 基本信息, 语种信息的编辑状态 1 year ago
YCC 0dd8cc7a69 调整表格字段位置 1 year ago
Jimmy Liow 7593637786 fix: 解决产品管理没有权限也有导航 1 year ago
YCC 945a1a7a17 解决invoice的图片显示问题 1 year ago
Jimmy Liow 7d4b7bbba1 perf: 使用Message全局提示上传 1 year ago
Jimmy Liow 4671179614 feat: 增加上传PageSpy离线日志 1 year ago
YCC ff8c072e07 token名称的统一 1 year ago
Jimmy Liow 4c1855d65b feat: 取消令牌时间过期检测 1 year ago
Lei OT 93cf0e5c5e Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 0bb1f24977 fix: 产品管理: 编辑: 保存后绑定项目未显示; 删除绑定项目1; 1 year ago
Jimmy Liow 3a63b11b3d feat: 预览文档增加随机数 1 year ago
YCC aba7c69a86 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
YCC e3f8262cff 预览文档增加随机数 1 year ago
Lei OT fe58f01f22 perf: 产品管理: 编辑保存后, 不更新树的显示状态 1 year ago
Lei OT 7045af0881 perf: 产品管理: 导出docx: +v0903 1 year ago
Lei OT 1f574acab3 perf: 产品管理: `名称`编辑更新到中文语种`名称` 1 year ago
Lei OT df64cc306a todo: 产品管理: 导出docx: +v0903 1 year ago
Lei OT 866433419c perf: 产品管理: 导出docx 1 year ago
Lei OT c4d0ac4e4e Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT f0f7dc3939 . 1 year ago
YCC 3839e2a212 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
YCC fd86659634 显示账单状态 1 year ago
Lei OT cb0f519adf feat: 导出产品合同 .docx 1 year ago
Lei OT 6ecb8908f9 test: 删除测试的ID列 1 year ago
Jimmy Liow 3e5528eeb6 报价类型增加提示文字 1 year ago
YCC 418d16c138 账单提交和变更显示和确认 1 year ago
Lei OT 8fff3a2885 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 9a387067f9 test: 导出word 1 year ago
Jimmy Liow 59c0f5df4f 删除表单调试代码 1 year ago
Lei OT 2c674d5a03 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT dcc20afd03 test: 导出word 1 year ago
Jimmy Liow 0f518d04cf perf: 批量设置价格可以有多个有效期 1 year ago
Lei OT 7719b8df3b fix(产品管理): 绑定: 搜索所有产品: +年份, 必须 1 year ago
Lei OT d26a0a94bd Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 2762b5237d perf: 新增的产品, 也要红色提示 1 year ago
YCC f34e2bc632 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
YCC ecdba1ee09 账单页面,搜索功能 1 year ago
Jimmy Liow b285526dcb 增加内部测试144地址 1 year ago
Lei OT 03173157c7 style: 1 year ago
Lei OT 40053efbe8 fix: 修改价格, 重置状态 1 year ago
Lei OT e66431806b Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT d5777eaff1 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT be31765e44 fix: 产品管理: 头部, 审核发布/拒绝 1 year ago
Jimmy Liow bd5269f3f7 feat: 编辑账号搜索供应商增加防抖处理 1 year ago
YCC 31720a2930 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
YCC 0c49bdcf6c 出票信息修改功能 1 year ago
Jimmy Liow 2f7184d837 fix: 取消测试删除价格失败 1 year ago
Jimmy Liow 910c6c02af fix: 删除价格导致产品只剩一项 1 year ago
Lei OT 6e9faa39f1 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT d65c12cb2c fix: 新增产品: 名称填充 1 year ago
Jimmy Liow f33dfa2415 fix: 新增价格取消默认周末设置 1 year ago
Jimmy Liow 6ecdb54938 解决新增价格后端删除错误 1 year ago
Lei OT b861cc66ae fix(产品管理): 编辑: 保存再次提交多语种重复 1 year ago
Lei OT eb4592acd0 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 04552f3f00 perf(产品管理): 编辑: 产品树+【城市】 1 year ago
Jimmy Liow 7b25c9962f feat: 重置密码使用大小写英文加数字,才能这国内供应商平台登录 1 year ago
Lei OT c101d6660c fix(产品管理): 编辑: 初始化空数据后新增 1 year ago
Lei OT a78f128c26 perf(产品管理): 整理多语种 1 year ago
Lei OT c8299b747b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/views/products/Detail/ProductInfoQuotation.jsx
1 year ago
Lei OT 19fc024967 产品管理: 增加刷新 1 year ago
Lei OT be392588db perf(产品管理): form tooltip 1 year ago
Lei OT 96ae28e947 产品管理: 调整提交保存的字段 1 year ago
Jimmy Liow 058e8ef33a perf: 调整供应商名字宽度 1 year ago
Jimmy Liow d1977c180e perf: 删除不需要的多语言 1 year ago
Lei OT ea3c468feb Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 12ab80403f perf: 增加价格校验文字 1 year ago
Lei OT 3fb6872538 test: 1 year ago
Jimmy Liow f315b22b90 perf:删除无效组件 1 year ago
Jimmy Liow fa9feea260 fix: 解决价格组件无效判断 1 year ago
Jimmy Liow 97013bf61f Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
#	src/views/products/Detail/PriceCompactInput.jsx
1 year ago
Lei OT acaf5a3de7 # 1 year ago
Lei OT 4829b0c12c 产品管理: 新增按钮 1 year ago
Lei OT 7267eb145f Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 31abdfefea fix: 语种参数初始化 1 year ago
Lei OT d83f39efe6 产品管理: 编辑权限 1 year ago
Jimmy Liow 301031884b feat: 价格币种增加:RMB,USD,THB,JPY 1 year ago
Lei OT 53407fa57a perf: 产品管理: form : 必填 1 year ago
Lei OT ef8cda5002 perf: 产品管理: form tooltip: new Product 1 year ago
Jimmy Liow 2aa7769709 feat: 分离表单价格录入组件 1 year ago
Lei OT d8cf4da101 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT fdddfe8db6 perf: 产品管理: 树组件操作 1 year ago
Jimmy Liow 307b23021d fix: 修复获取默认语言不严谨 1 year ago
Lei OT bdb3caf735 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 628a9ab14f perf: 调整报价表格位置 1 year ago
Lei OT 6b470fedb8 style: 1 year ago
Jimmy Liow c475d7c766 fix: 解决默认语言未加添到 request 参数 1 year ago
Jimmy Liow 247caad4f5 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow 872f302ed4 feat: 登录时要选择中英文,方便业务数据查询。 1 year ago
Lei OT cb0c2a9e8e 产品管理: 提交报价数据; 产品名称 1 year ago
Jimmy Liow 4688c78dbd fix: 删除无效引用 1 year ago
Jimmy Liow eba209ea15 feat: 增加删除价格出错提示;给每个 Store 命名,方便调试 1 year ago
Jimmy Liow fe562c260f feat: 增加为测试环境构建的命令及配置 1 year ago
Lei OT 0f6cf8e1bc Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 8dbedbcf38 fix: 删除价格后,同时更新 State 数据 1 year ago
Lei OT 4bc7e74825 perf: commons 1 year ago
Lei OT 8f43258d99 style: 1 year ago
Jimmy Liow b1ddfc9bda fix: CNY -> RMB; 迁移批量设置价格代码 1 year ago
Jimmy Liow 41b32aaff4 fix: 解决 confirm 静态方法警告 1 year ago
Jimmy Liow 8970be0c10 fix: 解决表格没有 Key 的警告 1 year ago
Jimmy Liow 7fb85e308d fix: 删除表单调试 JSON;修复周末数据格式 1 year ago
Jimmy Liow 0f65540733 feat: 增加价格变化对象存储 1 year ago
Jimmy Liow 60be7b7457 feat: 完编辑价格保存 1 year ago
Jimmy Liow 9b0427bc00 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow 65e534bf3e feat: 增加删除产品价格 1 year ago
Lei OT 7c85e61f78 todo: form tooltip 1 year ago
Lei OT 0601729c92 产品管理: 编辑: 报价: CNY-> RMB 1 year ago
Lei OT 63561e3804 产品管理: 复制: 文字说明 1 year ago
Jimmy Liow 2254a09c5f Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow a186142cc0 feat: 价格使用 Form 管理 1 year ago
Lei OT ceb3690530 产品管理: 编辑: 报价数组 1 year ago
Lei OT f308b994e3 perf: 产品管理: catch 1 year ago
Lei OT 605eae0db5 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 09cacf5f85 产品管理: 控制头部操作 1 year ago
Jimmy Liow b3faf7453e Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow e6af8c1e1e feat: 对比价格是否有修改 1 year ago
Lei OT 98329e9876 产品管理: header 1 year ago
Lei OT c03a8fd1fe Revert "产品管理: 编辑: 仅信息, 多语种"
This reverts commit aae952f5e3.
1 year ago
Lei OT aae952f5e3 产品管理: 编辑: 仅信息, 多语种 1 year ago
Lei OT 86d0d175d3 产品管理: 管理: 编辑title 1 year ago
Lei OT 3040ca6220 style: 审核: 变更: 红色 1 year ago
Lei OT 88b91387e4 # 附加项目 1 year ago
Lei OT 8e6db3bf85 复制产品后, 跳转 1 year ago
Lei OT 6dce885450 Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 3ec112e88b feat:增加价格对比;增加是否可编辑价格判断 1 year ago
Lei OT 1cb54dbb75 编辑页面的各操作权限: 有 `htid` 则不允许修改信息; 提交审核方法 1 year ago
Lei OT 8dfb787db5 style: 多语种信息编辑 1 year ago
Lei OT f6b0dd8d04 多语种信息编辑 1 year ago
Lei OT b2dcec8c37 Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 59aa37cd99 feat: 准备客服测试系统 1 year ago
Lei OT 5e0013f0b4 产品类型: 控制编辑字段 1 year ago
Lei OT 2004aafa6d 多语种信息编辑 1 year ago
Jimmy Liow 16a40e6280 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow 19dfc575b4 fix:批量设置人等取值不对
del:不用的组件
1 year ago
Lei OT e7a83df8a2 跳转链接控制: 权限, 页面 1 year ago
Lei OT c2e4b027a1 保存, 价格 1 year ago
Lei OT 4fbcc93134 可编辑状态 1 year ago
Lei OT 2692579437 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 0647d845ba 产品管理: 审核页面调整编辑, 定位; 1 year ago
Jimmy Liow b8b679a0ec 批量设置价格后马上预览 1 year ago
Lei OT 98937960e5 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 80a54193a5 产品管理: 审核页面调整编辑, 定位 1 year ago
Lei OT b9a2b0e6ac 产品编辑页面: 保存后更新树 1 year ago
Jimmy Liow 7f9025db5c 开发报价新增表单 1 year ago
Lei OT 2caddfd092 供应商权限: 产品管理导航 1 year ago
Lei OT 09d9cf5ec6 产品编辑页面: 保存 1 year ago
Jimmy Liow e0784eb593 合并价格表单 1 year ago
Jimmy Liow 5f4f525f45 Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
#	src/views/products/Detail/ProductInfoForm.jsx
1 year ago
Jimmy Liow b6e57cd4ba 开发报价新增表单 1 year ago
Lei OT 0d9a80cefd 产品编辑页面: 组件 新增 1 year ago
Lei OT ab527e36c2 产品编辑页面: 组件 editable 1 year ago
Lei OT a63887a7b6 产品编辑页面: 组件 info, form, lgc 1 year ago
Lei OT 2a193f9955 todo: 产品编辑页面: 组件 1 year ago
Lei OT 26d354e0ea Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 2e68c7621d 价格设置、人等增加默认值,使用颜色表示必填 1 year ago
Lei OT 6f761a233e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/views/products/Detail.jsx
1 year ago
Lei OT 1dfc2d23d7 todo: 产品编辑页面: 组件 1 year ago
Jimmy Liow 2b9a365c45 完成批量价格生成和预览 1 year ago
Jimmy Liow cae1a8774a 完成批量设置价格界面 1 year ago
Jimmy Liow f68370fa72 批量添加价格可以同时设置人等 1 year ago
YCC 606c54a4f9 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
YCC 655114ab44 机票信息编辑 1 year ago
Lei OT ab50a891f2 style: 头部账户信息 1 year ago
黄文强@HWQ-PC 01e4dbbf4f 增加Header,把提交审核按钮和增加产品按钮移到Header 1 year ago
Lei OT af71ebf18e Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 71147a728d 产品管理: 审核页面: 调整Header组件 1 year ago
Jimmy Liow e6bc9b2dc2 fix: ESLint warning 1 year ago
黄文强@HWQ-PC 58fc202f69 1.增加年份选择功能
2.增加地接需要审核结果页面,查看哪些产品和价格是否通过功能
3.地接可以在审核界面跳过去修改产品价格功能
1 year ago
Lei OT 3a592a640d 审核页: 数据更新 1 year ago
Lei OT 09091eaff5 Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow 3544419d11 feat: SearchForm 增加时间 onMounted,解决 View 获取初始值加载数据 1 year ago
Lei OT d9c45f9962 feat: 产品管理: 审核: 切换状态 1 year ago
黄文强@HWQ-PC 83275f2d25 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
黄文强@HWQ-PC 9cb6d187c0 1.增加代理供应商录入产品描述、价格功能
2.增加供应商提交产品审核功能
1 year ago
Lei OT 05bbfaf49f Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow f1defd23e6 doc: 注释 dev 模式热更新出错原因 1 year ago
Lei OT fe868543ff 产品管理: 客服首页不限制审核跳转 1 year ago
Jimmy Liow ab01680747 更新价格状态迁移流程 1 year ago
黄文强@HWQ-PC 944c607c77 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
黄文强@HWQ-PC 0db9a5429a 1.增加供应商新增产品
2.供应商保存产品
1 year ago
Lei OT 2671015b43 feat: 产品管理: 复制产品: 增加是否复制价格; 所有项目类型 1 year ago
Lei OT 6cf4f81cdf feat: 产品管理: 审核: 切换年份; 切换供应商; 1 year ago
Lei OT bc6b5cbed1 feat: 供应商选择; perf: 产品管理二级页面头部 1 year ago
Lei OT 0a391acdd0 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 31d5db8387 产品管理: 客服首页, 审核状态 1 year ago
Jimmy Liow 2e49c01dac fix: 账号、角色保存出错不关闭表单 1 year ago
YCC d97638b843 Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Lei OT 7a411ebfa9 test: 绑定产品 1 year ago
Lei OT 5b9f8eeb7f test: 绑定产品 1 year ago
Lei OT dc87c7bdb6 绑定产品: 完毕之后更新 1 year ago
Lei OT 93572e6594 feat: 城市选择器 1 year ago
Jimmy Liow 2d9e577859 feat:账号管理界面增加中英文 1 year ago
Jimmy Liow d7118b0791 fix: 删除 Mobx 代码 1 year ago
Jimmy Liow cce861bd52 feat: 调整导航宽度,适应小屏幕 1 year ago
黄文强@HWQ-PC b22e9d2edd 修改报价报价的编辑界面 1 year ago
Lei OT b5953c5c12 style: 顶部: 账户名, 太长导致换行, 样式撑开了 1 year ago
Lei OT 9491ada91a 审核价格: 单行审核: 取消每次从后端更新数据, 仅前端响应 1 year ago
Lei OT c6739e5279 perf: 公共函数: 深拷贝. 解决内存泄漏 1 year ago
Lei OT 6ae1984b91 feat: 复制产品价格 1 year ago
Lei OT 472273396c 表单的返回值处理 1 year ago
Lei OT 2f2c86026a feat: 绑定项目: 搜索已发布的产品 1 year ago
Lei OT ce921312af 表单的返回值处理 1 year ago
Lei OT cbfb2749d0 Merge remote-tracking branch 'origin/main' 1 year ago
Jimmy Liow db2ee69edf Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow a19d787fab feat: 账号删除 realname 搜索 1 year ago
黄文强@HWQ-PC a0f81d26aa Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
黄文强@HWQ-PC 852c784f9a 1.增加新增产品功能
2.修改设置全年日期功能
1 year ago
Jimmy Liow 395e2e44db feat: 团计划增加【未确认】搜索 1 year ago
Jimmy Liow 2a20ed0f14 feat: 导航增加产品管理权限 1 year ago
Jimmy Liow b7d7c86319 增加根据供应商搜索账号 1 year ago
Lei OT 05a4106fd8 conf: 审核页面权限 1 year ago
Lei OT 5baeb5162f style: primary, danger, muted 1 year ago
Lei OT 67a21477c6 绑定项目只显示名称 1 year ago
Lei OT 4350f37a6a 超公里不需要公里数字段 1 year ago
Jimmy Liow 70f5332839 feat: 登陆界面增加版本号;调整界面布局 1 year ago
黄文强@HWQ-PC f77bcf4288 修改批量录入界面功能 1 year ago
黄文强@HWQ-PC f13241f262 修改批量录入界面功能 1 year ago
Lei OT 06db76ce86 合并 1 year ago
Lei OT 1a958639d5 当前编辑的产品 1 year ago
Lei OT efa3f052a6 当前编辑的产品; 价格表i18n; 1 year ago
Lei OT efc12c25a9 Merge remote-tracking branch 'origin/main' 1 year ago
Lei OT 4fb6273ed1 # 1 year ago
Jimmy Liow f11edab9cb Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
Jimmy Liow 4bdf085a35 feat: 开发模式不加载 PageSpy 1 year ago
黄文强@HWQ-PC 8bfb9defdc Merge branch 'main' of github.com:hainatravel/GHHub 1 year ago
黄文强@HWQ-PC 71c24be596 1.怎加批量录入价格功能 1 year ago
Jimmy Liow 9008ae8511 fix:登录超时后没有用户名 1 year ago
Jimmy Liow 3f4fcc3789 feat: 把 style 转为 Tailwind CSS 1 year ago
Jimmy Liow 81397e7a68 fix: 解决常量未导入 1 year ago
Jimmy Liow 4940a54e13 feat: 价格编辑增加路由限制 1 year ago
Jimmy Liow e3038e0a9d fix:解决 Forget to pass form prop 1 year ago