提交
This commit is contained in:
1 parent
5fe53c5481
commit
5cf67f60d1
39 files changed
+18999
-15713
No files matched your search
@@ -0,0 +1,76 @@
|
||||
-- 合同类型:框架合同 → 框架销售合同 / 框架采购合同
|
||||
-- 幂等可重复执行
|
||||
|
||||
-- 1) 停用旧「框架合同」
|
||||
UPDATE sys_dict_data
|
||||
SET del_flag = 1,
|
||||
update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type'
|
||||
AND dict_value = 'framework'
|
||||
AND tenant_no = 'shanxia2.0'
|
||||
AND del_flag = 0;
|
||||
|
||||
-- 2) 新增/恢复两类
|
||||
INSERT INTO sys_dict_data (
|
||||
id, dict_label, dict_value, tag_type, dict_type, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
) VALUES (
|
||||
'SXDC0000020260804FS01', '框架销售合同', 'framework_sale', '', 'crm_contract_type', 'shanxia2.0', 3,
|
||||
'原框架合同拆分:供方为本公司时',
|
||||
'1', '', NOW(), NULL, NOW(), 0
|
||||
)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
dict_label = VALUES(dict_label),
|
||||
order_num = 3,
|
||||
remark = VALUES(remark),
|
||||
del_flag = 0,
|
||||
update_time = NOW();
|
||||
|
||||
INSERT INTO sys_dict_data (
|
||||
id, dict_label, dict_value, tag_type, dict_type, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
) VALUES (
|
||||
'SXDC0000020260804FP01', '框架采购合同', 'framework_purchase', '', 'crm_contract_type', 'shanxia2.0', 4,
|
||||
'原框架合同拆分:供方非本公司时',
|
||||
'1', '', NOW(), NULL, NOW(), 0
|
||||
)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
dict_label = VALUES(dict_label),
|
||||
order_num = 4,
|
||||
remark = VALUES(remark),
|
||||
del_flag = 0,
|
||||
update_time = NOW();
|
||||
|
||||
-- 3) 固定后续排序(避免重复执行时 order_num 漂移)
|
||||
UPDATE sys_dict_data SET order_num = 1, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'sale' AND del_flag = 0;
|
||||
UPDATE sys_dict_data SET order_num = 2, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'purchase' AND del_flag = 0;
|
||||
UPDATE sys_dict_data SET order_num = 5, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'service';
|
||||
UPDATE sys_dict_data SET order_num = 6, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'lease';
|
||||
UPDATE sys_dict_data SET order_num = 7, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'other';
|
||||
UPDATE sys_dict_data SET order_num = 8, update_time = NOW()
|
||||
WHERE dict_type = 'crm_contract_type' AND tenant_no = 'shanxia2.0' AND dict_value = 'supplement';
|
||||
|
||||
-- 4) 业务数据:供方为本公司 → 框架销售
|
||||
-- 含用户口述「安庆市山峡有限公司」及库内全称「安庆市山峡化工有限公司」
|
||||
UPDATE crm_contract
|
||||
SET contract_type = 'framework_sale',
|
||||
update_time = NOW()
|
||||
WHERE tenant_no = 'shanxia2.0'
|
||||
AND contract_type = 'framework'
|
||||
AND TRIM(IFNULL(party_a, '')) IN (
|
||||
'安庆市山峡有限公司',
|
||||
'安庆市山峡化工有限公司',
|
||||
'安徽云栋化工有限公司'
|
||||
);
|
||||
|
||||
-- 5) 其余原框架合同 → 框架采购
|
||||
UPDATE crm_contract
|
||||
SET contract_type = 'framework_purchase',
|
||||
update_time = NOW()
|
||||
WHERE tenant_no = 'shanxia2.0'
|
||||
AND contract_type = 'framework';
|
||||
@@ -0,0 +1,32 @@
|
||||
# 合同名称按供需方面板生成
|
||||
|
||||
## 目标
|
||||
|
||||
合同名称始终为:`{供方简称}-{需方简称}({合同编号})`。
|
||||
|
||||
「供方 / 需方」指面板 `partyA` / `partyB`,与是否调换、合同类型无关;采购合同不再单独反序。
|
||||
|
||||
## 简称解析
|
||||
|
||||
对每一侧单位全称,按精确匹配:
|
||||
|
||||
1. 交易主体名称或简称 → 交易主体 `shortName`(无则全称)
|
||||
2. 客户名称、简称或开票公司名 → 客户 `shortName`(无则全称)
|
||||
3. 否则用面板全称
|
||||
|
||||
后端保存时**始终以客户主数据 `short_name` 为准**;若提交的名称片段含单位全称(前端误预览),按简称重算。
|
||||
|
||||
## 行为
|
||||
|
||||
| 场景 | 行为 |
|
||||
|------|------|
|
||||
| 名称为空 | 后端按 `party_a`/`party_b` 自动生成 |
|
||||
| 名称含面板/客户/开票全称 | 按简称重算(防误用全称) |
|
||||
| 真正手填自定义名 | 保留主体,仅校正末尾括号内合同编号 |
|
||||
| 前端选客户/交易主体/调换供需方 | 按面板重建名称(可预览);选客户时拉取客户详情取简称 |
|
||||
| 续签 | 不改(仍为原名-续签N) |
|
||||
|
||||
## 改动
|
||||
|
||||
- `backend/app/crud/crm/contract.py`:`resolve_party_short_name` + `generate_contract_name`;create/update 在 apply 字段后生成;提交名含全称时重算简称
|
||||
- `ContractFormDialog.vue`(及遗留 `form.vue`):`rebuildContractName` 按面板解析;选客户时 `fetchCustomerDetail` 取 `shortName`
|
||||
Reference in new issue
Block a user