Commit Graph
100 Commits
Author SHA1 Message Date
b2894lxlx 6a87066097 调整 合同、运力、客商、项目 2026-09-15 11:59:55 +08:00
b2894lxlx 79aa4f9fae 调整 合同、运力、基础配置、客商 2026-09-14 23:43:20 +08:00
b2894lxlx f1e2313e4c 调整 合同 2026-09-14 15:01:13 +08:00
b2894lxlx acbc9d3322 调整 基础数据、运力、车船务 2026-09-14 01:49:23 +08:00
b2894lxlx dbeb174ae2 调整项目 2026-09-13 01:01:24 +08:00
b2894lxlx 764c0f4581 运单调整 2026-09-11 14:39:30 +08:00
b2894lxlx 1a9cd55d66 1、调整导入运单
2、调整对账
2026-09-10 22:50:18 +08:00
b2894lxlx 38e53e01af Merge remote-tracking branch 'websoft/master' 2026-09-10 02:01:42 +08:00
b2894lxlx 6ff672211f 1、调整导入运单
2、调整对账
2026-09-10 02:01:28 +08:00
b2894lxlx 70bb94a2e6 Merge remote-tracking branch 'websoft/master' 2026-09-09 14:43:49 +08:00
b2894lxlx f78e61b433 1、调整导入运单
2、调整对账
2026-09-09 14:43:38 +08:00
b2894lxlx 6d4961f404 1、调整凭证
2、调整对账
3、解决正式结算冲突bug
2026-09-09 10:21:19 +08:00
b2894lxlx cba2ad3b3b 1、调整凭证
2、调整运单
2026-09-08 17:50:34 +08:00
b2894lxlx a7315b4491 调整结算模块 2026-09-07 19:37:27 +08:00
b2894lxlx 0d070d4b34 调整业务模块 2026-09-07 10:05:32 +08:00
b2894lxlx 6a6d10dc79 调整业务模块 2026-09-05 23:26:37 +08:00
b2894lxlx 3bac9b6472 调整结算 2026-09-05 00:04:46 +08:00
b2894lxlx 96f2fa0eb5 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/contract-manage-change.vue
2026-09-04 05:24:02 +08:00
b2894lxlx e789f1647a 调整业务模块 2026-09-04 05:23:34 +08:00
b2894lxlx c63c7c3e33 调整基础数据、车船务、项目、合同 2026-09-03 22:40:11 +08:00
b2894lxlx 024e77801e 1、修复基础配置
2、修复业务模块
3、拆分页面代码
2026-09-03 15:59:34 +08:00
b2894lxlx 40925cb21f Merge remote-tracking branch 'websoft/master' 2026-09-03 03:31:34 +08:00
b2894lxlx 6f0f1842cb 1、修复基础配置
2、修复业务模块
3、拆分页面代码
2026-09-03 03:31:30 +08:00
b2894lxlx 008ec7a6a8 微调合同 2026-09-02 15:14:05 +08:00
b2894lxlx 429b5548dd Merge remote-tracking branch 'websoft/master' 2026-09-02 15:11:34 +08:00
b2894lxlx 6d4434f5c9 修复付款的付款方式 2026-09-02 15:11:30 +08:00
b2894lxlx 252df72f87 1、调整业务模块 2026-09-02 03:22:51 +08:00
b2894lxlx 80a15fc626 1、调整收付款
2、调整基础配置
3、调整结算
2026-09-01 17:35:53 +08:00
b2894lxlx f858eb2bcd 调整收付款问题 2026-09-01 11:52:22 +08:00
b2894lxlx a9b4ab069b Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/settlement/receivable-payable-detail.vue
2026-08-31 19:30:16 +08:00
b2894lxlx 449e4e1884 调整收付款问题 2026-08-31 19:29:57 +08:00
b2894lxlx dea760ea1c 调整收付款问题 2026-08-31 12:40:35 +08:00
b2894lxlx 2451efdfcb Merge remote-tracking branch 'websoft/master' 2026-08-31 10:38:25 +08:00
b2894lxlx a75ac1cfa4 fix 2026-08-31 10:38:21 +08:00
b2894lxlx a10eea247f Merge remote-tracking branch 'websoft/master' 2026-08-28 18:22:20 +08:00
b2894lxlx 4fb8c74b5c fix 2026-08-28 18:22:17 +08:00
b2894lxlx a3ff00eaaf Merge remote-tracking branch 'websoft/master' 2026-08-28 16:01:49 +08:00
b2894lxlx d901d484fd fix 2026-08-28 16:01:42 +08:00
b2894lxlx 9a4e0f7c03 fix 2026-08-28 15:30:24 +08:00
b2894lxlx 17bbde81b2 fix 2026-08-28 02:10:54 +08:00
b2894lxlx 3482d03905 Merge remote-tracking branch 'websoft/master' 2026-08-27 23:52:21 +08:00
b2894lxlx b446e34c94 完善收付款管理 2026-08-27 23:52:17 +08:00
b2894lxlx e98aa61cd2 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/contract-manage.vue
#	src/views/business/project-apply.vue
2026-08-27 18:21:24 +08:00
b2894lxlx cec4c323a7 完善付款管理 2026-08-27 18:21:07 +08:00
b2894lxlx a176608019 Merge remote-tracking branch 'websoft/master' 2026-08-27 12:54:21 +08:00
b2894lxlx 3a262216c7 fix bug 2026-08-27 12:54:17 +08:00
b2894lxlx 2c08d0c362 Merge remote-tracking branch 'websoft/master' 2026-08-26 23:18:19 +08:00
b2894lxlx b36aefc7c4 fix bug 2026-08-26 23:18:14 +08:00
b2894lxlx 9d512ebad4 Merge remote-tracking branch 'websoft/master' 2026-08-26 15:57:49 +08:00
b2894lxlx 5dc3c2d2c5 1、调整合同
2、调整项目
3、调整客商
2026-08-26 15:57:46 +08:00
b2894lxlx 70ebe31103 1、调整合同
2、调整项目
3、调整客商
2026-08-26 15:56:35 +08:00
b2894lxlx dc5a2235eb 1、调整合同
2、调整项目
3、调整付款管理
2026-08-26 02:31:12 +08:00
b2894lxlx 3da2d428f3 fix bug 2026-08-25 22:35:50 +08:00
b2894lxlx cb98355715 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/contract-manage-change.vue
2026-08-25 20:47:06 +08:00
b2894lxlx 335e45c3f1 fix bug 2026-08-25 20:46:37 +08:00
b2894lxlx 665503f43e Merge remote-tracking branch 'websoft/master' 2026-08-25 18:39:57 +08:00
b2894lxlx 4340c9fc59 fix bug 2026-08-25 18:39:51 +08:00
b2894lxlx d6b6be0e9b Merge remote-tracking branch 'websoft/master' 2026-08-25 16:14:02 +08:00
b2894lxlx 55583551b5 fix bug 2026-08-25 16:13:58 +08:00
b2894lxlx e309987199 Merge remote-tracking branch 'websoft/master' 2026-08-25 13:44:24 +08:00
b2894lxlx f3c29ef2bf 调整评分量化表 2026-08-25 13:44:20 +08:00
b2894lxlx 8955ef16c7 调整评分量化表 2026-08-25 03:26:49 +08:00
b2894lxlx 9405c51de8 调整评分量化表 2026-08-25 03:25:56 +08:00
b2894lxlx e5992a0c63 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/components/business-crud-page.vue
2026-08-25 00:11:14 +08:00
b2894lxlx 1ef050dda6 fix bug 2026-08-25 00:10:45 +08:00
b2894lxlx e1bade226f 调整预结算、正式结算 2026-08-24 00:59:08 +08:00
b2894lxlx 44e31fbd22 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/components/business-crud-page.vue
#	src/views/business/contract-manage.vue
#	src/views/settlement/components/pre-settlement-editor.vue
#	src/views/settlement/formal-settlement.vue
2026-08-22 21:12:26 +08:00
b2894lxlx 5fcb82c0c0 1、调整配载、总单
2、新增收付款模块
2026-08-22 21:11:48 +08:00
b2894lxlx 1962bee882 Merge remote-tracking branch 'websoft/master' 2026-08-21 12:08:01 +08:00
b2894lxlx 868ec4aac0 fix bug 2026-08-21 12:07:56 +08:00
b2894lxlx b07205be8c Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/settlement/transport-reconciliation.vue
2026-08-21 00:18:28 +08:00
b2894lxlx 5d1d15d3a5 调整项目-合同-运单-结算逻辑链 2026-08-21 00:18:05 +08:00
b2894lxlx fd5b1484e6 1、新增结算模块
2、调整业务模块
3、调整客商模块
2026-08-20 06:33:01 +08:00
b2894lxlx b8decb1d73 修改客商变更记录 2026-08-14 15:51:24 +08:00
b2894lxlx e50391f4a5 修改客商变更记录 2026-08-14 15:20:22 +08:00
b2894lxlx 230110c486 修复业务模块bug 2026-08-14 14:46:05 +08:00
b2894lxlx c6217fcff7 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/process-config.vue
2026-08-14 14:19:48 +08:00
b2894lxlx 574b1a52f4 修复业务模块bug 2026-08-14 14:19:12 +08:00
b2894lxlx 6bc9981ffc Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/business/components/waybill-import-dialog.vue
2026-08-14 02:50:07 +08:00
b2894lxlx 6e012d766c 修复业务模块bug 2026-08-14 02:49:46 +08:00
b2894lxlx eceac8b31f Merge remote-tracking branch 'websoft/master' 2026-08-13 20:56:00 +08:00
b2894lxlx 5c89140b21 修复业务模块bug 2026-08-13 20:55:55 +08:00
b2894lxlx b25b2fae20 修复业务模块bug 2026-08-13 18:53:49 +08:00
b2894lxlx f62e36e846 修复业务模块bug 2026-08-13 14:07:04 +08:00
b2894lxlx 6554ad80dd 1、新增应付明细
2、新增应收明细
3、新增异常处置
4、新增风险处置
5、新增在途追踪
6、修复业务模块bug
2026-08-13 00:01:23 +08:00
b2894lxlx 748dd80d4a Merge remote-tracking branch 'websoft/master' 2026-08-11 23:50:54 +08:00
b2894lxlx 3e585b89fd 1、新增总单
2、fix bug
2026-08-11 23:50:51 +08:00
b2894lxlx 1f669bfd29 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/views/vehicle/customer-archive.vue
2026-08-11 15:26:57 +08:00
b2894lxlx 9c37fa4c61 1、完善配载
2、调整客商
3、调整临时额度
4、新增表头拖拽排序
2026-08-11 15:26:44 +08:00
b2894lxlx 0a5b3b2cab fix bug 2026-08-11 09:31:42 +08:00
b2894lxlx 9391c4db09 fix bug 2026-08-10 15:21:14 +08:00
b2894lxlx 0469b3e10c Merge remote-tracking branch 'websoft/master' 2026-08-07 15:44:24 +08:00
b2894lxlx a8c495a102 fix 2026-08-07 15:44:19 +08:00
b2894lxlx 56729c8cc9 调整基础数据模块 2026-08-07 13:36:51 +08:00
b2894lxlx 04ab648f5b Merge remote-tracking branch 'websoft/master' 2026-08-07 13:15:44 +08:00
b2894lxlx f550b55341 1、新增复评权限判断 2026-08-07 13:15:38 +08:00
b2894lxlx 52d4b6b486 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/option/transportCapacity/transport-ship.js
#	src/option/transportCapacity/transport-vehicle.js
2026-08-07 08:28:42 +08:00
b2894lxlx 6a02e9126b 1、车船模块fix bug
2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块
2026-08-07 08:28:21 +08:00
b2894lxlx 1e4de76978 Merge remote-tracking branch 'websoft/master'
# Conflicts:
#	src/option/business/process-config.js
#	src/views/business/process-config.vue
#	src/views/vehicle/customer-archive.vue
2026-08-06 17:41:03 +08:00
b2894lxlx e6d4edf362 项目、合同fix 2026-08-06 17:40:03 +08:00