Commit Graph

4046 Commits (8a6758ba605d8ad31226e235619a9ca831bd9041)

Author SHA1 Message Date
zy 5ab25d6e86 申请 2025-05-01 18:21:41 +08:00
quu 7898d17c4d crm 报价 商机 合同 三块整改 2025-05-01 19:03:18 +09:00
zy f5f0249b42 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-05-01 17:34:42 +08:00
zy 248ea11952 合同新增 2025-05-01 17:33:14 +08:00
quu 7eea86323c Merge branch 'wkz' 2025-05-01 17:41:38 +09:00
quu 7d7333532c crm 报价 商机 合同 三块整改 2025-05-01 17:41:17 +09:00
苑坤 d506fa487b Merge remote-tracking branch 'origin/master' 2025-05-01 15:26:50 +08:00
苑坤 f66a939237 客户名称可模糊查询 2025-05-01 15:26:34 +08:00
quu fcee2c4429 Merge branch 'master' into wkz 2025-05-01 16:22:26 +09:00
zy 39fea5ff3a 报价 2025-05-01 15:21:49 +08:00
zy 4c9e2eb21d 验证 2025-05-01 13:57:56 +08:00
zy 2a156f4616 页面调整 2025-05-01 12:31:20 +08:00
quu 33cf806121 Merge branch 'master' into wkz
# Conflicts:
#	src/views/crm/quotation/components/QuotationProductForm.vue
2025-05-01 13:25:10 +09:00
zy 28154362b2 替换 2025-05-01 11:22:08 +08:00
zy c6cea2752c 1 2025-05-01 00:52:36 +08:00
zy af6d863dc0 报价 2025-05-01 00:50:37 +08:00
zy f22127a4ad 合同变更 2025-04-30 23:49:27 +08:00
zy 912dd110fb 问题修改 2025-04-30 17:59:45 +08:00
quu a5e73d21b0 Merge branch 'master' into wkz
# Conflicts:
#	.env.local
2025-04-30 18:00:59 +09:00
quu 10942b3fae crm 报价 商机 合同 三块整改 2025-04-30 17:26:51 +09:00
苑坤 a55437683e 调整页面内容 2025-04-30 12:39:35 +08:00
苑坤 35ee692d4f 调整页面内容 2025-04-30 11:54:49 +08:00
苑坤 68ca552fe8 Merge remote-tracking branch 'origin/master' 2025-04-29 23:52:35 +08:00
zy 86e426595b 修改问题 2025-04-29 23:10:39 +08:00
苑坤 d53c55a9e9 Merge remote-tracking branch 'origin/master' 2025-04-29 14:59:47 +08:00
zy 54d277984e 详情 2025-04-29 14:59:15 +08:00
zy a392f7d034 回访类型 2025-04-29 14:04:34 +08:00
苑坤 00ebfe482e Merge remote-tracking branch 'origin/master' 2025-04-29 11:32:55 +08:00
zy 8d85aa49b7 合同 2025-04-29 11:32:20 +08:00
苑坤 46c0fb56fa Merge remote-tracking branch 'origin/master' 2025-04-29 00:16:13 +08:00
zy 5c0e4096f8 工作流 2025-04-29 00:15:39 +08:00
苑坤 cb780a06b4 Merge remote-tracking branch 'origin/master' 2025-04-28 22:36:00 +08:00
zy cd23457490 合同新增 2025-04-28 22:18:42 +08:00
苑坤 4068575149 Merge remote-tracking branch 'origin/master' 2025-04-28 20:44:47 +08:00
zy 25cc74d9c3 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	src/api/crm/billtemplate/index.ts
#	src/views/crm/quotation/QuotationForm.vue
#	src/views/crm/quotation/components/QuotationProductForm.vue
2025-04-28 20:44:26 +08:00
zy b4dbadc0a6 方案报价 2025-04-28 20:36:48 +08:00
苑坤 834420cd64 Merge remote-tracking branch 'origin/master' 2025-04-28 20:23:08 +08:00
quu 0a3d1daaee Merge branch 'master' into wkz 2025-04-28 18:40:54 +09:00
quu 804ab71841 crm 报价 商机 合同 三块整改 2025-04-28 18:40:37 +09:00
苑坤 4aa2b31abb Merge remote-tracking branch 'origin/master' 2025-04-28 17:18:50 +08:00
zy 33c57d2328 模版 2025-04-28 17:17:43 +08:00
苑坤 d762e636dd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/crm/business/BusinessForm.vue
2025-04-28 14:54:47 +08:00
zy 9bd370647f Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa 2025-04-28 14:53:32 +08:00
zy 4ebd624e71 商机 2025-04-28 14:53:29 +08:00
苑坤 c46164c1c2 Merge remote-tracking branch 'origin/master' 2025-04-28 13:22:38 +08:00
felix 9546839b34 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
# Conflicts:
#	.env.local
2025-04-28 12:22:24 +08:00
felix 7b909062d7 客户投诉 2025-04-28 12:21:46 +08:00
zy 31e9c45532 商机 2025-04-28 11:32:29 +08:00
felix 704eb548de 客户投诉 2025-04-28 11:18:28 +08:00
苑坤 211a982241 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/api/crm/contractaauthorizedcompany/index.ts
#	src/api/crm/contractaauthorizedperson/index.ts
#	src/api/crm/contractbauthorizedperson/index.ts
#	src/views/crm/business/components/BusinessProductForm.vue
#	src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue
#	src/views/crm/contract/components/ContractAAuthorizedPersonForm.vue
#	src/views/crm/contract/components/ContractBAuthorizedPersonForm.vue
#	src/views/crm/quotation/QuotationForm.vue
2025-04-27 17:50:52 +08:00