diff --git a/backend/src/api/contactOA.js b/backend/src/api/contactOA.js
index 04396cc..5217493 100644
--- a/backend/src/api/contactOA.js
+++ b/backend/src/api/contactOA.js
@@ -72,7 +72,7 @@ export function getContactOrgTree(params) {
   })
 }
 
-// 获取组织架构列表（用于选择器）
+// 获取组织架构列表
 export function getOrganizationList(params) {
   return request({
     url: '/backend/erp/getOrganization',
@@ -81,7 +81,7 @@ export function getOrganizationList(params) {
   })
 }
 
-// 获取职位列表（用于选择器，可按部门筛选）
+// 获取职位列表
 export function getPositionList(params) {
   return request({
     url: '/backend/erp/getPosition',
@@ -90,7 +90,7 @@ export function getPositionList(params) {
   })
 }
 
-// 获取职位详情（编辑联系人时，已选职位若不在当前部门列表内用于回显）
+// 获取职位详情
 export function getPositionDetail(id) {
   return request({
     url: `/backend/erp/getPositionDetail/${id}`,
diff --git a/backend/src/api/crm.js b/backend/src/api/crm.js
index e620eec..359194c 100644
--- a/backend/src/api/crm.js
+++ b/backend/src/api/crm.js
@@ -39,6 +39,14 @@ export function toggleCrmCustomerStatus(id, status) {
   });
 }
 
+/**
+ * 客户转供应商：把客户档案（含联系人）复制一套到供应商库。
+ * 同一家单位可能既是客户又是供应商，因此原客户记录保留；供应商库已有同名企业时不重复建档，只补同步联系人。
+ */
+export function convertCustomerToSupplier(id) {
+  return request({ url: `/backend/erp/customer/${id}/convert-supplier`, method: "post" });
+}
+
 /* -------------------------------- 供应商 -------------------------------- */
 
 export function getCrmSupplierList(params) {
@@ -69,6 +77,14 @@ export function toggleCrmSupplierStatus(id, status) {
   });
 }
 
+/**
+ * 供应商转客户：把供应商档案（含联系人）复制一套到客户库。
+ * 同一家单位可能既是供应商又是客户，因此原供应商记录保留；客户库已有同名企业时不重复建档，只补同步联系人。
+ */
+export function convertSupplierToCustomer(id) {
+  return request({ url: `/backend/erp/supplier/${id}/convert-customer`, method: "post" });
+}
+
 /* ------------------------------- 客户公海 ------------------------------- */
 
 /** 公海列表：租户内共享，所有成员可见 */
diff --git a/backend/src/api/crmContract.js b/backend/src/api/crmContract.js
index 9a3ee5f..5041ee3 100644
--- a/backend/src/api/crmContract.js
+++ b/backend/src/api/crmContract.js
@@ -5,7 +5,7 @@ import request from "@/utils/request";
  *
  * 说明：
  * - 合同绑定项目：project_id 为空即为「无头合同」，否则为「项目合同」；
- * - 合同状态 status：1=草稿 2=已完成 3=已作废 4=履约中 5=执行异常；
+ * - 合同状态 status：1=草稿 2=已完成 3=已作废 4=履约中 5=异常；
  * - 参与方 parties / 产品清单 products / 金额汇总 summary 随主表一并以 JSON 提交，
  *   后端按需落库；step 记录进度式创建所到达的步骤，支持每步保存续填。
  */
@@ -35,7 +35,7 @@ export function deleteContract(id) {
   return request({ url: `/backend/crm/contract/${id}`, method: "delete" });
 }
 
-/** 合同状态流转：status 1=草稿 2=已完成 3=已作废 4=履约中 5=执行异常 */
+/** 合同状态流转：status 1=草稿 2=已完成 3=已作废 4=履约中 5=异常 */
 export function changeContractStatus(id, status) {
   return request({ url: `/backend/crm/contract/${id}/status`, method: "post", data: { status } });
 }
diff --git a/backend/src/api/crmPipeline.js b/backend/src/api/crmPipeline.js
index 533a39c..897fc55 100644
--- a/backend/src/api/crmPipeline.js
+++ b/backend/src/api/crmPipeline.js
@@ -82,6 +82,21 @@ export function deleteProject(id) {
   return request({ url: `/backend/crm/project/${id}`, method: "delete" });
 }
 
+/** 项目状态流转：仅更新状态（1未开始 / 2进行中 / 3已完成 / 4已暂停 / 5异常） */
+export function changeProjectStatus(id, status) {
+  return request({ url: `/backend/crm/project/${id}/status`, method: "post", data: { status } });
+}
+
+/**
+ * 保存项目联系人：从对应企业通讯录中挑选的联系人ID集合（多选）。
+ * - upstream_contact_ids：上游（客户方）选中的联系人ID数组；
+ * - downstream_contact_ids：下游/中游（对方主体方）选中的联系人ID数组；
+ * - 单一项目后端会自动清空下游集合，传入不属于对应企业的ID会被过滤。
+ */
+export function saveProjectContacts(id, data) {
+  return request({ url: `/backend/crm/project/${id}/contacts`, method: "post", data });
+}
+
 /* --------------------------- 项目文档（OA 文档库） --------------------------- */
 
 /**
diff --git a/backend/src/api/customer.js b/backend/src/api/customer.js
index 7412e24..362e1df 100644
--- a/backend/src/api/customer.js
+++ b/backend/src/api/customer.js
@@ -45,3 +45,15 @@ export function toggleCustomerStatus(id, status) {
     data: { status }
   })
 }
+
+/**
+ * 客户转供应商：把客户档案（含联系人）复制一套到供应商库。
+ * 同一家单位可能既是客户又是供应商，因此原客户记录保留；
+ * 供应商库已有同名企业时不重复建档，只补同步联系人。
+ */
+export function convertCustomerToSupplier(id) {
+  return request({
+    url: `/backend/erp/customer/${id}/convert-supplier`,
+    method: 'post'
+  })
+}
diff --git a/backend/src/api/supplier.js b/backend/src/api/supplier.js
index d9a08a2..87384b5 100644
--- a/backend/src/api/supplier.js
+++ b/backend/src/api/supplier.js
@@ -45,3 +45,15 @@ export function toggleSupplierStatus(id, status) {
     data: { status }
   })
 }
+
+/**
+ * 供应商转客户：把供应商档案（含联系人）复制一套到客户库。
+ * 同一家单位可能既是供应商又是客户，因此原供应商记录保留；
+ * 客户库已有同名企业时不重复建档，只补同步联系人。
+ */
+export function convertSupplierToCustomer(id) {
+  return request({
+    url: `/backend/erp/supplier/${id}/convert-customer`,
+    method: 'post'
+  })
+}
diff --git a/backend/src/views/apps/crm/business/components/detail_attach.vue b/backend/src/views/apps/crm/business/components/detail_attach.vue
index 875af71..2e4de34 100644
--- a/backend/src/views/apps/crm/business/components/detail_attach.vue
+++ b/backend/src/views/apps/crm/business/components/detail_attach.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="detail-attach">
     <div class="tab-toolbar">
-      <el-upload :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
-        <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+      <!-- multiple：支持一次选择多个文件批量上传，全部结束后统一提示并刷新列表 -->
+      <el-upload multiple :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
+        <el-tooltip content="支持多选：可一次选择多个文件批量上传" placement="top">
+          <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+        </el-tooltip>
       </el-upload>
       <span v-if="tip" class="tip">{{ tip }}</span>
     </div>
@@ -61,6 +64,10 @@ const emit = defineEmits(["count"]);
 const loading = ref(false);
 const uploading = ref(false);
 const list = ref([]);
+// 批量上传：并发计数 + 结果汇总（全部结束后统一提示、统一刷新）
+const pending = ref(0);
+const okCount = ref(0);
+const failed = ref([]);
 
 /** 供父组件（detail.vue）在抽屉打开时调用 */
 async function reload() {
@@ -86,9 +93,20 @@ async function reload() {
   emit("count", list.value.length);
 }
 
+/**
+ * 单文件上传：多选时 el-upload 会为每个文件调用一次（并发），
+ * 这里用 pending 计数保证全部结束后只提示一次、只刷新一次列表。
+ */
 async function handleUpload(options) {
   const file = options.file;
-  uploading.value = true;
+  if (!file) return;
+  // 新一轮批量上传：重置汇总，并保持按钮 loading 直到最后一个文件结束
+  if (pending.value === 0) {
+    okCount.value = 0;
+    failed.value = [];
+    uploading.value = true;
+  }
+  pending.value += 1;
   try {
     const fd = new FormData();
     fd.append("file", file);
@@ -102,12 +120,26 @@ async function handleUpload(options) {
       file_url: data.url || "",
       file_size: file.size || 0,
     });
-    ElMessage.success("上传成功");
-    reload();
+    okCount.value += 1;
   } catch (e) {
-    ElMessage.error(e.message || "上传失败");
+    failed.value.push(`${file.name}：${e?.message || "上传失败"}`);
   } finally {
+    pending.value -= 1;
+    if (pending.value > 0) return;
     uploading.value = false;
+    // 统一提示：单个成功保持原文案，多个成功汇总，失败逐个列出
+    if (failed.value.length) {
+      ElMessage.error(
+        okCount.value
+          ? `成功 ${okCount.value} 个，失败 ${failed.value.length} 个：${failed.value.join("；")}`
+          : `上传失败：${failed.value.join("；")}`
+      );
+    } else if (okCount.value > 1) {
+      ElMessage.success(`已上传 ${okCount.value} 个附件`);
+    } else {
+      ElMessage.success("上传成功");
+    }
+    if (okCount.value) reload();
   }
 }
 
diff --git a/backend/src/views/apps/crm/business/components/detail_contact.vue b/backend/src/views/apps/crm/business/components/detail_contact.vue
index 5e067fe..8886d59 100644
--- a/backend/src/views/apps/crm/business/components/detail_contact.vue
+++ b/backend/src/views/apps/crm/business/components/detail_contact.vue
@@ -12,7 +12,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="position" label="职位" min-width="85" show-overflow-tooltip />
-      <el-table-column prop="mobile" label="手机号" min-width="110" />
+      <el-table-column label="手机号" min-width="140" show-overflow-tooltip>
+        <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.mobile || "-" }}</template>
+      </el-table-column>
       <el-table-column prop="wechat" label="微信" min-width="95" show-overflow-tooltip />
       <el-table-column prop="qq" label="QQ" min-width="85" />
       <el-table-column prop="remark" label="备注" min-width="95" show-overflow-tooltip />
@@ -32,7 +34,17 @@
           <el-input v-model="form.contact_name" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="职位"><el-input v-model="form.position" /></el-form-item>
-        <el-form-item label="手机号"><el-input v-model="form.mobile" /></el-form-item>
+        <el-form-item label="手机号">
+          <div class="mobile-list">
+            <div v-for="(m, idx) in form.mobiles" :key="idx" class="mobile-item">
+              <el-input v-model="form.mobiles[idx]" placeholder="请输入手机号" maxlength="20" clearable />
+              <el-button :icon="Delete" :disabled="form.mobiles.length <= 1" @click="removeMobile(idx)" />
+            </div>
+            <el-button v-if="form.mobiles.length < 5" type="primary" plain :icon="Plus" @click="addMobile">
+              添加手机号（{{ form.mobiles.length }}/5）
+            </el-button>
+          </div>
+        </el-form-item>
         <el-form-item label="微信"><el-input v-model="form.wechat" /></el-form-item>
         <el-form-item label="QQ"><el-input v-model="form.qq" /></el-form-item>
         <el-form-item label="邮箱"><el-input v-model="form.email" /></el-form-item>
@@ -52,13 +64,14 @@
 <script setup>
 import { ref, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { Plus } from "@element-plus/icons-vue";
+import { Plus, Delete } from "@element-plus/icons-vue";
 import {
   getEntityContactList,
   addEntityContact,
   updateEntityContact,
   deleteEntityContact,
 } from "@/api/crmPipeline";
+import { formatMobiles } from "../../dict";
 
 const props = defineProps({
   // 关联对象ID（商机ID）
@@ -82,6 +95,8 @@ const defaultForm = () => ({
   contact_name: "",
   position: "",
   mobile: "",
+  // 手机号支持登记多个（有的人有多个号码），默认一行，点加号增加
+  mobiles: [""],
   wechat: "",
   qq: "",
   email: "",
@@ -90,6 +105,16 @@ const defaultForm = () => ({
 });
 const form = reactive(defaultForm());
 
+/** 增加一行手机号输入 */
+function addMobile() {
+  if (form.mobiles.length < 5) form.mobiles.push("");
+}
+
+/** 删除一行手机号输入（至少保留一行） */
+function removeMobile(idx) {
+  if (form.mobiles.length > 1) form.mobiles.splice(idx, 1);
+}
+
 /** 供父组件（detail.vue）在抽屉打开时调用 */
 async function reload() {
   if (!props.relatedId) {
@@ -116,7 +141,26 @@ async function reload() {
 
 function openEdit(row) {
   Object.assign(form, defaultForm());
-  if (row) Object.assign(form, row);
+  if (row) {
+    Object.assign(form, row);
+    // 回显手机号：兼容 JSON 数组 / 分隔符字符串 / 旧数据单个 mobile（最多 5 个）
+    let arr = [];
+    const raw = row.mobiles;
+    if (Array.isArray(raw)) {
+      arr = raw;
+    } else if (raw !== undefined && raw !== null && String(raw).trim()) {
+      const s = String(raw).trim();
+      try {
+        const parsed = JSON.parse(s);
+        arr = Array.isArray(parsed) ? parsed : [s];
+      } catch (e) {
+        arr = s.split(/[，,、;；\s]+/);
+      }
+    }
+    arr = arr.map((m) => String(m || "").trim()).filter(Boolean).slice(0, 5);
+    if (arr.length === 0 && row.mobile) arr = [String(row.mobile).trim()];
+    form.mobiles = arr.length ? arr : [""];
+  }
   dialog.value = true;
 }
 
@@ -127,10 +171,14 @@ async function handleSave() {
   }
   saving.value = true;
   try {
+    // 手机号：动态列表去空后按数组提交（后端按 JSON 数组存储，最多 5 个）
+    const mobiles = form.mobiles.map((m) => (m || "").trim()).filter(Boolean);
     const payload = {
       ...form,
       related_type: props.relatedType,
       related_id: props.relatedId,
+      mobiles,
+      mobile: mobiles[0] || "",
     };
     if (form.id) {
       await updateEntityContact(payload);
@@ -173,4 +221,16 @@ defineExpose({ reload });
     color: var(--el-text-color-secondary);
   }
 }
+
+/* 手机号：动态列表，每行输入框 + 删除按钮 */
+.mobile-list {
+  width: 100%;
+
+  .mobile-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 8px;
+  }
+}
 </style>
diff --git a/backend/src/views/apps/crm/clue/components/detail.vue b/backend/src/views/apps/crm/clue/components/detail.vue
index 07ff6fc..626a5e9 100644
--- a/backend/src/views/apps/crm/clue/components/detail.vue
+++ b/backend/src/views/apps/crm/clue/components/detail.vue
@@ -7,6 +7,27 @@
     @update:model-value="handleClose"
     @opened="loadAll"
   >
+    <!-- 标题 + 右上角操作：编辑 / 删除（自带的 X 关闭按钮仍在其右侧） -->
+    <template #header>
+      <div class="drawer-header">
+        <span class="drawer-title">{{ clue?.clue_name || "线索详情" }}</span>
+        <div v-if="clue" class="drawer-actions">
+          <el-button size="small" :icon="EditPen" :disabled="Number(clue.locked) === 1" @click="emit('edit', clue)">
+            编辑
+          </el-button>
+          <el-button
+            size="small"
+            type="danger"
+            :icon="Delete"
+            :disabled="Number(clue.locked) === 1 || Number(clue.status) === 2"
+            @click="emit('delete', clue)"
+          >
+            删除
+          </el-button>
+        </div>
+      </div>
+    </template>
+
     <div v-if="clue" class="clue-detail">
       <el-alert
         v-if="Number(clue.locked) === 1 || Number(clue.status) === 2"
@@ -66,6 +87,7 @@
 
 <script setup>
 import { ref, reactive, watch } from "vue";
+import { Delete, EditPen } from "@element-plus/icons-vue";
 import DetailBasic from "./detail_basic.vue";
 import DetailContact from "./detail_contact.vue";
 import DetailFollow from "./detail_follow.vue";
@@ -76,7 +98,7 @@ const props = defineProps({
   visible: { type: Boolean, default: false },
   clue: { type: Object, default: null },
 });
-const emit = defineEmits(["update:visible", "refresh"]);
+const emit = defineEmits(["update:visible", "refresh", "edit", "delete"]);
 
 // 关联类型：1=线索
 const RELATED_TYPE = 1;
@@ -122,6 +144,30 @@ defineExpose({ loadAll });
   overflow-x: hidden;
 }
 
+/* 抽屉头部：左侧标题（超长省略）+ 右上角编辑 / 删除 */
+.drawer-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  width: 100%;
+
+  .drawer-title {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    font-size: 16px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .drawer-actions {
+    flex-shrink: 0;
+  }
+}
+
 .clue-detail {
   .detail-tabs {
     // 横向 flex：导航固定宽 + 内容区占满剩余宽度
diff --git a/backend/src/views/apps/crm/clue/components/detail_attach.vue b/backend/src/views/apps/crm/clue/components/detail_attach.vue
index e6173a0..7c26777 100644
--- a/backend/src/views/apps/crm/clue/components/detail_attach.vue
+++ b/backend/src/views/apps/crm/clue/components/detail_attach.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="detail-attach">
     <div class="tab-toolbar">
-      <el-upload :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
-        <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+      <!-- multiple：支持一次选择多个文件批量上传，全部结束后统一提示并刷新列表 -->
+      <el-upload multiple :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
+        <el-tooltip content="支持多选：可一次选择多个文件批量上传" placement="top">
+          <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+        </el-tooltip>
       </el-upload>
       <span v-if="tip" class="tip">{{ tip }}</span>
     </div>
@@ -61,6 +64,10 @@ const emit = defineEmits(["count"]);
 const loading = ref(false);
 const uploading = ref(false);
 const list = ref([]);
+// 批量上传：并发计数 + 结果汇总（全部结束后统一提示、统一刷新）
+const pending = ref(0);
+const okCount = ref(0);
+const failed = ref([]);
 
 /** 供父组件（detail.vue）在抽屉打开时调用 */
 async function reload() {
@@ -86,9 +93,20 @@ async function reload() {
   emit("count", list.value.length);
 }
 
+/**
+ * 单文件上传：多选时 el-upload 会为每个文件调用一次（并发），
+ * 这里用 pending 计数保证全部结束后只提示一次、只刷新一次列表。
+ */
 async function handleUpload(options) {
   const file = options.file;
-  uploading.value = true;
+  if (!file) return;
+  // 新一轮批量上传：重置汇总，并保持按钮 loading 直到最后一个文件结束
+  if (pending.value === 0) {
+    okCount.value = 0;
+    failed.value = [];
+    uploading.value = true;
+  }
+  pending.value += 1;
   try {
     const fd = new FormData();
     fd.append("file", file);
@@ -102,12 +120,26 @@ async function handleUpload(options) {
       file_url: data.url || "",
       file_size: file.size || 0,
     });
-    ElMessage.success("上传成功");
-    reload();
+    okCount.value += 1;
   } catch (e) {
-    ElMessage.error(e.message || "上传失败");
+    failed.value.push(`${file.name}：${e?.message || "上传失败"}`);
   } finally {
+    pending.value -= 1;
+    if (pending.value > 0) return;
     uploading.value = false;
+    // 统一提示：单个成功保持原文案，多个成功汇总，失败逐个列出
+    if (failed.value.length) {
+      ElMessage.error(
+        okCount.value
+          ? `成功 ${okCount.value} 个，失败 ${failed.value.length} 个：${failed.value.join("；")}`
+          : `上传失败：${failed.value.join("；")}`
+      );
+    } else if (okCount.value > 1) {
+      ElMessage.success(`已上传 ${okCount.value} 个附件`);
+    } else {
+      ElMessage.success("上传成功");
+    }
+    if (okCount.value) reload();
   }
 }
 
diff --git a/backend/src/views/apps/crm/clue/components/detail_contact.vue b/backend/src/views/apps/crm/clue/components/detail_contact.vue
index 3b7c3bd..d5fd97e 100644
--- a/backend/src/views/apps/crm/clue/components/detail_contact.vue
+++ b/backend/src/views/apps/crm/clue/components/detail_contact.vue
@@ -12,7 +12,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="position" label="职位" min-width="85" show-overflow-tooltip />
-      <el-table-column prop="mobile" label="手机号" min-width="110" />
+      <el-table-column label="手机号" min-width="140" show-overflow-tooltip>
+        <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.mobile || "-" }}</template>
+      </el-table-column>
       <el-table-column prop="wechat" label="微信" min-width="95" show-overflow-tooltip />
       <el-table-column prop="qq" label="QQ" min-width="85" />
       <el-table-column prop="remark" label="备注" min-width="95" show-overflow-tooltip />
@@ -32,7 +34,17 @@
           <el-input v-model="form.contact_name" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="职位"><el-input v-model="form.position" /></el-form-item>
-        <el-form-item label="手机号"><el-input v-model="form.mobile" /></el-form-item>
+        <el-form-item label="手机号">
+          <div class="mobile-list">
+            <div v-for="(m, idx) in form.mobiles" :key="idx" class="mobile-item">
+              <el-input v-model="form.mobiles[idx]" placeholder="请输入手机号" maxlength="20" clearable />
+              <el-button :icon="Delete" :disabled="form.mobiles.length <= 1" @click="removeMobile(idx)" />
+            </div>
+            <el-button v-if="form.mobiles.length < 5" type="primary" plain :icon="Plus" @click="addMobile">
+              添加手机号（{{ form.mobiles.length }}/5）
+            </el-button>
+          </div>
+        </el-form-item>
         <el-form-item label="微信"><el-input v-model="form.wechat" /></el-form-item>
         <el-form-item label="QQ"><el-input v-model="form.qq" /></el-form-item>
         <el-form-item label="邮箱"><el-input v-model="form.email" /></el-form-item>
@@ -52,13 +64,14 @@
 <script setup>
 import { ref, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { Plus } from "@element-plus/icons-vue";
+import { Plus, Delete } from "@element-plus/icons-vue";
 import {
   getEntityContactList,
   addEntityContact,
   updateEntityContact,
   deleteEntityContact,
 } from "@/api/crmPipeline";
+import { formatMobiles } from "../../dict";
 
 const props = defineProps({
   // 关联对象ID（线索ID）
@@ -80,6 +93,8 @@ const defaultForm = () => ({
   contact_name: "",
   position: "",
   mobile: "",
+  // 手机号支持登记多个（有的人有多个号码），默认一行，点加号增加
+  mobiles: [""],
   wechat: "",
   qq: "",
   email: "",
@@ -88,6 +103,16 @@ const defaultForm = () => ({
 });
 const form = reactive(defaultForm());
 
+/** 增加一行手机号输入 */
+function addMobile() {
+  if (form.mobiles.length < 5) form.mobiles.push("");
+}
+
+/** 删除一行手机号输入（至少保留一行） */
+function removeMobile(idx) {
+  if (form.mobiles.length > 1) form.mobiles.splice(idx, 1);
+}
+
 /** 供父组件（detail.vue）在抽屉打开时调用 */
 async function reload() {
   if (!props.relatedId) {
@@ -112,7 +137,26 @@ async function reload() {
 
 function openEdit(row) {
   Object.assign(form, defaultForm());
-  if (row) Object.assign(form, row);
+  if (row) {
+    Object.assign(form, row);
+    // 回显手机号：兼容 JSON 数组 / 分隔符字符串 / 旧数据单个 mobile（最多 5 个）
+    let arr = [];
+    const raw = row.mobiles;
+    if (Array.isArray(raw)) {
+      arr = raw;
+    } else if (raw !== undefined && raw !== null && String(raw).trim()) {
+      const s = String(raw).trim();
+      try {
+        const parsed = JSON.parse(s);
+        arr = Array.isArray(parsed) ? parsed : [s];
+      } catch (e) {
+        arr = s.split(/[，,、;；\s]+/);
+      }
+    }
+    arr = arr.map((m) => String(m || "").trim()).filter(Boolean).slice(0, 5);
+    if (arr.length === 0 && row.mobile) arr = [String(row.mobile).trim()];
+    form.mobiles = arr.length ? arr : [""];
+  }
   dialog.value = true;
 }
 
@@ -123,10 +167,14 @@ async function handleSave() {
   }
   saving.value = true;
   try {
+    // 手机号：动态列表去空后按数组提交（后端按 JSON 数组存储，最多 5 个）
+    const mobiles = form.mobiles.map((m) => (m || "").trim()).filter(Boolean);
     const payload = {
       ...form,
       related_type: props.relatedType,
       related_id: props.relatedId,
+      mobiles,
+      mobile: mobiles[0] || "",
     };
     if (form.id) {
       await updateEntityContact(payload);
@@ -169,4 +217,16 @@ defineExpose({ reload });
     color: var(--el-text-color-secondary);
   }
 }
+
+/* 手机号：动态列表，每行输入框 + 删除按钮 */
+.mobile-list {
+  width: 100%;
+
+  .mobile-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 8px;
+  }
+}
 </style>
diff --git a/backend/src/views/apps/crm/clue/components/edit.vue b/backend/src/views/apps/crm/clue/components/edit.vue
index df8b707..5b431b2 100644
--- a/backend/src/views/apps/crm/clue/components/edit.vue
+++ b/backend/src/views/apps/crm/clue/components/edit.vue
@@ -63,6 +63,14 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <!-- 线索状态：编辑时可直接管理（跟进中 / 已转化 / 已废弃） -->
+        <el-col v-if="isEdit" :span="12">
+          <el-form-item label="线索状态" prop="status">
+            <el-select v-model="form.status" placeholder="请选择" style="width: 100%">
+              <el-option v-for="i in CLUE_STATUS_OPTIONS" :key="i.value" :label="i.label" :value="i.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="公司地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入公司地址" maxlength="255" />
@@ -126,6 +134,7 @@ import { getAllUsers } from "@/api/user";
 import { useAuthStore } from "@/stores/auth";
 import {
   CLUE_SOURCE_OPTIONS,
+  CLUE_STATUS_OPTIONS,
   PIPELINE_LEVEL_OPTIONS,
 } from "../../dict";
 
@@ -152,6 +161,8 @@ const defaultForm = () => ({
   amount: "",
   next_contact_time: "",
   clue_level: "2",
+  // 线索状态：1跟进中 / 2已转化 / 3已废弃（编辑时可调整，新增固定为跟进中）
+  status: "1",
   contact_person: "",
   contact_position: "",
   contact_phone: "",
@@ -181,6 +192,8 @@ watch(
         isEdit.value = true;
         internalId.value = props.editData.id;
         Object.assign(form, defaultForm(), props.editData);
+        // 后端返回的状态是数字，下拉选项用字符串值，统一归一避免回显为空
+        form.status = String(props.editData.status ?? 1);
       } else {
         isEdit.value = false;
         internalId.value = null;
diff --git a/backend/src/views/apps/crm/clue/index.vue b/backend/src/views/apps/crm/clue/index.vue
index 8d616af..f9fecc7 100644
--- a/backend/src/views/apps/crm/clue/index.vue
+++ b/backend/src/views/apps/crm/clue/index.vue
@@ -81,11 +81,9 @@
         <el-table-column label="下次联系时间" width="160" align="center">
           <template #default="{ row }">{{ formatDateTime(row.next_contact_time) }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="220" align="center" fixed="right">
+        <el-table-column label="操作" width="100" align="center" fixed="right">
           <template #default="{ row }">
-            <el-button link type="primary" size="small" :disabled="row.locked === 1" @click="openEdit(row)">
-              编辑
-            </el-button>
+            <!-- 编辑 / 删除已收口到「线索详情」内，列表只保留转化 -->
             <el-button
               link
               type="warning"
@@ -95,15 +93,6 @@
             >
               转化
             </el-button>
-            <el-button
-              link
-              type="danger"
-              size="small"
-              :disabled="row.locked === 1 || row.status === 2"
-              @click="handleDelete(row)"
-            >
-              删除
-            </el-button>
           </template>
         </el-table-column>
         <template #empty><el-empty description="暂无线索" :image-size="80" /></template>
@@ -128,6 +117,8 @@
       v-model:visible="detailVisible"
       :clue="currentEditData"
       @refresh="fetchList"
+      @edit="handleDetailEdit"
+      @delete="handleDetailDelete"
     />
   </div>
 </template>
@@ -209,11 +200,6 @@ function openCreate() {
   editVisible.value = true;
 }
 
-function openEdit(row) {
-  currentEditData.value = { ...row };
-  editVisible.value = true;
-}
-
 function openConvert(row) {
   currentEditData.value = { ...row };
   convertVisible.value = true;
@@ -229,6 +215,20 @@ function handleConvertSuccess() {
   ElMessage.success("线索已转化，可在商机管理中继续跟进");
 }
 
+/** 详情内编辑：收起详情后打开编辑弹窗（详情数据即当前行） */
+function handleDetailEdit() {
+  detailVisible.value = false;
+  editVisible.value = true;
+}
+
+/** 详情内删除：复用删除逻辑，删除成功后收起详情 */
+async function handleDetailDelete() {
+  const row = currentEditData.value;
+  if (!row) return;
+  if (await handleDelete(row)) detailVisible.value = false;
+}
+
+/** 删除线索：返回是否删除成功，供详情内调用判断是否需要收起抽屉 */
 async function handleDelete(row) {
   try {
     await ElMessageBox.confirm(`确定删除线索「${row.clue_name}」吗？删除后不可恢复。`, "删除确认", {
@@ -237,8 +237,10 @@ async function handleDelete(row) {
     await deleteClue(row.id);
     ElMessage.success("删除成功");
     fetchList();
+    return true;
   } catch (e) {
     if (e !== "cancel") ElMessage.error(e.message || "删除失败");
+    return false;
   }
 }
 </script>
diff --git a/backend/src/views/apps/crm/contact/components/edit.vue b/backend/src/views/apps/crm/contact/components/edit.vue
index 77df56a..6a3bb0d 100644
--- a/backend/src/views/apps/crm/contact/components/edit.vue
+++ b/backend/src/views/apps/crm/contact/components/edit.vue
@@ -73,9 +73,33 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="手机号" prop="mobile">
-            <el-input v-model="form.mobile" placeholder="请输入手机号" />
+        <el-col :span="24">
+          <!-- 手机号：支持登记多个（有的人有多个号码），默认一行，点加号增加，最多 5 个 -->
+          <el-form-item label="手机号" prop="mobiles">
+            <div class="mobile-list">
+              <div v-for="(item, idx) in form.mobiles" :key="idx" class="mobile-item">
+                <el-input
+                  v-model="form.mobiles[idx]"
+                  :placeholder="`手机号${idx + 1}`"
+                  maxlength="20"
+                  clearable
+                />
+                <el-button
+                  :icon="Delete"
+                  :disabled="form.mobiles.length <= 1"
+                  @click="removeMobile(idx)"
+                />
+              </div>
+              <el-button
+                v-if="form.mobiles.length < 5"
+                type="primary"
+                plain
+                :icon="Plus"
+                @click="addMobile"
+              >
+                添加手机号（{{ form.mobiles.length }}/5）
+              </el-button>
+            </div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -163,6 +187,7 @@
 <script setup>
 import { ref, reactive, computed, watch, nextTick } from "vue";
 import { ElMessage } from "element-plus";
+import { Plus, Delete } from "@element-plus/icons-vue";
 import { createContact, updateContact } from "@/api/contact";
 import { getCrmCustomerList, getCrmSupplierList } from "@/api/crm";
 import { RELATED_TYPE_OPTIONS, GENDER_OPTIONS } from "../../dict";
@@ -190,7 +215,8 @@ const defaultForm = () => ({
   related_id: undefined,
   contact_name: "",
   gender: 0,
-  mobile: "",
+  // 手机号：动态列表，默认一行，点击加号增加（最多 5 个，与后端存储上限一致）
+  mobiles: [""],
   phone: "",
   email: "",
   wechat: "",
@@ -210,13 +236,15 @@ const rules = {
   related_type: [{ required: true, message: "请选择关联类型", trigger: "change" }],
   related_id: [{ required: true, message: "请选择关联对象", trigger: "change" }],
   contact_name: [{ required: true, message: "请输入联系人姓名", trigger: "blur" }],
-  mobile: [
+  mobiles: [
     {
-      // 手机号非必填，填写时才校验格式
+      // 手机号非必填，填写时才校验格式（多个号码逐个校验）
       validator: (rule, value, callback) => {
-        const val = (value || "").trim();
-        if (!val) return callback();
-        if (!/^1[3-9]\d{9}$/.test(val)) return callback(new Error("手机号格式不正确"));
+        const list = Array.isArray(value) ? value : [value];
+        const bad = list
+          .map((m) => String(m || "").trim())
+          .find((m) => m && !/^1[3-9]\d{9}$/.test(m));
+        if (bad) return callback(new Error(`手机号格式不正确：${bad}`));
         callback();
       },
       trigger: "blur",
@@ -225,6 +253,42 @@ const rules = {
   email: [{ type: "email", message: "邮箱格式不正确", trigger: "blur" }],
 };
 
+/** 解析手机号：兼容 JSON 数组 / 分隔符字符串 / 旧数据只存单个 mobile */
+function parseMobiles(row) {
+  let arr = [];
+  const raw = row?.mobiles;
+  if (Array.isArray(raw)) {
+    arr = raw;
+  } else if (raw !== undefined && raw !== null && String(raw).trim()) {
+    const s = String(raw).trim();
+    try {
+      const parsed = JSON.parse(s);
+      arr = Array.isArray(parsed) ? parsed : [s];
+    } catch (e) {
+      arr = s.split(/[，,、;；\s]+/);
+    }
+  }
+  arr = arr.map((m) => String(m || "").trim()).filter(Boolean);
+  if (arr.length === 0 && row?.mobile) arr = [String(row.mobile).trim()];
+  return arr;
+}
+
+/** 手机号填充表单：全部号码进动态列表（最多 5 个，与后端存储上限一致） */
+function fillMobiles(row) {
+  const arr = parseMobiles(row).slice(0, 5);
+  form.mobiles = arr.length ? arr : [""];
+}
+
+/** 增加一行手机号输入 */
+function addMobile() {
+  if (form.mobiles.length < 5) form.mobiles.push("");
+}
+
+/** 删除一行手机号输入（至少保留一行） */
+function removeMobile(idx) {
+  if (form.mobiles.length > 1) form.mobiles.splice(idx, 1);
+}
+
 const companyPlaceholder = computed(() =>
   form.related_type === 2 ? "搜索供应商名称" : "搜索客户名称"
 );
@@ -271,6 +335,7 @@ watch(
       form.related_type = Number(props.editData.related_type) || 1;
       form.is_primary = Number(props.editData.is_primary) || 0;
       form.gender = Number(props.editData.gender) || 0;
+      fillMobiles(props.editData);
       await loadCompanyOptions();
       // 编辑时确保关联对象在下拉中存在
       const name =
@@ -314,7 +379,27 @@ async function handleSave() {
   }
   submitting.value = true;
   try {
-    const payload = { ...form };
+    // 手机号：动态列表去空后按数组提交（后端按 JSON 数组存储，最多 5 个）
+    const mobiles = form.mobiles.map((m) => String(m || "").trim()).filter(Boolean);
+    const payload = {
+      id: form.id,
+      related_type: form.related_type,
+      related_id: form.related_id,
+      contact_name: form.contact_name,
+      gender: form.gender,
+      mobiles,
+      phone: form.phone,
+      email: form.email,
+      wechat: form.wechat,
+      qq: form.qq,
+      dingtalk: form.dingtalk,
+      department: form.department,
+      position: form.position,
+      home_address: form.home_address,
+      is_primary: form.is_primary,
+      status: form.status,
+      remark: form.remark,
+    };
     if (isEdit.value) {
       await updateContact(payload);
       ElMessage.success("更新成功");
@@ -331,3 +416,22 @@ async function handleSave() {
   }
 }
 </script>
+
+<style lang="less" scoped>
+/* 手机号：动态列表，每行输入框 + 删除按钮 */
+.mobile-list {
+  width: 100%;
+
+  .mobile-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 8px;
+
+    :deep(.el-input) {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+}
+</style>
diff --git a/backend/src/views/apps/crm/contact/index.vue b/backend/src/views/apps/crm/contact/index.vue
index 79f3b99..1529507 100644
--- a/backend/src/views/apps/crm/contact/index.vue
+++ b/backend/src/views/apps/crm/contact/index.vue
@@ -73,7 +73,10 @@
         <el-table-column label="性别" width="70" align="center">
           <template #default="{ row }">{{ genderText(row.gender) }}</template>
         </el-table-column>
-        <el-table-column prop="mobile" label="手机号" width="130" />
+        <!-- 手机号可能登记多个（一人多号），列表合并展示 -->
+        <el-table-column label="手机号" min-width="170" show-overflow-tooltip>
+          <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.mobile || "-" }}</template>
+        </el-table-column>
         <el-table-column label="关联类型" width="100" align="center">
           <template #default="{ row }">
             <el-tag size="small" :type="Number(row.related_type) === 1 ? 'primary' : 'warning'">
@@ -137,7 +140,9 @@
           <el-descriptions-item label="关联对象">{{ detailData.related_name || '-' }}</el-descriptions-item>
           <el-descriptions-item label="部门">{{ detailData.department || '-' }}</el-descriptions-item>
           <el-descriptions-item label="职位">{{ detailData.position || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="手机号">{{ detailData.mobile || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="手机号">
+            {{ formatMobiles(detailData.mobiles) || detailData.mobile || "-" }}
+          </el-descriptions-item>
           <el-descriptions-item label="座机">{{ detailData.phone || '-' }}</el-descriptions-item>
           <el-descriptions-item label="邮箱">{{ detailData.email || '-' }}</el-descriptions-item>
           <el-descriptions-item label="微信">{{ detailData.wechat || '-' }}</el-descriptions-item>
@@ -177,6 +182,7 @@ import {
   genderText,
   relatedTypeText,
   formatDateTime,
+  formatMobiles,
 } from "../dict";
 
 const loading = ref(false);
diff --git a/backend/src/views/apps/crm/contract/components/PartySelect.vue b/backend/src/views/apps/crm/contract/components/PartySelect.vue
index 2f9d8bc..d14143a 100644
--- a/backend/src/views/apps/crm/contract/components/PartySelect.vue
+++ b/backend/src/views/apps/crm/contract/components/PartySelect.vue
@@ -88,6 +88,11 @@
       </el-select>
       <el-input v-model="party.signer_phone" placeholder="联系电话" maxlength="20" />
     </div>
+
+    <!-- 该企业还没有联系人：签约人姓名与电话会在保存合同时写入企业通讯录 -->
+    <div v-if="showContactTip" class="contact-tip">
+      该企业暂无联系人，填写姓名与电话即可，保存合同后会自动写入通讯录，可稍后补全其他资料
+    </div>
   </div>
 </template>
 
@@ -143,6 +148,15 @@ const contactPlaceholder = computed(() => {
   return party.value?.ref_id ? "选择签约人（也可输入）" : "请先选择客户 / 供应商";
 });
 
+/** 已选企业但通讯录里还没有联系人：提示签约人信息会在保存合同后自动写入通讯录 */
+const showContactTip = computed(
+  () =>
+    !isOwnCompany.value &&
+    !!party.value?.ref_id &&
+    !contactLoading.value &&
+    contacts.value.length === 0
+);
+
 /** 拉取本公司人员（在职员工），映射为与联系人一致的字段结构，便于复用下拉渲染 */
 async function fetchOwnEmployees() {
   ownLoading.value = true;
@@ -338,5 +352,13 @@ const handleRefTypeChange = () => {
   .select-footer {
     text-align: center;
   }
+
+  /* 暂无联系人提示：签约人信息保存后自动写入通讯录 */
+  .contact-tip {
+    margin-top: 8px;
+    font-size: 12px;
+    line-height: 1.5;
+    color: var(--el-text-color-secondary);
+  }
 }
 </style>
diff --git a/backend/src/views/apps/crm/contract/components/ProductList.vue b/backend/src/views/apps/crm/contract/components/ProductList.vue
index d7c42d8..1bb7c74 100644
--- a/backend/src/views/apps/crm/contract/components/ProductList.vue
+++ b/backend/src/views/apps/crm/contract/components/ProductList.vue
@@ -10,6 +10,15 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column label="研发方式" width="120">
+        <template #default="{ row }">
+          <!-- 软件开发分两种：自行研发 / 外协研发（别人帮我们研发，成本按外包总额计） -->
+          <el-select v-if="row.line_type === 'dev'" v-model="row.dev_mode" style="width: 100%">
+            <el-option v-for="i in DEV_MODE_OPTIONS" :key="i.value" :label="i.label" :value="i.value" />
+          </el-select>
+          <span v-else class="muted">—</span>
+        </template>
+      </el-table-column>
       <el-table-column label="产品类别" width="150">
         <template #default="{ row }">
           <el-select
@@ -74,7 +83,24 @@
       </el-table-column>
       <el-table-column label="单位" width="90">
         <template #default="{ row }">
-          <el-input v-model="row.unit" :placeholder="row.line_type === 'dev' ? '项' : '套'" maxlength="10" />
+          <!-- 单位下拉取自「基本设置 - 单位设置」（启用中的单位），支持搜索与直接输入 -->
+          <el-select
+            v-model="row.unit"
+            filterable
+            allow-create
+            clearable
+            :placeholder="row.line_type === 'dev' ? '项' : '套'"
+            style="width: 100%"
+          >
+            <el-option v-for="u in unitOptions" :key="u" :label="u" :value="u" />
+            <!-- 历史数据中的单位不在单位设置里时兜底展示，避免已填单位看不到 -->
+            <el-option
+              v-if="row.unit && !unitOptions.includes(row.unit)"
+              :key="row.unit"
+              :label="row.unit"
+              :value="row.unit"
+            />
+          </el-select>
         </template>
       </el-table-column>
       <el-table-column label="数量" width="110">
@@ -198,13 +224,14 @@
           <span class="summary-label">产品总成本</span>
           <span class="summary-value">￥{{ formatMoney(summary.total_cost) }}</span>
         </div>
+        <!-- 我方为甲方（付款方）时显示「合同支出」（负数），否则显示「合同总利润」 -->
         <div class="summary-item profit">
-          <span class="summary-label">合同总利润</span>
+          <span class="summary-label">{{ contractProfitLabel(ourRole) }}</span>
           <span
             class="summary-value"
-            :class="{ loss: summary.total_profit < 0 }"
+            :class="{ loss: !isPayerContract(ourRole) && summary.total_profit < 0 }"
           >
-            ￥{{ formatMoney(summary.total_profit) }}
+            {{ contractProfitText(ourRole, summary) }}
           </span>
         </div>
       </div>
@@ -226,20 +253,31 @@
 <script setup>
 import { ref, computed, onMounted } from "vue";
 import { Plus } from "@element-plus/icons-vue";
-import { formatMoney } from "../../dict";
+import {
+  formatMoney,
+  PRODUCT_UNIT_OPTIONS,
+  DEV_MODE_OPTIONS,
+  contractProfitLabel,
+  contractProfitText,
+  isPayerContract,
+} from "../../dict";
 import { buildSummary, lineAmount, devCost, treeSellTotal } from "./utils";
 import { getProductList } from "@/api/crmProduct";
 import { getProductCategoryList } from "@/api/crmProductCategory";
+import { getUnitList } from "@/api/crmUnit";
 import DevModuleTree from "./DevModuleTree.vue";
 
 const props = defineProps({
   /** 产品行数组（父组件持有） */
   products: { type: Array, required: true },
+  /** 我方角色：1=甲方（付款方，金额汇总显示「合同支出」，不显示利润） */
+  ourRole: { type: [Number, String], default: 2 },
 });
 
 const summary = computed(() => buildSummary(props.products));
 
 const categoryOptions = ref([]);
+const unitOptions = ref([]);
 const productOptions = ref([]);
 const activeRow = ref(null); // 当前正在操作的产品行（用于按分类过滤搜索）
 
@@ -259,6 +297,7 @@ const addRow = () => {
     tax_rate: 0,
     dev_tree: [],
     dev_unit_price: 0,
+    dev_mode: "self", // 软件开发研发方式：self=自行研发（默认）/ outsource=外协研发
     dev_total_price: 0, // 模块报价带出的开发总成本（= 本行成本单价）
     dev_auto_total: 0, // 最近一次按人天自动汇总的值，用于判断是否需要跟随更新
     remark: "",
@@ -269,11 +308,12 @@ const removeRow = (index) => {
   props.products.splice(index, 1);
 };
 
-/** 切换行类型：软件开发行确保有模块树容器，并补上类别/单位默认值 */
+/** 切换行类型：软件开发行确保有模块树容器与研发方式，并补上类别/单位默认值 */
 function onLineTypeChange(row) {
   if (row.line_type === "dev") {
     if (!Array.isArray(row.dev_tree)) row.dev_tree = [];
     if (row.dev_unit_price == null) row.dev_unit_price = 0;
+    if (!row.dev_mode) row.dev_mode = "self";
     // 开发行不进产品管理建档，类别与单位需在此兜底，否则详情展示为空
     if (!row.category) row.category = "软件开发";
     if (!row.unit) row.unit = "项";
@@ -333,6 +373,21 @@ async function fetchCategories() {
   }
 }
 
+/** 加载计量单位下拉：基本设置「单位设置」中启用中的单位 + 内置默认单位（去重） */
+async function fetchUnits() {
+  let names = [];
+  try {
+    const res = await getUnitList({ page: 1, pageSize: 200, status: 1 });
+    names = (res?.data?.list || []).map((i) => i.name).filter(Boolean);
+  } catch (e) {
+    names = [];
+  }
+  PRODUCT_UNIT_OPTIONS.forEach((i) => {
+    if (!names.includes(i.value)) names.push(i.value);
+  });
+  unitOptions.value = names;
+}
+
 /** 切换分类：清空已选产品及带出的字段，强制「分类优先」，并重载该分类下的产品选项 */
 function onCategoryChange(row) {
   row.name = "";
@@ -393,6 +448,8 @@ function onProductPick(row, val) {
     if (hit.line_type === "dev") {
       row.line_type = "dev";
       row.dev_unit_price = Number(hit.dev_unit_price) || 0;
+      // 研发方式随产品档案带出（自行研发 / 外协研发），可在本行调整
+      row.dev_mode = hit.dev_mode === "outsource" ? "outsource" : "self";
       row.dev_tree = Array.isArray(hit.dev_tree)
         ? JSON.parse(JSON.stringify(hit.dev_tree))
         : safeParseTree(hit.dev_tree);
@@ -442,6 +499,7 @@ function safeParseTree(v) {
 
 onMounted(() => {
   fetchCategories();
+  fetchUnits();
   // 为已加载的合同产品预置下拉选项，保证名称回显
   props.products.forEach((r) => {
     // 兼容历史数据：开发行补全「开发总成本 / 成本单价 / 销售单价」，避免显示为 0
@@ -454,6 +512,8 @@ onMounted(() => {
       if (!Number(r.price)) r.price = total;
       if (!r.category) r.category = "软件开发";
       if (!r.unit) r.unit = "项";
+      // 历史数据补默认研发方式（自行研发）
+      if (!r.dev_mode) r.dev_mode = "self";
     }
     if (r && r.name && !productOptions.value.some((o) => o.product_name === r.name)) {
       productOptions.value.push({
diff --git a/backend/src/views/apps/crm/contract/components/QuickCreateParty.vue b/backend/src/views/apps/crm/contract/components/QuickCreateParty.vue
index d4af14f..2af85e9 100644
--- a/backend/src/views/apps/crm/contract/components/QuickCreateParty.vue
+++ b/backend/src/views/apps/crm/contract/components/QuickCreateParty.vue
@@ -8,7 +8,7 @@
     @closed="handleClosed"
   >
     <el-alert
-      :title="`创建成功后将自动关联到合同参与方`"
+      :title="`创建成功后将自动关联到${associateTip}`"
       type="info"
       :closable="false"
       show-icon
@@ -32,7 +32,7 @@
         <el-input v-model="form.contact_person" placeholder="请输入联系人（选填）" />
       </el-form-item>
       <el-form-item label="联系电话" prop="contact_phone">
-        <el-input v-model="form.contact_phone" placeholder="请输入联系电话（选填）" />
+        <el-input v-model="form.contact_phone" placeholder="请输入联系电话" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -48,6 +48,7 @@
 import { ref, reactive, computed, watch } from "vue";
 import { ElMessage } from "element-plus";
 import { createCrmCustomer, createCrmSupplier } from "@/api/crm";
+import { createContact } from "@/api/contact";
 import { CUSTOMER_TYPE_OPTIONS, SUPPLIER_TYPE_OPTIONS } from "../../dict";
 
 const props = defineProps({
@@ -56,6 +57,8 @@ const props = defineProps({
   refType: { type: [Number, String], default: 1 },
   /** 从搜索词带入名称 */
   presetName: { type: String, default: "" },
+  /** 创建成功后自动关联的目标（提示文案，如：合同参与方 / 项目客户） */
+  associateTip: { type: String, default: "合同参与方" },
 });
 
 const emit = defineEmits(["update:visible", "created"]);
@@ -79,6 +82,8 @@ const form = reactive(defaultForm());
 
 const rules = {
   name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+  // 后端正式保存要求联系电话非空，这里提前提示，避免提交后才报错
+  contact_phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
 };
 
 watch(
@@ -99,6 +104,33 @@ function handleClosed() {
   Object.assign(form, defaultForm());
 }
 
+/** 是否手机号（11 位、1 开头）；非手机号按座机提交，保证联系人资料分列正确 */
+function isMobilePhone(phone) {
+  return /^1\d{10}$/.test(String(phone || "").replace(/[\s-]/g, ""));
+}
+
+/**
+ * 新建企业时填写的联系人一并写入企业通讯录（仅姓名 + 电话，其余资料可后续在联系人中补全）；
+ * 写入失败不阻断企业创建结果。
+ */
+async function syncContactToBook(companyID) {
+  const name = String(form.contact_person || "").trim();
+  if (!companyID || !name) return;
+  const phone = String(form.contact_phone || "").trim();
+  try {
+    await createContact({
+      related_type: Number(props.refType) === 2 ? 2 : 1,
+      related_id: companyID,
+      contact_name: name,
+      mobile: phone && isMobilePhone(phone) ? phone : "",
+      phone: phone && !isMobilePhone(phone) ? phone : "",
+      is_primary: 1, // 新企业还没有联系人，首个联系人默认设为主联系人
+    });
+  } catch (e) {
+    // 通讯录写入失败不影响企业创建，用户可稍后在联系人中手动补录
+  }
+}
+
 async function handleSubmit() {
   if (!formRef.value) return;
   try {
@@ -127,11 +159,17 @@ async function handleSubmit() {
       const res = await createCrmCustomer(payload);
       row = res?.data || { id: null, customer_name: form.name };
     }
+    const createdID = Number(row?.id ?? row?.customer_id ?? row?.supplier_id ?? 0);
+    // 新建企业时填写的联系人写入企业通讯录（先写入再回调，调用方刷新联系人时即可选到）
+    await syncContactToBook(createdID);
     ElMessage.success(`${refTypeText.value}创建成功`);
     emit("created", {
       ...row,
-      id: row?.id ?? row?.customer_id ?? row?.supplier_id ?? null,
+      id: createdID || null,
       label: form.name,
+      // 一并回传联系人信息，供调用方自动带出对接人 / 电话
+      contact_person: form.contact_person,
+      contact_phone: form.contact_phone,
     });
     handleClose();
   } catch (e) {
diff --git a/backend/src/views/apps/crm/contract/components/create.vue b/backend/src/views/apps/crm/contract/components/create.vue
index ee7f201..6897f65 100644
--- a/backend/src/views/apps/crm/contract/components/create.vue
+++ b/backend/src/views/apps/crm/contract/components/create.vue
@@ -45,12 +45,30 @@
           <div class="config-block">
             <span class="config-label">我方角色</span>
             <el-radio-group v-model="form.our_role">
+              <el-radio-button :value="0">无</el-radio-button>
               <el-radio-button v-for="i in roleOptionsForCount" :key="i.value" :value="i.value">
                 {{ i.label }}
               </el-radio-button>
             </el-radio-group>
           </div>
         </div>
+        <!-- 我方不参与：如上中游项目中上游与中游主体之间签订的合同，甲乙双方均非本公司 -->
+        <el-alert
+          v-if="Number(form.our_role) === 0"
+          type="info"
+          :closable="false"
+          show-icon
+          title="我方不参与本合同签约：甲乙双方均从客户库 / 供应商库中选择，本公司不作为签约主体。"
+          style="margin: 0 16px 16px"
+        />
+        <el-alert
+          v-else-if="selectedProjectType === 3"
+          type="warning"
+          :closable="false"
+          show-icon
+          title="该项目为上中游项目：若登记的是上游公司与中游主体之间签订的合同，我方不参与签约，请将「我方角色」切换为「无」；若是我方与中游主体之间的合同，保持当前角色即可。"
+          style="margin: 0 16px 16px"
+        />
         <div class="parties-grid">
           <div v-for="role in activeRoles" :key="role.key">
             <PartySelect
@@ -188,7 +206,7 @@
 
       <!-- 步骤 2：产品清单 -->
       <div v-show="activeStep === 1">
-        <ProductList :products="products" />
+        <ProductList :products="products" :our-role="form.our_role" />
       </div>
     </el-form>
 
@@ -321,8 +339,12 @@ const initParties = () => {
   parties.value = PARTY_ROLES.slice(0, count).map((r) => emptyParty(r.key));
 };
 
-/** 当前租户在合同中的角色：由「我方角色」决定（1甲方/2乙方/3丙方/4丁方） */
+/**
+ * 当前租户在合同中的角色：由「我方角色」决定（1甲方/2乙方/3丙方/4丁方）。
+ * 0=我方不参与（如上中游项目的链条合同）：不锁定任何一方，全部参与方从客户/供应商库选择。
+ */
 const ownPartyRole = computed(() => {
+  if (Number(form.our_role) === 0) return "";
   const idx = Math.min(Math.max(Number(form.our_role) || 2, 1), 4);
   return PARTY_ROLES[idx - 1].key;
 });
@@ -399,6 +421,16 @@ const handleProjectChange = (id) => {
   form.project_name = hit?.project_name || "";
 };
 
+/**
+ * 当前选中项目的类型：1=单一 2=上下游 3=上中游。
+ * 上中游项目存在「上游与中游主体之间」的合同，我方不参与签约，需提示切换角色。
+ */
+const selectedProjectType = computed(() => {
+  if (!form.project_id) return 0;
+  const hit = projectOptions.value.find((i) => String(i.id) === String(form.project_id));
+  return Number(hit?.project_type) || 0;
+});
+
 /* ------------------------------ 联动 ------------------------------ */
 
 /** 我方角色切换：原我方还原为待选方（保留签约人），新我方写入当前租户，其余各方不受影响 */
@@ -406,7 +438,9 @@ watch(
   () => form.our_role,
   (nv, ov) => {
     if (!props.visible) return;
-    const roleKeyOf = (v) => PARTY_ROLES[Math.min(Math.max(Number(v) || 2, 1), 4) - 1].key;
+    // 0=我方不参与：没有对应的参与方
+    const roleKeyOf = (v) =>
+      Number(v) === 0 ? "" : PARTY_ROLES[Math.min(Math.max(Number(v) || 2, 1), 4) - 1].key;
     const prevKey = roleKeyOf(ov);
     const nextKey = roleKeyOf(nv);
     if (prevKey === nextKey) return;
@@ -460,8 +494,9 @@ const setPartyCount = (v) => {
   applyOwnParty();
 };
 
-/** 把当前租户（组织架构中的企业单位）写入本公司方 */
+/** 把当前租户（组织架构中的企业单位）写入本公司方；我方不参与时不写入任何一方 */
 const applyOwnParty = () => {
+  if (!ownPartyRole.value) return;
   const own = parties.value.find((p) => p.role === ownPartyRole.value);
   if (own) {
     own.ref_type = 0;
@@ -482,8 +517,9 @@ watch(
       isEdit.value = true;
       internalId.value = props.editData.id;
       Object.assign(form, emptyForm(), props.editData);
-      // 类型归一：后端返回数字，统一转为对应类型确保回显匹配
-      form.our_role = Number(props.editData.our_role) || 2;
+      // 类型归一：后端返回数字，统一转为对应类型确保回显匹配（0=我方不参与是合法值）
+      form.our_role =
+        props.editData.our_role == null ? 2 : Number(props.editData.our_role);
       form.contract_category =
         props.editData.contract_category == null ? "" : String(props.editData.contract_category);
       form.party_count = Number(props.editData.party_count) || 2;
@@ -516,6 +552,7 @@ watch(
           {
             id: props.presetProject.id,
             project_name: form.project_name || `项目 #${props.presetProject.id}`,
+            project_type: props.presetProject.project_type,
           },
         ];
       }
@@ -583,7 +620,7 @@ const buildPayload = (step, status) => {
     sign_date: normalizeDate(form.sign_date),
     effective_date: normalizeDate(form.effective_date),
     expire_date: normalizeDate(form.expire_date),
-    our_role: Number(form.our_role) || 2,
+    our_role: Number(form.our_role) === 0 ? 0 : Number(form.our_role) || 2,
     party_count: Number(form.party_count) || 2,
     parties: parties.value.map((p) => ({ ...p })),
     products: products.value.map(({ __key, ...rest }) => ({
diff --git a/backend/src/views/apps/crm/contract/components/detail_basic.vue b/backend/src/views/apps/crm/contract/components/detail_basic.vue
index 95dccdc..26a31ea 100644
--- a/backend/src/views/apps/crm/contract/components/detail_basic.vue
+++ b/backend/src/views/apps/crm/contract/components/detail_basic.vue
@@ -7,7 +7,7 @@
           {{ contractStatusText(detail.status) }}
         </el-tag> -->
         <el-tag v-if="contractOverdue(detail).overdue" type="danger" size="small" effect="dark">
-          {{ overdueText(contractOverdue(detail).days) }}
+          {{ contractOverdue(detail).text }}
         </el-tag>
       </div>
       <!-- <div class="detail-sub">
@@ -25,7 +25,11 @@
       <el-descriptions-item label="履约状态">
         <el-tag :type="contractStatusTag(detail.status)" size="small">{{ contractStatusText(detail.status) }}</el-tag>
       </el-descriptions-item>
-      <el-descriptions-item label="我方角色">{{ ourRoleText(detail.our_role) }}</el-descriptions-item>
+      <el-descriptions-item label="我方角色">
+        <el-tag :type="ourRoleTag(detail.our_role)" size="small" effect="plain">
+          {{ ourRoleText(detail.our_role) }}
+        </el-tag>
+      </el-descriptions-item>
       <el-descriptions-item label="所属项目" :span="2">
         <span v-if="detail.project_id">{{ detail.project_name }}</span>
         <span v-else>-</span>
@@ -66,7 +70,10 @@
       <el-table-column label="产品名称" min-width="180" show-overflow-tooltip>
         <template #default="{ row }">
           <span>{{ row.name || (isDevRow(row) ? "软件开发" : "-") }}</span>
-          <!-- <el-tag v-if="isDevRow(row)" size="small" effect="plain" type="danger" class="dev-flag">开发</el-tag> -->
+          <!-- 软件开发行区分研发方式：自研 / 外协（别人帮我们研发） -->
+          <el-tag v-if="isDevRow(row)" size="small" effect="plain" :type="devModeTag(row.dev_mode)" class="dev-flag">
+            {{ devModeShortText(row.dev_mode) }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="类别" width="100" align="center">
@@ -103,9 +110,12 @@
         <span class="label">产品总成本</span>
         <span class="value">￥{{ formatMoney(summary.total_cost) }}</span>
       </div>
+      <!-- 我方为甲方（付款方）时显示「合同支出」（负数），否则显示「合同总利润」 -->
       <div class="summary-card">
-        <span class="label">合同总利润</span>
-        <span class="value success">￥{{ formatMoney(summary.total_profit) }}</span>
+        <span class="label">{{ contractProfitLabel(detail.our_role) }}</span>
+        <span class="value success">
+          {{ contractProfitText(detail.our_role, summary) }}
+        </span>
       </div>
       <div class="summary-card">
         <span class="label">硬件部分金额</span>
@@ -130,13 +140,17 @@ import {
   formatMoney,
   formatDateOnly,
   contractCategoryText,
+  devModeShortText,
+  devModeTag,
   ourRoleText,
+  ourRoleTag,
   contractStatusText,
   contractStatusTag,
   contractOverdue,
-  overdueText,
   productCategoryText,
   productCategoryTag,
+  contractProfitLabel,
+  contractProfitText,
 } from "../../dict";
 
 const props = defineProps({
diff --git a/backend/src/views/apps/crm/contract/components/detail_payback.vue b/backend/src/views/apps/crm/contract/components/detail_payback.vue
index eed8488..35baca9 100644
--- a/backend/src/views/apps/crm/contract/components/detail_payback.vue
+++ b/backend/src/views/apps/crm/contract/components/detail_payback.vue
@@ -11,37 +11,68 @@
       </el-tooltip>
     </div>
 
-    <el-table v-loading="loading" :data="list" border size="small">
-      <el-table-column label="状态" width="90" align="center">
+    <!-- 树形：计划为总条目（父行），其明细节点（进度 / 分期）以子条目挂在下方 -->
+    <el-table
+      v-loading="loading"
+      :data="treeRows"
+      border
+      size="small"
+      row-key="id"
+      :tree-props="{ children: '__itemRows' }"
+      default-expand-all
+    >
+      <el-table-column label="名称" min-width="160" show-overflow-tooltip>
         <template #default="{ row }">
-          <el-tag :type="paybackStatusTag(row.status)" size="small">{{ paybackStatusText(row.status) }}</el-tag>
+          <span v-if="!row.__isItem" class="plan-name">{{ paybackCycleText(row.plan_type) }}回款计划</span>
+          <span v-else class="item-name">{{ row.name || `节点${row.seq}` }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="回款周期" width="90" align="center">
+      <el-table-column label="状态" width="85" align="center">
         <template #default="{ row }">
-          <el-tag size="small" effect="plain">{{ paybackCycleText(row.plan_type) }}</el-tag>
+          <el-tag v-if="!row.__isItem" :type="paybackStatusTag(row.status)" size="small">
+            {{ paybackStatusText(row.status) }}
+          </el-tag>
+          <el-tag v-else :type="paybackItemStatusTag(row)" size="small">
+            {{ paybackItemStatusText(row) }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="回款进度" min-width="140" align="center">
+      <el-table-column label="周期 / 进度" width="110" align="center">
         <template #default="{ row }">
-          <el-progress :percentage="paybackPercent(row)" :stroke-width="10" />
+          <el-tag v-if="!row.__isItem" size="small" effect="plain">{{ paybackCycleText(row.plan_type) }}</el-tag>
+          <span v-else class="item-percent">{{ Number(row.percent) > 0 ? `${Number(row.percent)}%` : "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="计划回款总额" width="130" align="right">
-        <template #default="{ row }">{{ formatMoney(row.total_amount) }}</template>
+      <el-table-column label="回款进度" min-width="125" align="center">
+        <template #default="{ row }">
+          <el-progress v-if="!row.__isItem" :percentage="paybackPercent(row)" :stroke-width="10" />
+          <el-progress
+            v-else
+            :percentage="paybackItemPercent(row)"
+            :stroke-width="8"
+            :status="itemStatusOf(row) === 2 ? 'success' : undefined"
+          />
+        </template>
       </el-table-column>
-      <el-table-column label="已回款" width="120" align="right">
-        <template #default="{ row }">{{ formatMoney(row.received_amount) }}</template>
+      <el-table-column label="计划回款总额" width="115" align="right">
+        <template #default="{ row }">{{ formatMoney(row.__isItem ? row.amount : row.total_amount) }}</template>
       </el-table-column>
-      <el-table-column label="回款方式" width="100" align="center">
-        <template #default="{ row }">{{ paybackMethodText(row.pay_method) }}</template>
+      <el-table-column label="已回款" width="105" align="right">
+        <template #default="{ row }">
+          <span v-if="!row.__isItem">{{ formatMoney(row.received_amount) }}</span>
+          <span v-else class="amount">{{ formatMoney(itemReceivedOf(row)) }}</span>
+        </template>
       </el-table-column>
-      <el-table-column label="负责人" width="90">
-        <template #default="{ row }">{{ row.owner_user_name || "-" }}</template>
+      <el-table-column label="计划回款日期" width="105" align="center">
+        <template #default="{ row }">
+          <span v-if="row.__isItem">{{ row.plan_date || "-" }}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
       <el-table-column label="操作" width="80" align="center" fixed="right">
         <template #default="{ row }">
-          <el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
+          <!-- 仅顶级（计划）有详情按钮；回款登记统一走「回款进度」区块的新建回款 -->
+          <el-button v-if="!row.__isItem" link type="primary" size="small" @click="openDetail(row)">详情</el-button>
         </template>
       </el-table-column>
       <template #empty>
@@ -59,7 +90,7 @@
       </div>
       <el-tooltip :disabled="list.length > 0" content="回款进度以回款计划为先导条件，请先新建回款计划" placement="top">
         <span class="btn-wrap">
-          <el-button type="primary" size="small" :icon="Plus" :disabled="!list.length" @click="openReceive">
+          <el-button type="primary" size="small" :icon="Plus" :disabled="!list.length" @click="openReceive()">
             新建回款
           </el-button>
         </span>
@@ -71,7 +102,10 @@
         <template #default="{ row }">{{ row.received_date || "-" }}</template>
       </el-table-column>
       <el-table-column label="对应回款计划" min-width="180" show-overflow-tooltip>
-        <template #default="{ row }">{{ planText(planOf(row.payback_id)) }}</template>
+        <template #default="{ row }">
+          {{ planText(planOf(row.payback_id)) }}
+          <span v-if="row.item_name" class="item-tag">· {{ row.item_name }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="本次回款金额" width="130" align="right">
         <template #default="{ row }">
@@ -149,6 +183,22 @@
             <el-option v-for="p in list" :key="p.id" :label="planText(p)" :value="p.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="进度节点">
+          <!-- 按现有进度选择性付款：不指定时按整单登记 -->
+          <el-select
+            v-model="receiveForm.item_seq"
+            clearable
+            placeholder="不指定（按整单登记）"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="it in planItems(receiveForm.payback_id)"
+              :key="it.seq"
+              :label="`${it.name || '节点' + it.seq}（￥${formatMoney(it.amount)}）`"
+              :value="it.seq"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="本次回款" required>
           <el-input-number
             v-model="receiveForm.amount"
@@ -296,6 +346,68 @@ function planText(p) {
   )}`;
 }
 
+/** 金额保留两位小数 */
+const round2 = (n) => Math.round((Number(n) || 0) * 100) / 100;
+
+/* ---------------------- 树形结构：计划（总条目） → 明细节点（子条目） ---------------------- */
+
+/**
+ * 树形行数据：计划为父行，其 items 明细（进度节点 / 分期）为子行；
+ * 子行 row-key 全局唯一（`{计划ID}-item-{序号}`）；父行的回款记录（children）仅用于节点已回款汇总，
+ * 不参与树形展示（tree-props 显式指向 __itemRows）。
+ */
+const treeRows = computed(() =>
+  list.value.map((p) => ({
+    ...p,
+    __isItem: false,
+    __itemRows: (Array.isArray(p.items) ? p.items : []).map((it) => ({
+      id: `${p.id}-item-${it.seq}`,
+      __isItem: true,
+      __plan: p,
+      ...it,
+    })),
+  }))
+);
+
+/** 指定计划的明细节点列表（供新建回款选择进度节点） */
+function planItems(paybackId) {
+  const p = list.value.find((i) => Number(i.id) === Number(paybackId));
+  return Array.isArray(p?.items) ? p.items : [];
+}
+
+/** 节点已回款：按「标记到该节点的回款记录」汇总，兼容历史上按明细直接登记（received_amount）的值 */
+function itemReceivedOf(row) {
+  const plan = row.__plan;
+  const fromRecords = (Array.isArray(plan?.children) ? plan.children : [])
+    .filter((r) => Number(r.item_seq) === Number(row.seq))
+    .reduce((s, r) => s + (Number(r.amount) || 0), 0);
+  const legacy = Number(row.received_amount) || 0;
+  return Math.max(round2(fromRecords), legacy);
+}
+
+/** 节点回款进度百分比 */
+function paybackItemPercent(row) {
+  const total = Number(row.amount) || 0;
+  if (!total) return 0;
+  return Math.min(100, Math.round((itemReceivedOf(row) / total) * 100));
+}
+
+/** 节点状态：0未回款 1部分回款 2已收齐 */
+function itemStatusOf(row) {
+  const total = Number(row.amount) || 0;
+  const received = itemReceivedOf(row);
+  if (total > 0 && received >= total) return 2;
+  return received > 0 ? 1 : 0;
+}
+
+function paybackItemStatusText(row) {
+  return { 0: "未回款", 1: "部分回款", 2: "已收齐" }[itemStatusOf(row)] || "-";
+}
+
+function paybackItemStatusTag(row) {
+  return { 0: "info", 1: "warning", 2: "success" }[itemStatusOf(row)] || "info";
+}
+
 /** 回款计划是否已全部收齐（总进度达到 100%），收齐后禁止再新建回款计划 */
 const paidOff = computed(() => {
   const planned = Number(progressSummary.value.total_planned) || 0;
@@ -386,6 +498,7 @@ const receiveVisible = ref(false);
 const receiveSaving = ref(false);
 const receiveForm = reactive({
   payback_id: null,
+  item_seq: 0, // 进度节点序号（1-based），0=不指定（按整单登记）
   amount: 0,
   received_date: "",
   pay_method: 1,
@@ -394,7 +507,10 @@ const receiveForm = reactive({
   remark: "",
 });
 
-/** 新建回款：以回款计划为先导条件（无计划时不允许登记） */
+/**
+ * 新建回款：以回款计划为先导条件（无计划时不允许登记）。
+ * 计划与进度节点（按进度选择性付款）都在弹窗内选择。
+ */
 function openReceive() {
   if (!list.value.length) {
     ElMessage.warning("请先新建回款计划，回款进度以计划为先导条件");
@@ -403,6 +519,7 @@ function openReceive() {
   const first = list.value[0];
   Object.assign(receiveForm, {
     payback_id: first.id,
+    item_seq: 0,
     amount: 0,
     received_date: todayStr(),
     pay_method: first.pay_method || 1,
@@ -413,10 +530,11 @@ function openReceive() {
   receiveVisible.value = true;
 }
 
-/** 切换回款计划：同步该计划的回款方式作为默认值 */
+/** 切换回款计划：同步该计划的回款方式作为默认值，并清空进度节点选择 */
 function onPlanChange(pid) {
   const p = planOf(pid);
   if (p) receiveForm.pay_method = p.pay_method || 1;
+  receiveForm.item_seq = 0;
 }
 
 const uploading = ref(false);
@@ -515,6 +633,7 @@ async function submitReceive() {
   try {
     await createPaybackRecord({
       payback_id: receiveForm.payback_id,
+      item_seq: Number(receiveForm.item_seq) || 0,
       amount: Number(receiveForm.amount) || 0,
       received_date: receiveForm.received_date || "",
       pay_method: receiveForm.pay_method,
@@ -602,6 +721,29 @@ defineExpose({ reload });
   color: #409eff;
 }
 
+/* 树形父行：计划名称 */
+.plan-name {
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+/* 树形子条目：进度节点名称 + 百分比 */
+.item-name {
+  font-weight: 500;
+  color: var(--el-text-color-primary);
+}
+
+.item-percent {
+  margin-left: 4px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
+.item-tag {
+  margin-left: 2px;
+  color: var(--el-color-primary);
+}
+
 .receipt-block {
   width: 100%;
 
diff --git a/backend/src/views/apps/crm/contract/index.vue b/backend/src/views/apps/crm/contract/index.vue
index 2f16917..8fd89e1 100644
--- a/backend/src/views/apps/crm/contract/index.vue
+++ b/backend/src/views/apps/crm/contract/index.vue
@@ -14,6 +14,7 @@
     <!-- 统计周期 -->
     <div class="stat-period-bar">
       <el-radio-group v-model="statsPeriod" @change="onPeriodChange">
+        <el-radio-button label="all">全部</el-radio-button>
         <el-radio-button label="month">本月</el-radio-button>
         <el-radio-button label="quarter">本季</el-radio-button>
         <el-radio-button label="year">本年</el-radio-button>
@@ -30,10 +31,12 @@
         :clearable="false"
         @change="onRangeChange"
       />
+      <!-- 当前统计范围：切换周期后卡片按该区间重新统计（区间相同则数字自然相同） -->
+      <span class="stat-scope">统计范围：{{ statsScopeText }}</span>
     </div>
 
     <!-- 统计卡片 -->
-    <div class="stat-cards">
+    <div class="stat-cards" v-loading="statsLoading">
       <div class="stat-card">
         <span class="stat-label">合同总数</span>
         <span class="stat-value">{{ stats.total ?? 0 }}</span>
@@ -47,7 +50,12 @@
         <span class="stat-value">{{ formatMoney(stats.total_cost) }}</span>
       </div>
       <div class="stat-card">
-        <span class="stat-label">合同总利润</span>
+        <el-tooltip
+          content="仅统计非甲方（收款方）合同的利润；我方为甲方的合同属于支出，不计入利润"
+          placement="top"
+        >
+          <span class="stat-label">合同总利润</span>
+        </el-tooltip>
         <span class="stat-value" :style="profitStyle(stats.total_profit)">{{ profitText(stats.total_profit) }}</span>
       </div>
     </div>
@@ -65,8 +73,8 @@
           />
         </el-form-item>
         <el-form-item label="我方角色">
-          <el-select v-model="filters.our_role" clearable placeholder="全部" style="width: 110px">
-            <el-option v-for="i in OUR_ROLE_OPTIONS" :key="i.value" :label="i.label" :value="i.value" />
+          <el-select v-model="filters.our_role" clearable placeholder="全部" style="width: 130px">
+            <el-option v-for="i in ourRoleFilterOptions" :key="i.value" :label="i.label" :value="i.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="合同分类">
@@ -101,8 +109,13 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="contract_no" label="合同编号" width="150" show-overflow-tooltip />
-        <el-table-column label="合同名称" min-width="190" show-overflow-tooltip fixed>
+        <el-table-column label="我方角色" width="90" align="center" fixed>
+          <template #default="{ row }">
+            <el-tag :type="ourRoleTag(row.our_role)" size="small" effect="plain">{{ ourRoleText(row.our_role) }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="contract_no" label="合同编号" width="150" show-overflow-tooltip /> -->
+        <el-table-column label="合同名称" min-width="190" show-overflow-tooltip >
           <template #default="{ row }">
             <span class="name-link" @click="openRow(row)">
               {{ row.contract_name }}
@@ -110,11 +123,6 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="我方角色" width="90" align="center">
-          <template #default="{ row }">
-            <el-tag type="primary" size="small" effect="plain">{{ ourRoleText(row.our_role) }}</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="分类" width="100" align="center">
           <template #default="{ row }">{{ contractCategoryText(row.contract_category) }}</template>
         </el-table-column>
@@ -128,20 +136,28 @@
             {{ formatMoney(row.summary?.total_amount ?? row.total_amount) }}
           </template>
         </el-table-column>
-        <el-table-column label="合同总利润" width="130" align="right">
+        <el-table-column label="合同利润/支出" width="140" align="right">
+          <template #header>
+            <el-tooltip
+              content="我方为甲方（付款方）：按负数（绿色）显示合同支出 = 合同总金额；其余角色：显示合同利润 = 总金额 − 产品总成本"
+              placement="top"
+            >
+              <span>合同利润/支出</span>
+            </el-tooltip>
+          </template>
           <template #default="{ row }">
-            <span :style="profitStyle(row.summary?.total_profit ?? row.total_profit)">
-              {{ profitText(row.summary?.total_profit ?? row.total_profit) }}
+            <span :style="profitStyle(contractProfitOrExpense(row))">
+              {{ profitText(contractProfitOrExpense(row)) }}
             </span>
           </template>
         </el-table-column>
         <el-table-column label="签订日期" width="110" align="center">
           <template #default="{ row }">{{ formatDateOnly(row.sign_date) }}</template>
         </el-table-column>
-        <el-table-column label="逾期" width="100" align="center">
+        <el-table-column label="逾期" width="130" align="center">
           <template #default="{ row }">
             <el-tag v-if="contractOverdue(row).overdue" type="danger" size="small" effect="dark">
-              {{ overdueText(contractOverdue(row).days) }}
+              {{ contractOverdue(row).text }}
             </el-tag>
             <span v-else>-</span>
           </template>
@@ -184,7 +200,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, nextTick, watch } from "vue";
+import { ref, reactive, computed, onMounted, nextTick, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { Plus, Search, Refresh } from "@element-plus/icons-vue";
@@ -197,16 +213,17 @@ import ContractCreate from "./components/create.vue";
 import ContractDetail from "./components/detail.vue";
 import {
   CONTRACT_CATEGORY_OPTIONS,
-  OUR_ROLE_OPTIONS,
+  ourRoleFilterOptions,
   CONTRACT_STATUS_OPTIONS,
   ourRoleText,
+  ourRoleTag,
   contractCategoryText,
   contractStatusText,
   contractStatusTag,
   contractOverdue,
-  overdueText,
   formatDateOnly,
   formatMoney,
+  isPayerContract,
 } from "../dict";
 
 const route = useRoute();
@@ -228,15 +245,46 @@ const filters = reactive({
 });
 const pagination = reactive({ page: 1, pageSize: 20, total: 0 });
 
-/** 统计周期：month/quarter/year/custom（自定义选区间），默认本年 */
-const statsPeriod = ref("year");
+/** 统计周期：all（全部）/ month / quarter / year / custom（自定义选区间），默认全部 */
+const statsPeriod = ref("all");
 const statsRange = ref([]);
 
 /** 列表页统计：后端按周期汇总（排除已作废），周期参数透传给 Stats */
 const stats = ref({ total: 0, total_amount: 0, total_cost: 0, total_profit: 0 });
+/** 卡片加载态：切换周期时给出可见的刷新反馈 */
+const statsLoading = ref(false);
 
-/** 周期参数：统计与列表共用，保证两者口径一致 */
+/** 当前统计范围文案：与后端口径一致（合同有效期与所选周期重叠），便于对照卡片数字 */
+const statsScopeText = computed(() => {
+  const pad = (n) => String(n).padStart(2, "0");
+  const fmt = (d) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+  const now = new Date();
+  const y = now.getFullYear();
+  const m = now.getMonth();
+  switch (statsPeriod.value) {
+    case "month":
+      return `${fmt(new Date(y, m, 1))} ~ ${fmt(new Date(y, m + 1, 0))}`;
+    case "quarter": {
+      const q = Math.floor(m / 3);
+      return `${fmt(new Date(y, q * 3, 1))} ~ ${fmt(new Date(y, q * 3 + 3, 0))}`;
+    }
+    case "year":
+      return `${y}-01-01 ~ ${y}-12-31`;
+    case "custom":
+      return statsRange.value?.length === 2
+        ? `${statsRange.value[0]} ~ ${statsRange.value[1]}`
+        : "自定义区间";
+    default:
+      return "全部时间（不限有效期）";
+  }
+});
+
+/**
+ * 周期参数：统计与列表共用，保证两者口径一致。
+ * 「全部」不传周期参数——列表不按有效期过滤，避免有效期不在所选周期内的合同（如历史合同）被隐藏。
+ */
 function periodParams() {
+  if (statsPeriod.value === "all") return {};
   const params = { period: statsPeriod.value };
   if (statsPeriod.value === "custom" && statsRange.value && statsRange.value.length === 2) {
     params.start_date = statsRange.value[0];
@@ -246,11 +294,14 @@ function periodParams() {
 }
 
 async function loadStats() {
+  statsLoading.value = true;
   try {
     const res = await getContractStats(periodParams());
     stats.value = res?.data || stats.value;
   } catch {
     /* 统计失败不影响列表 */
+  } finally {
+    statsLoading.value = false;
   }
 }
 
@@ -373,6 +424,18 @@ function profitStyle(val) {
   return {};
 }
 
+/**
+ * 列表展示值：我方为甲方（付款方）的合同是「支出」，取负值 → 显示为 -￥X（绿色）；
+ * 其余角色的合同是「利润」（总金额 − 产品总成本）。表头已注明口径，单元格内不写"支出"文字。
+ */
+function contractProfitOrExpense(row) {
+  if (!isPayerContract(row.our_role)) {
+    return Number(row.summary?.total_profit ?? row.total_profit) || 0;
+  }
+  const paid = Number(row.summary?.total_amount ?? row.total_amount) || 0;
+  return -paid;
+}
+
 function openCreate() {
   currentRow.value = null;
   initStep.value = 1;
@@ -434,6 +497,13 @@ async function handleDelete(row) {
   gap: 12px;
   margin-bottom: 12px;
   flex-wrap: wrap;
+
+  /* 当前统计范围：右对齐说明，切换周期后随卡片一起刷新 */
+  .stat-scope {
+    margin-left: auto;
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
 }
 
   .stat-card {
diff --git a/backend/src/views/apps/crm/customer/index.vue b/backend/src/views/apps/crm/customer/index.vue
index 216f29a..98354ea 100644
--- a/backend/src/views/apps/crm/customer/index.vue
+++ b/backend/src/views/apps/crm/customer/index.vue
@@ -81,6 +81,10 @@
         <el-table-column label="客户名称" min-width="200" show-overflow-tooltip>
           <template #default="{ row }">
             <span class="name-link" @click="openDetail(row)">{{ row.customer_name }}</span>
+            <!-- 同一家单位可能既是客户又是供应商（已建供应商档案） -->
+            <el-tag v-if="row.also_supplier" size="small" type="warning" effect="plain" style="margin-left: 6px">
+              也是供应商
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="类型" width="110" align="center">
@@ -111,10 +115,11 @@
         <el-table-column label="更新时间" width="160" align="center">
           <template #default="{ row }">{{ formatDateTime(row.update_time) }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="280" align="center" fixed="right">
+        <el-table-column label="操作" width="350" align="center" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
             <el-button link type="primary" size="small" @click="openContact(row)">联系人</el-button>
+            <el-button link type="success" size="small" @click="handleConvertSupplier(row)">转为供应商</el-button>
             <el-button link type="warning" size="small" @click="openMovePool([row])">移入公海</el-button>
             <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
           </template>
@@ -151,6 +156,10 @@
       size="700px"
     >
       <div v-if="detailData" class="detail-content">
+        <div class="detail-actions">
+          <el-button type="success" size="small" @click="handleConvertSupplier(detailData)">转为供应商</el-button>
+          <span class="detail-actions-tip">同一家单位可能既是客户又是供应商，转化后原客户记录保留</span>
+        </div>
         <el-descriptions title="基本信息" :column="2" border size="small">
           <el-descriptions-item label="客户名称" :span="2">
             {{ detailData.customer_name }}
@@ -254,12 +263,14 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="mobile" label="手机号" width="130" />
+          <el-table-column prop="department" label="部门" width="120" show-overflow-tooltip />
+          <el-table-column prop="position" label="职位" width="130" show-overflow-tooltip />
+          <el-table-column label="手机号" width="170" show-overflow-tooltip>
+            <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.mobile || "-" }}</template>
+          </el-table-column>
           <el-table-column prop="email" label="邮箱" min-width="180" show-overflow-tooltip />
           <el-table-column prop="wechat" label="微信" width="120" show-overflow-tooltip />
           <el-table-column prop="qq" label="QQ" width="110" show-overflow-tooltip />
-          <el-table-column prop="department" label="部门" width="120" show-overflow-tooltip />
-          <el-table-column prop="position" label="职位" width="130" show-overflow-tooltip />
           <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="{ row }">
               <el-button link type="primary" size="small" @click="openContactEdit(row)">编辑</el-button>
@@ -323,6 +334,7 @@ import {
   getCrmCustomerList,
   deleteCrmCustomer,
   moveToPool,
+  convertCustomerToSupplier,
 } from "@/api/crm";
 import { listContacts, deleteContact } from "@/api/contact";
 import CustomerEdit from "./components/edit.vue";
@@ -341,6 +353,7 @@ import {
   statusTag,
   formatDate,
   formatDateTime,
+  formatMobiles,
 } from "../dict";
 
 const loading = ref(false);
@@ -465,6 +478,35 @@ async function handleDelete(row) {
   }
 }
 
+/**
+ * 客户转供应商：把客户的企业资料与联系人复制一套到供应商库。
+ * 同一家单位可能既是客户又是供应商，原客户记录保留；供应商库已有同名企业时只补同步联系人，不重复建档。
+ */
+async function handleConvertSupplier(row) {
+  try {
+    await ElMessageBox.confirm(
+      `将客户「${row.customer_name}」的企业资料与联系人复制一套到供应商库？原客户记录会保留，可在供应商管理中继续完善。`,
+      "转为供应商",
+      { type: "warning", confirmButtonText: "确认转化" }
+    );
+  } catch (e) {
+    return; // 取消
+  }
+  try {
+    const res = await convertCustomerToSupplier(row.id);
+    const data = res?.data || {};
+    const c = data.contacts || {};
+    ElMessage.success(
+      data.existed
+        ? `供应商库已有同名企业，已同步联系人（新增 ${c.inserted || 0}、补充 ${c.merged || 0}），未重复建档`
+        : `已转为供应商，并同步联系人（新增 ${c.inserted || 0}）`
+    );
+    fetchList();
+  } catch (e) {
+    ElMessage.error(e.message || "转化失败");
+  }
+}
+
 /* ------------------------------ 联系人 ------------------------------ */
 async function openContact(row) {
   currentRow.value = { ...row };
@@ -621,6 +663,18 @@ async function submitMovePool() {
 .detail-content {
   padding: 4px 8px;
 
+  .detail-actions {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 16px;
+  }
+
+  .detail-actions-tip {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
   :deep(.el-descriptions__label) {
     width: 130px;
     min-width: 130px;
diff --git a/backend/src/views/apps/crm/dict.js b/backend/src/views/apps/crm/dict.js
index 702dbe5..ea115e6 100644
--- a/backend/src/views/apps/crm/dict.js
+++ b/backend/src/views/apps/crm/dict.js
@@ -163,7 +163,7 @@ export const PIPELINE_LEVEL_OPTIONS = [
 export const CLUE_STATUS_OPTIONS = [
   { label: "跟进中", value: "1" },
   { label: "已转化", value: "2" },
-  { label: "已关闭", value: "3" },
+  { label: "已废弃", value: "3" },
 ];
 
 /** 商机阶段 */
@@ -189,6 +189,19 @@ export const PROJECT_STATUS_OPTIONS = [
   { label: "进行中", value: "2" },
   { label: "已完成", value: "3" },
   { label: "已暂停", value: "4" },
+  { label: "异常", value: "5" },
+];
+
+/**
+ * 项目类型：
+ * 1单一项目（仅上游客户）
+ * 2上下游项目（上游客户 + 下游供应商/客户）
+ * 3上中游项目（上游 A 公司 + 中游 B 公司，下游为本公司）
+ */
+export const PROJECT_TYPE_OPTIONS = [
+  { label: "单一项目", value: "1" },
+  { label: "上下游项目", value: "2" },
+  { label: "上中游项目", value: "3" },
 ];
 
 /** 回访方式 */
@@ -213,13 +226,16 @@ const CLUE_STATUS_MAP = CLUE_STATUS_OPTIONS.reduce((m, i) => ((m[i.value] = i.la
 const BUSINESS_STAGE_MAP = BUSINESS_STAGE_OPTIONS.reduce((m, i) => ((m[i.value] = i.label), m), {});
 const BUSINESS_STATUS_MAP = BUSINESS_STATUS_OPTIONS.reduce((m, i) => ((m[i.value] = i.label), m), {});
 const PROJECT_STATUS_MAP = PROJECT_STATUS_OPTIONS.reduce((m, i) => ((m[i.value] = i.label), m), {});
+const PROJECT_TYPE_MAP = PROJECT_TYPE_OPTIONS.reduce((m, i) => ((m[i.value] = i.label), m), {});
 const FOLLOW_TYPE_MAP = FOLLOW_TYPE_OPTIONS.reduce((m, i) => ((m[i.value] = i.label), m), {});
 
 const PIPELINE_LEVEL_TAG = { 1: "danger", 2: "warning", 3: "info" };
 const CLUE_STATUS_TAG = { 1: "primary", 2: "success", 3: "info" };
 const BUSINESS_STAGE_TAG = { 1: "info", 2: "primary", 3: "warning", 4: "warning", 5: "success", 6: "danger" };
 const BUSINESS_STATUS_TAG = { 1: "primary", 2: "success", 3: "info" };
-const PROJECT_STATUS_TAG = { 1: "info", 2: "primary", 3: "success", 4: "warning" };
+const PROJECT_STATUS_TAG = { 1: "info", 2: "primary", 3: "success", 4: "warning", 5: "danger" };
+const PROJECT_TYPE_SHORT = { 1: "单一", 2: "上下游", 3: "上中游" };
+const PROJECT_TYPE_TAG = { 1: "info", 2: "warning", 3: "primary" };
 
 export const clueSourceText = (val) => CLUE_SOURCE_MAP[normalize(val)] || "-";
 export const pipelineLevelText = (val) => PIPELINE_LEVEL_MAP[normalize(val)] || "-";
@@ -232,6 +248,12 @@ export const businessStatusText = (val) => BUSINESS_STATUS_MAP[normalize(val)] |
 export const businessStatusTag = (val) => BUSINESS_STATUS_TAG[normalize(val)] || "info";
 export const projectStatusText = (val) => PROJECT_STATUS_MAP[normalize(val)] || "-";
 export const projectStatusTag = (val) => PROJECT_STATUS_TAG[normalize(val)] || "info";
+
+/** 项目类型：1单一项目 / 2上下游项目 / 3上中游项目（上中游=上游 A + 中游 B，下游为本公司） */
+export const projectTypeText = (val) => PROJECT_TYPE_MAP[normalize(val)] || "单一项目";
+/** 列表用的项目类型短标签：单一 / 上下游 / 上中游 */
+export const projectTypeShortText = (val) => PROJECT_TYPE_SHORT[normalize(val)] || "单一";
+export const projectTypeTag = (val) => PROJECT_TYPE_TAG[normalize(val)] || "info";
 export const followTypeText = (val) => FOLLOW_TYPE_MAP[normalize(val)] || "-";
 
 export const pipelineRelatedTypeText = (val) => {
@@ -245,6 +267,28 @@ const PIPELINE_STAGE_TAG = { 1: "info", 2: "primary", 3: "success" };
 export const pipelineStageText = (val) => pipelineRelatedTypeText(val);
 export const pipelineStageTag = (val) => PIPELINE_STAGE_TAG[normalize(val)] || "info";
 
+/** 多个手机号格式化：JSON数组 / 逗号分隔 / 单个号码 → "138…、139…"（无内容返回空串） */
+export function formatMobiles(val) {
+  if (!val) return "";
+  let arr = [];
+  if (Array.isArray(val)) {
+    arr = val;
+  } else {
+    const s = String(val).trim();
+    if (!s) return "";
+    try {
+      const parsed = JSON.parse(s);
+      arr = Array.isArray(parsed) ? parsed : [s];
+    } catch (e) {
+      arr = s.split(/[，,、;；\s]+/);
+    }
+  }
+  return arr
+    .map((m) => String(m || "").trim())
+    .filter(Boolean)
+    .join("、");
+}
+
 /** 金额格式化：12345.6 -> 12,345.60 */
 export function formatMoney(val) {
   if (val === undefined || val === null || val === "") return "-";
@@ -283,36 +327,82 @@ export function overdueDays(dateStr) {
   return Math.round((t - d) / 86400000);
 }
 
-/** 逾期文案：days>0 -> "逾期 N 天"，否则空串 */
+/**
+ * 逾期时长换算（日历口径、含闰年）：
+ * 从 startDate 到今天，先取满整年数 x（闰日 2-29 加年落到 2-28），
+ * 再取扣除整年后的剩余天数 y；不足 1 年按总天数展示。
+ * 返回 { days, years, rest, text }：text 如 "逾期 1 年 35 天" / "逾期 12 天"（未逾期为空串）。
+ */
+export function overdueDuration(startDate) {
+  const days = overdueDays(startDate);
+  if (days <= 0) return { days: 0, years: 0, rest: 0, text: "" };
+  const start = new Date(startDate);
+  if (isNaN(start.getTime())) return { days, years: 0, rest: 0, text: `逾期 ${days} 天` };
+  start.setHours(0, 0, 0, 0);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  // 加 n 年：闰日 2-29 在平年落到 2-28，避免日期溢出到下月
+  const addYears = (d, n) => {
+    const y = d.getFullYear() + n;
+    const m = d.getMonth();
+    const day = Math.min(d.getDate(), new Date(y, m + 1, 0).getDate());
+    return new Date(y, m, day);
+  };
+  let years = 0;
+  while (addYears(start, years + 1) <= today) years++;
+  const anchor = addYears(start, years);
+  const rest = Math.round((today - anchor) / 86400000);
+  let text = `逾期 ${days} 天`;
+  if (years >= 1) text = rest > 0 ? `逾期 ${years} 年 ${rest} 天` : `逾期 ${years} 年`;
+  return { days, years, rest, text };
+}
+
+/** 逾期文案（简易版）：days>0 -> "逾期 N 天"，否则空串。
+ *  需要"x 年 y 天"的日历换算（含闰年）时，用 overdueDuration(startDate) 或各 overdue() 返回的 text。 */
 export function overdueText(days) {
   return days > 0 ? `逾期 ${days} 天` : "";
 }
 
-/** 项目逾期信息：{ overdue, days } */
+/** 项目逾期信息：{ overdue, days, text }（text 为"逾期 x 年 y 天"日历换算） */
 export function projectOverdue(row) {
   // 项目起止时间以关联合同汇总为准（contract_end_date），兼容历史的手工日期 end_date
-  const days = overdueDays(row?.contract_end_date || row?.end_date);
+  const dateStr = row?.contract_end_date || row?.end_date;
+  const days = overdueDays(dateStr);
   const overdue = days > 0 && Number(row?.status) !== 3;
-  return { overdue, days: overdue ? days : 0 };
+  return { overdue, days: overdue ? days : 0, text: overdue ? overdueDuration(dateStr).text : "" };
 }
 
-/** 合同逾期信息：{ overdue, days } */
+/** 合同逾期信息：{ overdue, days, text }（text 为"逾期 x 年 y 天"日历换算） */
 export function contractOverdue(row) {
   const days = overdueDays(row?.expire_date);
   const overdue = days > 0 && ![2, 3].includes(Number(row?.status));
-  return { overdue, days: overdue ? days : 0 };
+  return { overdue, days: overdue ? days : 0, text: overdue ? overdueDuration(row?.expire_date).text : "" };
 }
 
-/** 回款明细逾期信息：{ overdue, days } */
+/** 回款明细逾期信息：{ overdue, days, text }
+ *  已收齐（status=3 已完成 或 已回款金额达计划金额）不算逾期；
+ *  按「回款记录」挂到节点的汇总口径见 paybackPlanOverdue。 */
 export function paybackItemOverdue(item) {
   const days = overdueDays(item?.plan_date);
-  const overdue = days > 0 && Number(item?.status) !== 3;
-  return { overdue, days: overdue ? days : 0 };
+  const amount = Number(item?.amount) || 0;
+  const received = Number(item?.received_amount) || 0;
+  const settled = Number(item?.status) === 3 || (amount > 0 && received >= amount);
+  const overdue = days > 0 && !settled;
+  return { overdue, days: overdue ? days : 0, text: overdue ? overdueDuration(item?.plan_date).text : "" };
 }
 
-/** 回款计划逾期：任一明细逾期即视为计划逾期（items 可能为数组或 JSON 字符串）。
- *  返回 { overdue, days }，days 取逾期明细中最大的逾期天数。 */
+/**
+ * 回款计划逾期：任一「未收齐」明细超过计划回款日期即视为计划逾期，
+ * 天数取逾期明细中最大天数，文案按该明细的计划日期换算（含闰年）。
+ *
+ * 明细「已收齐」判定（与回款登记机制保持一致）：
+ *   - 计划整体已完成（status=2）；
+ *   - 明细旧登记值 received_amount >= amount（历史「进度登记」机制）；
+ *   - 计划回款记录（children，按 item_seq 挂到明细）金额合计 >= amount（当前「新建回款」机制）。
+ * 注意：登记回款记录不会回写明细 status，因此不能再以明细 status 判定是否逾期。
+ */
 export function paybackPlanOverdue(payback) {
+  if (Number(payback?.status) === 2) return { overdue: false, days: 0, text: "" };
   let items = payback?.items;
   if (typeof items === "string" && items.trim()) {
     try {
@@ -322,16 +412,30 @@ export function paybackPlanOverdue(payback) {
     }
   }
   if (!Array.isArray(items)) items = [];
+  // 回款记录按明细序号汇总（item_seq=0 的记录按整单登记，不计入任何明细）
+  const receivedBySeq = {};
+  for (const r of Array.isArray(payback?.children) ? payback.children : []) {
+    const seq = Number(r?.item_seq) || 0;
+    if (seq > 0) receivedBySeq[seq] = (receivedBySeq[seq] || 0) + (Number(r?.amount) || 0);
+  }
   let maxDays = 0;
-  let overdue = false;
+  let maxDate = "";
   for (const it of items) {
-    const r = paybackItemOverdue(it);
-    if (r.overdue) {
-      overdue = true;
-      if (r.days > maxDays) maxDays = r.days;
+    const amount = Number(it?.amount) || 0;
+    const received = Math.max(
+      Number(it?.received_amount) || 0,
+      receivedBySeq[Number(it?.seq)] || 0
+    );
+    const settled = Number(it?.status) === 3 || (amount > 0 && received >= amount);
+    if (settled) continue;
+    const days = overdueDays(it?.plan_date);
+    if (days > maxDays) {
+      maxDays = days;
+      maxDate = it?.plan_date;
     }
   }
-  return { overdue, days: overdue ? maxDays : 0 };
+  const overdue = maxDays > 0;
+  return { overdue, days: overdue ? maxDays : 0, text: overdue ? overdueDuration(maxDate).text : "" };
 }
 
 /* =====================================================================
@@ -371,12 +475,12 @@ export const CONTRACT_PARTY_COUNT_OPTIONS = [
   { label: "四方合同", value: 4 },
 ];
 
-/** 合同状态：1=草稿 2=已完成 3=已作废 4=履约中 5=执行异常 */
+/** 合同状态：1=草稿 2=已完成 3=已作废 4=履约中 5=异常 */
 export const CONTRACT_STATUS_OPTIONS = [
   { label: "草稿", value: "1" },
   { label: "已完成", value: "2" },
   { label: "履约中", value: "4" },
-  { label: "执行异常", value: "5" },
+  { label: "异常", value: "5" },
   { label: "已作废", value: "3" },
 ];
 
@@ -403,7 +507,8 @@ const CONTRACT_CATEGORY_MAP = CONTRACT_CATEGORY_OPTIONS.reduce(
 );
 const OUR_ROLE_MAP = OUR_ROLE_OPTIONS.reduce(
   (m, i) => ((m[i.value] = i.label), m),
-  {}
+  // 0=我方不参与：如上中游项目中上游与中游主体之间的合同，我方不是签约方
+  { 0: "无" }
 );
 const CONTRACT_STATUS_MAP = CONTRACT_STATUS_OPTIONS.reduce(
   (m, i) => ((m[i.value] = i.label), m),
@@ -420,10 +525,41 @@ const PRODUCT_CATEGORY_TAG = { 1: "warning", 2: "primary", 3: "success", 4: "dan
 export const contractCategoryText = (val) =>
   CONTRACT_CATEGORY_MAP[normalize(val)] || normalize(val) || "-";
 
-/** 我方角色文案：1甲方/2乙方/3丙方/4丁方 */
+/** 我方角色文案：1甲方/2乙方/3丙方/4丁方/0我方不参与 */
 export const ourRoleText = (val) =>
   OUR_ROLE_MAP[normalize(val)] || normalize(val) || "-";
-export const ourRoleTag = () => "primary";
+
+/** 我方角色标签颜色：甲方红 / 乙方蓝 / 丙方橙 / 丁方绿 / 我方不参与灰 */
+const OUR_ROLE_TAG = { 0: "info", 1: "danger", 2: "primary", 3: "warning", 4: "success" };
+export const ourRoleTag = (val) => OUR_ROLE_TAG[normalize(val)] || "primary";
+
+/**
+ * 合同利润 / 支出口径（全模块统一）：
+ * 我方为甲方（1）= 采购 / 付款方，合同金额即支出，不存在利润；
+ * 其余角色（乙方 / 丙方 / 丁方）= 收款方，按「合同总金额 − 产品总成本」计利润。
+ */
+export const isPayerContract = (ourRole) => Number(ourRole) === 1;
+
+/** 金额汇总标题：甲方合同显示「合同支出」，其余显示「合同总利润」 */
+export const contractProfitLabel = (ourRole) =>
+  isPayerContract(ourRole) ? "合同支出" : "合同总利润";
+
+/** 金额汇总数值：甲方合同取合同总金额（支出），其余取 总金额 − 总成本（利润） */
+export const contractProfitValue = (ourRole, summary) => {
+  const s = summary || {};
+  return isPayerContract(ourRole) ? Number(s.total_amount) || 0 : Number(s.total_profit) || 0;
+};
+
+/**
+ * 金额汇总显示文案：甲方合同为支出，按负数展示（如 -￥1,000.00，绿色）；
+ * 其余角色为利润金额（如 ￥1,000.00）。
+ */
+export const contractProfitText = (ourRole, summary) => {
+  const value = contractProfitValue(ourRole, summary);
+  return isPayerContract(ourRole)
+    ? `-￥${formatMoney(Math.abs(value))}`
+    : `￥${formatMoney(value)}`;
+};
 export const contractStatusText = (val) =>
   CONTRACT_STATUS_MAP[normalize(val)] || normalize(val) || "-";
 export const contractStatusTag = (val) => CONTRACT_STATUS_TAG[normalize(val)] || "info";
@@ -462,6 +598,25 @@ const PRODUCT_STATUS_TAG = { 1: "success", 0: "info" };
 export const productStatusText = (val) => PRODUCT_STATUS_MAP[normalize(val)] || "-";
 export const productStatusTag = (val) => PRODUCT_STATUS_TAG[normalize(val)] || "info";
 
+/* ---------------------------------------------------------------------
+ * 软件开发研发方式（软件开发行的特例区分）
+ * self=自行研发（默认，自己团队开发）/ outsource=外协研发（别人帮我们研发，成本按外包合同总额计）
+ * ------------------------------------------------------------------- */
+export const DEV_MODE_OPTIONS = [
+  { label: "自行研发", value: "self" },
+  { label: "外协研发", value: "outsource" },
+];
+
+const DEV_MODE_MAP = { self: "自行研发", outsource: "外协研发" };
+const DEV_MODE_SHORT_MAP = { self: "自研", outsource: "外协" };
+const DEV_MODE_TAG = { self: "success", outsource: "warning" };
+
+/** 研发方式文案：空值按默认「自行研发」展示 */
+export const devModeText = (val) => DEV_MODE_MAP[normalize(val)] || DEV_MODE_MAP.self;
+/** 研发方式短文案（列表标签用）：自研 / 外协 */
+export const devModeShortText = (val) => DEV_MODE_SHORT_MAP[normalize(val)] || DEV_MODE_SHORT_MAP.self;
+export const devModeTag = (val) => DEV_MODE_TAG[normalize(val)] || "success";
+
 /** 税率格式化：13 -> 13% */
 export function formatPercent(val) {
   if (val === undefined || val === null || val === "") return "-";
@@ -474,6 +629,8 @@ export function formatPercent(val) {
 export const contractCategoryOptions = CONTRACT_CATEGORY_OPTIONS;
 export const contractStatusOptions = CONTRACT_STATUS_OPTIONS;
 export const ourRoleOptions = OUR_ROLE_OPTIONS;
+/** 我方角色筛选选项：在甲乙丙丁之外补充「我方不参与」（0） */
+export const ourRoleFilterOptions = [{ label: "无", value: 0 }, ...OUR_ROLE_OPTIONS];
 export const contractPartyCountOptions = CONTRACT_PARTY_COUNT_OPTIONS;
 export const contractProductCategoryOptions = CONTRACT_PRODUCT_CATEGORY_OPTIONS;
 
diff --git a/backend/src/views/apps/crm/payback/components/detail.vue b/backend/src/views/apps/crm/payback/components/detail.vue
index 504ae9d..b1b894d 100644
--- a/backend/src/views/apps/crm/payback/components/detail.vue
+++ b/backend/src/views/apps/crm/payback/components/detail.vue
@@ -59,14 +59,46 @@
         <el-descriptions-item label="备注" :span="2">{{ detail.remark || "-" }}</el-descriptions-item>
       </el-descriptions>
 
+      <!-- 计划明细：进度节点 / 分期（可按节点选择性登记回款） -->
+      <template v-if="planItems.length">
+        <div class="detail-section-title">
+          <span>计划明细</span>
+          <span class="section-tip">共 {{ planItems.length }} 个节点，点击「登记回款」可按进度付款</span>
+        </div>
+        <el-table :data="planItems" border size="small" class="items-table">
+          <el-table-column label="名称" min-width="110" show-overflow-tooltip>
+            <template #default="{ row }">{{ row.name || `节点${row.seq}` }}</template>
+          </el-table-column>
+          <el-table-column label="百分比" width="70" align="center">
+            <template #default="{ row }">{{ Number(row.percent) > 0 ? `${Number(row.percent)}%` : "-" }}</template>
+          </el-table-column>
+          <el-table-column label="计划金额" width="110" align="right">
+            <template #default="{ row }">￥{{ formatMoney(row.amount) }}</template>
+          </el-table-column>
+          <el-table-column label="已回款" width="110" align="right">
+            <template #default="{ row }">
+              <span class="success-text">￥{{ formatMoney(itemReceivedOf(row)) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划回款日期" width="110" align="center">
+            <template #default="{ row }">{{ row.plan_date || "-" }}</template>
+          </el-table-column>
+          <el-table-column label="状态" width="90" align="center">
+            <template #default="{ row }">
+              <el-tag :type="itemStatusTagOf(row)" size="small">{{ itemStatusTextOf(row) }}</el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+
       <!-- 回款明细：一笔笔实际回款记录 -->
-      <div class="detail-section-title">
+      <div class="detail-section-title" style="margin-top: 18px">
         <span>回款明细</span>
         <div class="section-right">
           <span class="section-tip">
             共 {{ records.length }} 笔，累计 ￥{{ formatMoney(receivedSum) }}
           </span>
-          <el-button type="primary" size="small" :icon="Plus" @click="openRecord">新建回款记录</el-button>
+          <el-button type="primary" size="small" :icon="Plus" @click="openRecord()">新建回款记录</el-button>
         </div>
       </div>
 
@@ -74,6 +106,12 @@
         <el-table-column label="回款日期" width="120" align="center">
           <template #default="{ row }">{{ row.received_date || "-" }}</template>
         </el-table-column>
+        <el-table-column label="进度节点" width="110" align="center">
+          <template #default="{ row }">
+            <span v-if="row.item_name">{{ row.item_name }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
         <el-table-column label="本次回款金额" min-width="140" align="right">
           <template #default="{ row }">
             <span class="success-text">￥{{ formatMoney(row.amount) }}</span>
@@ -122,6 +160,21 @@
       <!-- 新建回款记录（当前计划固定，无需再选） -->
       <el-dialog v-model="recordVisible" title="新建回款记录" width="460px" append-to-body>
         <el-form :model="recordForm" label-width="90px">
+          <el-form-item v-if="planItems.length" label="进度节点">
+            <el-select
+              v-model="recordForm.item_seq"
+              clearable
+              placeholder="不指定（按整单登记）"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="it in planItems"
+                :key="it.seq"
+                :label="`${it.name || '节点' + it.seq}（￥${formatMoney(it.amount)}）`"
+                :value="it.seq"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="本次回款" required>
             <el-input-number
               v-model="recordForm.amount"
@@ -217,6 +270,51 @@ const receivedSum = computed(() =>
   records.value.reduce((sum, r) => sum + (Number(r.amount) || 0), 0)
 );
 
+/** 金额保留两位小数 */
+const round2 = (n) => Math.round((Number(n) || 0) * 100) / 100;
+
+/* ---------------------- 计划明细（进度节点 / 分期） ---------------------- */
+
+/** 计划明细：detail.items（后端解析为数组，兼容字符串存储） */
+const planItems = computed(() => {
+  const raw = detail.value?.items;
+  if (Array.isArray(raw)) return raw;
+  if (typeof raw === "string" && raw.trim()) {
+    try {
+      const arr = JSON.parse(raw);
+      return Array.isArray(arr) ? arr : [];
+    } catch (e) {
+      return [];
+    }
+  }
+  return [];
+});
+
+/** 节点已回款：按「标记到该节点的回款记录」汇总，兼容历史上按明细直接登记（received_amount）的值 */
+function itemReceivedOf(item) {
+  const fromRecords = records.value
+    .filter((r) => Number(r.item_seq) === Number(item.seq))
+    .reduce((s, r) => s + (Number(r.amount) || 0), 0);
+  const legacy = Number(item.received_amount) || 0;
+  return Math.max(round2(fromRecords), legacy);
+}
+
+/** 节点状态：0未回款 1部分回款 2已收齐 */
+function itemStatusOf(item) {
+  const total = Number(item.amount) || 0;
+  const received = itemReceivedOf(item);
+  if (total > 0 && received >= total) return 2;
+  return received > 0 ? 1 : 0;
+}
+
+function itemStatusTextOf(item) {
+  return { 0: "未回款", 1: "部分回款", 2: "已收齐" }[itemStatusOf(item)] || "-";
+}
+
+function itemStatusTagOf(item) {
+  return { 0: "info", 1: "warning", 2: "success" }[itemStatusOf(item)] || "info";
+}
+
 async function loadDetail() {
   // 先用列表行数据回显，再拉取详情补充完整信息
   detail.value = props.payback || {};
@@ -272,6 +370,7 @@ const recordForm = reactive({
   amount: 0,
   received_date: "",
   pay_method: 1,
+  item_seq: 0, // 进度节点序号（1-based），0=不指定（按整单登记）
   receipt_url: "",
   receipt_name: "",
   remark: "",
@@ -285,12 +384,16 @@ function todayStr() {
   return `${d.getFullYear()}-${m}-${day}`;
 }
 
-/** 打开新建回款记录（计划已固定为当前详情） */
+/**
+ * 打开新建回款记录（计划已固定为当前详情）。
+ * 进度节点在弹窗内选择（按进度选择性付款），不指定时按整单登记。
+ */
 function openRecord() {
   Object.assign(recordForm, {
     amount: 0,
     received_date: todayStr(),
     pay_method: detail.value.pay_method || 1,
+    item_seq: 0,
     receipt_url: "",
     receipt_name: "",
     remark: "",
@@ -332,6 +435,7 @@ async function submitRecord() {
   try {
     await createPaybackRecord({
       payback_id: detail.value.id,
+      item_seq: Number(recordForm.item_seq) || 0,
       amount: Number(recordForm.amount) || 0,
       received_date: recordForm.received_date || "",
       pay_method: recordForm.pay_method,
@@ -423,6 +527,10 @@ async function handleDelete() {
     margin-bottom: 18px;
   }
 
+  .items-table {
+    margin-bottom: 4px;
+  }
+
   .detail-section-title {
     display: flex;
     justify-content: space-between;
diff --git a/backend/src/views/apps/crm/payback/index.vue b/backend/src/views/apps/crm/payback/index.vue
index a74f867..b4b9de9 100644
--- a/backend/src/views/apps/crm/payback/index.vue
+++ b/backend/src/views/apps/crm/payback/index.vue
@@ -77,11 +77,11 @@
             <el-tag v-else size="small" effect="plain" type="success">回款</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="逾期" width="120" align="center">
+        <el-table-column label="逾期" width="140" align="center">
           <template #default="{ row }">
             <template v-if="row.__isPlan">
               <el-tag v-if="paybackPlanOverdue(row).overdue" type="danger" size="small" effect="dark">
-                {{ overdueText(paybackPlanOverdue(row).days) }}
+                {{ paybackPlanOverdue(row).text }}
               </el-tag>
               <span v-else>-</span>
             </template>
@@ -91,6 +91,8 @@
           <template #default="{ row }">
             <span v-if="row.__isPlan" class="name-link" @click="openDetail(row)">{{ row.contract_name || "-" }}</span>
             <span v-else class="record-name">
+              <!-- 记录挂到计划明细节点时展示节点名（按进度选择性付款） -->
+              <span v-if="row.item_name" class="record-item">{{ row.item_name }} · </span>
               {{ row.received_date || "-" }} 回款
               <span v-if="row.remark" class="record-remark">（{{ row.remark }}）</span>
             </span>
@@ -267,7 +269,6 @@ import {
   paybackStatusText,
   paybackStatusTag,
   paybackPlanOverdue,
-  overdueText,
   formatMoney,
 } from "../dict";
 
@@ -510,6 +511,10 @@ onMounted(fetchList);
   font-size: 13px;
   color: var(--el-text-color-regular);
 
+  .record-item {
+    color: var(--el-color-primary);
+  }
+
   .record-remark {
     font-size: 12px;
     color: var(--el-text-color-secondary);
diff --git a/backend/src/views/apps/crm/product/cate.vue b/backend/src/views/apps/crm/product/cate.vue
index ff4065c..60edc8d 100644
--- a/backend/src/views/apps/crm/product/cate.vue
+++ b/backend/src/views/apps/crm/product/cate.vue
@@ -3,7 +3,7 @@
     <div class="page-header">
       <div>
         <h2>产品分类</h2>
-        <p>维护 CRM 产品的自定义归类，产品表单的分类下拉取自本表</p>
+        <p>维护 CRM 产品的自定义归类</p>
       </div>
       <div class="header-actions">
         <el-button :icon="Refresh" @click="fetchList">刷新</el-button>
@@ -37,9 +37,23 @@
 
     <div class="table-container" v-loading="loading">
       <el-table :data="tableData" stripe border row-key="id">
-        <el-table-column prop="name" label="分类名称" min-width="160" show-overflow-tooltip />
+        <el-table-column label="分类名称" min-width="180" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.name }}
+            <!-- 系统默认分类（未分类）：只读 -->
+            <!-- <el-tag
+              v-if="Number(row.is_default) === 1"
+              type="primary"
+              size="small"
+              effect="plain"
+              style="margin-left: 6px"
+            >
+              默认
+            </el-tag> -->
+          </template>
+        </el-table-column>
         <el-table-column prop="code" label="分类编码" width="140" show-overflow-tooltip />
-        <el-table-column prop="sort" label="排序" width="90" align="center" />
+        <!-- <el-table-column prop="sort" label="排序" width="90" align="center" /> -->
         <el-table-column label="状态" width="90" align="center">
           <template #default="{ row }">
             <el-tag :type="productStatusTag(row.status)" size="small">{{ productStatusText(row.status) }}</el-tag>
@@ -50,8 +64,16 @@
         </el-table-column>
         <el-table-column label="操作" width="160" align="center" fixed="right">
           <template #default="{ row }">
-            <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
-            <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+            <!-- 系统默认分类（未分类）只读；租户新增分类可编辑、删除 -->
+            <template v-if="Number(row.is_default) === 1">
+              <el-tooltip content="系统默认分类不可编辑、不可删除" placement="top">
+                <span class="readonly-tip">系统内置</span>
+              </el-tooltip>
+            </template>
+            <template v-else>
+              <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+              <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+            </template>
           </template>
         </el-table-column>
         <template #empty><el-empty description="暂无产品分类" :image-size="80" /></template>
@@ -85,9 +107,9 @@
         <el-form-item label="分类编码" prop="code">
           <el-input v-model="form.code" placeholder="选填，如：SERVER" maxlength="50" />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
+        <!-- <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort" :min="0" :max="9999" :controls="false" style="width: 140px" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择" style="width: 100%">
             <el-option v-for="i in PRODUCT_STATUS_OPTIONS" :key="i.value" :label="i.label" :value="Number(i.value)" />
@@ -185,6 +207,11 @@ function openCreate() {
 }
 
 function openEdit(row) {
+  // 双保险：系统默认分类不可编辑（按钮已隐藏，这里再拦一次）
+  if (Number(row.is_default) === 1) {
+    ElMessage.warning("系统默认分类不可编辑，如需调整请新增自定义分类");
+    return;
+  }
   isEdit.value = true;
   currentId.value = row.id;
   Object.assign(form, defaultForm(), row);
@@ -229,6 +256,11 @@ async function handleSubmit() {
 }
 
 async function handleDelete(row) {
+  // 双保险：系统默认分类不可删除（按钮已隐藏，这里再拦一次）
+  if (Number(row.is_default) === 1) {
+    ElMessage.warning("系统默认分类不可删除");
+    return;
+  }
   try {
     await ElMessageBox.confirm(`确定删除产品分类「${row.name}」吗？删除后不可恢复。`, "删除确认", {
       type: "warning",
@@ -243,3 +275,12 @@ async function handleDelete(row) {
 </script>
 
 <style lang="less" scoped src="../styles/crm-page.less"></style>
+
+<style lang="less" scoped>
+/* 系统默认分类：只读提示 */
+.readonly-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  cursor: help;
+}
+</style>
diff --git a/backend/src/views/apps/crm/product/components/detail.vue b/backend/src/views/apps/crm/product/components/detail.vue
index 707d21e..6fdd6cc 100644
--- a/backend/src/views/apps/crm/product/components/detail.vue
+++ b/backend/src/views/apps/crm/product/components/detail.vue
@@ -10,6 +10,11 @@
       <el-descriptions :column="1" border>
         <el-descriptions-item label="产品编号">{{ product.product_no || "-" }}</el-descriptions-item>
         <el-descriptions-item label="产品名称">{{ product.product_name }}</el-descriptions-item>
+        <el-descriptions-item label="行类型">
+          <el-tag :type="isDev ? 'warning' : 'primary'" size="small" effect="plain">
+            {{ isDev ? "软件开发" : "成品" }}
+          </el-tag>
+        </el-descriptions-item>
         <el-descriptions-item label="产品分类">
           <el-tag :type="categoryType(product.category)" size="small" effect="plain">
             {{ categoryDisplay(product.category) }}
@@ -17,12 +22,27 @@
         </el-descriptions-item>
         <el-descriptions-item label="规格型号">{{ product.spec || "-" }}</el-descriptions-item>
         <el-descriptions-item label="单位">{{ product.unit || "-" }}</el-descriptions-item>
-        <el-descriptions-item label="销售单价">￥{{ formatMoney(product.price) }}</el-descriptions-item>
-        <el-descriptions-item label="成本单价">￥{{ formatMoney(product.cost_price) }}</el-descriptions-item>
+        <!-- 软件开发（特例）：按人天与模块报价，无销售 / 成本单价口径 -->
+        <template v-if="isDev">
+          <el-descriptions-item label="研发方式">
+            <el-tag :type="devModeTag(product.dev_mode)" size="small" effect="plain">
+              {{ devModeText(product.dev_mode) }}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="统一人天单价">
+            ￥{{ formatMoney(product.dev_unit_price) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="模块总额">￥{{ formatMoney(devTotal) }}</el-descriptions-item>
+          <el-descriptions-item label="人天合计">{{ treeManDays(devTree) }} 人天</el-descriptions-item>
+        </template>
+        <template v-else>
+          <el-descriptions-item label="销售单价">￥{{ formatMoney(product.price) }}</el-descriptions-item>
+          <el-descriptions-item label="成本单价">￥{{ formatMoney(product.cost_price) }}</el-descriptions-item>
+          <el-descriptions-item label="毛利">
+            ￥{{ formatMoney((Number(product.price) || 0) - (Number(product.cost_price) || 0)) }}
+          </el-descriptions-item>
+        </template>
         <el-descriptions-item label="税率">{{ formatPercent(product.tax_rate) }}</el-descriptions-item>
-        <el-descriptions-item label="毛利">
-          ￥{{ formatMoney((Number(product.price) || 0) - (Number(product.cost_price) || 0)) }}
-        </el-descriptions-item>
         <el-descriptions-item label="状态">
           <el-tag :type="productStatusTag(product.status)" size="small">{{ productStatusText(product.status) }}</el-tag>
         </el-descriptions-item>
@@ -31,21 +51,49 @@
         <el-descriptions-item label="创建时间">{{ formatDateTime(product.create_time) }}</el-descriptions-item>
         <el-descriptions-item label="更新时间">{{ formatDateTime(product.update_time) }}</el-descriptions-item>
       </el-descriptions>
+
+      <!-- 软件开发模块明细（只读树形：模块 / 人天 / 金额，父级自动汇总） -->
+      <template v-if="isDev">
+        <el-divider content-position="left">软件开发模块明细</el-divider>
+        <el-table
+          v-if="moduleRows.length"
+          :data="moduleRows"
+          row-key="__key"
+          :tree-props="{ children: 'children' }"
+          size="small"
+          border
+          default-expand-all
+        >
+          <el-table-column label="模块名称" min-width="150" show-overflow-tooltip>
+            <template #default="{ row }">{{ row.name || "-" }}</template>
+          </el-table-column>
+          <el-table-column label="人天" width="80" align="right">
+            <template #default="{ row }">{{ treeManDays([row]) }}</template>
+          </el-table-column>
+          <el-table-column label="金额" width="120" align="right">
+            <template #default="{ row }">￥{{ formatMoney(treeSellTotal([row], unitPrice)) }}</template>
+          </el-table-column>
+        </el-table>
+        <el-empty v-else description="暂无模块配置" :image-size="50" />
+      </template>
     </div>
   </el-drawer>
 </template>
 
 <script setup>
-import { reactive, watch } from "vue";
+import { computed, reactive, watch } from "vue";
 import {
   productCategoryText,
   productCategoryTag,
   productStatusText,
   productStatusTag,
+  devModeText,
+  devModeTag,
   formatMoney,
   formatPercent,
   formatDateTime,
 } from "../../dict";
+import { treeSellTotal, treeManDays } from "../../contract/components/utils";
 import { getProductCategoryList } from "@/api/crmProductCategory";
 
 const props = defineProps({
@@ -56,6 +104,46 @@ const emit = defineEmits(["update:visible"]);
 
 const categoryMap = reactive({});
 
+/* ---------------------- 软件开发（行类型特例）展示 ---------------------- */
+
+/** 行类型：dev=软件开发（按人天 + 模块树报价） */
+const isDev = computed(() => props.product?.line_type === "dev");
+
+/** 安全解析产品返回的 dev_tree（可能为字符串或数组） */
+function normalizeDevTree(v) {
+  if (Array.isArray(v)) return v;
+  if (typeof v === "string" && v) {
+    try {
+      const parsed = JSON.parse(v);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch (e) {
+      return [];
+    }
+  }
+  return [];
+}
+
+const devTree = computed(() => normalizeDevTree(props.product?.dev_tree));
+const unitPrice = computed(() => Number(props.product?.dev_unit_price) || 0);
+/** 模块总额 = 各叶子人天 × 统一人天单价（父级自动汇总） */
+const devTotal = computed(() => treeSellTotal(devTree.value, unitPrice.value));
+
+/** 树形行包装：为 el-table 生成唯一 row-key（模块节点本身没有 id） */
+function wrapTree(nodes, prefix = "") {
+  return (Array.isArray(nodes) ? nodes : []).map((n, i) => {
+    const key = `${prefix}${i}`;
+    const row = { ...n, __key: key };
+    if (Array.isArray(n.children) && n.children.length) {
+      row.children = wrapTree(n.children, `${key}-`);
+    } else {
+      delete row.children;
+    }
+    return row;
+  });
+}
+
+const moduleRows = computed(() => wrapTree(devTree.value));
+
 /** 详情分类展示：优先管理分类名称；同步写入的产品带「金额归属」编码时回退 */
 function categoryDisplay(val) {
   if (!val) return "-";
diff --git a/backend/src/views/apps/crm/product/components/edit.vue b/backend/src/views/apps/crm/product/components/edit.vue
index b82107c..e0a4555 100644
--- a/backend/src/views/apps/crm/product/components/edit.vue
+++ b/backend/src/views/apps/crm/product/components/edit.vue
@@ -34,6 +34,14 @@
             </el-input-number>
           </el-form-item>
         </el-col>
+        <!-- 软件开发分两种：自行研发 / 外协研发（别人帮我们研发，成本按外包总额计） -->
+        <el-col :span="12" v-if="form.line_type === 'dev'">
+          <el-form-item label="研发方式" prop="dev_mode">
+            <el-select v-model="form.dev_mode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="i in DEV_MODE_OPTIONS" :key="i.value" :label="i.label" :value="i.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="产品分类" prop="category">
             <el-select
@@ -89,7 +97,8 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="form.line_type === 'product'">
+        <!-- 税率：成品与软件开发均需开票记录（软件开发为特例，但同样可能开票） -->
+        <el-col :span="8">
           <el-form-item label="税率(%)" prop="tax_rate">
             <el-input-number v-model="form.tax_rate" :min="0" :max="100" :precision="2" :controls="false" style="width: 100%" />
           </el-form-item>
@@ -130,7 +139,7 @@ import { ElMessage } from "element-plus";
 import { createProduct, updateProduct } from "@/api/crmProduct";
 import { getProductCategoryList } from "@/api/crmProductCategory";
 import { getUnitList } from "@/api/crmUnit";
-import { PRODUCT_STATUS_OPTIONS, PRODUCT_UNIT_OPTIONS, formatMoney } from "../../dict";
+import { PRODUCT_STATUS_OPTIONS, PRODUCT_UNIT_OPTIONS, DEV_MODE_OPTIONS, formatMoney } from "../../dict";
 import { treeSellTotal } from "../../contract/components/utils";
 import DevModuleTree from "../../contract/components/DevModuleTree.vue";
 
@@ -159,6 +168,8 @@ const defaultForm = () => ({
   cost_price: 0,
   tax_rate: 0,
   dev_unit_price: 0,
+  // 软件开发研发方式：self=自行研发（默认）/ outsource=外协研发
+  dev_mode: "self",
   dev_tree: [],
   status: 1,
   remark: "",
@@ -170,14 +181,16 @@ const rules = {
   product_name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
 };
 
-/** 切换行类型：开发行确保有模块树容器；切回成品时清空开发字段，避免残留脏数据 */
+/** 切换行类型：开发行确保有模块树容器与研发方式；切回成品时清空开发字段，避免残留脏数据 */
 function onLineTypeChange() {
   if (form.line_type === "dev") {
     if (!Array.isArray(form.dev_tree)) form.dev_tree = [];
     if (form.dev_unit_price == null) form.dev_unit_price = 0;
+    if (!form.dev_mode) form.dev_mode = "self";
   } else {
     form.dev_tree = [];
     form.dev_unit_price = 0;
+    form.dev_mode = "self";
   }
 }
 
@@ -207,6 +220,7 @@ watch(
         if (isNaN(form.status)) form.status = 1;
         form.line_type = props.editData.line_type === "dev" ? "dev" : "product";
         form.dev_unit_price = Number(props.editData.dev_unit_price) || 0;
+        form.dev_mode = props.editData.dev_mode === "outsource" ? "outsource" : "self";
         form.dev_tree = normalizeDevTree(props.editData.dev_tree);
       } else {
         isEdit.value = false;
diff --git a/backend/src/views/apps/crm/product/index.vue b/backend/src/views/apps/crm/product/index.vue
index 42114bc..336ece3 100644
--- a/backend/src/views/apps/crm/product/index.vue
+++ b/backend/src/views/apps/crm/product/index.vue
@@ -85,6 +85,15 @@
               </template>
             </el-table-column>
             <el-table-column prop="product_no" label="产品编号" width="130" show-overflow-tooltip />
+            <el-table-column label="行类型" width="125" align="center">
+              <template #default="{ row }">
+                <!-- 软件开发为特例，并区分研发方式：自研 / 外协（别人帮我们研发） -->
+                <el-tag v-if="row.line_type === 'dev'" :type="devModeTag(row.dev_mode)" size="small" effect="plain">
+                  软件开发 · {{ devModeShortText(row.dev_mode) }}
+                </el-tag>
+                <el-tag v-else type="primary" size="small" effect="plain">成品</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="分类" width="130" align="center">
               <template #default="{ row }">
                 <el-tag :type="categoryType(row.category)" size="small" effect="plain">
@@ -154,6 +163,8 @@ import {
   productCategoryTag,
   productStatusText,
   productStatusTag,
+  devModeShortText,
+  devModeTag,
   formatMoney,
   formatPercent,
 } from "../dict";
diff --git a/backend/src/views/apps/crm/project/components/detail.vue b/backend/src/views/apps/crm/project/components/detail.vue
index 9609b72..b1ec9ed 100644
--- a/backend/src/views/apps/crm/project/components/detail.vue
+++ b/backend/src/views/apps/crm/project/components/detail.vue
@@ -12,10 +12,27 @@
         <div class="toolbar-status">
           <el-tag :type="projectStatusTag(project.status)" size="small">{{ projectStatusText(project.status) }}</el-tag>
           <el-tag v-if="projectOverdue(project).overdue" type="danger" size="small" effect="dark">
-            {{ overdueText(projectOverdue(project).days) }}
+            {{ projectOverdue(project).text }}
           </el-tag>
         </div>
         <div class="toolbar-actions">
+          <!-- 状态流转：与合同详情一致，右上角下拉切换项目状态 -->
+          <el-dropdown trigger="click" @command="(cmd) => handleChangeStatus(cmd)">
+            <el-button link type="warning" size="small">
+              状态流转<el-icon style="margin-left: 2px"><ArrowDown /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item
+                  v-for="i in statusOptionsExcept(project.status)"
+                  :key="i.value"
+                  :command="i.value"
+                >
+                  {{ i.label }}
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
           <el-button type="primary" size="small" :icon="Edit" @click="handleEdit">编辑</el-button>
           <el-button type="danger" size="small" :icon="Delete" @click="handleDelete">删除</el-button>
         </div>
@@ -26,14 +43,9 @@
           <DetailBasic :project="project" />
         </el-tab-pane>
 
-        <!-- 联系人（正式客户通讯录） -->
+        <!-- 联系人（按项目类型分组：从对应企业通讯录中挑选，支持多选） -->
         <el-tab-pane :label="`联系人 (${counts.contact})`" name="contact">
-          <DetailContact
-            ref="contactRef"
-            :company-id="project.customer_id"
-            company-type="customer"
-            @count="counts.contact = $event"
-          />
+          <DetailContact ref="contactRef" :project="project" @count="counts.contact = $event" />
         </el-tab-pane>
 
         <!-- 跟进记录（链路累积：线索 + 商机 + 项目） -->
@@ -55,6 +67,7 @@
             ref="contractRef"
             :project-id="project.id"
             :project-name="project.project_name || ''"
+            :project-type="project.project_type"
             @count="counts.contract = $event"
           />
         </el-tab-pane>
@@ -93,8 +106,8 @@
 <script setup>
 import { ref, reactive, watch } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { Edit, Delete } from "@element-plus/icons-vue";
-import { deleteProject } from "@/api/crmPipeline";
+import { Edit, Delete, ArrowDown } from "@element-plus/icons-vue";
+import { deleteProject, changeProjectStatus, getProjectDetail } from "@/api/crmPipeline";
 import DetailBasic from "./detail_basic.vue";
 import DetailContact from "./detail_contact.vue";
 import DetailFollow from "./detail_follow.vue";
@@ -102,7 +115,12 @@ import DetailContract from "./detail_contract.vue";
 import DetailAttach from "./detail_attach.vue";
 import DetailDocs from "./detail_docs.vue";
 import DetailLog from "./detail_log.vue";
-import { projectStatusText, projectStatusTag, projectOverdue, overdueText } from "../../dict";
+import {
+  PROJECT_STATUS_OPTIONS,
+  projectStatusText,
+  projectStatusTag,
+  projectOverdue,
+} from "../../dict";
 
 const props = defineProps({
   visible: { type: Boolean, default: false },
@@ -145,6 +163,24 @@ function handleEdit() {
   emit("edit", props.project);
 }
 
+/** 状态流转候选：排除当前状态 */
+function statusOptionsExcept(cur) {
+  return PROJECT_STATUS_OPTIONS.filter((i) => String(i.value) !== String(cur));
+}
+
+/** 项目状态流转：成功后更新本地展示并通知父组件刷新列表 */
+async function handleChangeStatus(status) {
+  if (!props.project?.id) return;
+  try {
+    await changeProjectStatus(props.project.id, Number(status));
+    ElMessage.success(`状态已更新为「${projectStatusText(status)}」`);
+    props.project.status = Number(status);
+    emit("refresh");
+  } catch (e) {
+    ElMessage.error(e.message || "状态更新失败");
+  }
+}
+
 async function handleDelete() {
   try {
     await ElMessageBox.confirm(`确定删除项目「${props.project.project_name}」吗？删除后不可恢复。`, "删除确认", {
@@ -160,8 +196,19 @@ async function handleDelete() {
 }
 
 /** 抽屉打开后刷新各 Tab 数据 */
-function loadAll() {
+async function loadAll() {
   if (!props.project?.id) return;
+  // 列表行数据是打开页面时的快照，联系人选中集合等字段可能已过期（如刚在其他项目/本次会话保存过），
+  // 先拉取最新详情刷新快照，各 Tab（含联系人）再按最新数据加载
+  try {
+    const res = await getProjectDetail(props.project.id);
+    const data = res?.data;
+    if (data && typeof data === "object" && props.project) {
+      Object.assign(props.project, data);
+    }
+  } catch (e) {
+    // 详情接口失败时保持快照展示，不阻断其他 Tab
+  }
   contactRef.value?.reload();
   followRef.value?.reload();
   contractRef.value?.reload();
diff --git a/backend/src/views/apps/crm/project/components/detail_attach.vue b/backend/src/views/apps/crm/project/components/detail_attach.vue
index d1bfd4c..18bcd14 100644
--- a/backend/src/views/apps/crm/project/components/detail_attach.vue
+++ b/backend/src/views/apps/crm/project/components/detail_attach.vue
@@ -2,8 +2,11 @@
   <div class="detail-attach">
     <div class="tab-toolbar">
       <div class="toolbar-left">
-        <el-upload :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
-          <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+        <!-- multiple：支持一次选择多个文件批量上传，全部结束后统一提示并刷新列表 -->
+        <el-upload multiple :show-file-list="false" :http-request="handleUpload" :disabled="uploading">
+          <el-tooltip content="支持多选：可一次选择多个文件批量上传" placement="top">
+            <el-button type="primary" size="small" :icon="Upload" :loading="uploading">上传附件</el-button>
+          </el-tooltip>
         </el-upload>
         <span v-if="tip" class="tip">{{ tip }}</span>
       </div>
@@ -219,6 +222,10 @@ const emit = defineEmits(["count"]);
 const loading = ref(false);
 const uploading = ref(false);
 const list = ref([]);
+// 批量上传：并发计数 + 结果汇总（全部结束后统一提示、统一刷新）
+const pending = ref(0);
+const okCount = ref(0);
+const failed = ref([]);
 // 视图模式：grid=图标模式（默认，便于快速查找） / list=列表模式
 const viewMode = ref("grid");
 // 分页：默认每页 20 条
@@ -341,9 +348,20 @@ function handleSizeChange(s) {
   reload();
 }
 
+/**
+ * 单文件上传：多选时 el-upload 会为每个文件调用一次（并发），
+ * 这里用 pending 计数保证全部结束后只提示一次、只刷新一次列表。
+ */
 async function handleUpload(options) {
   const file = options.file;
-  uploading.value = true;
+  if (!file) return;
+  // 新一轮批量上传：重置汇总，并保持按钮 loading 直到最后一个文件结束
+  if (pending.value === 0) {
+    okCount.value = 0;
+    failed.value = [];
+    uploading.value = true;
+  }
+  pending.value += 1;
   try {
     const fd = new FormData();
     fd.append("file", file);
@@ -357,13 +375,29 @@ async function handleUpload(options) {
       file_url: data.url || "",
       file_size: file.size || 0,
     });
-    ElMessage.success("上传成功");
-    page.value = 1;
-    reload();
+    okCount.value += 1;
   } catch (e) {
-    ElMessage.error(e.message || "上传失败");
+    failed.value.push(`${file.name}：${e?.message || "上传失败"}`);
   } finally {
+    pending.value -= 1;
+    if (pending.value > 0) return;
     uploading.value = false;
+    // 统一提示：单个成功保持原文案，多个成功汇总，失败逐个列出
+    if (failed.value.length) {
+      ElMessage.error(
+        okCount.value
+          ? `成功 ${okCount.value} 个，失败 ${failed.value.length} 个：${failed.value.join("；")}`
+          : `上传失败：${failed.value.join("；")}`
+      );
+    } else if (okCount.value > 1) {
+      ElMessage.success(`已上传 ${okCount.value} 个附件`);
+    } else {
+      ElMessage.success("上传成功");
+    }
+    if (okCount.value) {
+      page.value = 1; // 批量上传后回到第一页，确保新附件可见
+      reload();
+    }
   }
 }
 
diff --git a/backend/src/views/apps/crm/project/components/detail_basic.vue b/backend/src/views/apps/crm/project/components/detail_basic.vue
index db5b260..45c9b7b 100644
--- a/backend/src/views/apps/crm/project/components/detail_basic.vue
+++ b/backend/src/views/apps/crm/project/components/detail_basic.vue
@@ -5,8 +5,8 @@
       <el-descriptions-item label="项目名称" :span="2">{{ project.project_name }}</el-descriptions-item>
       <el-descriptions-item label="项目编号">{{ project.project_no || "-" }}</el-descriptions-item>
       <el-descriptions-item label="项目类型">
-        <el-tag :type="isBackToBack ? 'warning' : 'info'" size="small" effect="plain">
-          {{ isBackToBack ? "上下游项目" : "单一项目" }}
+        <el-tag :type="projectTypeTag(project.project_type)" size="small" effect="plain">
+          {{ projectTypeText(project.project_type) }}
         </el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="项目状态">
@@ -30,35 +30,47 @@
       <el-descriptions-item label="备注" :span="2">{{ project.remark || "-" }}</el-descriptions-item>
     </el-descriptions>
 
-    <!-- 单一项目不存在上下游概念，只展示客户信息；上下游项目则区分上游（客户侧） -->
-    <el-divider content-position="left">{{ isBackToBack ? "上游信息" : "客户信息" }}</el-divider>
+    <!-- 单一项目不存在上下游概念，只展示客户信息；上下游 / 上中游项目区分上游（客户侧） -->
+    <el-divider content-position="left">{{ hasCounterparty ? "上游信息" : "客户信息" }}</el-divider>
     <el-descriptions :column="2" border size="small">
-      <el-descriptions-item label="客户名称">{{ project.customer_name || "-" }}</el-descriptions-item>
-      <el-descriptions-item :label="isBackToBack ? '上游金额' : '项目金额'">
+      <el-descriptions-item :label="hasCounterparty ? '上游客户' : '客户名称'">
+        {{ project.customer_name || "-" }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="hasCounterparty ? '上游金额' : '项目金额'">
         {{ formatMoney(upstreamAmount) }}
       </el-descriptions-item>
-      <el-descriptions-item :label="isBackToBack ? '上游对接人' : '对接人'">
+      <el-descriptions-item :label="hasCounterparty ? '上游对接人' : '对接人'">
         {{ project.upstream_contact || project.contact_person || "-" }}
       </el-descriptions-item>
-      <el-descriptions-item :label="isBackToBack ? '上游联系电话' : '联系电话'">
+      <el-descriptions-item :label="hasCounterparty ? '上游联系电话' : '联系电话'">
         {{ project.upstream_phone || project.contact_phone || "-" }}
       </el-descriptions-item>
     </el-descriptions>
 
-    <!-- 下游（供应商侧）：仅上下游项目展示 -->
-    <template v-if="isBackToBack">
-      <el-divider content-position="left">下游信息</el-divider>
+    <!-- 对方主体（上下游的下游供应商 / 上中游的中游中间方）：仅这两类项目展示 -->
+    <template v-if="hasCounterparty">
+      <el-divider content-position="left">{{ counterpartyLabel }}信息</el-divider>
       <el-descriptions :column="2" border size="small">
-        <el-descriptions-item label="供应商/客户">
+        <el-descriptions-item :label="isUpMid ? '中游企业' : '供应商/客户'">
           {{ project.supplier_name || "-" }}
           <el-tag v-if="Number(project.supplier_ref_type) === 1" size="small" effect="plain" type="success">客户</el-tag>
           <el-tag v-else-if="Number(project.supplier_ref_type) === 2" size="small" effect="plain" type="warning">
             供应商
           </el-tag>
         </el-descriptions-item>
-        <el-descriptions-item label="下游金额">{{ formatMoney(project.downstream_amount) }}</el-descriptions-item>
-        <el-descriptions-item label="下游对接人">{{ project.downstream_contact || "-" }}</el-descriptions-item>
-        <el-descriptions-item label="下游联系电话">{{ project.downstream_phone || "-" }}</el-descriptions-item>
+        <el-descriptions-item :label="`${counterpartyLabel}金额`">
+          {{ formatMoney(project.downstream_amount) }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="`${counterpartyLabel}对接人`">
+          {{ project.downstream_contact || "-" }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="`${counterpartyLabel}联系电话`">
+          {{ project.downstream_phone || "-" }}
+        </el-descriptions-item>
+        <!-- 上中游项目：下游固定为本公司 -->
+        <el-descriptions-item v-if="isUpMid" label="下游（本公司）" :span="2">
+          {{ ownCompanyName }}
+        </el-descriptions-item>
       </el-descriptions>
     </template>
   </div>
@@ -66,9 +78,12 @@
 
 <script setup>
 import { computed } from "vue";
+import { useAuthStore } from "@/stores/auth";
 import {
   projectStatusText,
   projectStatusTag,
+  projectTypeText,
+  projectTypeTag,
   formatDateTime,
   formatMoney,
   formatDateOnly,
@@ -79,9 +94,23 @@ const props = defineProps({
   project: { type: Object, default: null },
 });
 
+const authStore = useAuthStore();
+
 /** 是否背靠背项目：需要展示下游（供应商）信息 */
 const isBackToBack = computed(() => Number(props.project?.project_type) === 2);
 
+/** 是否上中游项目：上游 A 公司 + 中游 B 公司，下游固定为本公司 */
+const isUpMid = computed(() => Number(props.project?.project_type) === 3);
+
+/** 是否需要展示「对方主体」（上下游的下游 / 上中游的中游） */
+const hasCounterparty = computed(() => isBackToBack.value || isUpMid.value);
+
+/** 对方主体称谓：上下游项目叫「下游」，上中游项目叫「中游」 */
+const counterpartyLabel = computed(() => (isUpMid.value ? "中游" : "下游"));
+
+/** 本公司名称：上中游项目的下游固定为本公司 */
+const ownCompanyName = computed(() => authStore.user?.tenant_name || "本公司");
+
 /** 上游金额：新字段优先，兼容存量项目仅有旧「项目金额」的情况 */
 const upstreamAmount = computed(
   () => Number(props.project?.upstream_amount) || Number(props.project?.amount) || 0
diff --git a/backend/src/views/apps/crm/project/components/detail_contact.vue b/backend/src/views/apps/crm/project/components/detail_contact.vue
index 8a7dbdb..773e2af 100644
--- a/backend/src/views/apps/crm/project/components/detail_contact.vue
+++ b/backend/src/views/apps/crm/project/components/detail_contact.vue
@@ -1,224 +1,205 @@
 <template>
-  <div class="detail-contact">
-    <div class="tab-toolbar">
-      <el-button
-        type="primary"
-        size="small"
-        :icon="Plus"
-        :disabled="!companyId"
-        @click="openEdit(null)"
-      >
-        新增联系人
-      </el-button>
-    </div>
+  <div class="detail-contact" v-loading="loading">
     <el-alert
-      v-if="!companyId"
+      v-if="!project?.customer_id && !downCompany"
       type="info"
       :closable="false"
       show-icon
-      title="该项目未关联正式客户，暂无正式联系人"
+      title="该项目未关联企业主体，暂无可选联系人"
       style="margin-bottom: 12px"
     />
-    <el-table :data="list" v-loading="loading" stripe border size="small">
-      <el-table-column label="姓名" min-width="95">
-        <template #default="{ row }">
-          {{ row.name }}
-          <el-tag v-if="Number(row.is_primary) === 1" type="danger" size="small" effect="plain">主要</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="性别" min-width="50" align="center">
-        <template #default="{ row }">{{ genderText(row.gender) }}</template>
-      </el-table-column>
-      <el-table-column label="状态" min-width="60" align="center">
-        <template #default="{ row }">
-          <el-tag :type="Number(row.status) === 1 ? 'success' : 'info'" size="small">
-            {{ Number(row.status) === 1 ? "在职" : "离职" }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="department" label="部门" min-width="70" show-overflow-tooltip />
-      <el-table-column prop="position" label="职位" min-width="70" show-overflow-tooltip />
-      <el-table-column label="手机" min-width="100" show-overflow-tooltip>
-        <template #default="{ row }">{{ formatMobiles(row.mobiles) }}</template>
-      </el-table-column>
-      <el-table-column prop="phone" label="座机" min-width="78" show-overflow-tooltip />
-      <el-table-column prop="email" label="邮箱" min-width="100" show-overflow-tooltip />
-      <el-table-column label="操作" width="96" align="center">
-        <template #default="{ row }">
-          <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
-          <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
-        </template>
-      </el-table-column>
-      <template #empty><el-empty description="暂无联系人" :image-size="60" /></template>
-    </el-table>
 
-    <!-- 联系人编辑（参数与 ERP 通讯录一致） -->
+    <template v-else>
+      <el-alert
+        type="info"
+        :closable="false"
+        show-icon
+        :title="`从各企业通讯录中挑选本项目对接联系人（多选），联系人信息与企业通讯录实时一致`"
+        style="margin-bottom: 12px"
+      />
+
+      <!-- 上游（客户方） -->
+      <div class="contact-group">
+        <div class="group-header">
+          <div class="group-title-row">
+            <span class="group-title">上游联系人</span>
+            <span class="group-company">{{ project?.customer_name || "-" }}</span>
+          </div>
+          <el-button
+            type="primary"
+            size="small"
+            :icon="Plus"
+            :disabled="!project?.customer_id"
+            @click="openPicker('upstream')"
+          >
+            选择联系人
+          </el-button>
+        </div>
+        <el-table :data="upSelected" stripe border size="small">
+          <el-table-column label="姓名" min-width="95">
+            <template #default="{ row }">
+              {{ row.name }}
+              <el-tag v-if="Number(row.is_primary) === 1" type="danger" size="small" effect="plain">主要</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="department" label="部门" min-width="75" show-overflow-tooltip />
+          <el-table-column prop="position" label="职位" min-width="75" show-overflow-tooltip />
+          <el-table-column label="手机" min-width="110" show-overflow-tooltip>
+            <template #default="{ row }">{{ formatMobiles(row.mobiles) }}</template>
+          </el-table-column>
+          <el-table-column prop="email" label="邮箱" min-width="110" show-overflow-tooltip />
+          <el-table-column label="操作" width="70" align="center">
+            <template #default="{ row }">
+              <el-button link type="danger" size="small" @click="removePicked('upstream', row)">移除</el-button>
+            </template>
+          </el-table-column>
+          <template #empty><el-empty description="尚未选择联系人" :image-size="60" /></template>
+        </el-table>
+      </div>
+
+      <!-- 下游（上下游项目）/ 中游（上中游项目） -->
+      <div v-if="pt !== 1" class="contact-group">
+        <div class="group-header">
+          <div class="group-title-row">
+            <span class="group-title">{{ downLabel }}联系人</span>
+            <span class="group-company">{{ project?.supplier_name || "-" }}</span>
+          </div>
+          <el-button
+            type="primary"
+            size="small"
+            :icon="Plus"
+            :disabled="!downCompany"
+            @click="openPicker('downstream')"
+          >
+            选择联系人
+          </el-button>
+        </div>
+        <el-table v-if="downCompany" :data="downSelected" stripe border size="small">
+          <el-table-column label="姓名" min-width="95">
+            <template #default="{ row }">
+              {{ row.name }}
+              <el-tag v-if="Number(row.is_primary) === 1" type="danger" size="small" effect="plain">主要</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="department" label="部门" min-width="75" show-overflow-tooltip />
+          <el-table-column prop="position" label="职位" min-width="75" show-overflow-tooltip />
+          <el-table-column label="手机" min-width="110" show-overflow-tooltip>
+            <template #default="{ row }">{{ formatMobiles(row.mobiles) }}</template>
+          </el-table-column>
+          <el-table-column prop="email" label="邮箱" min-width="110" show-overflow-tooltip />
+          <el-table-column label="操作" width="70" align="center">
+            <template #default="{ row }">
+              <el-button link type="danger" size="small" @click="removePicked('downstream', row)">移除</el-button>
+            </template>
+          </el-table-column>
+          <template #empty><el-empty description="尚未选择联系人" :image-size="60" /></template>
+        </el-table>
+        <el-alert
+          v-else
+          type="warning"
+          :closable="false"
+          show-icon
+          :title="`${downLabel}主体未正式关联企业档案，无法选择联系人`"
+        />
+      </div>
+    </template>
+
+    <!-- 选择联系人弹窗（多选，来源为对应企业通讯录） -->
     <el-dialog
-      v-model="dialog"
-      :title="form.id ? '编辑联系人' : '新增联系人'"
-      width="640px"
+      v-model="picker.visible"
+      :title="pickerTitle"
+      width="680px"
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="90px" label-position="right">
-        <el-row :gutter="16">
-          <el-col :span="12">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="性别" prop="gender">
-              <el-select v-model="form.gender" placeholder="请选择" style="width: 100%">
-                <el-option label="未知" :value="0" />
-                <el-option label="男" :value="1" />
-                <el-option label="女" :value="2" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门" prop="department">
-              <el-input v-model="form.department" placeholder="请输入部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="职位" prop="position">
-              <el-input v-model="form.position" placeholder="请输入职位" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="座机" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入座机号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 手机（动态，最多5个） -->
-        <el-form-item label="手机">
-          <div class="mobile-list">
-            <div v-for="(m, idx) in form.mobiles" :key="idx" class="mobile-item">
-              <el-input v-model="form.mobiles[idx]" placeholder="请输入手机号" style="flex: 1" />
-              <el-button :icon="Delete" :disabled="form.mobiles.length <= 1" @click="removeMobile(idx)" />
-            </div>
-            <el-button v-if="form.mobiles.length < 5" type="primary" plain :icon="Plus" @click="addMobile">
-              添加手机号（{{ form.mobiles.length }}/5）
-            </el-button>
-          </div>
-        </el-form-item>
-
-        <el-row :gutter="16">
-          <el-col :span="12">
-            <el-form-item label="微信" prop="wechat">
-              <el-input v-model="form.wechat" placeholder="请输入微信号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="QQ" prop="qq">
-              <el-input v-model="form.qq" placeholder="请输入QQ号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="钉钉" prop="dingtalk">
-              <el-input v-model="form.dingtalk" placeholder="请输入钉钉号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="主要联系人" prop="is_primary">
-              <el-switch
-                v-model="form.is_primary"
-                :active-value="1"
-                :inactive-value="0"
-                active-text="是"
-                inactive-text="否"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="人员状态" prop="status">
-              <el-select v-model="form.status" placeholder="请选择" style="width: 100%">
-                <el-option label="在职" :value="1" />
-                <el-option label="离职" :value="0" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="家庭住址" prop="home_address">
-              <el-input v-model="form.home_address" placeholder="请输入家庭住址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <el-input
+        v-model="picker.keyword"
+        placeholder="搜索姓名 / 职位 / 手机号"
+        :prefix-icon="Search"
+        clearable
+        style="margin-bottom: 12px"
+      />
+      <el-table
+        ref="pickerTableRef"
+        :data="pickerFilteredList"
+        v-loading="picker.loading"
+        stripe
+        border
+        size="small"
+        max-height="380"
+        row-key="id"
+        @selection-change="pickerSelection = $event"
+      >
+        <el-table-column type="selection" width="45" reserve-selection />
+        <el-table-column label="姓名" min-width="90">
+          <template #default="{ row }">
+            {{ row.name }}
+            <el-tag v-if="Number(row.is_primary) === 1" type="danger" size="small" effect="plain">主要</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="department" label="部门" min-width="75" show-overflow-tooltip />
+        <el-table-column prop="position" label="职位" min-width="75" show-overflow-tooltip />
+        <el-table-column label="手机" min-width="120" show-overflow-tooltip>
+          <template #default="{ row }">{{ formatMobiles(row.mobiles) }}</template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" min-width="120" show-overflow-tooltip />
+      </el-table>
       <template #footer>
-        <el-button @click="dialog = false">取消</el-button>
-        <el-button type="primary" :loading="saving" @click="handleSave">保存</el-button>
+        <el-button @click="picker.visible = false">取消</el-button>
+        <el-button type="primary" :loading="saving" @click="confirmPicker">确定</el-button>
       </template>
     </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { Plus, Delete } from "@element-plus/icons-vue";
-import {
-  getCompanyContactList,
-  createCompanyContact,
-  updateCompanyContact,
-  deleteCompanyContact,
-} from "@/api/companyContact";
+import { ref, reactive, computed, nextTick } from "vue";
+import { ElMessage } from "element-plus";
+import { Plus, Search } from "@element-plus/icons-vue";
+import { getCompanyContactList } from "@/api/companyContact";
+import { saveProjectContacts } from "@/api/crmPipeline";
 
 const props = defineProps({
-  // 正式客户ID（项目关联的 customer_id）
-  companyId: { type: [Number, String], default: null },
-  // 正式客户类型
-  companyType: { type: String, default: "customer" },
+  // 完整项目对象（含 project_type / customer_id / supplier_id / *_contact_ids）
+  project: { type: Object, default: null },
 });
 const emit = defineEmits(["count"]);
 
 const loading = ref(false);
 const saving = ref(false);
-const list = ref([]);
-const dialog = ref(false);
-const formRef = ref();
 
-// 联系人表单：字段与 ERP 通讯录（contactBook.vue）完全一致
-const defaultForm = () => ({
-  id: null,
-  name: "",
-  gender: 0,
-  phone: "",
-  mobiles: [""],
-  wechat: "",
-  qq: "",
-  dingtalk: "",
-  email: "",
-  department: "",
-  position: "",
-  home_address: "",
-  is_primary: 0,
-  status: 1,
-  remark: "",
+// 两个企业通讯录的联系人（实时来自企业档案）
+const upstreamContacts = ref([]);
+const downstreamContacts = ref([]);
+// 当前选中的联系人ID集合（项目联系人 = 从企业通讯录中挑选）
+const pickedUp = ref([]);
+const pickedDown = ref([]);
+
+// 项目类型：1=单一项目（仅上游客户） 2=上下游项目 3=上中游项目
+const pt = computed(() => {
+  const t = Number(props.project?.project_type) || 1;
+  return t === 2 || t === 3 ? t : 1;
+});
+// 对方主体：2=上下游项目的下游 / 3=上中游项目的中游
+const downLabel = computed(() => (pt.value === 3 ? "中游" : "下游"));
+// 对方主体的联系人来源库：supplier_ref_type 1=客户库 2=供应商库
+const downCompany = computed(() => {
+  const p = props.project;
+  if (pt.value === 1 || !p?.supplier_id) return null;
+  return { type: Number(p.supplier_ref_type) === 1 ? "customer" : "supplier", id: p.supplier_id };
 });
-const form = reactive(defaultForm());
 
-const rules = {
-  name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-};
-
-function genderText(g) {
-  if (Number(g) === 1) return "男";
-  if (Number(g) === 2) return "女";
-  return "未知";
+/** 解析项目上的联系人ID集合（JSON 数组字符串 / 数组） */
+function parseIds(raw) {
+  if (Array.isArray(raw)) return raw.map(Number).filter(Boolean);
+  const s = String(raw || "").trim();
+  if (!s) return [];
+  try {
+    const parsed = JSON.parse(s);
+    return Array.isArray(parsed) ? parsed.map(Number).filter(Boolean) : [];
+  } catch (e) {
+    return [];
+  }
 }
 
 function formatMobiles(mobiles) {
@@ -232,147 +213,205 @@ function formatMobiles(mobiles) {
   }
 }
 
-function addMobile() {
-  if (form.mobiles.length < 5) form.mobiles.push("");
+/** 按 ID 把已选集合映射为联系人详情（联系人已删除时自动剔除） */
+function mapSelected(ids, contacts) {
+  const map = new Map(contacts.map((c) => [Number(c.id), c]));
+  return (ids || []).map((id) => map.get(id)).filter(Boolean);
 }
 
-function removeMobile(idx) {
-  if (form.mobiles.length > 1) form.mobiles.splice(idx, 1);
+const upSelected = computed(() => mapSelected(pickedUp.value, upstreamContacts.value));
+const downSelected = computed(() => mapSelected(pickedDown.value, downstreamContacts.value));
+
+async function loadCompanyContacts(companyType, companyId) {
+  try {
+    const res = await getCompanyContactList({ company_type: companyType, company_id: companyId });
+    const data = res?.data || {};
+    const list = Array.isArray(data) ? data : data.list || [];
+    return list.filter((c) => Number(c.status) !== 0); // 离职联系人不参与选择
+  } catch (e) {
+    return [];
+  }
 }
 
 /** 供父组件（detail.vue）在抽屉打开时调用 */
 async function reload() {
-  if (!props.companyId) {
-    list.value = [];
+  const p = props.project;
+  pickedUp.value = parseIds(p?.upstream_contact_ids);
+  pickedDown.value = parseIds(p?.downstream_contact_ids);
+  if (!p?.customer_id && !downCompany.value) {
+    upstreamContacts.value = [];
+    downstreamContacts.value = [];
     emit("count", 0);
     return;
   }
   loading.value = true;
-  try {
-    const res = await getCompanyContactList({
-      company_type: props.companyType,
-      company_id: props.companyId,
-    });
-    const data = res?.data || {};
-    list.value = Array.isArray(data) ? data : data.list || [];
-  } catch (e) {
-    list.value = [];
-  } finally {
-    loading.value = false;
+  const jobs = [];
+  if (p?.customer_id) {
+    jobs.push(
+      loadCompanyContacts("customer", p.customer_id).then((list) => {
+        upstreamContacts.value = list;
+      })
+    );
+  } else {
+    upstreamContacts.value = [];
   }
-  emit("count", list.value.length);
+  if (downCompany.value) {
+    jobs.push(
+      loadCompanyContacts(downCompany.value.type, downCompany.value.id).then((list) => {
+        downstreamContacts.value = list;
+      })
+    );
+  } else {
+    downstreamContacts.value = [];
+  }
+  await Promise.all(jobs);
+  loading.value = false;
+  emit("count", upSelected.value.length + downSelected.value.length);
 }
 
-function openEdit(row) {
-  if (!props.companyId) {
-    ElMessage.warning("该项目未关联正式客户，暂无正式联系人");
+/* ------------------------------ 选择联系人 ------------------------------ */
+
+const picker = reactive({ visible: false, groupKey: "", keyword: "", loading: false, list: [] });
+const pickerTableRef = ref();
+const pickerSelection = ref([]);
+
+const pickerTitle = computed(() => {
+  if (picker.groupKey === "upstream") {
+    return `选择上游联系人（${props.project?.customer_name || "客户方"}）`;
+  }
+  return `选择${downLabel.value}联系人（${props.project?.supplier_name || "对方主体"}）`;
+});
+
+const pickerFilteredList = computed(() => {
+  const kw = picker.keyword.trim().toLowerCase();
+  if (!kw) return picker.list;
+  return picker.list.filter((c) =>
+    [c.name, c.position, c.department, formatMobiles(c.mobiles)]
+      .map((v) => String(v || "").toLowerCase())
+      .some((v) => v.includes(kw))
+  );
+});
+
+async function openPicker(groupKey) {
+  picker.groupKey = groupKey;
+  picker.keyword = "";
+  pickerSelection.value = [];
+  picker.visible = true;
+
+  // 目标企业联系人：优先用已加载的缓存，无则现场拉取
+  const isUp = groupKey === "upstream";
+  const cached = isUp ? upstreamContacts.value : downstreamContacts.value;
+  if (cached.length) {
+    picker.list = cached;
+    await syncPickerSelection();
     return;
   }
-  Object.assign(form, defaultForm());
-  if (row) {
-    let mobiles = [""];
-    try {
-      mobiles = row.mobiles ? (typeof row.mobiles === "string" ? JSON.parse(row.mobiles) : row.mobiles) : [""];
-      if (!Array.isArray(mobiles) || mobiles.length === 0) mobiles = [""];
-    } catch (e) {
-      mobiles = [""];
-    }
-    Object.assign(form, {
-      id: row.id,
-      name: row.name || "",
-      gender: Number(row.gender) || 0,
-      phone: row.phone || "",
-      mobiles,
-      wechat: row.wechat || "",
-      qq: row.qq || "",
-      dingtalk: row.dingtalk || "",
-      email: row.email || "",
-      department: row.department || "",
-      position: row.position || "",
-      home_address: row.home_address || "",
-      is_primary: Number(row.is_primary) === 1 ? 1 : 0,
-      status: row.status === undefined || row.status === null ? 1 : Number(row.status),
-      remark: row.remark || "",
-    });
-  }
-  dialog.value = true;
+  const company = isUp
+    ? { type: "customer", id: props.project?.customer_id }
+    : downCompany.value;
+  if (!company?.id) return;
+  picker.loading = true;
+  picker.list = await loadCompanyContacts(company.type, company.id);
+  if (isUp) upstreamContacts.value = picker.list;
+  else downstreamContacts.value = picker.list;
+  picker.loading = false;
+  await syncPickerSelection();
 }
 
-async function handleSave() {
-  if (formRef.value) {
-    try {
-      await formRef.value.validate();
-    } catch (e) {
-      return;
+/** 打开弹窗后回显当前已选 */
+async function syncPickerSelection() {
+  await nextTick();
+  const table = pickerTableRef.value;
+  if (!table) return;
+  // 先清空历史勾选：弹窗关闭后表格会保留上次的选中（reserve-selection），
+  // 不清会导致跨项目/跨次打开时残留上一个项目的选择，与本次实际勾选错位
+  table.clearSelection();
+  const picked = picker.groupKey === "upstream" ? pickedUp.value : pickedDown.value;
+  picker.list.forEach((row) => {
+    if (picked.includes(Number(row.id))) {
+      table.toggleRowSelection(row, true);
     }
-  }
-  // 过滤空手机号后按 JSON 数组提交（与 ERP 通讯录一致）
-  const validMobiles = form.mobiles.filter((m) => m && String(m).trim());
+  });
+}
+
+async function confirmPicker() {
+  const ids = pickerSelection.value.map((row) => Number(row.id)).filter(Boolean);
+  if (picker.groupKey === "upstream") pickedUp.value = ids;
+  else pickedDown.value = ids;
+  await persist();
+  picker.visible = false;
+}
+
+/** 单个移除：更新集合后立即保存 */
+async function removePicked(groupKey, row) {
+  const id = Number(row.id);
+  if (groupKey === "upstream") pickedUp.value = pickedUp.value.filter((i) => i !== id);
+  else pickedDown.value = pickedDown.value.filter((i) => i !== id);
+  await persist();
+}
+
+/** 保存两组选中集合（接口全量覆盖，一次性提交避免互相覆盖） */
+async function persist() {
+  if (!props.project?.id) return;
   saving.value = true;
   try {
-    const payload = {
-      company_type: props.companyType,
-      company_id: Number(props.companyId),
-      name: form.name,
-      gender: form.gender,
-      phone: form.phone,
-      mobiles: JSON.stringify(validMobiles),
-      wechat: form.wechat,
-      qq: form.qq,
-      dingtalk: form.dingtalk,
-      email: form.email,
-      department: form.department,
-      position: form.position,
-      home_address: form.home_address,
-      is_primary: form.is_primary,
-      status: form.status,
-      remark: form.remark,
-    };
-    if (form.id) {
-      await updateCompanyContact(form.id, payload);
-    } else {
-      await createCompanyContact(payload);
+    const res = await saveProjectContacts(props.project.id, {
+      upstream_contact_ids: pickedUp.value,
+      downstream_contact_ids: pickedDown.value,
+    });
+    const data = res?.data || {};
+    // 以后端过滤结果为准（剔除不属于对应企业的ID / 单一项目的下游集合）
+    pickedUp.value = (data.upstream_contact_ids || []).map(Number);
+    pickedDown.value = (data.downstream_contact_ids || []).map(Number);
+    // 同步写回项目快照：详情数据源为列表行快照，不写回则关闭重开详情会读到旧集合（联系人不显示）
+    if (props.project) {
+      props.project.upstream_contact_ids = JSON.stringify(pickedUp.value);
+      props.project.downstream_contact_ids = JSON.stringify(pickedDown.value);
     }
-    ElMessage.success("保存成功");
-    dialog.value = false;
-    reload();
+    emit("count", upSelected.value.length + downSelected.value.length);
+    ElMessage.success("项目联系人已保存");
   } catch (e) {
     ElMessage.error(e.message || "保存失败");
+    // 保存失败时重新拉取，避免本地状态与后端不一致
+    await reload();
   } finally {
     saving.value = false;
   }
 }
 
-async function handleDelete(row) {
-  try {
-    await ElMessageBox.confirm(`确定删除联系人「${row.name}」吗？`, "删除确认", { type: "warning" });
-    await deleteCompanyContact(row.id);
-    ElMessage.success("删除成功");
-    reload();
-  } catch (e) {
-    if (e !== "cancel") ElMessage.error(e.message || "删除失败");
-  }
-}
-
 defineExpose({ reload });
 </script>
 
 <style lang="less" scoped>
-.tab-toolbar {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 12px;
-}
+.contact-group {
+  margin-bottom: 20px;
 
-.mobile-list {
-  width: 100%;
-
-  .mobile-item {
+  .group-header {
     display: flex;
     align-items: center;
-    gap: 8px;
+    justify-content: space-between;
     margin-bottom: 8px;
+
+    .group-title-row {
+      display: flex;
+      align-items: baseline;
+      gap: 8px;
+      min-width: 0;
+    }
+
+    .group-title {
+      font-size: 14px;
+      font-weight: 600;
+      color: var(--el-text-color-primary);
+    }
+
+    .group-company {
+      font-size: 12px;
+      color: var(--el-text-color-secondary);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
 }
 </style>
diff --git a/backend/src/views/apps/crm/project/components/detail_contract.vue b/backend/src/views/apps/crm/project/components/detail_contract.vue
index cb73af8..e318db2 100644
--- a/backend/src/views/apps/crm/project/components/detail_contract.vue
+++ b/backend/src/views/apps/crm/project/components/detail_contract.vue
@@ -16,8 +16,8 @@
           <template #label>
             <span class="tab-label">
               <span class="tab-name">{{ c.contract_name }}</span>
-              <el-tag :type="contractSideOf(c) === 'down' ? 'warning' : 'success'" size="small" effect="plain">
-                {{ contractSideOf(c) === "down" ? "下游" : "上游" }}
+              <el-tag v-if="showSideTag" :type="sideTagType(c)" size="small" effect="plain">
+                {{ sideLabel(c) }}
               </el-tag>
             </span>
           </template>
@@ -32,8 +32,8 @@
                 >
                   {{ c.contract_name }}
                 </span>
-                <el-tag :type="contractSideOf(c) === 'down' ? 'warning' : 'success'" size="small" effect="plain">
-                  {{ contractSideOf(c) === "down" ? "下游" : "上游" }}
+                <el-tag v-if="showSideTag" :type="sideTagType(c)" size="small" effect="plain">
+                  {{ sideLabel(c) }}
                 </el-tag>
               </div>
               <!-- <div class="pane-actions">
@@ -114,9 +114,12 @@
                 <span class="label">产品总成本</span>
                 <span class="value">￥{{ formatMoney(summaryOf(c).total_cost) }}</span>
               </div>
+              <!-- 我方为甲方（付款方）时显示「合同支出」（负数），否则显示「合同总利润」 -->
               <div class="summary-card">
-                <span class="label">合同总利润</span>
-                <span class="value success">￥{{ formatMoney(summaryOf(c).total_profit) }}</span>
+                <span class="label">{{ contractProfitLabel(c.our_role) }}</span>
+                <span class="value success">
+                  {{ contractProfitText(c.our_role, summaryOf(c)) }}
+                </span>
               </div>
               <div class="summary-card">
                 <span class="label">硬件部分金额</span>
@@ -166,6 +169,8 @@ import {
   contractCategoryText,
   productCategoryText,
   productCategoryTag,
+  contractProfitLabel,
+  contractProfitText,
 } from "../../dict";
 
 const props = defineProps({
@@ -173,6 +178,8 @@ const props = defineProps({
   projectId: { type: [Number, String], default: null },
   // 关联项目名称（用于新建合同时预设）
   projectName: { type: String, default: "" },
+  // 项目类型：1=单一项目（仅上游） 2=上下游项目
+  projectType: { type: [Number, String], default: 1 },
 });
 const emit = defineEmits(["count"]);
 
@@ -187,25 +194,53 @@ const createVisible = ref(false);
 const editRow = ref(null);
 const initStep = ref(1);
 
-/** 新建合同时预设的关联项目 */
+/** 新建合同时预设的关联项目（带项目类型，供新建向导给出上中游提示） */
 const presetProject = computed(() =>
-  props.projectId ? { id: props.projectId, project_name: props.projectName } : null
+  props.projectId
+    ? { id: props.projectId, project_name: props.projectName, project_type: props.projectType }
+    : null
 );
 
 const partyLabel = (role) => PARTY_ROLES.find((r) => r.key === role)?.label || role || "-";
 
 /**
- * 合同在项目中的上下游归属：
- * 判定以「我方是收款方还是付款方」为准 —— 参与方中出现供应商（我方下游）即下游合同；
- * 其余按我方角色判断：我方为甲方（采购 / 付款方）算下游，为乙方（供货 / 收款方）算上游。
- * 注意：不能只看对方是否在客户库建档，客户也可能是我方的上游供应商。
+ * 是否展示合同归属分段标签：上下游项目区分「上游 / 下游」，
+ * 上中游项目区分「上中游 / 中下游」；单一项目只有一段，不展示。
+ */
+const showSideTag = computed(() => [2, 3].includes(Number(props.projectType)));
+
+/**
+ * 合同在项目中的归属分段（side：up / down / mid）：
+ * - 上下游项目（type=2）：判定以「我方是收款方还是付款方」为准 —— 参与方中出现供应商（我方下游）
+ *   即下游合同；其余按我方角色判断：我方为甲方（采购 / 付款方）算下游，为乙方（供货 / 收款方）算上游。
+ *   注意：不能只看对方是否在客户库建档，客户也可能是我方的上游供应商。
+ * - 上中游项目（type=3）：我方不参与签约（our_role=0 或参与方中无本公司）即「上中游」
+ *   （上游与中游主体之间的合同，甲乙双方均非本公司）；否则为我方与中游主体之间的「中下游」合同。
  */
 function contractSideOf(c) {
   const parties = Array.isArray(c?.parties) ? c.parties : [];
+  if (Number(props.projectType) === 3) {
+    const ownIn = Number(c?.our_role) !== 0 && parties.some((p) => Number(p?.ref_type) === 0);
+    return ownIn ? "down" : "mid";
+  }
   if (parties.some((p) => Number(p?.ref_type) === 2)) return "down";
   return Number(c?.our_role) === 1 ? "down" : "up";
 }
 
+/** 分段标签文案：上下游项目=上游 / 下游；上中游项目=上中游 / 中下游 */
+function sideLabel(c) {
+  const side = contractSideOf(c);
+  if (Number(props.projectType) === 3) return side === "down" ? "中下游" : "上中游";
+  return side === "down" ? "下游" : "上游";
+}
+
+/** 分段标签颜色 */
+function sideTagType(c) {
+  const side = contractSideOf(c);
+  if (Number(props.projectType) === 3) return side === "down" ? "warning" : "danger";
+  return side === "down" ? "warning" : "success";
+}
+
 /** 金额汇总：优先后端 summary，缺失时按产品清单前端重算 */
 function summaryOf(c) {
   const s = c?.summary;
diff --git a/backend/src/views/apps/crm/project/components/detail_docs.vue b/backend/src/views/apps/crm/project/components/detail_docs.vue
index 9988068..051f4fe 100644
--- a/backend/src/views/apps/crm/project/components/detail_docs.vue
+++ b/backend/src/views/apps/crm/project/components/detail_docs.vue
@@ -69,10 +69,31 @@
               </el-button>
             </el-upload>
             <el-button size="small" :icon="Refresh" :disabled="loading" @click="reload">刷新</el-button>
+            <!-- 视图切换：列表 / 图标（记住上次选择） -->
+            <el-radio-group v-model="viewMode" size="small">
+              <el-radio-button value="list">
+                <el-tooltip content="列表视图" placement="top">
+                  <el-icon><List /></el-icon>
+                </el-tooltip>
+              </el-radio-button>
+              <el-radio-button value="grid">
+                <el-tooltip content="图标视图" placement="top">
+                  <el-icon><Grid /></el-icon>
+                </el-tooltip>
+              </el-radio-button>
+            </el-radio-group>
           </div>
         </div>
 
-        <el-table :data="list" v-loading="loading" stripe border size="small">
+        <!-- 列表视图 -->
+        <el-table
+          v-if="viewMode === 'list'"
+          :data="list"
+          v-loading="loading"
+          stripe
+          border
+          size="small"
+        >
           <el-table-column label="文件名" min-width="150" show-overflow-tooltip>
             <template #default="{ row }">
               <a :href="row.file_url" target="_blank" class="file-link">
@@ -102,13 +123,55 @@
           </el-table-column>
           <template #empty><el-empty description="暂无项目文档" :image-size="60" /></template>
         </el-table>
+
+        <!-- 图标视图：文件卡片（点击文件图标/名称打开，删除在卡片底部） -->
+        <div v-else class="doc-grid" v-loading="loading">
+          <div
+            v-for="row in list"
+            :key="row.id"
+            class="doc-card"
+            :title="`${row.file_name || row.title || '-'}（${formatFileSize(row.size)}）`"
+          >
+            <a class="doc-card-link" :href="row.file_url" target="_blank">
+              <span class="doc-card-icon" :style="{ color: docIcon(row).color }">
+                <el-icon><component :is="docIcon(row).icon" /></el-icon>
+              </span>
+              <span class="doc-card-name">{{ row.file_name || row.title || "-" }}</span>
+            </a>
+            <span class="doc-card-meta">{{ formatFileSize(row.size) }}</span>
+            <div class="doc-card-actions">
+              <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+            </div>
+          </div>
+          <el-empty
+            v-if="!list.length && !loading"
+            description="暂无项目文档"
+            :image-size="60"
+            class="grid-empty"
+          />
+        </div>
+
+        <!-- 分页：列表 / 图标视图共用，默认每页 20 -->
+        <div class="docs-pagination">
+          <el-pagination
+            v-model:current-page="pagination.page"
+            v-model:page-size="pagination.pageSize"
+            :total="pagination.total"
+            :page-sizes="[10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next"
+            size="small"
+            background
+            @size-change="handlePageSizeChange"
+            @current-change="reload"
+          />
+        </div>
       </section>
     </div>
   </div>
 </template>
 
 <script setup>
-import { computed, nextTick, ref } from "vue";
+import { computed, nextTick, reactive, ref, watch } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import {
   Upload,
@@ -117,6 +180,15 @@ import {
   FolderDelete,
   Folder,
   FolderOpened,
+  List,
+  Grid,
+  Document,
+  DataBoard,
+  Picture,
+  Box,
+  VideoCamera,
+  Headset,
+  Files,
 } from "@element-plus/icons-vue";
 import {
   getProjectDocs,
@@ -149,10 +221,34 @@ const DOC_TYPE_TEXT = {
   8: "音频",
 };
 
+// 视图模式：list 列表 / grid 图标卡片（localStorage 记住上次选择）
+const VIEW_KEY = "crm_project_doc_view";
+const viewMode = ref(localStorage.getItem(VIEW_KEY) === "grid" ? "grid" : "list");
+watch(viewMode, (v) => localStorage.setItem(VIEW_KEY, v));
+
+// 文档类型图标与颜色（图标视图卡片使用）
+const DOC_TYPE_ICON = {
+  0: { icon: Files, color: "#909399" },
+  1: { icon: Document, color: "#409eff" },
+  2: { icon: Grid, color: "#67c23a" },
+  3: { icon: DataBoard, color: "#e6a23c" },
+  4: { icon: Document, color: "#f56c6c" },
+  5: { icon: Picture, color: "#67c23a" },
+  6: { icon: Box, color: "#e6a23c" },
+  7: { icon: VideoCamera, color: "#9c27b0" },
+  8: { icon: Headset, color: "#e6a23c" },
+};
+
+function docIcon(row) {
+  return DOC_TYPE_ICON[Number(row?.doc_type)] || DOC_TYPE_ICON[0];
+}
+
 const loading = ref(false);
 const uploading = ref(false);
 const pending = ref(0);
 const list = ref([]);
+// 分页：默认每页 20，与后端 DocList 一致
+const pagination = reactive({ page: 1, pageSize: 20, total: 0 });
 // 项目文件夹树（根为项目文件夹，子节点为项目内新建的文件夹＝文档库子分类）
 const folderTree = ref([]);
 // 项目根文件夹分类ID
@@ -186,10 +282,17 @@ function findFolder(nodes, id) {
   return null;
 }
 
-/** 左侧树节点点击：切换筛选文件夹 */
+/** 左侧树节点点击：切换筛选文件夹（回到第一页） */
 function handleNodeClick(data) {
   if (!data.id || data.id === selectedFolder.value) return;
   selectedFolder.value = data.id;
+  pagination.page = 1;
+  reload();
+}
+
+/** 每页条数变化：回到第一页重新拉取 */
+function handlePageSizeChange() {
+  pagination.page = 1;
   reload();
 }
 
@@ -204,29 +307,39 @@ function syncTreeHighlight() {
 async function reload() {
   if (!props.projectId) {
     list.value = [];
+    pagination.total = 0;
     emit("count", 0);
     return;
   }
   loading.value = true;
   try {
-    const params = { page: 1, pageSize: 200 };
+    const params = { page: pagination.page, pageSize: pagination.pageSize };
     if (selectedFolder.value) params.category_id = selectedFolder.value;
     const res = await getProjectDocs(props.projectId, params);
     const data = res?.data || {};
     rootId.value = data.category_id || 0;
     list.value = data.list || [];
+    pagination.total = Number(data.total) || 0;
     folderTree.value = data.folders || [];
     // 兜底：默认选中项目根文件夹（项目名称）；选中的文件夹已被删除时回到根
     if (!selectedFolder.value || !findFolder(folderTree.value, selectedFolder.value)) {
       selectedFolder.value = rootId.value;
     }
+    // 当前页超出总页数（删除文档 / 切换文件夹后）自动回退到最后一页
+    const maxPage = Math.max(1, Math.ceil(pagination.total / pagination.pageSize));
+    if (pagination.page > maxPage) {
+      pagination.page = maxPage;
+      await reload();
+      return;
+    }
   } catch (e) {
     list.value = [];
   } finally {
     loading.value = false;
   }
   syncTreeHighlight();
-  emit("count", list.value.length);
+  // 计数（Tab 角标）使用全部文档数而非当前页条数
+  emit("count", pagination.total);
 }
 
 function extOf(name) {
@@ -339,7 +452,11 @@ async function handleUpload(options) {
   } finally {
     pending.value -= 1;
     uploading.value = pending.value > 0;
-    if (pending.value === 0) reload();
+    if (pending.value === 0) {
+      // 上传完成后回到第一页，便于直接看到新文档
+      pagination.page = 1;
+      reload();
+    }
   }
 }
 
@@ -493,6 +610,14 @@ defineExpose({ reload });
     align-items: center;
     gap: 8px;
     flex-shrink: 0;
+
+    /* 视图切换按钮：图标居中、紧凑内边距 */
+    :deep(.el-radio-button__inner) {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      padding: 5px 9px;
+    }
   }
 }
 
@@ -504,4 +629,86 @@ defineExpose({ reload });
     text-decoration: underline;
   }
 }
+
+/* 分页：列表 / 图标视图共用 */
+.docs-pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+
+/* 图标视图：文件卡片网格 */
+.doc-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
+  gap: 10px;
+  align-content: start;
+  max-height: 420px;
+  overflow-y: auto;
+  padding: 2px;
+
+  .doc-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 5px;
+    padding: 14px 8px 8px;
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 6px;
+    background: var(--el-bg-color);
+    transition: border-color 0.2s, box-shadow 0.2s;
+
+    &:hover {
+      border-color: var(--el-color-primary-light-5);
+      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.07);
+    }
+
+    .doc-card-link {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 6px;
+      width: 100%;
+      text-decoration: none;
+    }
+
+    .doc-card-icon {
+      font-size: 34px;
+      line-height: 1;
+    }
+
+    .doc-card-name {
+      width: 100%;
+      font-size: 12px;
+      color: var(--el-text-color-primary);
+      text-align: center;
+      line-height: 1.35;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      word-break: break-all;
+
+      &:hover {
+        color: var(--el-color-primary);
+      }
+    }
+
+    .doc-card-meta {
+      font-size: 11px;
+      color: var(--el-text-color-secondary);
+      text-align: center;
+    }
+
+    .doc-card-actions {
+      display: flex;
+      justify-content: center;
+      margin-top: -2px;
+    }
+  }
+
+  .grid-empty {
+    grid-column: 1 / -1;
+  }
+}
 </style>
diff --git a/backend/src/views/apps/crm/project/components/edit.vue b/backend/src/views/apps/crm/project/components/edit.vue
index 06f62b3..128f886 100644
--- a/backend/src/views/apps/crm/project/components/edit.vue
+++ b/backend/src/views/apps/crm/project/components/edit.vue
@@ -8,12 +8,14 @@
     @opened="handleOpened"
   >
     <el-form ref="formRef" :model="form" :rules="rules" label-width="110px" label-position="right">
-      <!-- 项目类型：决定是否需要维护下游（供应商）信息 -->
+      <!-- 项目类型：决定是否需要维护「对方主体」（上下游项目的下游 / 上中游项目的中游） -->
       <el-form-item label="项目类型" prop="project_type">
         <el-radio-group v-model="form.project_type">
           <el-radio-button :value="1">单一项目</el-radio-button>
           <el-radio-button :value="2">上下游项目</el-radio-button>
+          <el-radio-button :value="3">上中游项目</el-radio-button>
         </el-radio-group>
+        <!-- <span class="type-tip">{{ projectTypeTip }}</span> -->
       </el-form-item>
 
       <el-divider content-position="left">项目概况</el-divider>
@@ -59,34 +61,41 @@
         </el-col>
       </el-row>
 
-      <!-- 单一项目不存在上下游概念，只展示客户信息；上下游项目才区分上游（客户侧） -->
-      <el-divider content-position="left">{{ isBackToBack ? "上游信息" : "客户信息" }}</el-divider>
+      <!-- 单一项目不存在上下游概念，只展示客户信息；上下游 / 上中游项目区分上游（客户侧） -->
+      <el-divider content-position="left">{{ hasCounterparty ? "上游信息" : "客户信息" }}</el-divider>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="客户" prop="customer_id">
-            <el-select
-              v-model="form.customer_id"
-              filterable
-              remote
-              clearable
-              :remote-method="searchCustomers"
-              :loading="customerLoading"
-              placeholder="输入客户名称搜索"
-              style="width: 100%"
-            >
-              <el-option v-for="c in customerOptions" :key="c.id" :label="c.customer_name" :value="c.id" />
-            </el-select>
+            <div class="picker-with-add">
+              <el-select
+                v-model="form.customer_id"
+                filterable
+                remote
+                clearable
+                :remote-method="searchCustomers"
+                :loading="customerLoading"
+                placeholder="输入客户名称搜索"
+                style="flex: 1"
+                @change="onCustomerPick"
+              >
+                <el-option v-for="c in customerOptions" :key="c.id" :label="c.customer_name" :value="c.id" />
+              </el-select>
+              <!-- 客户库没有时，可直接新建，创建成功后自动选中并回填 -->
+              <el-tooltip content="没有找到？点击新建客户" placement="top">
+                <el-button :icon="Plus" @click="openCustomerCreate" />
+              </el-tooltip>
+            </div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="isBackToBack ? '上游金额' : '项目金额'" prop="upstream_amount">
+          <el-form-item :label="hasCounterparty ? '上游金额' : '项目金额'" prop="upstream_amount">
             <el-input v-model="form.upstream_amount" placeholder="对客户的收入金额">
               <template #append>元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="isBackToBack ? '上游对接人' : '对接人'" prop="upstream_contact">
+          <el-form-item :label="hasCounterparty ? '上游对接人' : '对接人'" prop="upstream_contact">
             <!-- 对接人从该客户已有联系人中带出（自动带出电话），不支持手工输入 -->
             <el-select
               v-model="form.upstream_contact"
@@ -108,55 +117,70 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="isBackToBack ? '上游联系电话' : '联系电话'" prop="upstream_phone">
+          <el-form-item :label="hasCounterparty ? '上游联系电话' : '联系电话'" prop="upstream_phone">
             <el-input v-model="form.upstream_phone" placeholder="客户方对接人电话" maxlength="20" />
           </el-form-item>
         </el-col>
       </el-row>
 
-      <!-- 下游信息：仅上下游项目需要维护 -->
-      <template v-if="isBackToBack">
-        <el-divider content-position="left">下游信息</el-divider>
+      <!-- 对方主体信息：上下游项目维护下游（供应商/客户），上中游项目维护中游（中间方 B 公司） -->
+      <template v-if="hasCounterparty">
+        <el-divider content-position="left">{{ counterpartyLabel }}信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="供应商/客户" prop="supplier_name">
-              <el-autocomplete
-                v-model="form.supplier_name"
-                clearable
-                value-key="supplier_name"
-                :fetch-suggestions="querySuppliers"
-                placeholder="输入名称搜索供应商库 / 客户库，没有则直接填写"
-                style="width: 100%"
-                @focus="searchSuppliers(form.supplier_name || '')"
-                @select="applySupplier"
-                @blur="() => applySupplier(null)"
-              >
-                <template #default="{ item }">
-                  <span>{{ item.supplier_name }}</span>
-                  <el-tag size="small" effect="plain" :type="Number(item.ref_type) === 1 ? 'success' : 'warning'">
-                    {{ Number(item.ref_type) === 1 ? "客户" : "供应商" }}
-                  </el-tag>
-                </template>
-              </el-autocomplete>
+            <el-form-item :label="isUpMid ? '中游企业' : '供应商/客户'" prop="supplier_name">
+              <div class="picker-with-add">
+                <el-autocomplete
+                  v-model="form.supplier_name"
+                  clearable
+                  value-key="supplier_name"
+                  :fetch-suggestions="querySuppliers"
+                  :placeholder="
+                    isUpMid
+                      ? '输入名称搜索供应商库 / 客户库（中游 B 公司），没有则直接填写'
+                      : '输入名称搜索供应商库 / 客户库，没有则直接填写'
+                  "
+                  style="flex: 1"
+                  @focus="searchSuppliers(form.supplier_name || '')"
+                  @select="applySupplier"
+                  @blur="() => applySupplier(null)"
+                >
+                  <template #default="{ item }">
+                    <span>{{ item.supplier_name }}</span>
+                    <el-tag size="small" effect="plain" :type="Number(item.ref_type) === 1 ? 'success' : 'warning'">
+                      {{ Number(item.ref_type) === 1 ? "客户" : "供应商" }}
+                    </el-tag>
+                  </template>
+                </el-autocomplete>
+                <!-- 中游企业可能不在客户 / 供应商库中：支持直接新建（建到客户库）并自动关联 -->
+                <el-tooltip v-if="isUpMid" content="没有找到？点击新建中游企业" placement="top">
+                  <el-button :icon="Plus" @click="openCounterpartyCreate" />
+                </el-tooltip>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下游金额" prop="downstream_amount">
-              <el-input v-model="form.downstream_amount" placeholder="支付给供应商的成本">
+            <el-form-item :label="`${counterpartyLabel}金额`" prop="downstream_amount">
+              <el-input
+                v-model="form.downstream_amount"
+                :placeholder="isUpMid ? '中游方与我方的合同金额' : '支付给供应商的成本'"
+              >
                 <template #append>元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下游对接人" prop="downstream_contact">
-              <!-- 对接人从下游主体（供应商 / 客户）已有联系人中带出，不支持手工输入 -->
+            <el-form-item :label="`${counterpartyLabel}对接人`" prop="downstream_contact">
+              <!-- 对接人从对方主体（供应商 / 客户）已有联系人中带出，不支持手工输入 -->
               <el-select
                 v-model="form.downstream_contact"
                 filterable
                 clearable
                 :loading="downstreamContactLoading"
                 :disabled="!form.supplier_id"
-                :placeholder="form.supplier_id ? '选择对方联系人' : '请先选择供应商/客户'"
+                :placeholder="
+                  form.supplier_id ? '选择对方联系人' : isUpMid ? '请先选择中游企业' : '请先选择供应商/客户'
+                "
                 style="width: 100%"
                 @change="onDownstreamContactPick"
               >
@@ -170,8 +194,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下游联系电话" prop="downstream_phone">
-              <el-input v-model="form.downstream_phone" placeholder="供应商方对接人电话" maxlength="20" />
+            <el-form-item :label="`${counterpartyLabel}联系电话`" prop="downstream_phone">
+              <el-input
+                v-model="form.downstream_phone"
+                :placeholder="isUpMid ? '中游方对接人电话' : '供应商方对接人电话'"
+                maxlength="20"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 上中游项目：下游固定为本公司，无需维护，仅展示 -->
+        <el-row v-if="isUpMid" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="下游（本公司）">
+              <el-input :model-value="ownCompanyName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -184,6 +221,24 @@
     </el-divider>
     <ProductList :products="form.products" /> -->
 
+    <!-- 快速新建客户：创建成功后自动选中并回填项目客户信息 -->
+    <QuickCreateParty
+      v-model:visible="customerCreateVisible"
+      :ref-type="1"
+      :preset-name="customerKeyword"
+      associate-tip="项目客户"
+      @created="onCustomerCreated"
+    />
+
+    <!-- 快速新建中游企业：中游企业可能不在客户 / 供应商库中，创建成功后自动选中并回填中游信息 -->
+    <QuickCreateParty
+      v-model:visible="counterpartyCreateVisible"
+      :ref-type="1"
+      :preset-name="form.supplier_name"
+      associate-tip="项目中游企业"
+      @created="onCounterpartyCreated"
+    />
+
     <template #footer>
       <el-button @click="handleClose">取消</el-button>
       <el-button type="primary" :loading="submitting" @click="handleSubmit">保存</el-button>
@@ -194,6 +249,7 @@
 <script setup>
 import { computed, ref, reactive, watch } from "vue";
 import { ElMessage } from "element-plus";
+import { Plus } from "@element-plus/icons-vue";
 import { createProject, updateProject } from "@/api/crmPipeline";
 import { getProductList } from "@/api/crmProduct";
 import { getCrmCustomerList, getCrmSupplierList } from "@/api/crm";
@@ -202,6 +258,7 @@ import { getAllUsers } from "@/api/user";
 import { useAuthStore } from "@/stores/auth";
 import { PROJECT_STATUS_OPTIONS, formatMoney } from "../../dict";
 import ProductList from "../../contract/components/ProductList.vue";
+import QuickCreateParty from "../../contract/components/QuickCreateParty.vue";
 
 const props = defineProps({
   visible: { type: Boolean, default: false },
@@ -217,11 +274,14 @@ const internalId = ref(null);
 const userOptions = ref([]);
 const customerOptions = ref([]);
 const customerLoading = ref(false);
+// 最近一次搜索词：打开新建客户弹窗时带入名称，省去重复输入
+const customerKeyword = ref("");
+const customerCreateVisible = ref(false);
 
 const defaultForm = () => ({
   project_name: "",
   project_no: "",
-  // 项目类型：1=单一项目（仅上游） 2=上下游项目（上游客户 + 下游供应商）
+  // 项目类型：1=单一项目（仅上游） 2=上下游项目（上游客户 + 下游供应商） 3=上中游项目（上游 A + 中游 B，下游为本公司）
   project_type: 1,
   customer_id: "",
   customer_name: "",
@@ -251,16 +311,40 @@ const form = reactive(defaultForm());
 /** 是否上下游项目：需要维护下游（供应商）信息 */
 const isBackToBack = computed(() => Number(form.project_type) === 2);
 
+/** 是否上中游项目：上游 A 公司 + 中游 B 公司，下游固定为本公司 */
+const isUpMid = computed(() => Number(form.project_type) === 3);
+
+/** 是否需要维护「对方主体」：上下游项目的下游 / 上中游项目的中游（两者复用同一组字段存储） */
+const hasCounterparty = computed(() => isBackToBack.value || isUpMid.value);
+
+/** 对方主体称谓：上下游项目叫「下游」，上中游项目叫「中游」 */
+const counterpartyLabel = computed(() => (isUpMid.value ? "中游" : "下游"));
+
+/** 项目类型说明：随所选类型提示参与方结构 */
+// const projectTypeTip = computed(() => {
+//   switch (Number(form.project_type)) {
+//     case 2:
+//       return "上游客户 + 下游供应商（背靠背）";
+//     case 3:
+//       return "上游 A 公司 + 中游 B 公司，下游为本公司";
+//     default:
+//       return "仅上游客户";
+//   }
+// });
+
+/** 本公司名称：上中游项目的下游固定为本公司 */
+const ownCompanyName = computed(() => authStore.user?.tenant_name || "本公司");
+
 /** 项目毛利：上游金额 − 下游金额（仅上下游项目有意义） */
 const profitAmount = computed(
   () => (Number(form.upstream_amount) || 0) - (Number(form.downstream_amount) || 0)
 );
 
-/** 切换为单一项目时清空下游信息，避免残留数据造成误解 */
+/** 切换为单一项目时清空下游 / 中游信息，避免残留数据造成误解 */
 watch(
   () => form.project_type,
   (val) => {
-    if (Number(val) === 2) return;
+    if (Number(val) === 2 || Number(val) === 3) return;
     form.supplier_id = 0;
     form.supplier_ref_type = 0;
     form.supplier_name = "";
@@ -376,6 +460,7 @@ async function loadUsers() {
 }
 
 async function searchCustomers(keyword) {
+  customerKeyword.value = String(keyword || "");
   customerLoading.value = true;
   try {
     const res = await getCrmCustomerList({ page: 1, pageSize: 20, keyword: keyword || "" });
@@ -388,6 +473,35 @@ async function searchCustomers(keyword) {
   }
 }
 
+/** 选中客户后同步名称；清空时一并清掉，避免把旧名称提交到后端 */
+function onCustomerPick(id) {
+  const hit = customerOptions.value.find((c) => Number(c.id) === Number(id));
+  form.customer_name = hit ? hit.customer_name : "";
+}
+
+/* --------------------------- 快速新建客户 --------------------------- */
+
+function openCustomerCreate() {
+  customerCreateVisible.value = true;
+}
+
+/**
+ * 快速新建客户成功：刷新候选并自动选中新客户，
+ * 同时按新建时填写的信息回填对接人与联系电话（对接人候选随 customer_id 自动加载）。
+ */
+async function onCustomerCreated(row) {
+  if (!row?.id) return;
+  const name = row.customer_name || row.label || "";
+  await searchCustomers("");
+  if (!customerOptions.value.some((c) => Number(c.id) === Number(row.id))) {
+    customerOptions.value.unshift({ id: row.id, customer_name: name });
+  }
+  form.customer_id = Number(row.id);
+  form.customer_name = name;
+  form.upstream_contact = row.contact_person || "";
+  form.upstream_phone = row.contact_phone || "";
+}
+
 /* --------------------------- 下游主体（供应商 / 客户） --------------------------- */
 
 const supplierOptions = ref([]);
@@ -451,6 +565,30 @@ function applySupplier(item) {
   }
 }
 
+/* --------------------------- 快速新建中游企业 --------------------------- */
+
+// 中游企业可能不在客户 / 供应商库中：支持直接新建到客户库后自动关联
+const counterpartyCreateVisible = ref(false);
+
+function openCounterpartyCreate() {
+  counterpartyCreateVisible.value = true;
+}
+
+/**
+ * 快速新建中游企业成功：按新建记录回填中游企业（库关联 + 标准名称），
+ * 并用新建时填写的联系人带出中游对接人 / 电话（联系人候选随 supplier_id 自动加载）。
+ */
+async function onCounterpartyCreated(row) {
+  if (!row?.id) return;
+  const name = row.customer_name || row.supplier_name || row.label || "";
+  await searchSuppliers(name);
+  form.supplier_id = Number(row.id);
+  form.supplier_ref_type = Number(row.ref_type) || 1; // 新建的企业落在客户库
+  form.supplier_name = name;
+  form.downstream_contact = row.contact_person || "";
+  form.downstream_phone = row.contact_phone || "";
+}
+
 /* --------------------------- 对接人（取自企业联系人） --------------------------- */
 
 const upstreamContacts = ref([]);
@@ -554,15 +692,15 @@ async function handleSubmit() {
       owner_user_name: form.owner_user_name,
       industry: form.industry,
       upstream_amount: upstream,
-      downstream_amount: isBackToBack.value ? Number(form.downstream_amount) || 0 : 0,
+      downstream_amount: hasCounterparty.value ? Number(form.downstream_amount) || 0 : 0,
       amount: upstream, // 兼容旧字段
       status: Number(form.status) || 1,
       start_date: form.start_date,
       end_date: form.end_date,
       upstream_contact: form.upstream_contact,
       upstream_phone: form.upstream_phone,
-      downstream_contact: isBackToBack.value ? form.downstream_contact : "",
-      downstream_phone: isBackToBack.value ? form.downstream_phone : "",
+      downstream_contact: hasCounterparty.value ? form.downstream_contact : "",
+      downstream_phone: hasCounterparty.value ? form.downstream_phone : "",
       address: form.address,
       remark: form.remark,
       products: JSON.stringify(form.products || []),
@@ -602,6 +740,17 @@ async function handleSubmit() {
   color: var(--el-color-danger);
 }
 
+/* 下拉选择 + 右侧新建按钮 */
+.picker-with-add {
+  display: flex;
+  gap: 8px;
+  width: 100%;
+
+  .el-button {
+    flex-shrink: 0;
+  }
+}
+
 .opt-meta {
   margin-left: 8px;
   font-size: 12px;
diff --git a/backend/src/views/apps/crm/project/index.vue b/backend/src/views/apps/crm/project/index.vue
index 6e7146a..45a2c8b 100644
--- a/backend/src/views/apps/crm/project/index.vue
+++ b/backend/src/views/apps/crm/project/index.vue
@@ -50,15 +50,15 @@
         <el-table-column prop="project_no" label="项目编号" width="140" show-overflow-tooltip />
         <el-table-column label="类型" width="90" align="center">
           <template #default="{ row }">
-            <el-tag size="small" effect="plain" :type="Number(row.project_type) === 2 ? 'warning' : 'info'">
-              {{ Number(row.project_type) === 2 ? "上下游" : "单一" }}
+            <el-tag size="small" effect="plain" :type="projectTypeTag(row.project_type)">
+              {{ projectTypeShortText(row.project_type) }}
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="客户" min-width="200" show-overflow-tooltip>
           <template #default="{ row }">
-            <!-- 上下游项目：客户 / 供应商；单一项目：仅客户 -->
-            <span v-if="Number(row.project_type) === 2">
+            <!-- 上下游：客户 / 下游；上中游：上游客户 / 中游；单一项目：仅客户 -->
+            <span v-if="Number(row.project_type) === 2 || Number(row.project_type) === 3">
               {{ row.customer_name || "-" }} / {{ row.supplier_name || "-" }}
             </span>
             <span v-else>{{ row.customer_name || "-" }}</span>
@@ -72,10 +72,10 @@
             {{ Number(row.project_type) === 2 ? formatMoney(row.downstream_amount) : "-" }}
           </template>
         </el-table-column> -->
-        <el-table-column label="逾期" width="100" align="center">
+        <el-table-column label="逾期" width="130" align="center">
           <template #default="{ row }">
             <el-tag v-if="projectOverdue(row).overdue" type="danger" size="small" effect="dark">
-              {{ overdueText(projectOverdue(row).days) }}
+              {{ projectOverdue(row).text }}
             </el-tag>
             <span v-else>-</span>
           </template>
@@ -140,8 +140,9 @@ import {
   PROJECT_STATUS_OPTIONS,
   projectStatusText,
   projectStatusTag,
+  projectTypeShortText,
+  projectTypeTag,
   projectOverdue,
-  overdueText,
   formatMoney,
   formatDateOnly,
 } from "../dict";
diff --git a/backend/src/views/apps/crm/setting/unit/index.vue b/backend/src/views/apps/crm/setting/unit/index.vue
index 6ff9a0b..bbe21ef 100644
--- a/backend/src/views/apps/crm/setting/unit/index.vue
+++ b/backend/src/views/apps/crm/setting/unit/index.vue
@@ -3,11 +3,11 @@
     <div class="page-header">
       <div>
         <h2>单位设置</h2>
-        <p>维护产品、报价等业务使用的计量单位，产品表单的「单位」下拉取自本表</p>
+        <p>维护产品、报价等业务使用的计量单位。系统默认单位不可编辑、不可删除；可新增本租户自定义单位</p>
       </div>
       <div class="header-actions">
         <el-button :icon="Refresh" @click="fetchList">刷新</el-button>
-        <el-button :icon="RefreshLeft" @click="handleInitDefault">恢复默认单位</el-button>
+        <!-- <el-button :icon="RefreshLeft" @click="handleInitDefault">恢复默认单位</el-button> -->
         <el-button type="primary" :icon="Plus" @click="openCreate">新增单位</el-button>
       </div>
     </div>
@@ -38,7 +38,21 @@
 
     <div class="table-container" v-loading="loading">
       <el-table :data="tableData" stripe border row-key="id">
-        <el-table-column prop="name" label="单位名称" min-width="140" show-overflow-tooltip />
+        <el-table-column label="单位名称" min-width="160" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.name }}
+            <!-- 系统默认单位：只读（不可编辑 / 删除） -->
+            <el-tag
+              v-if="Number(row.is_default) === 1"
+              type="primary"
+              size="small"
+              effect="plain"
+              style="margin-left: 6px"
+            >
+              默认
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="code" label="单位编码" width="140" show-overflow-tooltip>
           <template #default="{ row }">{{ row.code || "-" }}</template>
         </el-table-column>
@@ -59,8 +73,16 @@
         </el-table-column>
         <el-table-column label="操作" width="160" align="center" fixed="right">
           <template #default="{ row }">
-            <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
-            <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+            <!-- 系统默认单位只读；自定义单位可编辑、删除 -->
+            <template v-if="Number(row.is_default) === 1">
+              <el-tooltip content="系统默认单位不可编辑、不可删除" placement="top">
+                <span class="readonly-tip">系统内置</span>
+              </el-tooltip>
+            </template>
+            <template v-else>
+              <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+              <el-button link type="danger" size="small" @click="handleDelete(row)">删除</el-button>
+            </template>
           </template>
         </el-table-column>
         <template #empty><el-empty description="暂无单位" :image-size="80" /></template>
@@ -139,26 +161,36 @@ function openCreate() {
 }
 
 function openEdit(row) {
+  // 双保险：系统默认单位不可编辑（按钮已隐藏，这里再拦一次）
+  if (Number(row.is_default) === 1) {
+    ElMessage.warning("系统默认单位不可编辑，如需调整请新增自定义单位");
+    return;
+  }
   currentRow.value = { ...row };
   dialogVisible.value = true;
 }
 
 /** 补齐缺失的系统默认单位（已存在的不会被覆盖） */
-async function handleInitDefault() {
-  try {
-    await ElMessageBox.confirm("将补充缺失的默认单位（套 / 台 / 个 …），已存在的单位不会被修改。", "恢复默认单位", {
-      type: "warning",
-    });
-    const res = await initDefaultUnits();
-    const added = res?.data?.added || 0;
-    ElMessage.success(added ? `已补充 ${added} 个单位` : "默认单位已齐全");
-    fetchList();
-  } catch (e) {
-    if (e !== "cancel") ElMessage.error(e.message || "操作失败");
-  }
-}
+// async function handleInitDefault() {
+//   try {
+//     await ElMessageBox.confirm("将补充缺失的默认单位（套 / 台 / 个 …），已存在的单位不会被修改。", "恢复默认单位", {
+//       type: "warning",
+//     });
+//     const res = await initDefaultUnits();
+//     const added = res?.data?.added || 0;
+//     ElMessage.success(added ? `已补充 ${added} 个单位` : "默认单位已齐全");
+//     fetchList();
+//   } catch (e) {
+//     if (e !== "cancel") ElMessage.error(e.message || "操作失败");
+//   }
+// }
 
 async function handleDelete(row) {
+  // 双保险：系统默认单位不可删除（按钮已隐藏，这里再拦一次）
+  if (Number(row.is_default) === 1) {
+    ElMessage.warning("系统默认单位不可删除");
+    return;
+  }
   const used = Number(row.used_count) || 0;
   const tip = used ? `该单位已被 ${used} 个产品引用，删除后产品中的历史单位不受影响。` : "删除后不可恢复。";
   try {
@@ -173,3 +205,12 @@ async function handleDelete(row) {
 </script>
 
 <style lang="less" scoped src="../../styles/crm-page.less"></style>
+
+<style lang="less" scoped>
+/* 系统默认单位：只读提示 */
+.readonly-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  cursor: help;
+}
+</style>
diff --git a/backend/src/views/apps/crm/supplier/index.vue b/backend/src/views/apps/crm/supplier/index.vue
index 41db26c..2d689da 100644
--- a/backend/src/views/apps/crm/supplier/index.vue
+++ b/backend/src/views/apps/crm/supplier/index.vue
@@ -66,6 +66,10 @@
         <el-table-column label="供应商名称" min-width="200" show-overflow-tooltip>
           <template #default="{ row }">
             <span class="name-link" @click="openDetail(row)">{{ row.supplier_name }}</span>
+            <!-- 同一家单位可能既是供应商又是客户（已建客户档案） -->
+            <el-tag v-if="row.also_customer" size="small" type="warning" effect="plain" style="margin-left: 6px">
+              也是客户
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="类型" width="140" align="center">
@@ -98,10 +102,11 @@
         <el-table-column label="更新时间" width="160" align="center">
           <template #default="{ row }">{{ formatDateTime(row.update_time) }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="260" align="center" fixed="right">
+        <el-table-column label="操作" width="330" align="center" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
             <el-button link type="primary" size="small" @click="openContact(row)">联系人</el-button>
+            <el-button link type="success" size="small" @click="handleConvertCustomer(row)">转为客户</el-button>
             <el-button link type="primary" size="small" @click="handleToggleStatus(row)">
               {{ row.status === '1' ? '禁用' : '启用' }}
             </el-button>
@@ -140,6 +145,10 @@
       size="560px"
     >
       <div v-if="detailData" class="detail-content">
+        <div class="detail-actions">
+          <el-button type="success" size="small" @click="handleConvertCustomer(detailData)">转为客户</el-button>
+          <span class="detail-actions-tip">同一家单位可能既是供应商又是客户，转化后原供应商记录保留</span>
+        </div>
         <el-descriptions title="基本信息" :column="2" border size="small">
           <el-descriptions-item label="供应商名称" :span="2">
             {{ detailData.supplier_name }}
@@ -240,12 +249,14 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="mobile" label="手机号" width="130" />
+          <el-table-column prop="department" label="部门" width="120" show-overflow-tooltip />
+          <el-table-column prop="position" label="职位" width="130" show-overflow-tooltip />
+          <el-table-column label="手机号" width="170" show-overflow-tooltip>
+            <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.mobile || "-" }}</template>
+          </el-table-column>
           <el-table-column prop="email" label="邮箱" min-width="180" show-overflow-tooltip />
           <el-table-column prop="wechat" label="微信" width="120" show-overflow-tooltip />
           <el-table-column prop="qq" label="QQ" width="110" show-overflow-tooltip />
-          <el-table-column prop="department" label="部门" width="120" show-overflow-tooltip />
-          <el-table-column prop="position" label="职位" width="130" show-overflow-tooltip />
           <el-table-column label="操作" width="120" align="center" fixed="right">
             <template #default="{ row }">
               <el-button link type="primary" size="small" @click="openContactEdit(row)">编辑</el-button>
@@ -284,6 +295,7 @@ import {
   getCrmSupplierList,
   deleteCrmSupplier,
   toggleCrmSupplierStatus,
+  convertSupplierToCustomer,
 } from "@/api/crm";
 import { listContacts, deleteContact } from "@/api/contact";
 import SupplierEdit from "./components/edit.vue";
@@ -301,6 +313,7 @@ import {
   statusTag,
   formatDate,
   formatDateTime,
+  formatMobiles,
 } from "../dict";
 
 const loading = ref(false);
@@ -392,6 +405,35 @@ function openDetail(row) {
   detailVisible.value = true;
 }
 
+/**
+ * 供应商转客户：把供应商的企业资料与联系人复制一套到客户库。
+ * 同一家单位可能既是供应商又是客户，原供应商记录保留；客户库已有同名企业时只补同步联系人，不重复建档。
+ */
+async function handleConvertCustomer(row) {
+  try {
+    await ElMessageBox.confirm(
+      `将供应商「${row.supplier_name}」的企业资料与联系人复制一套到客户库？原供应商记录会保留，可在客户管理中继续完善。`,
+      "转为客户",
+      { type: "warning", confirmButtonText: "确认转化" }
+    );
+  } catch (e) {
+    return; // 取消
+  }
+  try {
+    const res = await convertSupplierToCustomer(row.id);
+    const data = res?.data || {};
+    const c = data.contacts || {};
+    ElMessage.success(
+      data.existed
+        ? `客户库已有同名企业，已同步联系人（新增 ${c.inserted || 0}、补充 ${c.merged || 0}），未重复建档`
+        : `已转为客户，并同步联系人（新增 ${c.inserted || 0}）`
+    );
+    fetchList();
+  } catch (e) {
+    ElMessage.error(e.message || "转化失败");
+  }
+}
+
 async function handleToggleStatus(row) {
   const newStatus = row.status === "1" ? "0" : "1";
   const action = newStatus === "1" ? "启用" : "禁用";
@@ -552,6 +594,18 @@ async function handleContactDelete(row) {
 .detail-content {
   padding: 4px 8px;
 
+  .detail-actions {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 16px;
+  }
+
+  .detail-actions-tip {
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+  }
+
   :deep(.el-descriptions__label) {
     width: 130px;
     min-width: 130px;
diff --git a/backend/src/views/apps/erp/components/contactBook.vue b/backend/src/views/apps/erp/components/contactBook.vue
index ed7ce81..ed35179 100644
--- a/backend/src/views/apps/erp/components/contactBook.vue
+++ b/backend/src/views/apps/erp/components/contactBook.vue
@@ -21,6 +21,8 @@
             <el-tag v-if="row.is_primary === 1" type="danger" size="small" effect="plain" style="margin-left:4px">主要</el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="department" label="部门" width="90" show-overflow-tooltip />
+        <el-table-column prop="position" label="职位" width="90" show-overflow-tooltip />
         <el-table-column prop="gender" label="性别" width="60" align="center">
           <template #default="{ row }">{{ genderText(row.gender) }}</template>
         </el-table-column>
@@ -31,8 +33,6 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="department" label="部门" width="90" show-overflow-tooltip />
-        <el-table-column prop="position" label="职位" width="90" show-overflow-tooltip />
         <!-- <el-table-column prop="phone" label="座机" width="110" show-overflow-tooltip /> -->
         <el-table-column label="手机" min-width="130" show-overflow-tooltip>
           <template #default="{ row }">{{ formatMobiles(row.mobiles) }}</template>
diff --git a/backend/src/views/apps/erp/customer/index.vue b/backend/src/views/apps/erp/customer/index.vue
index 096f25f..e3c0665 100644
--- a/backend/src/views/apps/erp/customer/index.vue
+++ b/backend/src/views/apps/erp/customer/index.vue
@@ -68,6 +68,8 @@
             <div class="name-cell-wrapper">
               <span class="name-cell name-link" @click="openDetail(row)">{{ row.customer_name }}</span>
               <el-tag v-if="row.is_draft === 1" type="warning" size="small" effect="plain">草稿</el-tag>
+              <!-- 同一家单位可能既是客户又是供应商（已建供应商档案） -->
+              <el-tag v-if="row.also_supplier" type="warning" size="small" effect="plain">也是供应商</el-tag>
             </div>
           </template>
         </el-table-column>
@@ -101,10 +103,11 @@
             {{ formatDateTime(row.update_time) }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="240" align="center" fixed="right">
+        <el-table-column label="操作" width="300" align="center" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" size="small" @click="openContactBook(row)">通讯录</el-button>
             <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+            <el-button link type="success" size="small" @click="handleConvertSupplier(row)">转为供应商</el-button>
             <el-button link type="primary" size="small" @click="handleToggleStatus(row)">
               {{ row.status === '1' ? '禁用' : '启用' }}
             </el-button>
@@ -140,6 +143,10 @@
       size="560px"
     >
       <div v-if="detailData" class="detail-content">
+        <div class="detail-actions">
+          <el-button type="success" size="small" @click="handleConvertSupplier(detailData)">转为供应商</el-button>
+          <span class="detail-actions-tip">同一家单位可能既是客户又是供应商，转化后原客户记录保留</span>
+        </div>
         <el-descriptions title="基本信息" :column="2" border size="small" label-width="120px">
           <el-descriptions-item label="客户名称" :span="2">{{ detailData.customer_name }}</el-descriptions-item>
           <el-descriptions-item label="客户类型">{{ customerTypeText(detailData.customer_type) }}</el-descriptions-item>
@@ -206,7 +213,7 @@
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Search, Refresh, Cpu } from '@element-plus/icons-vue'
-import { getCustomerList, deleteCustomer, toggleCustomerStatus } from '@/api/customer'
+import { getCustomerList, deleteCustomer, toggleCustomerStatus, convertCustomerToSupplier } from '@/api/customer'
 import CustomerEdit from './components/edit.vue'
 import ContactBook from '../components/contactBook.vue'
 import SmartAddCompany from '../components/smartAddCompany.vue'
@@ -377,6 +384,35 @@ async function handleDelete(row) {
   }
 }
 
+/**
+ * 客户转供应商：把客户的企业资料与联系人复制一套到供应商库。
+ * 同一家单位可能既是客户又是供应商，原客户记录保留；供应商库已有同名企业时只补同步联系人，不重复建档。
+ */
+async function handleConvertSupplier(row) {
+  try {
+    await ElMessageBox.confirm(
+      `将客户「${row.customer_name}」的企业资料与联系人复制一套到供应商库？原客户记录会保留，可在供应商管理中继续完善。`,
+      '转为供应商',
+      { type: 'warning', confirmButtonText: '确认转化' }
+    )
+  } catch (e) {
+    return // 取消
+  }
+  try {
+    const res = await convertCustomerToSupplier(row.id)
+    const data = res?.data || {}
+    const c = data.contacts || {}
+    ElMessage.success(
+      data.existed
+        ? `供应商库已有同名企业，已同步联系人（新增 ${c.inserted || 0}、补充 ${c.merged || 0}），未重复建档`
+        : `已转为供应商，并同步联系人（新增 ${c.inserted || 0}）`
+    )
+    fetchList()
+  } catch (e) {
+    ElMessage.error(e.message || '转化失败')
+  }
+}
+
 function customerTypeText(type) {
   const map = { '1': '企业', '2': '政府机构', '3': '国企', '4': '教育机构', '5':'个人' }
   return map[type] || type
@@ -479,4 +515,16 @@ function statusTag(status) {
   display: flex;
   justify-content: flex-end;
 }
+
+.detail-actions {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 16px;
+}
+
+.detail-actions-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
 </style>
diff --git a/backend/src/views/apps/erp/supplier/index.vue b/backend/src/views/apps/erp/supplier/index.vue
index 21f41f1..ef9d09f 100644
--- a/backend/src/views/apps/erp/supplier/index.vue
+++ b/backend/src/views/apps/erp/supplier/index.vue
@@ -67,6 +67,8 @@
             <div class="name-cell-wrapper">
               <span class="name-cell name-link" @click="openDetail(row)">{{ row.supplier_name }}</span>
               <el-tag v-if="row.is_draft === 1" type="warning" size="small" effect="plain">草稿</el-tag>
+              <!-- 同一家单位可能既是供应商又是客户（已建客户档案） -->
+              <el-tag v-if="row.also_customer" type="warning" size="small" effect="plain">也是客户</el-tag>
             </div>
           </template>
         </el-table-column>
@@ -100,10 +102,11 @@
             {{ formatDateTime(row.update_time) }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="240" align="center" fixed="right">
+        <el-table-column label="操作" width="300" align="center" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" size="small" @click="openContactBook(row)">通讯录</el-button>
             <el-button link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
+            <el-button link type="success" size="small" @click="handleConvertCustomer(row)">转为客户</el-button>
             <el-button link type="primary" size="small" @click="handleToggleStatus(row)">
               {{ row.status === '1' ? '禁用' : '启用' }}
             </el-button>
@@ -139,6 +142,10 @@
       size="560px"
     >
       <div v-if="detailData" class="detail-content">
+        <div class="detail-actions">
+          <el-button type="success" size="small" @click="handleConvertCustomer(detailData)">转为客户</el-button>
+          <span class="detail-actions-tip">同一家单位可能既是供应商又是客户，转化后原供应商记录保留</span>
+        </div>
         <el-descriptions title="基本信息" :column="2" border size="small" label-width="120px">
           <el-descriptions-item label="供应商名称" :span="2">{{ detailData.supplier_name }}</el-descriptions-item>
           <el-descriptions-item label="供应商类型">{{ supplierTypeText(detailData.supplier_type) }}</el-descriptions-item>
@@ -205,7 +212,7 @@
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Search, Refresh, Cpu } from '@element-plus/icons-vue'
-import { getSupplierList, deleteSupplier, toggleSupplierStatus } from '@/api/supplier'
+import { getSupplierList, deleteSupplier, toggleSupplierStatus, convertSupplierToCustomer } from '@/api/supplier'
 import SupplierEdit from './components/edit.vue'
 import ContactBook from '../components/contactBook.vue'
 import SmartAddCompany from '../components/smartAddCompany.vue'
@@ -376,6 +383,35 @@ async function handleDelete(row) {
   }
 }
 
+/**
+ * 供应商转客户：把供应商的企业资料与联系人复制一套到客户库。
+ * 同一家单位可能既是供应商又是客户，原供应商记录保留；客户库已有同名企业时只补同步联系人，不重复建档。
+ */
+async function handleConvertCustomer(row) {
+  try {
+    await ElMessageBox.confirm(
+      `将供应商「${row.supplier_name}」的企业资料与联系人复制一套到客户库？原供应商记录会保留，可在客户管理中继续完善。`,
+      '转为客户',
+      { type: 'warning', confirmButtonText: '确认转化' }
+    )
+  } catch (e) {
+    return // 取消
+  }
+  try {
+    const res = await convertSupplierToCustomer(row.id)
+    const data = res?.data || {}
+    const c = data.contacts || {}
+    ElMessage.success(
+      data.existed
+        ? `客户库已有同名企业，已同步联系人（新增 ${c.inserted || 0}、补充 ${c.merged || 0}），未重复建档`
+        : `已转为客户，并同步联系人（新增 ${c.inserted || 0}）`
+    )
+    fetchList()
+  } catch (e) {
+    ElMessage.error(e.message || '转化失败')
+  }
+}
+
 function supplierTypeText(type) {
   const map = { '1': '原材料供应商', '2': '设备供应商', '3': '服务供应商', '4': '其他' }
   return map[type] || type
@@ -478,4 +514,16 @@ function statusTag(status) {
   display: flex;
   justify-content: flex-end;
 }
+
+.detail-actions {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 16px;
+}
+
+.detail-actions-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
 </style>
diff --git a/backend/src/views/apps/oa/contact/components/contactDetailDialog.vue b/backend/src/views/apps/oa/contact/components/contactDetailDialog.vue
index f43ff29..45d7e59 100644
--- a/backend/src/views/apps/oa/contact/components/contactDetailDialog.vue
+++ b/backend/src/views/apps/oa/contact/components/contactDetailDialog.vue
@@ -41,9 +41,11 @@
         <h4>联系方式</h4>
         <el-descriptions :column="1" border size="small">
           <el-descriptions-item label="手机号">
-            <span v-if="contact.phone">
-              <a :href="'tel:' + contact.phone" class="contact-link">{{ contact.phone }}</a>
-            </span>
+            <template v-if="contactMobiles.length">
+              <div v-for="(m, i) in contactMobiles" :key="i">
+                <a :href="'tel:' + m" class="contact-link">{{ m }}</a>
+              </div>
+            </template>
             <span v-else class="empty-text">-</span>
           </el-descriptions-item>
           <el-descriptions-item label="办公电话">
@@ -124,6 +126,28 @@ const genderLabel = (gender) => {
   return map[gender] || '未知'
 }
 
+/** 解析多手机号：JSON 数组字符串优先，缺省回退单个 phone */
+const contactMobiles = computed(() => {
+  const c = props.contact
+  if (!c) return []
+  let arr = []
+  const raw = c.mobiles
+  if (Array.isArray(raw)) {
+    arr = raw
+  } else if (raw !== undefined && raw !== null && String(raw).trim()) {
+    const s = String(raw).trim()
+    try {
+      const parsed = JSON.parse(s)
+      arr = Array.isArray(parsed) ? parsed : [s]
+    } catch (error) {
+      arr = s.split(/[，,、;；\s]+/)
+    }
+  }
+  arr = arr.map((m) => String(m || '').trim()).filter(Boolean)
+  if (arr.length === 0 && c.phone) arr = [String(c.phone).trim()]
+  return arr
+})
+
 const handleEdit = () => {
   emit('edit', props.contact)
 }
diff --git a/backend/src/views/apps/oa/contact/components/contactEditDialog.vue b/backend/src/views/apps/oa/contact/components/contactEditDialog.vue
index 87b2460..22325f6 100644
--- a/backend/src/views/apps/oa/contact/components/contactEditDialog.vue
+++ b/backend/src/views/apps/oa/contact/components/contactEditDialog.vue
@@ -84,15 +84,23 @@
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="手机号" prop="phone">
-            <el-input
-              v-model="form.phone"
-              placeholder="请输入手机号"
-              maxlength="20"
-            />
+        <el-col :span="24">
+          <!-- 手机号：支持登记多个（有的人有多个号码），默认一行，点加号增加，最多 5 个 -->
+          <el-form-item label="手机号" prop="mobiles">
+            <div class="mobile-list">
+              <div v-for="(m, idx) in form.mobiles" :key="idx" class="mobile-item">
+                <el-input v-model="form.mobiles[idx]" placeholder="请输入手机号" maxlength="20" clearable />
+                <el-button :icon="Delete" :disabled="form.mobiles.length <= 1" @click="removeMobile(idx)" />
+              </div>
+              <el-button v-if="form.mobiles.length < 5" type="primary" plain :icon="Plus" @click="addMobile">
+                添加手机号（{{ form.mobiles.length }}/5）
+              </el-button>
+            </div>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="办公电话" prop="work_phone">
             <el-input
@@ -223,6 +231,7 @@
 <script setup>
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
+import { Plus, Delete } from '@element-plus/icons-vue'
 import { getOrganizationList, getPositionList, getPositionDetail } from '@/api/contactOA'
 
 const props = defineProps({
@@ -248,6 +257,8 @@ const emptyForm = () => ({
   contact_type: 2,
   gender: 0,
   phone: '',
+  // 手机号：动态列表，默认一行，点击加号增加（最多 5 个，与后端存储上限一致）
+  mobiles: [''],
   work_phone: '',
   email: '',
   wechat: '',
@@ -273,8 +284,17 @@ const rules = {
   contact_type: [
     { required: true, message: '请选择联系人类型', trigger: 'change' }
   ],
-  phone: [
-    { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+  mobiles: [
+    {
+      // 手机号非必填，填写时逐个校验格式
+      validator: (rule, value, callback) => {
+        const list = Array.isArray(value) ? value : [value]
+        const bad = list.map((m) => String(m || '').trim()).find((m) => m && !/^1[3-9]\d{9}$/.test(m))
+        if (bad) return callback(new Error(`手机号格式不正确：${bad}`))
+        callback()
+      },
+      trigger: 'blur'
+    }
   ],
   email: [
     { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
@@ -367,9 +387,41 @@ const handlePositionChange = (val) => {
   form.value.position_title = pos ? pos.position_name : ''
 }
 
+/** 增加一行手机号输入 */
+const addMobile = () => {
+  if (form.value.mobiles.length < 5) form.value.mobiles.push('')
+}
+
+/** 删除一行手机号输入（至少保留一行） */
+const removeMobile = (idx) => {
+  if (form.value.mobiles.length > 1) form.value.mobiles.splice(idx, 1)
+}
+
+/** 解析手机号集合：兼容 JSON 数组字符串 / 分隔符字符串 / 旧数据单个号码（最多 5 个） */
+const parseMobilesArr = (row) => {
+  let arr = []
+  const raw = row?.mobiles
+  if (Array.isArray(raw)) {
+    arr = raw
+  } else if (raw !== undefined && raw !== null && String(raw).trim()) {
+    const s = String(raw).trim()
+    try {
+      const parsed = JSON.parse(s)
+      arr = Array.isArray(parsed) ? parsed : [s]
+    } catch (error) {
+      arr = s.split(/[，,、;；\s]+/)
+    }
+  }
+  arr = arr.map((m) => String(m || '').trim()).filter(Boolean).slice(0, 5)
+  if (arr.length === 0 && row?.phone) arr = [String(row.phone).trim()]
+  return arr.length ? arr : ['']
+}
+
 const initForm = () => {
   if (props.isEdit && props.formData) {
     form.value = { ...props.formData }
+    // 回显手机号：mobiles JSON 数组优先，缺省回退单个 phone
+    form.value.mobiles = parseMobilesArr(props.formData)
   } else {
     form.value = emptyForm()
   }
@@ -380,7 +432,14 @@ const handleSubmit = async () => {
   try {
     await formRef.value.validate()
     submitting.value = true
-    const payload = { ...form.value }
+    // 手机号：动态列表去空后存 JSON 字符串（后端 TEXT 存 JSON 数组，最多 5 个），
+    // phone 同步为第一个号码，保持新旧字段一致
+    const valid = form.value.mobiles.map((m) => String(m || '').trim()).filter(Boolean)
+    const payload = {
+      ...form.value,
+      mobiles: valid.length ? JSON.stringify(valid) : '',
+      phone: valid[0] || ''
+    }
     emit('save', payload)
   } catch {
     // validation failed
@@ -424,4 +483,16 @@ watch(() => form.value.contact_type, (type) => {
   justify-content: flex-end;
   gap: 8px;
 }
+
+/* 手机号：动态列表，每行输入框 + 删除按钮 */
+.mobile-list {
+  width: 100%;
+
+  .mobile-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 8px;
+  }
+}
 </style>
diff --git a/backend/src/views/apps/oa/contact/index.vue b/backend/src/views/apps/oa/contact/index.vue
index 0234e4c..ad70456 100644
--- a/backend/src/views/apps/oa/contact/index.vue
+++ b/backend/src/views/apps/oa/contact/index.vue
@@ -116,7 +116,9 @@
                 <span>{{ row.org_name || row.dept_name || '-' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="phone" label="手机号" width="140" />
+            <el-table-column label="手机号" width="150" show-overflow-tooltip>
+              <template #default="{ row }">{{ formatMobiles(row.mobiles) || row.phone || '-' }}</template>
+            </el-table-column>
            <!-- <el-table-column prop="wechat" label="微信" width="180">
               <template #default="{ row }">
                 <span>{{ row.wechat || '-' }}</span>
@@ -319,6 +321,8 @@ const editFormData = reactive({
   contact_type: 2,
   gender: 0,
   phone: '',
+  // 多手机号原始 JSON 数组字符串，编辑弹窗内解析回显
+  mobiles: '',
   work_phone: '',
   email: '',
   wechat: '',
@@ -342,6 +346,7 @@ const openCreateContact = () => {
     contact_type: 2,
     gender: 0,
     phone: '',
+    mobiles: '',
     work_phone: '',
     email: '',
     wechat: '',
@@ -366,6 +371,8 @@ const openEditContact = (row) => {
     contact_type: row.contact_type,
     gender: row.gender,
     phone: row.phone,
+    // 多手机号原始 JSON 数组字符串，编辑弹窗内解析回显
+    mobiles: row.mobiles || '',
     work_phone: row.work_phone,
     email: row.email,
     wechat: row.wechat,
@@ -399,6 +406,25 @@ const handleSaveContact = async (payload) => {
   }
 }
 
+/** 多手机号格式化：JSON数组 / 分隔符字符串 / 单个号码 → "138…、139…"（无内容返回空串） */
+function formatMobiles(val) {
+  if (!val) return ''
+  let arr = []
+  if (Array.isArray(val)) {
+    arr = val
+  } else {
+    const s = String(val).trim()
+    if (!s) return ''
+    try {
+      const parsed = JSON.parse(s)
+      arr = Array.isArray(parsed) ? parsed : [s]
+    } catch (e) {
+      arr = s.split(/[，,、;；\s]+/)
+    }
+  }
+  return arr.map((m) => String(m || '').trim()).filter(Boolean).join('、')
+}
+
 // ---- 详情 ----
 const detailDialogVisible = ref(false)
 const detailContact = ref(null)
diff --git a/go/controllers/backend_contact.go b/go/controllers/backend_contact.go
index 44c291f..8ba4943 100644
--- a/go/controllers/backend_contact.go
+++ b/go/controllers/backend_contact.go
@@ -63,6 +63,8 @@ type erpContactDTO struct {
 	ContactName   string `json:"contact_name"`
 	Gender        int8   `json:"gender"`
 	Phone         string `json:"phone"`
+	// 手机号可登记多个（有的人有多个号码）：JSON 数组，最多 5 个；phone 保留为第一个
+	Mobiles       string `json:"mobiles"`
 	WorkPhone     string `json:"work_phone"`
 	Email         string `json:"email"`
 	Wechat        string `json:"wechat"`
@@ -188,6 +190,11 @@ func (c *BackendErpContactController) Create() {
 	contactType, _ := c.contactGetIntValue(body, "contact_type")
 	gender, _ := c.contactGetIntValue(body, "gender")
 	phone, _ := c.contactGetStringValue(body, "phone")
+	mobilesJSON, _ := c.contactGetStringValue(body, "mobiles")
+	// 多手机号：优先使用 mobiles 字段；未传手机号时从 mobiles 取第一个回填 phone（兼容旧调用方）
+	if strings.TrimSpace(phone) == "" {
+		phone = firstMobile(strings.TrimSpace(mobilesJSON))
+	}
 	workPhone, _ := c.contactGetStringValue(body, "work_phone")
 	email, _ := c.contactGetStringValue(body, "email")
 	wechat, _ := c.contactGetStringValue(body, "wechat")
@@ -211,6 +218,7 @@ func (c *BackendErpContactController) Create() {
 		ContactName:   contactName,
 		Gender:        int8(gender),
 		Phone:         contactStrPtr(phone),
+		Mobiles:       contactStrPtr(mobilesJSON),
 		WorkPhone:     contactStrPtr(workPhone),
 		Email:         contactStrPtr(email),
 		Wechat:        contactStrPtr(wechat),
@@ -276,6 +284,13 @@ func (c *BackendErpContactController) Update() {
 	if v, has := c.contactGetStringValue(body, "phone"); has {
 		update["phone"] = contactNullableString(v)
 	}
+	if v, has := c.contactGetStringValue(body, "mobiles"); has {
+		update["mobiles"] = contactNullableString(v)
+		// 多手机号下，phone 始终为第一个号码，保持两者一致
+		if p := firstMobile(strings.TrimSpace(v)); p != "" {
+			update["phone"] = contactNullableString(p)
+		}
+	}
 	if v, has := c.contactGetStringValue(body, "work_phone"); has {
 		update["work_phone"] = contactNullableString(v)
 	}
@@ -559,6 +574,7 @@ func (c *BackendErpContactController) contactDTO(row models.BackendErpContact) e
 		ContactName:   row.ContactName,
 		Gender:        row.Gender,
 		Phone:         contactDerefString(row.Phone),
+		Mobiles:       contactDerefString(row.Mobiles),
 		WorkPhone:     contactDerefString(row.WorkPhone),
 		Email:         contactDerefString(row.Email),
 		Wechat:        contactDerefString(row.Wechat),
diff --git a/go/controllers/backend_crm_clue.go b/go/controllers/backend_crm_clue.go
index 23a04c5..203d564 100644
--- a/go/controllers/backend_crm_clue.go
+++ b/go/controllers/backend_crm_clue.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"strconv"
 	"strings"
@@ -29,6 +30,8 @@ type cluePayload struct {
 	Amount          float64 `json:"amount"` // 预计金额
 	NextContactTime string `json:"next_contact_time"`
 	ClueLevel       string `json:"clue_level"`
+	// 线索状态：1跟进中 / 2已转化 / 3已废弃（编辑时可调整；新增固定为跟进中）
+	Status string `json:"status"`
 	ContactPerson   string `json:"contact_person"`
 	ContactPosition string `json:"contact_position"`
 	ContactPhone    string `json:"contact_phone"`
@@ -89,8 +92,9 @@ func (c *BackendCrmClueController) List() {
 	total, _ := qs.Count()
 	var list []models.TenantCrmClue
 	if total > 0 {
-		// 未转化的排前面，已转化的（locked=1）沉到列表下方
-		_, _ = qs.OrderBy("locked", "-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
+		// 列表排列：跟进中(1) → 已转化(2) → 已废弃(3)，同状态下按新→旧。
+		// 状态值本身即为期望的展示顺序，按 status 升序即可（排序在数据库侧完成，翻页后整体顺序一致）。
+		_, _ = qs.OrderBy("status", "-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
 	}
 	pipelineOk(&c.Controller, map[string]interface{}{
 		"list": list, "total": total, "page": page, "pageSize": pageSize,
@@ -262,16 +266,45 @@ func (c *BackendCrmClueController) Update() {
 	clue.ContactQQ = strings.TrimSpace(p.ContactQQ)
 	clue.Address = strings.TrimSpace(p.Address)
 	clue.Remark = p.Remark
+	// 线索状态：编辑时可直接管理（1跟进中 / 2已转化 / 3已废弃）。
+	// 标为「已转化」时与转化流程保持一致：同时锁定（locked=1），列表中沉底且不能再编辑 / 转化；
+	// 改回跟进中 / 已废弃则解除锁定（历史数据同样兜底）。
+	prevStatus := clue.Status
+	if s := strings.TrimSpace(p.Status); s != "" {
+		if v, err := strconv.Atoi(s); err == nil && v >= 1 && v <= 3 {
+			clue.Status = int8(v)
+			clue.Locked = 0
+			if clue.Status == 2 {
+				clue.Locked = 1
+			}
+		}
+	}
 	clue.UpdateTime = time.Now()
 
 	if _, err := models.Orm.Update(&clue); err != nil {
 		pipelineErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
 		return
 	}
+	if clue.Status != prevStatus {
+		crmWriteLog(clue.TenantID, 1, clue.ID, "status",
+			fmt.Sprintf("线索状态：%s → %s", clueStatusName(prevStatus), clueStatusName(clue.Status)), claims)
+	}
 	crmWriteLog(clue.TenantID, 1, clue.ID, "update", "更新线索："+clue.ClueName, claims)
 	pipelineOk(&c.Controller, map[string]interface{}{"id": clue.ID})
 }
 
+// clueStatusName 线索状态文案（用于操作日志）：1跟进中 / 2已转化 / 3已废弃
+func clueStatusName(s int8) string {
+	switch s {
+	case 2:
+		return "已转化"
+	case 3:
+		return "已废弃"
+	default:
+		return "跟进中"
+	}
+}
+
 // Delete DELETE /backend/crm/clue/:id
 func (c *BackendCrmClueController) Delete() {
 	claims, err := pipelineClaims(&c.Controller)
diff --git a/go/controllers/backend_crm_contact.go b/go/controllers/backend_crm_contact.go
index 1533f02..63bcc55 100644
--- a/go/controllers/backend_crm_contact.go
+++ b/go/controllers/backend_crm_contact.go
@@ -69,6 +69,99 @@ func buildMobiles(mobile string) string {
 	return string(b)
 }
 
+// buildMobilesFromList 将多个手机号去空、去重后转为 mobiles 的 JSON 数组字符串（最多 5 个，与 ERP 通讯录一致）
+func buildMobilesFromList(mobiles []string) string {
+	cleaned := make([]string, 0, len(mobiles))
+	seen := map[string]bool{}
+	for _, m := range mobiles {
+		m = strings.TrimSpace(m)
+		if m == "" || seen[m] {
+			continue
+		}
+		seen[m] = true
+		cleaned = append(cleaned, m)
+		if len(cleaned) >= 5 {
+			break
+		}
+	}
+	if len(cleaned) == 0 {
+		return ""
+	}
+	b, err := json.Marshal(cleaned)
+	if err != nil {
+		return ""
+	}
+	return string(b)
+}
+
+// normalizeMobiles 归一请求中的手机号：
+// 优先取 mobiles（数组，CRM 联系人支持登记多个手机号，如一人多号），
+// 缺省时回退单个 mobile（兼容线索转化 / 合同签约人自动建档等旧调用方）。
+func normalizeMobiles(mobiles []string, mobile string) string {
+	if len(mobiles) == 0 {
+		return buildMobiles(mobile)
+	}
+	return buildMobilesFromList(mobiles)
+}
+
+// splitMobiles 把手机号文本（JSON 数组 / 逗号等分隔符拼接）拆成号码列表（去空）
+func splitMobiles(mobiles string) []string {
+	mobiles = strings.TrimSpace(mobiles)
+	if mobiles == "" {
+		return nil
+	}
+	var arr []string
+	if err := json.Unmarshal([]byte(mobiles), &arr); err == nil {
+		out := make([]string, 0, len(arr))
+		for _, m := range arr {
+			if m = strings.TrimSpace(m); m != "" {
+				out = append(out, m)
+			}
+		}
+		return out
+	}
+	parts := strings.FieldsFunc(mobiles, func(r rune) bool {
+		switch r {
+		case ',', '，', '、', ';', '；', ' ', '/', '|':
+			return true
+		}
+		return false
+	})
+	out := make([]string, 0, len(parts))
+	for _, p := range parts {
+		if p = strings.TrimSpace(p); p != "" {
+			out = append(out, p)
+		}
+	}
+	return out
+}
+
+// mobilesFromPayload 解析请求体中的手机号字段，兼容多种入参形式：
+//   - JSON 数组：["138…","139…"]（新前端）
+//   - JSON 字符串：'["138…"]' 或 '138…,139…'（旧调用方）
+//   - 缺省：回退单个 mobile / phone 字段
+//
+// 统一返回 mobiles 的 JSON 数组字符串（去空去重，最多 5 个）。
+func mobilesFromPayload(raw json.RawMessage, fallback string) string {
+	if len(raw) > 0 {
+		text := strings.TrimSpace(string(raw))
+		if text != "" && text != "null" {
+			var arr []string
+			if err := json.Unmarshal(raw, &arr); err == nil {
+				return buildMobilesFromList(arr)
+			}
+			var s string
+			if err := json.Unmarshal(raw, &s); err == nil {
+				if strings.TrimSpace(s) == "" {
+					return ""
+				}
+				return buildMobilesFromList(splitMobiles(s))
+			}
+		}
+	}
+	return buildMobiles(fallback)
+}
+
 // firstMobile 从 mobiles（JSON 数组或普通字符串）中取出第一个手机号
 func firstMobile(mobiles string) string {
 	mobiles = strings.TrimSpace(mobiles)
@@ -221,6 +314,118 @@ func clearOtherPrimary(tenantID, companyType string, companyID, excludeID uint64
 	_, _ = qs.Update(map[string]interface{}{"is_primary": 0})
 }
 
+// isMobileNumber 粗略识别手机号（11 位、1 开头，忽略空格 / 横线等分隔符）；
+// 非手机号按座机写入 phone 字段，保证联系人资料里手机号 / 座机分列正确。
+func isMobileNumber(phone string) bool {
+	digits := strings.Map(func(r rune) rune {
+		if r >= '0' && r <= '9' {
+			return r
+		}
+		return -1
+	}, phone)
+	return len(digits) == 11 && digits[0] == '1'
+}
+
+// crmContactCompanyExists 关联企业（客户 / 供应商）在当前租户下是否存在且未删除
+func crmContactCompanyExists(tenantID, companyType string, companyID uint64) bool {
+	if models.Orm == nil || companyID == 0 {
+		return false
+	}
+	if companyType == "supplier" {
+		cnt, err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+			Filter("id", companyID).Filter("tenant_id", tenantID).
+			Filter("delete_time__isnull", true).Count()
+		return err == nil && cnt > 0
+	}
+	cnt, err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("id", companyID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).Count()
+	return err == nil && cnt > 0
+}
+
+// contactPhoneMatched 联系人是否已登记该电话（手机号数组或座机任一命中）
+func contactPhoneMatched(row models.ErpCompanyContact, phone string) bool {
+	if strings.TrimSpace(row.Phone) == phone {
+		return true
+	}
+	var mobiles []string
+	if err := json.Unmarshal([]byte(strings.TrimSpace(row.Mobiles)), &mobiles); err == nil {
+		for _, m := range mobiles {
+			if strings.TrimSpace(m) == phone {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// crmEnsureCompanyContact 确保企业通讯录（联系人）中已有该对接人：
+//   - 同名或同电话已存在时不再重复建档，仅在原联系人缺电话时补全；
+//   - 不存在时按「姓名 + 电话」建档，其余资料留空，后续可在联系人管理中补全；
+//   - 该企业还没有任何联系人时，默认把首个联系人设为主联系人。
+func crmEnsureCompanyContact(tenantID, companyType string, companyID uint64, name, phone string) {
+	if models.Orm == nil || companyID == 0 {
+		return
+	}
+	name = strings.TrimSpace(name)
+	phone = strings.TrimSpace(phone)
+	if name == "" {
+		return
+	}
+	var rows []models.ErpCompanyContact
+	if _, err := models.Orm.QueryTable(new(models.ErpCompanyContact)).
+		Filter("tenant_id", tenantID).
+		Filter("company_type", companyType).
+		Filter("company_id", companyID).
+		Filter("delete_time__isnull", true).
+		All(&rows); err != nil && err != orm.ErrNoRows {
+		return
+	}
+	for i := range rows {
+		row := rows[i]
+		sameName := strings.EqualFold(strings.TrimSpace(row.Name), name)
+		samePhone := phone != "" && contactPhoneMatched(row, phone)
+		if !sameName && !samePhone {
+			continue
+		}
+		// 已存在：仅在原记录没有电话时补全，不覆盖其他已填资料
+		if phone != "" && strings.TrimSpace(row.Mobiles) == "" && strings.TrimSpace(row.Phone) == "" {
+			up := map[string]interface{}{"update_time": time.Now()}
+			if isMobileNumber(phone) {
+				up["mobiles"] = buildMobiles(phone)
+			} else {
+				up["phone"] = phone
+			}
+			_, _ = models.Orm.QueryTable(new(models.ErpCompanyContact)).
+				Filter("id", row.ID).Update(up)
+		}
+		return
+	}
+
+	now := time.Now()
+	contact := models.ErpCompanyContact{
+		TenantID:    tenantID,
+		CompanyType: companyType,
+		CompanyID:   companyID,
+		Name:        name,
+		Status:      1,
+		Remark:      "由合同签约信息自动写入，可在联系人中补全其他资料",
+		CreateTime:  now,
+		UpdateTime:  now,
+	}
+	if len(rows) == 0 {
+		contact.IsPrimary = 1
+	}
+	if phone != "" {
+		if isMobileNumber(phone) {
+			contact.Mobiles = buildMobiles(phone)
+		} else {
+			contact.Phone = phone
+		}
+	}
+	_, _ = models.Orm.Insert(&contact)
+}
+
 // List GET /backend/crm/contact/list?related_type=1&related_id=7&keyword=&is_primary=
 func (c *BackendCrmContactController) List() {
 	claims, err := c.contactClaims()
@@ -259,6 +464,7 @@ func (c *BackendCrmContactController) List() {
 	if keyword != "" {
 		kw := orm.NewCondition().
 			Or("name__contains", keyword).
+			Or("mobiles__contains", keyword).
 			Or("phone__contains", keyword).
 			Or("email__contains", keyword)
 		cond = cond.AndCond(kw)
@@ -301,7 +507,9 @@ func (c *BackendCrmContactController) Add() {
 		ContactName string `json:"contact_name"`
 		Gender      int8   `json:"gender"`
 		Mobile      string `json:"mobile"`
-		Phone       string `json:"phone"`
+		// 手机号可登记多个（有的人有多个号码）：优先使用，缺省时回退单个 mobile
+		Mobiles     []string `json:"mobiles"`
+		Phone       string   `json:"phone"`
 		Email       string `json:"email"`
 		Wechat      string `json:"wechat"`
 		QQ          string `json:"qq"`
@@ -335,8 +543,8 @@ func (c *BackendCrmContactController) Add() {
 		CompanyID:   p.RelatedID,
 		Name:         strings.TrimSpace(p.ContactName),
 		Gender:       p.Gender,
-		Phone:        strings.TrimSpace(p.Phone), // 座机
-		Mobiles:      buildMobiles(p.Mobile),     // 手机号（JSON数组）
+		Phone:        strings.TrimSpace(p.Phone),            // 座机
+		Mobiles:      normalizeMobiles(p.Mobiles, p.Mobile), // 手机号（支持多个，JSON数组）
 		Email:        strings.TrimSpace(p.Email),
 		Wechat:       strings.TrimSpace(p.Wechat),
 		QQ:           strings.TrimSpace(p.QQ),
@@ -381,7 +589,9 @@ func (c *BackendCrmContactController) Edit() {
 		ContactName string `json:"contact_name"`
 		Gender      int8   `json:"gender"`
 		Mobile      string `json:"mobile"`
-		Phone       string `json:"phone"`
+		// 手机号可登记多个（有的人有多个号码）：优先使用，缺省时回退单个 mobile
+		Mobiles     []string `json:"mobiles"`
+		Phone       string   `json:"phone"`
 		Email       string `json:"email"`
 		Wechat      string `json:"wechat"`
 		QQ          string `json:"qq"`
@@ -430,8 +640,8 @@ func (c *BackendCrmContactController) Edit() {
 	contact.CompanyID = companyID
 	contact.Name = strings.TrimSpace(p.ContactName)
 	contact.Gender = p.Gender
-	contact.Phone = strings.TrimSpace(p.Phone) // 座机
-	contact.Mobiles = buildMobiles(p.Mobile)   // 手机号（JSON数组）
+	contact.Phone = strings.TrimSpace(p.Phone)              // 座机
+	contact.Mobiles = normalizeMobiles(p.Mobiles, p.Mobile) // 手机号（支持多个，JSON数组）
 	contact.Email = strings.TrimSpace(p.Email)
 	contact.Wechat = strings.TrimSpace(p.Wechat)
 	contact.QQ = strings.TrimSpace(p.QQ)
diff --git a/go/controllers/backend_crm_contract.go b/go/controllers/backend_crm_contract.go
index b07e211..9a11dba 100644
--- a/go/controllers/backend_crm_contract.go
+++ b/go/controllers/backend_crm_contract.go
@@ -35,23 +35,25 @@ type contractSummary struct {
 
 // contractPayload 创建 / 更新请求体。
 type contractPayload struct {
-	ContractNo       string          `json:"contract_no"`
-	ContractName     string          `json:"contract_name"`
-	ContractCategory string          `json:"contract_category"`
-	OurRole          int8            `json:"our_role"` // 我方角色：1甲方/2乙方/3丙方/4丁方
-	PartyCount       int8            `json:"party_count"`
-	ProjectID        uint64          `json:"project_id"`
-	ProjectName      string          `json:"project_name"`
-	OwnerUserID      string          `json:"owner_user_id"`
-	OwnerUserName    string          `json:"owner_user_name"`
-	SignDate         string          `json:"sign_date"`
-	EffectiveDate    string          `json:"effective_date"`
-	ExpireDate       string          `json:"expire_date"`
-	Parties          json.RawMessage `json:"parties"`
-	Products         json.RawMessage `json:"products"`
-	Step             int8            `json:"step"`
-	Status           int8            `json:"status"`
-	Remark           string          `json:"remark"`
+	ContractNo       string `json:"contract_no"`
+	ContractName     string `json:"contract_name"`
+	ContractCategory string `json:"contract_category"`
+	// 我方角色：0=我方不参与（如上中游项目中上游与中游主体之间的合同，我方不是签约方）
+	// 1甲方/2乙方/3丙方/4丁方。用指针区分「未传」与「传 0」。
+	OurRole       *int8           `json:"our_role"`
+	PartyCount    int8            `json:"party_count"`
+	ProjectID     uint64          `json:"project_id"`
+	ProjectName   string          `json:"project_name"`
+	OwnerUserID   string          `json:"owner_user_id"`
+	OwnerUserName string          `json:"owner_user_name"`
+	SignDate      string          `json:"sign_date"`
+	EffectiveDate string          `json:"effective_date"`
+	ExpireDate    string          `json:"expire_date"`
+	Parties       json.RawMessage `json:"parties"`
+	Products      json.RawMessage `json:"products"`
+	Step          int8            `json:"step"`
+	Status        int8            `json:"status"`
+	Remark        string          `json:"remark"`
 }
 
 // contractResp 列表 / 详情响应：parties / products 解析为 JSON 数组透出，summary 由金额字段组装。
@@ -138,7 +140,58 @@ func (c *BackendCrmContractController) List() {
 	total, _ := qs.Count()
 	var list []models.TenantCrmContract
 	if total > 0 {
-		_, _ = qs.OrderBy("-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
+		offset := (page - 1) * pageSize
+		if status != "" {
+			// 已按状态筛选：结果只含单一状态，直接按新→旧分页
+			if _, err := qs.OrderBy("-id").Offset(offset).Limit(pageSize).All(&list); err != nil {
+				pipelineErr(&c.Controller, 500, 500, "查询失败: "+err.Error())
+				return
+			}
+		} else {
+			// 列表排列：按状态分组展示 —— 草稿(1) → 异常(5) → 履约中(4) → 已完成(2) → 已作废(3)，
+			// 其余状态（NULL / 历史异常值）沉底；组内仍按新→旧。
+			// 先统计各组数量，把当前页窗口换算成各组区间，再分别取数按序拼接，保证翻页后整体顺序一致。
+			groupConds := []*orm.Condition{
+				orm.NewCondition().And("status", 1),
+				orm.NewCondition().And("status", 5),
+				orm.NewCondition().And("status", 4),
+				orm.NewCondition().And("status", 2),
+				orm.NewCondition().And("status", 3),
+				orm.NewCondition().AndNot("status__in", []int8{1, 5, 4, 2, 3}).Or("status__isnull", true),
+			}
+			end := offset + pageSize
+			if end > int(total) {
+				end = int(total)
+			}
+			cursor := 0
+			for _, gc := range groupConds {
+				if cursor >= end {
+					break
+				}
+				// 注意：beego 的 AndCond 会修改接收者，这里用新条件对象包装，避免循环内条件累积
+				groupCond := orm.NewCondition().AndCond(cond).AndCond(gc)
+				cnt, _ := models.Orm.QueryTable(new(models.TenantCrmContract)).SetCond(groupCond).Count()
+				groupTotal := int(cnt)
+				if groupTotal == 0 {
+					continue
+				}
+				groupStart := cursor
+				groupEnd := cursor + groupTotal
+				cursor = groupEnd
+				// 当前页与本组区间的交集
+				from, to := max(offset, groupStart), min(end, groupEnd)
+				if to <= from {
+					continue
+				}
+				var part []models.TenantCrmContract
+				if _, err := models.Orm.QueryTable(new(models.TenantCrmContract)).SetCond(groupCond).
+					OrderBy("-id").Offset(from - groupStart).Limit(to - from).All(&part); err != nil {
+					pipelineErr(&c.Controller, 500, 500, "查询失败: "+err.Error())
+					return
+				}
+				list = append(list, part...)
+			}
+		}
 	}
 	items := make([]contractResp, 0, len(list))
 	for i := range list {
@@ -153,6 +206,7 @@ func (c *BackendCrmContractController) List() {
 // 全租户合同统计（排除已作废），供列表页顶部汇总卡片使用。
 // 支持按周期筛选：period=month/quarter/year（当期）或 custom（start_date~end_date），
 // 按合同有效期 [生效日期, 结束日期] 与所选周期重叠统计。
+// 「合同总利润」仅统计非甲方（收款方）合同：我方为甲方的合同是采购付款，只有支出、不存在利润。
 func (c *BackendCrmContractController) Stats() {
 	claims, err := pipelineClaims(&c.Controller)
 	if err != nil {
@@ -168,7 +222,8 @@ func (c *BackendCrmContractController) Stats() {
 	}
 
 	table := new(models.TenantCrmContract).TableName()
-	where := "tenant_id = ? AND delete_time IS NULL AND status <> 3"
+	// 我方不参与的合同（our_role=0，如上中游项目的链条合同）不属于我方经营合同，不计入经营统计
+	where := "tenant_id = ? AND delete_time IS NULL AND status <> 3 AND our_role <> 0"
 	args := []interface{}{tenantID}
 	// 按合同有效期 [生效日期, 结束日期] 与所选周期 [start, end] 重叠来统计：
 	// 合同生效日 <= 周期末 且 合同结束日 >= 周期初；日期为空视为不限制对应边界。
@@ -180,8 +235,10 @@ func (c *BackendCrmContractController) Stats() {
 		where += " AND (effective_date IS NULL OR effective_date <= ?)"
 		args = append(args, end)
 	}
+	// 「合同总利润」只汇总非甲方（收款方）合同：我方为甲方时是采购付款方，合同金额即支出，不存在利润
 	raw := "SELECT COUNT(*) AS total, IFNULL(SUM(total_amount),0) AS total_amount, " +
-		"IFNULL(SUM(total_cost),0) AS total_cost, IFNULL(SUM(total_profit),0) AS total_profit " +
+		"IFNULL(SUM(total_cost),0) AS total_cost, " +
+		"IFNULL(SUM(CASE WHEN our_role <> 1 THEN total_profit ELSE 0 END),0) AS total_profit " +
 		"FROM " + table + " WHERE " + where
 	var rows []orm.Params
 	if _, err := models.Orm.Raw(raw, args...).Values(&rows); err != nil || len(rows) == 0 {
@@ -270,11 +327,15 @@ func (c *BackendCrmContractController) Create() {
 
 	tenantID := pipelineTenantID(claims)
 	now := time.Now()
+	ourRole := int8(2)
+	if p.OurRole != nil {
+		ourRole = *p.OurRole
+	}
 	row := models.TenantCrmContract{
 		TenantID:      tenantID,
 		ContractNo:    strings.TrimSpace(p.ContractNo),
 		ContractName:  strings.TrimSpace(p.ContractName),
-		OurRole:       pickInt8(p.OurRole, 2, 4),
+		OurRole:       normalizeOurRole(ourRole),
 		PartyCount:    pickInt8(p.PartyCount, 2, 4),
 		OwnerUserID:   firstNonEmpty(p.OwnerUserID, pipelineUID(claims)),
 		OwnerUserName: firstNonEmpty(p.OwnerUserName, resolveUserName(claims)),
@@ -338,6 +399,8 @@ func (c *BackendCrmContractController) Create() {
 		pipelineErr(&c.Controller, 500, 500, "创建失败: "+err.Error())
 		return
 	}
+	// 参与方填写的签约人（姓名 + 电话）同步写入对应企业的联系人通讯录
+	syncContractPartyContacts(tenantID, row.Parties)
 	crmWriteLog(tenantID, 3, row.ID, "create", "创建合同："+row.ContractName, claims)
 	pipelineOk(&c.Controller, map[string]interface{}{"id": row.ID})
 }
@@ -386,8 +449,9 @@ func (c *BackendCrmContractController) Update() {
 	if strings.TrimSpace(p.ContractCategory) != "" {
 		row.ContractCategory = strings.TrimSpace(p.ContractCategory)
 	}
-	if p.OurRole != 0 {
-		row.OurRole = p.OurRole
+	if p.OurRole != nil {
+		// 0=我方不参与也是合法值，用指针判断避免误吞
+		row.OurRole = normalizeOurRole(*p.OurRole)
 	}
 	if p.PartyCount != 0 {
 		row.PartyCount = p.PartyCount
@@ -451,6 +515,8 @@ func (c *BackendCrmContractController) Update() {
 		pipelineErr(&c.Controller, 500, 500, "更新失败: "+err.Error())
 		return
 	}
+	// 参与方填写的签约人（姓名 + 电话）同步写入对应企业的联系人通讯录
+	syncContractPartyContacts(tenantID, row.Parties)
 	crmWriteLog(tenantID, 3, row.ID, "update", "更新合同："+row.ContractName, claims)
 	pipelineOk(&c.Controller, map[string]interface{}{"id": row.ID})
 }
@@ -496,7 +562,7 @@ func (c *BackendCrmContractController) Delete() {
 }
 
 // ChangeStatus POST /backend/crm/contract/:id/status
-// 合同状态流转：1=草稿 2=已完成 3=已作废 4=履约中 5=执行异常。
+// 合同状态流转：1=草稿 2=已完成 3=已作废 4=履约中 5=异常。
 // 向导创建的合同默认为草稿，签订 / 履约等状态在列表中手动流转；各状态间可互切。
 func (c *BackendCrmContractController) ChangeStatus() {
 	claims, err := pipelineClaims(&c.Controller)
@@ -517,7 +583,7 @@ func (c *BackendCrmContractController) ChangeStatus() {
 		pipelineErr(&c.Controller, 400, 400, "参数错误")
 		return
 	}
-	// 合法目标状态：2已完成 / 3已作废 / 4履约中 / 5执行异常
+	// 合法目标状态：2已完成 / 3已作废 / 4履约中 / 5异常
 	if p.Status < 2 || p.Status > 5 {
 		pipelineErr(&c.Controller, 400, 400, "无效的状态值")
 		return
@@ -561,7 +627,7 @@ func contractStatusName(s int8) string {
 	case 4:
 		return "履约中"
 	case 5:
-		return "执行异常"
+		return "异常"
 	default:
 		return "未知"
 	}
@@ -600,6 +666,42 @@ func buildContractResp(row *models.TenantCrmContract) contractResp {
 	}
 }
 
+// syncContractPartyContacts 把合同参与方填写的签约人（姓名 + 电话）写入对应企业的联系人通讯录：
+// 新建的客户 / 供应商往往还没有联系人，用户只能手填签约人姓名与电话，
+// 这里自动建档（仅姓名 + 电话，其余资料留空，可在联系人管理中继续补全），
+// 避免这些信息只停留在合同文本里；同名或同号已存在时不会重复建档。
+// 仅处理关联了客户 / 供应商库的参与方：本公司方（ref_type=0）与手工填写未关联的名称（ref_id=0）跳过。
+func syncContractPartyContacts(tenantID, partiesJSON string) {
+	partiesJSON = strings.TrimSpace(partiesJSON)
+	if models.Orm == nil || partiesJSON == "" || partiesJSON == "[]" {
+		return
+	}
+	var parties []struct {
+		RefType     int    `json:"ref_type"`
+		RefID       uint64 `json:"ref_id"`
+		SignerName  string `json:"signer_name"`
+		SignerPhone string `json:"signer_phone"`
+	}
+	if err := json.Unmarshal([]byte(partiesJSON), &parties); err != nil {
+		return
+	}
+	for _, p := range parties {
+		// ref_type：0=本公司 1=客户 2=供应商；未关联库（ref_id=0）时无处可写
+		if p.RefID == 0 || (p.RefType != 1 && p.RefType != 2) {
+			continue
+		}
+		name := strings.TrimSpace(p.SignerName)
+		if name == "" {
+			continue
+		}
+		companyType := crmContactCompanyType(p.RefType)
+		if !crmContactCompanyExists(tenantID, companyType, p.RefID) {
+			continue
+		}
+		crmEnsureCompanyContact(tenantID, companyType, p.RefID, name, strings.TrimSpace(p.SignerPhone))
+	}
+}
+
 // resolveProject 校验项目归属当前租户并返回 (id, 标准项目名称)。
 func (c *BackendCrmContractController) resolveProject(tenantID string, projectID uint64) (uint64, string, bool) {
 	var proj models.TenantCrmProject
@@ -806,6 +908,15 @@ func genContractNo(tenantID string) string {
 	return fmt.Sprintf("HT-%s-%d", time.Now().Format("20060102"), time.Now().UnixNano()%100000)
 }
 
+// normalizeOurRole 归一我方角色：0=我方不参与（如上中游项目中上游与中游主体之间的合同，
+// 我方不是签约方），1=甲方 2=乙方 3=丙方 4=丁方，越界回退乙方。
+func normalizeOurRole(v int8) int8 {
+	if v == 0 {
+		return 0
+	}
+	return pickInt8(v, 2, 4)
+}
+
 // pickInt8 取值约束：v 落在 [min, max] 内返回 v，否则返回 def。
 func pickInt8(v, def, max int8) int8 {
 	if v >= 1 && v <= max {
diff --git a/go/controllers/backend_crm_party_convert.go b/go/controllers/backend_crm_party_convert.go
new file mode 100644
index 0000000..2b994e1
--- /dev/null
+++ b/go/controllers/backend_crm_party_convert.go
@@ -0,0 +1,363 @@
+package controllers
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"server/models"
+	"server/pkg/jwtutil"
+
+	"github.com/beego/beego/v2/client/orm"
+)
+
+/*
+客户 / 供应商互转（复制一套档案）：
+
+同一家单位可能既是客户又是供应商（先做客户后成为供应商，或反之），因此这里做「复制」而不是搬迁：
+  - 原记录保留（客户仍是客户，供应商仍是供应商），两边各自独立维护、互不影响；
+  - 企业资料整体复制：工商信息、注册 / 实缴资本、成立日期、行政区划、企业类型、纳税人资质、
+    经营范围、地址、合作期限（注册 / 到期时间）、开票资料、银行信息、备注；
+  - 联系人（yz_backend_contact_company）一并复制，按「姓名 + 手机号」去重，避免重复建档；
+  - 等级（核心 / 重要 / 普通 / 潜在）两边语义一致，直接沿用；
+  - 类型（客户类型：企业 / 政府 / 国企 / 教育 / 个人 与 供应商类型：原材料 / 设备 / 服务 / 其他）
+    语义不同，按目标库默认值建档（客户→供应商 为「其他」、供应商→客户 为「企业」），转化后可再调整；
+  - 目标库已存在同名企业时不再重复建档，只把联系人补同步过去，避免同库出现两条同名档案。
+*/
+
+// findSameNameSupplier 查找租户内同名且未删除的供应商，未找到返回 0
+func findSameNameSupplier(tenantID, name string) uint64 {
+	name = strings.TrimSpace(name)
+	if models.Orm == nil || name == "" {
+		return 0
+	}
+	var row models.TenantCrmSupplier
+	if err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+		Filter("tenant_id", tenantID).
+		Filter("supplier_name", name).
+		Filter("delete_time__isnull", true).
+		One(&row); err != nil {
+		return 0
+	}
+	return row.ID
+}
+
+// findSameNameCustomer 查找租户内同名且未删除的客户，未找到返回 0
+func findSameNameCustomer(tenantID, name string) uint64 {
+	name = strings.TrimSpace(name)
+	if models.Orm == nil || name == "" {
+		return 0
+	}
+	var row models.TenantCrmCustomer
+	if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("tenant_id", tenantID).
+		Filter("customer_name", name).
+		Filter("delete_time__isnull", true).
+		One(&row); err != nil {
+		return 0
+	}
+	return row.ID
+}
+
+// collectCustomerNames / collectSupplierNames 提取名称集合（去重、去空），用于批量判断双重身份
+func collectCustomerNames(list []models.TenantCrmCustomer) []string {
+	names := make([]string, 0, len(list))
+	for _, r := range list {
+		if n := strings.TrimSpace(r.CustomerName); n != "" {
+			names = append(names, n)
+		}
+	}
+	return names
+}
+
+func collectSupplierNames(list []models.TenantCrmSupplier) []string {
+	names := make([]string, 0, len(list))
+	for _, r := range list {
+		if n := strings.TrimSpace(r.SupplierName); n != "" {
+			names = append(names, n)
+		}
+	}
+	return names
+}
+
+// partyNameExists 批量判断名称是否已存在于指定库（kind：customer / supplier），
+// 供列表标记「同时也是客户 / 供应商」，避免用户重复转化。返回 map 的 key 已做 trim。
+func partyNameExists(tenantID, kind string, names []string) map[string]bool {
+	exists := map[string]bool{}
+	if models.Orm == nil || len(names) == 0 {
+		return exists
+	}
+	if kind == "supplier" {
+		var rows []models.TenantCrmSupplier
+		if _, err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+			Filter("tenant_id", tenantID).
+			Filter("supplier_name__in", names).
+			Filter("delete_time__isnull", true).
+			All(&rows); err == nil {
+			for _, r := range rows {
+				exists[strings.TrimSpace(r.SupplierName)] = true
+			}
+		}
+		return exists
+	}
+	var rows []models.TenantCrmCustomer
+	if _, err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("tenant_id", tenantID).
+		Filter("customer_name__in", names).
+		Filter("delete_time__isnull", true).
+		All(&rows); err == nil {
+		for _, r := range rows {
+			exists[strings.TrimSpace(r.CustomerName)] = true
+		}
+	}
+	return exists
+}
+
+// customerListRow 客户列表行：附带「同时也是供应商」标记，便于识别同一家单位的双重身份
+type customerListRow struct {
+	models.TenantCrmCustomer
+	AlsoSupplier bool `json:"also_supplier"`
+}
+
+// supplierListRow 供应商列表行：附带「同时也是客户」标记
+type supplierListRow struct {
+	models.TenantCrmSupplier
+	AlsoCustomer bool `json:"also_customer"`
+}
+
+// partyConvertRemark 转化后的备注：保留原备注并追加转化来源，便于溯源
+func partyConvertRemark(origin, fromLabel, name string) string {
+	tag := fmt.Sprintf("由%s「%s」转化而来", fromLabel, name)
+	origin = strings.TrimSpace(origin)
+	if origin == "" {
+		return tag
+	}
+	return origin + "\n" + tag
+}
+
+// copyCompanyContacts 把来源企业（客户 / 供应商）的联系人复制到目标企业：
+//   - 去重键「姓名 + 手机号」：命中时只补齐目标缺失字段，不覆盖已有资料；
+//   - 未命中时新档；目标企业已有联系人时不再设为主联系人，避免出现多个主联系人。
+//
+// 返回 (新增数, 合并数)。
+func copyCompanyContacts(tenantID, fromType string, fromID uint64, toType string, toID uint64) (int, int) {
+	if models.Orm == nil || fromID == 0 || toID == 0 {
+		return 0, 0
+	}
+	var src []models.ErpCompanyContact
+	if _, err := models.Orm.QueryTable(new(models.ErpCompanyContact)).
+		Filter("tenant_id", tenantID).
+		Filter("company_type", fromType).
+		Filter("company_id", fromID).
+		Filter("delete_time__isnull", true).
+		All(&src); err != nil && err != orm.ErrNoRows {
+		return 0, 0
+	}
+	if len(src) == 0 {
+		return 0, 0
+	}
+	var dst []models.ErpCompanyContact
+	_, _ = models.Orm.QueryTable(new(models.ErpCompanyContact)).
+		Filter("tenant_id", tenantID).
+		Filter("company_type", toType).
+		Filter("company_id", toID).
+		Filter("delete_time__isnull", true).
+		All(&dst)
+
+	now := time.Now()
+	inserted, merged := 0, 0
+	for _, s := range src {
+		srcName := strings.TrimSpace(s.Name)
+		srcMobile := firstMobile(s.Mobiles)
+		hit := -1
+		for i := range dst {
+			if !strings.EqualFold(strings.TrimSpace(dst[i].Name), srcName) {
+				continue
+			}
+			// 有手机号时必须手机号也匹配，避免同名不同人被判为同一人
+			if srcMobile != "" && !contactPhoneMatched(dst[i], srcMobile) {
+				continue
+			}
+			hit = i
+			break
+		}
+		if hit >= 0 {
+			d := dst[hit]
+			up := map[string]interface{}{}
+			if strings.TrimSpace(d.Mobiles) == "" && strings.TrimSpace(s.Mobiles) != "" {
+				up["mobiles"] = s.Mobiles
+			}
+			if strings.TrimSpace(d.Phone) == "" && strings.TrimSpace(s.Phone) != "" {
+				up["phone"] = s.Phone
+			}
+			if strings.TrimSpace(d.Email) == "" && strings.TrimSpace(s.Email) != "" {
+				up["email"] = s.Email
+			}
+			if strings.TrimSpace(d.Wechat) == "" && strings.TrimSpace(s.Wechat) != "" {
+				up["wechat"] = s.Wechat
+			}
+			if strings.TrimSpace(d.QQ) == "" && strings.TrimSpace(s.QQ) != "" {
+				up["qq"] = s.QQ
+			}
+			if strings.TrimSpace(d.Dingtalk) == "" && strings.TrimSpace(s.Dingtalk) != "" {
+				up["dingtalk"] = s.Dingtalk
+			}
+			if strings.TrimSpace(d.Department) == "" && strings.TrimSpace(s.Department) != "" {
+				up["department"] = s.Department
+			}
+			if strings.TrimSpace(d.Position) == "" && strings.TrimSpace(s.Position) != "" {
+				up["position"] = s.Position
+			}
+			if strings.TrimSpace(d.HomeAddress) == "" && strings.TrimSpace(s.HomeAddress) != "" {
+				up["home_address"] = s.HomeAddress
+			}
+			if len(up) == 0 {
+				continue
+			}
+			up["update_time"] = now
+			if _, err := models.Orm.QueryTable(new(models.ErpCompanyContact)).
+				Filter("id", d.ID).Update(up); err == nil {
+				merged++
+			}
+			continue
+		}
+
+		row := s
+		row.ID = 0
+		row.CompanyType = toType
+		row.CompanyID = toID
+		row.CreateTime = now
+		row.UpdateTime = now
+		if len(dst) > 0 {
+			row.IsPrimary = 0
+		}
+		if _, err := models.Orm.Insert(&row); err == nil {
+			inserted++
+		}
+	}
+	return inserted, merged
+}
+
+// convertCustomerToSupplier 客户 → 供应商：复制客户档案与联系人到供应商库。
+// 返回 (供应商库是否已存在同名企业, 供应商ID, 新增联系人, 合并联系人)。
+func convertCustomerToSupplier(tenantID string, src *models.TenantCrmCustomer, claims *jwtutil.Claims) (bool, uint64, int, int, error) {
+	if models.Orm == nil {
+		return false, 0, 0, 0, fmt.Errorf("数据库未初始化")
+	}
+	if src == nil || src.ID == 0 {
+		return false, 0, 0, 0, fmt.Errorf("客户未找到")
+	}
+	name := strings.TrimSpace(src.CustomerName)
+	if name == "" {
+		return false, 0, 0, 0, fmt.Errorf("客户名称为空，无法转化")
+	}
+	// 供应商库已有同名企业：不重复建档，只把联系人补同步过去
+	if id := findSameNameSupplier(tenantID, name); id > 0 {
+		inserted, merged := copyCompanyContacts(tenantID, "customer", src.ID, "supplier", id)
+		return true, id, inserted, merged, nil
+	}
+
+	now := time.Now()
+	supplier := models.TenantCrmSupplier{
+		TenantID:               tenantID,
+		SupplierName:           name,
+		SupplierType:           "4", // 客户类型与供应商类型语义不同，默认「其他」，建档后可调整
+		ContactPerson:          src.ContactPerson,
+		ContactPhone:           src.ContactPhone,
+		ContactEmail:           src.ContactEmail,
+		SupplierLevel:          firstNonEmpty(src.CustomerLevel, "3"), // 等级语义一致，直接沿用
+		Industry:               src.Industry,
+		RegisteredCapital:      src.RegisteredCapital,
+		PaidCapital:            src.PaidCapital,
+		EstablishDate:          src.EstablishDate,
+		AdministrativeDivision: src.AdministrativeDivision,
+		EnterpriseType:         src.EnterpriseType,
+		TaxpayerQualification:  src.TaxpayerQualification,
+		BusinessScope:          src.BusinessScope,
+		Address:                src.Address,
+		RegisterTime:           src.RegisterTime,
+		ExpireTime:             src.ExpireTime,
+		Status:                 firstNonEmpty(src.Status, "1"),
+		IsDraft:                src.IsDraft,
+		Remark:                 partyConvertRemark(src.Remark, "客户", name),
+		InvoiceTitle:           src.InvoiceTitle,
+		TaxNumber:              src.TaxNumber,
+		BankName:               src.BankName,
+		BankAccount:            src.BankAccount,
+		RegisteredAddress:      src.RegisteredAddress,
+		RegisteredPhone:        src.RegisteredPhone,
+		CreateUserID:           fmt.Sprintf("%d", claims.UserID),
+		CreateTime:             now,
+		UpdateTime:             now,
+	}
+	id, err := models.Orm.Insert(&supplier)
+	if err != nil {
+		return false, 0, 0, 0, fmt.Errorf("生成供应商失败: " + err.Error())
+	}
+	inserted, merged := copyCompanyContacts(tenantID, "customer", src.ID, "supplier", uint64(id))
+	return false, uint64(id), inserted, merged, nil
+}
+
+// convertSupplierToCustomer 供应商 → 客户：复制供应商档案与联系人到客户库。
+// 返回 (客户库是否已存在同名企业, 客户ID, 新增联系人, 合并联系人)。
+func convertSupplierToCustomer(tenantID string, src *models.TenantCrmSupplier, claims *jwtutil.Claims) (bool, uint64, int, int, error) {
+	if models.Orm == nil {
+		return false, 0, 0, 0, fmt.Errorf("数据库未初始化")
+	}
+	if src == nil || src.ID == 0 {
+		return false, 0, 0, 0, fmt.Errorf("供应商未找到")
+	}
+	name := strings.TrimSpace(src.SupplierName)
+	if name == "" {
+		return false, 0, 0, 0, fmt.Errorf("供应商名称为空，无法转化")
+	}
+	// 客户库已有同名企业：不重复建档，只把联系人补同步过去
+	if id := findSameNameCustomer(tenantID, name); id > 0 {
+		inserted, merged := copyCompanyContacts(tenantID, "supplier", src.ID, "customer", id)
+		return true, id, inserted, merged, nil
+	}
+
+	now := time.Now()
+	userID := fmt.Sprintf("%d", claims.UserID)
+	customer := models.TenantCrmCustomer{
+		TenantID:               tenantID,
+		CustomerName:           name,
+		CustomerType:           "1", // 供应商类型与客户类型语义不同，默认「企业」，建档后可调整
+		ContactPerson:          src.ContactPerson,
+		ContactPhone:           src.ContactPhone,
+		ContactEmail:           src.ContactEmail,
+		CustomerLevel:          firstNonEmpty(src.SupplierLevel, "3"), // 等级语义一致，直接沿用
+		Industry:               src.Industry,
+		RegisteredCapital:      src.RegisteredCapital,
+		PaidCapital:            src.PaidCapital,
+		EstablishDate:          src.EstablishDate,
+		AdministrativeDivision: src.AdministrativeDivision,
+		EnterpriseType:         src.EnterpriseType,
+		TaxpayerQualification:  src.TaxpayerQualification,
+		BusinessScope:          src.BusinessScope,
+		Address:                src.Address,
+		RegisterTime:           src.RegisterTime,
+		ExpireTime:             src.ExpireTime,
+		Status:                 firstNonEmpty(src.Status, "1"),
+		IsDraft:                src.IsDraft,
+		Remark:                 partyConvertRemark(src.Remark, "供应商", name),
+		InvoiceTitle:           src.InvoiceTitle,
+		TaxNumber:              src.TaxNumber,
+		BankName:               src.BankName,
+		BankAccount:            src.BankAccount,
+		RegisteredAddress:      src.RegisteredAddress,
+		RegisteredPhone:        src.RegisteredPhone,
+		InPool:                 0,
+		OwnerUserID:            userID,
+		OwnerUserName:          resolveUserName(claims),
+		CreateUserID:           userID,
+		CreateTime:             now,
+		UpdateTime:             now,
+	}
+	id, err := models.Orm.Insert(&customer)
+	if err != nil {
+		return false, 0, 0, 0, fmt.Errorf("生成客户失败: " + err.Error())
+	}
+	inserted, merged := copyCompanyContacts(tenantID, "supplier", src.ID, "customer", uint64(id))
+	return false, uint64(id), inserted, merged, nil
+}
diff --git a/go/controllers/backend_crm_payback.go b/go/controllers/backend_crm_payback.go
index 7856154..5877d4a 100644
--- a/go/controllers/backend_crm_payback.go
+++ b/go/controllers/backend_crm_payback.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"server/models"
+	"server/services"
 
 	"github.com/beego/beego/v2/client/orm"
 	beego "github.com/beego/beego/v2/server/web"
@@ -269,6 +270,10 @@ func (c *BackendCrmPaybackController) Create() {
 		return
 	}
 	crmWriteLog(tenantID, 4, row.ID, "create", "创建回款计划："+row.ContractName, claims)
+	// 回款逾期联动：新建的计划可能已含逾期节点，合同 / 项目状态即时生效
+	if row.ContractID != nil {
+		services.SyncPaybackOverdueForContract(tenantID, *row.ContractID)
+	}
 	pipelineOk(&c.Controller, map[string]interface{}{"id": row.ID})
 }
 
@@ -351,6 +356,10 @@ func (c *BackendCrmPaybackController) Update() {
 	// 已回款金额一律以「回款记录」为准重新汇总：
 	// 明细里不承载实收数据，若此处按明细重算，编辑计划（如调整回款日期）会把已回款冲成 0。
 	refreshPlanReceived(tenantID, row.ID)
+	// 回款逾期联动：调整计划日期 / 金额后，合同 / 项目状态即时生效
+	if row.ContractID != nil {
+		services.SyncPaybackOverdueForContract(tenantID, *row.ContractID)
+	}
 	crmWriteLog(tenantID, 4, row.ID, "update", "更新回款计划："+row.ContractName, claims)
 	pipelineOk(&c.Controller, map[string]interface{}{"id": row.ID})
 }
@@ -539,6 +548,10 @@ func (c *BackendCrmPaybackController) Receive() {
 		return
 	}
 	crmWriteLog(tenantID, 4, row.ID, "receive", fmt.Sprintf("回款登记：%s 第 %d 期 %s 元", row.ContractName, p.Seq, formatAmount(p.ReceivedAmount)), claims)
+	// 回款逾期联动：登记金额变化后，合同 / 项目状态即时生效
+	if row.ContractID != nil {
+		services.SyncPaybackOverdueForContract(tenantID, *row.ContractID)
+	}
 	pipelineOk(&c.Controller, buildPaybackResp(&row))
 }
 
@@ -759,6 +772,7 @@ func (c *BackendCrmPaybackController) CreateRecord() {
 	raw, _ := io.ReadAll(c.Ctx.Request.Body)
 	var p struct {
 		PaybackID    uint64  `json:"payback_id"`
+		ItemSeq      int     `json:"item_seq"` // 对应计划明细序号（1-based），0=未指定（按整单登记）
 		Amount       float64 `json:"amount"`
 		ReceivedDate string  `json:"received_date"`
 		PayMethod    int8    `json:"pay_method"`
@@ -791,6 +805,22 @@ func (c *BackendCrmPaybackController) CreateRecord() {
 	if payMethod <= 0 {
 		payMethod = plan.PayMethod
 	}
+	// 进度节点：指定 item_seq 时校验其在计划明细中存在，并留存节点名称快照
+	itemSeq := 0
+	itemName := ""
+	if p.ItemSeq > 0 {
+		for _, it := range parsePaybackItems(plan.Items) {
+			if it.Seq == p.ItemSeq {
+				itemSeq = it.Seq
+				itemName = it.Name
+				break
+			}
+		}
+		if itemSeq == 0 {
+			pipelineErr(&c.Controller, 400, 400, "计划明细节点不存在")
+			return
+		}
+	}
 	var contractID *uint64
 	if plan.ContractID != nil {
 		cid := *plan.ContractID
@@ -801,6 +831,8 @@ func (c *BackendCrmPaybackController) CreateRecord() {
 		TenantID:      tenantID,
 		ContractID:    contractID,
 		PaybackID:     plan.ID,
+		ItemSeq:       itemSeq,
+		ItemName:      itemName,
 		Amount:        round2(p.Amount),
 		ReceivedDate:  strings.TrimSpace(p.ReceivedDate),
 		PayMethod:     payMethod,
@@ -863,6 +895,10 @@ func (c *BackendCrmPaybackController) DeleteRecord() {
 		return
 	}
 	refreshPlanReceived(tenantID, row.PaybackID)
+	// 回款逾期联动：删除回款记录后可能转为逾期，合同 / 项目状态即时生效
+	if row.ContractID != nil {
+		services.SyncPaybackOverdueForContract(tenantID, *row.ContractID)
+	}
 	pipelineOk(&c.Controller, map[string]interface{}{"id": id})
 }
 
diff --git a/go/controllers/backend_crm_pipeline_common.go b/go/controllers/backend_crm_pipeline_common.go
index 8b8344e..1dae788 100644
--- a/go/controllers/backend_crm_pipeline_common.go
+++ b/go/controllers/backend_crm_pipeline_common.go
@@ -161,6 +161,30 @@ func mobileInMobiles(mobile, mobiles string) bool {
 	return strings.Contains(mobiles, mobile)
 }
 
+// entityContactMobiles 过程库联系人的手机号集合（JSON 数组字符串）：
+// 优先取新的 mobiles 字段，缺省时回退旧的单个 mobile。
+func entityContactMobiles(src models.TenantCrmEntityContact) string {
+	if s := strings.TrimSpace(src.Mobiles); s != "" {
+		return s
+	}
+	return buildMobiles(src.Mobile)
+}
+
+// mobilesMatched 判断两组手机号是否有交集（JSON 数组或分隔符字符串）
+func mobilesMatched(a, b string) bool {
+	for _, x := range splitMobiles(a) {
+		if x == "" {
+			continue
+		}
+		for _, y := range splitMobiles(b) {
+			if x == y {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 // mergeCompanyContact 合并过程库联系人到正式库联系人：仅补齐正式库空缺字段，不覆盖已有数据。
 func mergeCompanyContact(dst *models.ErpCompanyContact, src models.TenantCrmEntityContact) {
 	changed := false
@@ -180,9 +204,11 @@ func mergeCompanyContact(dst *models.ErpCompanyContact, src models.TenantCrmEnti
 		dst.Position = strings.TrimSpace(src.Position)
 		changed = true
 	}
-	if strings.TrimSpace(dst.Mobiles) == "" && strings.TrimSpace(src.Mobile) != "" {
-		dst.Mobiles = buildMobiles(src.Mobile)
-		changed = true
+	if strings.TrimSpace(dst.Mobiles) == "" {
+		if m := entityContactMobiles(src); m != "" {
+			dst.Mobiles = m
+			changed = true
+		}
 	}
 	if dst.Remark == "" && strings.TrimSpace(src.Remark) != "" {
 		dst.Remark = strings.TrimSpace(src.Remark)
@@ -213,7 +239,8 @@ func syncContactsToCompany(tenantID string, customerID uint64, contacts []models
 		if name == "" {
 			continue
 		}
-		mobile := strings.TrimSpace(src.Mobile)
+		mobiles := entityContactMobiles(src)
+		mobile := firstMobile(mobiles)
 		// 本次待同步集合内去重（同名同手机只处理一次）
 		key := name + "|" + mobile
 		if seen[key] {
@@ -232,8 +259,8 @@ func syncContactsToCompany(tenantID string, customerID uint64, contacts []models
 
 		matched := false
 		for i := range existingList {
-			// 有手机号时必须手机号匹配；无手机号时按同名视为同一人
-			if mobile == "" || mobileInMobiles(mobile, existingList[i].Mobiles) {
+			// 有手机号时手机号需有交集才视为同一人；无手机号时按同名视为同一人
+			if mobile == "" || mobilesMatched(mobiles, existingList[i].Mobiles) {
 				mergeCompanyContact(&existingList[i], src)
 				merged++
 				matched = true
@@ -250,7 +277,7 @@ func syncContactsToCompany(tenantID string, customerID uint64, contacts []models
 			CompanyID:   customerID,
 			Name:        name,
 			Phone:       "",
-			Mobiles:     buildMobiles(mobile),
+			Mobiles:     mobiles,
 			Wechat:      strings.TrimSpace(src.Wechat),
 			QQ:          strings.TrimSpace(src.QQ),
 			Email:       strings.TrimSpace(src.Email),
diff --git a/go/controllers/backend_crm_product.go b/go/controllers/backend_crm_product.go
index 0efabc2..0f3777d 100644
--- a/go/controllers/backend_crm_product.go
+++ b/go/controllers/backend_crm_product.go
@@ -30,11 +30,20 @@ type crmProductPayload struct {
 	TaxRate      float64         `json:"tax_rate"`
 	LineType     string          `json:"line_type"`
 	DevUnitPrice float64         `json:"dev_unit_price"`
+	DevMode      string          `json:"dev_mode"`
 	DevTree      json.RawMessage `json:"dev_tree"`
 	Status       int8            `json:"status"`
 	Remark       string          `json:"remark"`
 }
 
+// normalizeDevMode 规范软件开发「研发方式」：self=自行研发（默认）/ outsource=外协研发（别人帮我们研发）。
+func normalizeDevMode(v string) string {
+	if strings.TrimSpace(v) == "outsource" {
+		return "outsource"
+	}
+	return "self"
+}
+
 // crmProductItem 项目产品清单中的单行（也用于项目生成时写入产品管理）。
 type crmProductItem struct {
 	ProductNo string  `json:"product_no"`
@@ -148,9 +157,11 @@ func (c *BackendCrmProductController) Create() {
 	}
 	// 非开发行不保留开发字段，避免残留（如 dev_tree="[]"）导致清单调用时被误判为软件开发行
 	devUnitPrice := p.DevUnitPrice
+	devMode := normalizeDevMode(p.DevMode)
 	devTree := string(p.DevTree)
 	if lineType != "dev" {
 		devUnitPrice = 0
+		devMode = ""
 		devTree = ""
 	}
 	now := time.Now()
@@ -166,6 +177,7 @@ func (c *BackendCrmProductController) Create() {
 		TaxRate:      p.TaxRate,
 		LineType:     lineType,
 		DevUnitPrice: devUnitPrice,
+		DevMode:      devMode,
 		DevTree:      devTree,
 		Status:       status,
 		Remark:       p.Remark,
@@ -221,9 +233,11 @@ func (c *BackendCrmProductController) Update() {
 	}
 	// 非开发行清空开发字段，避免残留导致清单调用时被误判为软件开发行
 	devUnitPrice := p.DevUnitPrice
+	devMode := normalizeDevMode(p.DevMode)
 	devTree := string(p.DevTree)
 	if lineType != "dev" {
 		devUnitPrice = 0
+		devMode = ""
 		devTree = ""
 	}
 	now := time.Now()
@@ -240,6 +254,7 @@ func (c *BackendCrmProductController) Update() {
 			"tax_rate":       p.TaxRate,
 			"line_type":      lineType,
 			"dev_unit_price": devUnitPrice,
+			"dev_mode":       devMode,
 			"dev_tree":       devTree,
 			"status":         status,
 			"remark":         p.Remark,
@@ -454,9 +469,10 @@ func SyncContractProducts(tenantID, uid string, projectID uint64, projectName st
 			CreateTime:   now,
 			UpdateTime:   now,
 		}
-		// 软件开发行：写入统一人天单价与模块树，作为可复用的「开发包」
+		// 软件开发行：写入统一人天单价、研发方式与模块树，作为可复用的「开发包」
 		if lineType == "dev" {
 			row.DevUnitPrice = toFloat64(it["dev_unit_price"])
+			row.DevMode = normalizeDevMode(productFieldStr(it["dev_mode"]))
 			if tree := it["dev_tree"]; tree != nil {
 				if b, me := json.Marshal(tree); me == nil {
 					row.DevTree = string(b)
@@ -504,7 +520,7 @@ func productFieldStr(v interface{}) string {
 	return strings.TrimSpace(fmt.Sprintf("%v", v))
 }
 
-// syncDevTreeToProduct 软件开发行引用到产品档案时，回写最新模块树与人天单价
+// syncDevTreeToProduct 软件开发行引用到产品档案时，回写最新模块树、人天单价与研发方式
 // （仅在有变化时更新；销售/成本单价不回写，仍由产品管理主导），
 // 保证后续合同再选该产品能拿到最新的开发包。
 func syncDevTreeToProduct(p *models.TenantCrmProduct, it map[string]interface{}) {
@@ -521,12 +537,18 @@ func syncDevTreeToProduct(p *models.TenantCrmProduct, it map[string]interface{})
 	}
 	newTree := string(b)
 	newUnitPrice := toFloat64(it["dev_unit_price"])
-	if newTree == p.DevTree && newUnitPrice == p.DevUnitPrice {
+	// 研发方式：清单行传了值就跟随回写（自行研发 / 外协研发）
+	newMode := p.DevMode
+	if m := productFieldStr(it["dev_mode"]); m != "" {
+		newMode = normalizeDevMode(m)
+	}
+	if newTree == p.DevTree && newUnitPrice == p.DevUnitPrice && newMode == p.DevMode {
 		return
 	}
 	p.DevTree = newTree
 	p.DevUnitPrice = newUnitPrice
-	_, _ = models.Orm.Update(p, "DevTree", "DevUnitPrice")
+	p.DevMode = newMode
+	_, _ = models.Orm.Update(p, "DevTree", "DevUnitPrice", "DevMode")
 }
 
 // genProductNo 生成产品编号 P-yyyymmdd-4位序号，并保证本租户内不重复。
diff --git a/go/controllers/backend_crm_product_category.go b/go/controllers/backend_crm_product_category.go
index ae7b40f..9488fbe 100644
--- a/go/controllers/backend_crm_product_category.go
+++ b/go/controllers/backend_crm_product_category.go
@@ -26,6 +26,85 @@ type crmProductCategoryPayload struct {
 	Remark string `json:"remark"`
 }
 
+// crmDefaultCategoryName 系统默认产品分类名称：「未分类」。
+// 租户级默认分类，由系统确保存在，不可编辑、不可删除；其余分类均为租户自定义（可增删改）。
+const crmDefaultCategoryName = "未分类"
+
+// crmSystemCategoryItem 系统默认产品分类定义：排序取负数，保证始终排在租户自定义分类（sort>=0）之前。
+type crmSystemCategoryItem struct {
+	Name   string
+	Sort   int
+	Remark string
+}
+
+// crmSystemDefaultCategories 系统默认产品分类清单：
+//   - 未分类：新建/同步缺省归类，置顶；
+//   - 软件开发（含自行研发与外协研发）、软件产品、硬件产品：业务三大类，开箱即用。
+//
+// 名称含「软件」的分类计入合同软件部分、含「硬件」的计入硬件部分（与金额归属口径一致）。
+var crmSystemDefaultCategories = []crmSystemCategoryItem{
+	{crmDefaultCategoryName, -100, "系统默认分类（不可编辑、不可删除）"},
+	{"软件开发", -30, "系统默认分类（不可编辑、不可删除）；含自行研发与外协研发"},
+	{"软件产品", -20, "系统默认分类（不可编辑、不可删除）"},
+	{"硬件产品", -10, "系统默认分类（不可编辑、不可删除）"},
+}
+
+// crmIsSystemCategory 判断是否为系统级分类（不允许编辑、不允许删除）。
+// 双保险：is_default 标记命中，或名称命中系统内置清单
+// （防止历史数据标记被意外清零后，系统分类被删除破坏语义）。
+func crmIsSystemCategory(row *models.TenantCrmProductCategory) bool {
+	if row == nil {
+		return false
+	}
+	if row.IsDefault == 1 {
+		return true
+	}
+	for _, item := range crmSystemDefaultCategories {
+		if row.Name == item.Name {
+			return true
+		}
+	}
+	return false
+}
+
+// crmEnsureDefaultProductCategories 确保租户存在系统默认分类（未分类 / 软件开发 / 软件产品 / 硬件产品）：
+//   - 不存在（含曾被软删除）时创建 / 恢复，保证其始终可用（复用软删记录，避免唯一键冲突）；
+//   - 已存在同名分类（租户此前自建）时升级为系统默认，并修复默认标记、状态与内置排序（历史数据升级自修复）。
+func crmEnsureDefaultProductCategories(tenantID string) {
+	if models.Orm == nil || strings.TrimSpace(tenantID) == "" {
+		return
+	}
+	now := time.Now()
+	table := new(models.TenantCrmProductCategory).TableName()
+	for _, item := range crmSystemDefaultCategories {
+		var row models.TenantCrmProductCategory
+		err := models.Orm.QueryTable(new(models.TenantCrmProductCategory)).
+			Filter("tenant_id", tenantID).
+			Filter("name", item.Name).
+			One(&row)
+		if err == nil && row.ID > 0 {
+			// 已存在（含软删除）：恢复并修复默认标记、启用状态与内置排序
+			if row.DeleteTime != nil || row.IsDefault != 1 || row.Sort != item.Sort || row.Status != 1 {
+				_, _ = models.Orm.Raw("UPDATE "+table+
+					" SET delete_time = NULL, is_default = 1, sort = ?, status = 1, update_time = ? WHERE id = ?",
+					item.Sort, now, row.ID).Exec()
+			}
+			continue
+		}
+		newRow := models.TenantCrmProductCategory{
+			TenantID:   tenantID,
+			Name:       item.Name,
+			Sort:       item.Sort,
+			Status:     1,
+			IsDefault:  1,
+			Remark:     item.Remark,
+			CreateTime: now,
+			UpdateTime: now,
+		}
+		_, _ = models.Orm.Insert(&newRow)
+	}
+}
+
 // List GET /backend/crm/product/category/list
 func (c *BackendCrmProductCategoryController) List() {
 	claims, err := pipelineClaims(&c.Controller)
@@ -45,6 +124,8 @@ func (c *BackendCrmProductCategoryController) List() {
 	status := strings.TrimSpace(c.GetString("status"))
 
 	tenantID := pipelineTenantID(claims)
+	// 确保系统默认分类「未分类」存在（首次访问自动创建 / 恢复）
+	crmEnsureDefaultProductCategories(tenantID)
 	cond := orm.NewCondition().And("tenant_id", tenantID).And("delete_time__isnull", true)
 	if keyword != "" {
 		kw := orm.NewCondition().
@@ -165,6 +246,11 @@ func (c *BackendCrmProductCategoryController) Update() {
 		pipelineErr(&c.Controller, 404, 404, "产品分类未找到")
 		return
 	}
+	// 系统默认分类只读：不可编辑（防止改名破坏系统分类语义）
+	if crmIsSystemCategory(&row) {
+		pipelineErr(&c.Controller, 400, 400, "系统默认分类不可编辑")
+		return
+	}
 	status := p.Status
 	if status != 0 && status != 1 {
 		status = row.Status
@@ -211,6 +297,11 @@ func (c *BackendCrmProductCategoryController) Delete() {
 		pipelineErr(&c.Controller, 404, 404, "产品分类未找到")
 		return
 	}
+	// 系统默认分类只读：不可删除（系统级分类始终保留，保证产品归类语义稳定）
+	if crmIsSystemCategory(&row) {
+		pipelineErr(&c.Controller, 400, 400, "系统默认分类不可删除")
+		return
+	}
 	now := time.Now()
 	_, err = models.Orm.QueryTable(new(models.TenantCrmProductCategory)).
 		Filter("id", id).Filter("tenant_id", tenantID).
diff --git a/go/controllers/backend_crm_project.go b/go/controllers/backend_crm_project.go
index 38c8c54..bd8e81f 100644
--- a/go/controllers/backend_crm_project.go
+++ b/go/controllers/backend_crm_project.go
@@ -21,15 +21,37 @@ type BackendCrmProjectController struct {
 	beego.Controller
 }
 
+// crmProjectStatusDone 项目状态「已完成」（1未开始 / 2进行中 / 3已完成 / 4已暂停 / 5异常）：
+// 列表排列时「已完成」沉底展示，与前端筛选传参一致使用字符串值。
+const crmProjectStatusDone = "3"
+
+// projectStatusName 项目状态文案（用于操作日志）。
+func projectStatusName(s int8) string {
+	switch s {
+	case 1:
+		return "未开始"
+	case 2:
+		return "进行中"
+	case 3:
+		return "已完成"
+	case 4:
+		return "已暂停"
+	case 5:
+		return "异常"
+	}
+	return "未知"
+}
+
 type projectPayload struct {
 	ProjectName string `json:"project_name"`
 	ProjectNo   string `json:"project_no"`
 	// 项目类型：1=单一项目（仅上游客户） 2=上下游项目（上游客户 + 下游供应商）
+	// 3=上中游项目（上游 A 公司 + 中游 B 公司，下游固定为本公司）
 	ProjectType      int8   `json:"project_type"`
 	CustomerID       uint64 `json:"customer_id"`
 	CustomerName     string `json:"customer_name"`
 	SupplierID       uint64 `json:"supplier_id"`
-	SupplierRefType  int8   `json:"supplier_ref_type"` // 下游主体来源：1客户 2供应商
+	SupplierRefType  int8   `json:"supplier_ref_type"` // 对方主体来源：1客户 2供应商（下游 / 中游）
 	SupplierName     string `json:"supplier_name"`
 	SupplierIndustry string `json:"supplier_industry"`
 	OwnerUserID      string `json:"owner_user_id"`
@@ -57,12 +79,13 @@ type projectPayload struct {
 }
 
 // normalizeProjectFields 归一项目类型、上下游金额与上下游对接人：
-//   - 项目类型仅识别 2=上下游，其余一律按 1=单一项目处理；
+//   - 项目类型仅识别 2=上下游、3=上中游，其余一律按 1=单一项目处理；
 //   - 上游金额 / 上游对接人缺省时回退旧的 amount / contact_* 字段（兼容未升级的调用方）；
-//   - 单一项目不存在下游，下游金额与下游对接人一并清空。
+//   - 单一项目不存在上下游，下游金额与下游对接人一并清空；
+//   - 3=上中游项目（上游 A 公司 + 中游 B 公司，下游固定为本公司）的中游主体复用下游字段存储。
 func normalizeProjectFields(p *projectPayload) (pt int8, upstream, downstream float64, upContact, upPhone, downContact, downPhone string) {
 	pt = p.ProjectType
-	if pt != 2 {
+	if pt != 2 && pt != 3 {
 		pt = 1
 	}
 	upstream = p.UpstreamAmount
@@ -71,7 +94,8 @@ func normalizeProjectFields(p *projectPayload) (pt int8, upstream, downstream fl
 	}
 	upContact = strings.TrimSpace(firstNonEmpty(p.UpstreamContact, p.ContactPerson))
 	upPhone = strings.TrimSpace(firstNonEmpty(p.UpstreamPhone, p.ContactPhone))
-	if pt == 2 {
+	// 上下游项目：对方为下游（供应商/客户）；上中游项目：对方为中游（中间方）——两者均落在 downstream_* 字段
+	if pt == 2 || pt == 3 {
 		downstream = p.DownstreamAmount
 		downContact = strings.TrimSpace(p.DownstreamContact)
 		downPhone = strings.TrimSpace(p.DownstreamPhone)
@@ -179,29 +203,78 @@ func (c *BackendCrmProjectController) List() {
 	ownerID := strings.TrimSpace(c.GetString("owner_user_id"))
 
 	tenantID := pipelineTenantID(claims)
-	cond := orm.NewCondition().And("tenant_id", tenantID).And("delete_time__isnull", true)
-	// 数据范围：平台/租户管理员可见全部，其他用户仅本人（负责人或创建人）
-	cond = crmApplyOwnerScope(cond, claims)
-	if keyword != "" {
-		kw := orm.NewCondition().
-			Or("project_name__contains", keyword).
-			Or("project_no__contains", keyword).
-			Or("customer_name__contains", keyword).
-			Or("supplier_name__contains", keyword)
-		cond = cond.AndCond(kw)
-	}
-	if status != "" {
-		cond = cond.And("status", status)
-	}
-	if ownerID != "" {
-		cond = cond.And("owner_user_id", ownerID)
-	}
-	qs := models.Orm.QueryTable(new(models.TenantCrmProject)).SetCond(cond)
 
-	total, _ := qs.Count()
+	// buildCond 构造本次列表的筛选条件。
+	// 「已完成」沉底排列需要按「未完成 / 已完成」两组分别查询，因此这里做成可重复调用的构造方法。
+	buildCond := func() *orm.Condition {
+		cond := orm.NewCondition().And("tenant_id", tenantID).And("delete_time__isnull", true)
+		// 数据范围：平台/租户管理员可见全部，其他用户仅本人（负责人或创建人）
+		cond = crmApplyOwnerScope(cond, claims)
+		if keyword != "" {
+			kw := orm.NewCondition().
+				Or("project_name__contains", keyword).
+				Or("project_no__contains", keyword).
+				Or("customer_name__contains", keyword).
+				Or("supplier_name__contains", keyword)
+			cond = cond.AndCond(kw)
+		}
+		if status != "" {
+			cond = cond.And("status", status)
+		}
+		if ownerID != "" {
+			cond = cond.And("owner_user_id", ownerID)
+		}
+		return cond
+	}
+	projectQuery := func(cond *orm.Condition) orm.QuerySeter {
+		return models.Orm.QueryTable(new(models.TenantCrmProject)).SetCond(cond)
+	}
+	// 未完成组：除「已完成」外的全部状态（含历史数据中的空状态），沉底排列时取列表前段
+	unfinishedCond := func() *orm.Condition {
+		return buildCond().AndCond(orm.NewCondition().
+			Or("status__ne", crmProjectStatusDone).
+			Or("status__isnull", true))
+	}
+
+	total, _ := projectQuery(buildCond()).Count()
 	var list []models.TenantCrmProject
 	if total > 0 {
-		_, _ = qs.OrderBy("-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
+		offset := (page - 1) * pageSize
+		if status != "" {
+			// 已按状态筛选：结果只含单一状态，直接按新→旧分页
+			if _, err := projectQuery(buildCond()).OrderBy("-id").Offset(offset).Limit(pageSize).All(&list); err != nil {
+				pipelineErr(&c.Controller, 500, 500, "查询失败: "+err.Error())
+				return
+			}
+		} else {
+			// 列表排列：未完成项目在前、「已完成」项目沉底，两组内部仍按新→旧。
+			// 先按两组数量把当前页窗口换算成各组区间，再分别取数按序拼接，保证翻页后整体顺序一致。
+			unfinished, _ := projectQuery(unfinishedCond()).Count()
+			unfinishedTotal := int(unfinished)
+			finishedTotal := int(total) - unfinishedTotal
+			end := offset + pageSize
+			if end > int(total) {
+				end = int(total)
+			}
+			aFrom, aTo := min(offset, unfinishedTotal), min(end, unfinishedTotal)
+			bFrom := min(max(offset-unfinishedTotal, 0), finishedTotal)
+			bTo := min(max(end-unfinishedTotal, 0), finishedTotal)
+			if aTo > aFrom {
+				if _, err := projectQuery(unfinishedCond()).OrderBy("-id").Offset(aFrom).Limit(aTo - aFrom).All(&list); err != nil {
+					pipelineErr(&c.Controller, 500, 500, "查询失败: "+err.Error())
+					return
+				}
+			}
+			if bTo > bFrom {
+				var finished []models.TenantCrmProject
+				if _, err := projectQuery(buildCond().And("status", crmProjectStatusDone)).
+					OrderBy("-id").Offset(bFrom).Limit(bTo - bFrom).All(&finished); err != nil {
+					pipelineErr(&c.Controller, 500, 500, "查询失败: "+err.Error())
+					return
+				}
+				list = append(list, finished...)
+			}
+		}
 	}
 	attachBusinessName(tenantID, list)
 	// 项目起止时间由关联合同汇总（不再依赖手工维护的开始 / 结束日期）
@@ -495,6 +568,176 @@ func (c *BackendCrmProjectController) Delete() {
 	pipelineOk(&c.Controller, nil)
 }
 
+// ========================== 项目联系人（从对应企业通讯录挑选） ==========================
+
+// contactIDsJSON 把联系人ID数组序列化为 JSON 字符串；空集合返回空串。
+func contactIDsJSON(ids []uint64) string {
+	if len(ids) == 0 {
+		return ""
+	}
+	b, err := json.Marshal(ids)
+	if err != nil {
+		return ""
+	}
+	return string(b)
+}
+
+// filterCompanyContactIDs 过滤出确实属于指定企业通讯录的联系人ID（防止跨企业/脏ID混入）。
+// companyID 为空或 ids 为空时直接返回空集合。
+func filterCompanyContactIDs(tenantID string, companyType string, companyID *uint64, ids []uint64) []uint64 {
+	if companyID == nil || *companyID == 0 || len(ids) == 0 {
+		return nil
+	}
+	var rows []models.ErpCompanyContact
+	_, _ = models.Orm.QueryTable(new(models.ErpCompanyContact)).
+		Filter("tenant_id", tenantID).
+		Filter("company_type", companyType).
+		Filter("company_id", *companyID).
+		Filter("delete_time__isnull", true).
+		All(&rows)
+	allowed := make(map[uint64]bool, len(rows))
+	for _, r := range rows {
+		allowed[r.ID] = true
+	}
+	out := make([]uint64, 0, len(ids))
+	seen := make(map[uint64]bool, len(ids))
+	for _, id := range ids {
+		if id > 0 && allowed[id] && !seen[id] {
+			out = append(out, id)
+			seen[id] = true
+		}
+	}
+	return out
+}
+
+// SaveContacts POST /backend/crm/project/:id/contacts
+// 保存项目联系人：从对应企业通讯录中挑选的联系人ID集合（支持多选）。
+//   - 上游=客户方（customer_id 对应通讯录）；
+//   - 下游/中游=对方主体方（supplier_ref_type：1=客户库 2=供应商库，supplier_id 对应通讯录）；
+//   - 单一项目（project_type=1）只保留上游集合，下游集合自动清空；
+//   - 传入不属于对应企业的联系人ID会被过滤掉。
+func (c *BackendCrmProjectController) SaveContacts() {
+	claims, err := pipelineClaims(&c.Controller)
+	if err != nil {
+		pipelineErr(&c.Controller, 401, 401, err.Error())
+		return
+	}
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if id == 0 {
+		pipelineErr(&c.Controller, 400, 400, "无效的ID")
+		return
+	}
+	raw, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p struct {
+		UpstreamContactIDs   []uint64 `json:"upstream_contact_ids"`
+		DownstreamContactIDs []uint64 `json:"downstream_contact_ids"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		pipelineErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	tenantID := pipelineTenantID(claims)
+	var proj models.TenantCrmProject
+	if err := models.Orm.QueryTable(new(models.TenantCrmProject)).
+		Filter("id", id).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).One(&proj); err != nil {
+		pipelineErr(&c.Controller, 404, 404, "项目未找到")
+		return
+	}
+	// 数据范围校验：非管理员仅能操作本人（负责人或创建人）的数据
+	if !canAccessCrmRecord(claims, proj.OwnerUserID, proj.CreateUserID) {
+		pipelineErr(&c.Controller, 403, 403, "无权操作该项目数据")
+		return
+	}
+
+	pt := proj.ProjectType
+	if pt != 2 && pt != 3 {
+		pt = 1
+	}
+	upIDs := filterCompanyContactIDs(tenantID, "customer", proj.CustomerID, p.UpstreamContactIDs)
+	var downIDs []uint64
+	// 上下游 / 上中游项目：对方主体（下游 / 中游）联系人按 supplier_ref_type 选择对应库
+	if pt != 1 && proj.SupplierID != nil && *proj.SupplierID > 0 {
+		companyType := "supplier"
+		if proj.SupplierRefType == 1 {
+			companyType = "customer"
+		}
+		downIDs = filterCompanyContactIDs(tenantID, companyType, proj.SupplierID, p.DownstreamContactIDs)
+	}
+
+	now := time.Now()
+	_, err = models.Orm.QueryTable(new(models.TenantCrmProject)).
+		Filter("id", proj.ID).Filter("tenant_id", tenantID).
+		Update(map[string]interface{}{
+			"upstream_contact_ids":   contactIDsJSON(upIDs),
+			"downstream_contact_ids": contactIDsJSON(downIDs),
+			"update_time":            now,
+		})
+	if err != nil {
+		pipelineErr(&c.Controller, 500, 500, "保存项目联系人失败: "+err.Error())
+		return
+	}
+	crmWriteLog(tenantID, 3, proj.ID, "update", "更新项目联系人："+proj.ProjectName, claims)
+	pipelineOk(&c.Controller, map[string]interface{}{
+		"upstream_contact_ids":   upIDs,
+		"downstream_contact_ids": downIDs,
+	})
+}
+
+// ChangeStatus POST /backend/crm/project/:id/status
+// 项目状态流转：1=未开始 2=进行中 3=已完成 4=已暂停 5=异常。
+// 各状态间可互切；仅更新状态字段，不触碰其他业务字段。
+func (c *BackendCrmProjectController) ChangeStatus() {
+	claims, err := pipelineClaims(&c.Controller)
+	if err != nil {
+		pipelineErr(&c.Controller, 401, 401, err.Error())
+		return
+	}
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if id == 0 {
+		pipelineErr(&c.Controller, 400, 400, "无效的ID")
+		return
+	}
+	raw, _ := io.ReadAll(c.Ctx.Request.Body)
+	var p struct {
+		Status int8 `json:"status"`
+	}
+	if err := json.Unmarshal(raw, &p); err != nil {
+		pipelineErr(&c.Controller, 400, 400, "参数错误")
+		return
+	}
+	if p.Status < 1 || p.Status > 5 {
+		pipelineErr(&c.Controller, 400, 400, "无效的状态值")
+		return
+	}
+	tenantID := pipelineTenantID(claims)
+	var proj models.TenantCrmProject
+	if err := models.Orm.QueryTable(new(models.TenantCrmProject)).
+		Filter("id", id).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).One(&proj); err != nil {
+		pipelineErr(&c.Controller, 404, 404, "项目未找到")
+		return
+	}
+	// 数据范围校验：非管理员仅能操作本人（负责人或创建人）的数据
+	if !canAccessCrmRecord(claims, proj.OwnerUserID, proj.CreateUserID) {
+		pipelineErr(&c.Controller, 403, 403, "无权操作该项目数据")
+		return
+	}
+	if proj.Status == p.Status {
+		pipelineOk(&c.Controller, map[string]interface{}{"id": proj.ID, "status": proj.Status})
+		return
+	}
+	if _, err := models.Orm.QueryTable(new(models.TenantCrmProject)).
+		Filter("id", id).Filter("tenant_id", tenantID).
+		Update(map[string]interface{}{"status": p.Status, "update_time": time.Now()}); err != nil {
+		pipelineErr(&c.Controller, 500, 500, "状态更新失败: "+err.Error())
+		return
+	}
+	crmWriteLog(tenantID, 3, proj.ID, "status",
+		"项目状态流转："+projectStatusName(proj.Status)+" → "+projectStatusName(p.Status), claims)
+	pipelineOk(&c.Controller, map[string]interface{}{"id": proj.ID, "status": p.Status})
+}
+
 // ========================== 项目文档（OA 文档库绑定） ==========================
 
 // projectDocItem 项目文档条目：文档库文档 + 所在文件夹名称。
diff --git a/go/controllers/backend_crm_support.go b/go/controllers/backend_crm_support.go
index 897c3bf..0869f8d 100644
--- a/go/controllers/backend_crm_support.go
+++ b/go/controllers/backend_crm_support.go
@@ -490,7 +490,9 @@ type entityContactPayload struct {
 	ContactName string `json:"contact_name"`
 	Position    string `json:"position"`
 	Mobile      string `json:"mobile"`
-	Wechat      string `json:"wechat"`
+	// 手机号可登记多个（有的人有多个号码）：优先使用，缺省时回退单个 mobile
+	Mobiles     []string `json:"mobiles"`
+	Wechat      string   `json:"wechat"`
 	QQ          string `json:"qq"`
 	Email       string `json:"email"`
 	IsPrimary   int8   `json:"is_primary"`
@@ -515,13 +517,16 @@ func (c *BackendCrmEntityContactController) Add() {
 		return
 	}
 	tenantID := pipelineTenantID(claims)
+	// 手机号支持多个：优先取 mobiles 数组，缺省回退单个 mobile；mobile 保留为第一个号码
+	mobilesJSON := normalizeMobiles(p.Mobiles, p.Mobile)
 	row := models.TenantCrmEntityContact{
 		TenantID:    tenantID,
 		RelatedType: p.RelatedType,
 		RelatedID:   p.RelatedID,
 		ContactName: strings.TrimSpace(p.ContactName),
 		Position:    strings.TrimSpace(p.Position),
-		Mobile:      strings.TrimSpace(p.Mobile),
+		Mobile:      firstMobile(mobilesJSON),
+		Mobiles:     mobilesJSON,
 		Wechat:      strings.TrimSpace(p.Wechat),
 		QQ:          strings.TrimSpace(p.QQ),
 		Email:       strings.TrimSpace(p.Email),
@@ -568,7 +573,8 @@ func (c *BackendCrmEntityContactController) Edit() {
 	}
 	row.ContactName = strings.TrimSpace(p.ContactName)
 	row.Position = strings.TrimSpace(p.Position)
-	row.Mobile = strings.TrimSpace(p.Mobile)
+	row.Mobiles = normalizeMobiles(p.Mobiles, p.Mobile)
+	row.Mobile = firstMobile(row.Mobiles)
 	row.Wechat = strings.TrimSpace(p.Wechat)
 	row.QQ = strings.TrimSpace(p.QQ)
 	row.Email = strings.TrimSpace(p.Email)
diff --git a/go/controllers/backend_crm_unit.go b/go/controllers/backend_crm_unit.go
index 305140e..da0f3ce 100644
--- a/go/controllers/backend_crm_unit.go
+++ b/go/controllers/backend_crm_unit.go
@@ -63,16 +63,37 @@ var crmDefaultUnits = []struct {
 
 // crmEnsureDefaultUnits 租户首次使用（从未有过任何单位记录，含已软删除的）时写入默认单位。
 // 用户手动清空后不再自动补，避免越删越有；需要恢复时用「恢复默认单位」接口。
+// 已有记录时顺带修复存量默认单位的 is_default 标记（历史数据升级）。
 func crmEnsureDefaultUnits(tenantID string) {
 	if models.Orm == nil || strings.TrimSpace(tenantID) == "" {
 		return
 	}
 	cnt, err := models.Orm.QueryTable(new(models.TenantCrmUnit)).
 		Filter("tenant_id", tenantID).Count()
-	if err != nil || cnt > 0 {
+	if err != nil {
 		return
 	}
-	crmInsertDefaultUnits(tenantID, nil)
+	if cnt == 0 {
+		crmInsertDefaultUnits(tenantID, nil)
+		return
+	}
+	crmMarkDefaultUnits(tenantID)
+}
+
+// crmMarkDefaultUnits 将默认清单中已存在的存量单位标记为 is_default=1（历史数据升级自修复，
+// 避免早期写入的默认单位因未打标而被误编辑/删除）。
+func crmMarkDefaultUnits(tenantID string) {
+	names := make([]string, 0, len(crmDefaultUnits))
+	for _, u := range crmDefaultUnits {
+		names = append(names, u.Name)
+	}
+	if len(names) == 0 {
+		return
+	}
+	_, _ = models.Orm.QueryTable(new(models.TenantCrmUnit)).
+		Filter("tenant_id", tenantID).
+		Filter("name__in", names).
+		Update(orm.Params{"is_default": 1})
 }
 
 // crmInsertDefaultUnits 写入默认单位，跳过已存在的名称（existing 为已存在单位名集合）。
@@ -90,6 +111,7 @@ func crmInsertDefaultUnits(tenantID string, existing map[string]bool) int {
 			Code:       u.Code,
 			Sort:       i + 1,
 			Status:     1,
+			IsDefault:  1, // 系统默认单位：不可编辑、不可删除
 			CreateTime: now,
 			UpdateTime: now,
 		}
@@ -129,7 +151,7 @@ func crmInitDefaultUnits(tenantID string) int {
 		}
 		if id, ok := deleted[u.Name]; ok {
 			if _, err := models.Orm.Raw("UPDATE "+table+
-				" SET delete_time = NULL, status = 1, sort = ?, update_time = ? WHERE id = ?",
+				" SET delete_time = NULL, status = 1, is_default = 1, sort = ?, update_time = ? WHERE id = ?",
 				i+1, now, id).Exec(); err == nil {
 				existing[u.Name] = true
 				added++
@@ -142,6 +164,7 @@ func crmInitDefaultUnits(tenantID string) int {
 			Code:       u.Code,
 			Sort:       i + 1,
 			Status:     1,
+			IsDefault:  1, // 系统默认单位：不可编辑、不可删除
 			CreateTime: now,
 			UpdateTime: now,
 		}
@@ -359,6 +382,11 @@ func (c *BackendCrmUnitController) Update() {
 		pipelineErr(&c.Controller, 404, 404, "单位未找到")
 		return
 	}
+	// 系统默认单位只读：不可编辑
+	if row.IsDefault == 1 {
+		pipelineErr(&c.Controller, 400, 400, "系统默认单位不可编辑")
+		return
+	}
 	status := p.Status
 	if status != 0 && status != 1 {
 		status = row.Status
@@ -416,6 +444,11 @@ func (c *BackendCrmUnitController) Delete() {
 		pipelineErr(&c.Controller, 404, 404, "单位未找到")
 		return
 	}
+	// 系统默认单位只读：不可删除
+	if row.IsDefault == 1 {
+		pipelineErr(&c.Controller, 400, 400, "系统默认单位不可删除")
+		return
+	}
 	now := time.Now()
 	_, err = models.Orm.QueryTable(new(models.TenantCrmUnit)).
 		Filter("id", id).Filter("tenant_id", tenantID).
diff --git a/go/controllers/backend_erp_customer.go b/go/controllers/backend_erp_customer.go
index 65312bd..6f22f50 100644
--- a/go/controllers/backend_erp_customer.go
+++ b/go/controllers/backend_erp_customer.go
@@ -136,8 +136,18 @@ func (c *BackendErpCustomerController) List() {
 		return
 	}
 
+	// 标记「同时也是供应商」：同一家单位可能既是客户又是供应商，列表上直接可见，避免重复转化
+	alsoSupplier := partyNameExists(fmt.Sprintf("%d", claims.TenantId), "supplier", collectCustomerNames(list))
+	rows := make([]customerListRow, 0, len(list))
+	for _, r := range list {
+		rows = append(rows, customerListRow{
+			TenantCrmCustomer: r,
+			AlsoSupplier:      alsoSupplier[strings.TrimSpace(r.CustomerName)],
+		})
+	}
+
 	c.customerOk(map[string]interface{}{
-		"list":     list,
+		"list":     rows,
 		"total":    total,
 		"page":     page,
 		"pageSize": pageSize,
@@ -172,6 +182,48 @@ func (c *BackendErpCustomerController) Detail() {
 	c.customerOk(customer)
 }
 
+// ConvertToSupplier POST /backend/erp/customer/:id/convert-supplier
+// 客户转供应商：把客户档案（含联系人）复制一套到供应商库。
+// 同一家单位可能既是客户又是供应商，因此原客户记录保留、不删除；
+// 供应商库已存在同名企业时不重复建档，只把联系人补同步过去。
+func (c *BackendErpCustomerController) ConvertToSupplier() {
+	claims, err := c.customerClaims()
+	if err != nil {
+		c.customerJsonErr(401, 401, err.Error())
+		return
+	}
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if id == 0 {
+		c.customerJsonErr(400, 400, "无效的ID")
+		return
+	}
+
+	tenantID := fmt.Sprintf("%d", claims.TenantId)
+	var customer models.TenantCrmCustomer
+	if err := models.Orm.QueryTable(new(models.TenantCrmCustomer)).
+		Filter("id", id).
+		Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).
+		One(&customer); err != nil {
+		c.customerJsonErr(404, 404, "客户未找到")
+		return
+	}
+
+	existed, supplierID, inserted, merged, cerr := convertCustomerToSupplier(tenantID, &customer, claims)
+	if cerr != nil {
+		c.customerJsonErr(500, 500, cerr.Error())
+		return
+	}
+	c.customerOk(map[string]interface{}{
+		"id":      supplierID,
+		"existed": existed,
+		"contacts": map[string]interface{}{
+			"inserted": inserted,
+			"merged":   merged,
+		},
+	})
+}
+
 // Create POST /backend/erp/customer
 func (c *BackendErpCustomerController) Create() {
 	claims, err := c.customerClaims()
diff --git a/go/controllers/backend_erp_supplier.go b/go/controllers/backend_erp_supplier.go
index 1799503..a98db17 100644
--- a/go/controllers/backend_erp_supplier.go
+++ b/go/controllers/backend_erp_supplier.go
@@ -134,8 +134,18 @@ func (c *BackendErpSupplierController) List() {
 		return
 	}
 
+	// 标记「同时也是客户」：同一家单位可能既是供应商又是客户，列表上直接可见，避免重复转化
+	alsoCustomer := partyNameExists(fmt.Sprintf("%d", claims.TenantId), "customer", collectSupplierNames(list))
+	rows := make([]supplierListRow, 0, len(list))
+	for _, r := range list {
+		rows = append(rows, supplierListRow{
+			TenantCrmSupplier: r,
+			AlsoCustomer:      alsoCustomer[strings.TrimSpace(r.SupplierName)],
+		})
+	}
+
 	c.supplierOk(map[string]interface{}{
-		"list":     list,
+		"list":     rows,
 		"total":    total,
 		"page":     page,
 		"pageSize": pageSize,
@@ -170,6 +180,48 @@ func (c *BackendErpSupplierController) Detail() {
 	c.supplierOk(supplier)
 }
 
+// ConvertToCustomer POST /backend/erp/supplier/:id/convert-customer
+// 供应商转客户：把供应商档案（含联系人）复制一套到客户库。
+// 同一家单位可能既是客户又是供应商，因此原供应商记录保留、不删除；
+// 客户库已存在同名企业时不重复建档，只把联系人补同步过去。
+func (c *BackendErpSupplierController) ConvertToCustomer() {
+	claims, err := c.supplierClaims()
+	if err != nil {
+		c.supplierJsonErr(401, 401, err.Error())
+		return
+	}
+	id, _ := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
+	if id == 0 {
+		c.supplierJsonErr(400, 400, "无效的ID")
+		return
+	}
+
+	tenantID := fmt.Sprintf("%d", claims.TenantId)
+	var supplier models.TenantCrmSupplier
+	if err := models.Orm.QueryTable(new(models.TenantCrmSupplier)).
+		Filter("id", id).
+		Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).
+		One(&supplier); err != nil {
+		c.supplierJsonErr(404, 404, "供应商未找到")
+		return
+	}
+
+	existed, customerID, inserted, merged, cerr := convertSupplierToCustomer(tenantID, &supplier, claims)
+	if cerr != nil {
+		c.supplierJsonErr(500, 500, cerr.Error())
+		return
+	}
+	c.supplierOk(map[string]interface{}{
+		"id":      customerID,
+		"existed": existed,
+		"contacts": map[string]interface{}{
+			"inserted": inserted,
+			"merged":   merged,
+		},
+	})
+}
+
 // Create POST /backend/erp/supplier
 func (c *BackendErpSupplierController) Create() {
 	claims, err := c.supplierClaims()
diff --git a/go/docs/sql/alter_backend_crm_product_dev_mode.sql b/go/docs/sql/alter_backend_crm_product_dev_mode.sql
new file mode 100644
index 0000000..9088cc1
--- /dev/null
+++ b/go/docs/sql/alter_backend_crm_product_dev_mode.sql
@@ -0,0 +1,20 @@
+-- =============================================================
+-- Product dev_mode: distinguish self-developed vs outsourced
+-- (software development has two kinds: developed by ourselves,
+--  or developed by others for us)
+-- Table: yz_backend_crm_product
+--   dev_mode varchar(20) NOT NULL DEFAULT 'self'
+--     'self'      -> developed in-house (default)
+--     'outsource' -> outsourced / developed by others for us
+-- Note: the server also auto-adds this column on startup
+--       (models.EnsureCrmProductDevColumns); this file is only
+--       for manual repair. Re-running reports
+--       "Duplicate column name", which is safe.
+-- Run: mysql -h<host> -P<port> -u<user> -p <db> < alter_backend_crm_product_dev_mode.sql
+-- NOTE: keep this file ASCII-only; piping through some shells mangles non-ASCII.
+-- =============================================================
+
+ALTER TABLE `yz_backend_crm_product`
+  ADD COLUMN `dev_mode` VARCHAR(20) NOT NULL DEFAULT 'self'
+  COMMENT 'software dev mode: self in-house / outsource developed by others'
+  AFTER `dev_unit_price`;
diff --git a/go/docs/sql/alter_contact_mobiles.sql b/go/docs/sql/alter_contact_mobiles.sql
new file mode 100644
index 0000000..f52b0ac
--- /dev/null
+++ b/go/docs/sql/alter_contact_mobiles.sql
@@ -0,0 +1,48 @@
+-- =============================================================
+-- Contacts: support multiple mobile numbers (a person may have several)
+-- Tables:
+--   1) yz_backend_crm_entity_contact : contacts of clue / business / project
+--   2) yz_backend_erp_contact        : global address book contacts
+--   3) yz_backend_contact_company    : company contacts (customers/suppliers),
+--      shared by project contact picker / address book / customer-supplier
+--      conversion. This one was missed before: without the column any SELECT
+--      fails and contact lists show as empty (fixed by the server-side
+--      migration EnsureErpCompanyContactMobilesColumn on startup).
+-- All tables get a new column `mobiles` (TEXT, JSON array, max 5).
+-- The old `mobile` / `phone` column keeps the FIRST number for backward
+-- compatibility (list display, phone-based dedupe on sync), and existing
+-- single numbers are backfilled into `mobiles`.
+-- Run: mysql -h<host> -P<port> -u<user> -p <db> < alter_contact_mobiles.sql
+--      (re-running only reports "Duplicate column name", which is safe)
+-- NOTE: keep this file ASCII-only; piping through some shells mangles non-ASCII.
+-- =============================================================
+
+-- 1) clue / business / project contacts
+ALTER TABLE `yz_backend_crm_entity_contact`
+  ADD COLUMN `mobiles` TEXT NULL COMMENT 'phones in JSON array, max 5' AFTER `mobile`;
+
+-- backfill existing single number as a one-element JSON array
+UPDATE `yz_backend_crm_entity_contact`
+   SET `mobiles` = JSON_ARRAY(`mobile`)
+ WHERE (`mobiles` IS NULL OR `mobiles` = '')
+   AND `mobile` IS NOT NULL AND `mobile` <> '';
+
+-- 2) global address book contacts
+ALTER TABLE `yz_backend_erp_contact`
+  ADD COLUMN `mobiles` TEXT NULL COMMENT 'phones in JSON array, max 5' AFTER `phone`;
+
+UPDATE `yz_backend_erp_contact`
+   SET `mobiles` = JSON_ARRAY(`phone`)
+ WHERE (`mobiles` IS NULL OR `mobiles` = '')
+   AND `phone` IS NOT NULL AND `phone` <> '';
+
+-- 3) company contacts (customers / suppliers) - shared by project contact
+--    picker / address book / customer-supplier conversion.
+--    NOTE: also auto-added on server startup (EnsureErpCompanyContactMobilesColumn).
+ALTER TABLE `yz_backend_contact_company`
+  ADD COLUMN `mobiles` TEXT NULL COMMENT 'phones in JSON array, max 5' AFTER `phone`;
+
+UPDATE `yz_backend_contact_company`
+   SET `mobiles` = JSON_ARRAY(`phone`)
+ WHERE (`mobiles` IS NULL OR `mobiles` = '')
+   AND `phone` IS NOT NULL AND `phone` <> '';
diff --git a/go/docs/sql/alter_crm_product_category_default.sql b/go/docs/sql/alter_crm_product_category_default.sql
new file mode 100644
index 0000000..743ccc0
--- /dev/null
+++ b/go/docs/sql/alter_crm_product_category_default.sql
@@ -0,0 +1,21 @@
+-- =============================================================
+-- CRM product categories: system default category "未分类"
+-- Table: yz_backend_crm_product_category
+--   is_default = 1 -> system default category ("未分类"): kept by
+--                     the system, cannot be edited or deleted,
+--                     sort pinned to the top (-1)
+--   is_default = 0 -> tenant custom category (full CRUD)
+-- Existing "未分类" rows (if any) are marked as default below;
+-- the backend also self-heals the flag and creates the record
+-- on first use after upgrade.
+-- Run: mysql --default-character-set=utf8mb4 -h<host> -P<port> -u<user> -p <db> < alter_crm_product_category_default.sql
+--      (re-running only reports "Duplicate column name", which is safe)
+-- =============================================================
+
+ALTER TABLE `yz_backend_crm_product_category`
+  ADD COLUMN `is_default` TINYINT NOT NULL DEFAULT 0 COMMENT '1=system default category (read-only), 0=tenant custom' AFTER `status`;
+
+-- Mark existing default category (same name as backend default) and pin it to the top
+UPDATE `yz_backend_crm_product_category`
+   SET `is_default` = 1, `sort` = -1
+ WHERE `name` = '未分类';
diff --git a/go/docs/sql/alter_crm_unit_default.sql b/go/docs/sql/alter_crm_unit_default.sql
new file mode 100644
index 0000000..18825a5
--- /dev/null
+++ b/go/docs/sql/alter_crm_unit_default.sql
@@ -0,0 +1,19 @@
+-- =============================================================
+-- CRM units: mark system default units as not editable/deletable
+-- Table: yz_backend_crm_unit
+--   is_default = 1 -> system default unit (seeded by the system,
+--                     cannot be edited or deleted by tenants)
+--   is_default = 0 -> tenant custom unit (full CRUD)
+-- Existing seeded default units (matched by name) are marked below;
+-- the backend also self-heals the flag on first use after upgrade.
+-- Run: mysql --default-character-set=utf8mb4 -h<host> -P<port> -u<user> -p <db> < alter_crm_unit_default.sql
+--      (re-running only reports "Duplicate column name", which is safe)
+-- =============================================================
+
+ALTER TABLE `yz_backend_crm_unit`
+  ADD COLUMN `is_default` TINYINT NOT NULL DEFAULT 0 COMMENT '1=system default unit (read-only), 0=tenant custom' AFTER `status`;
+
+-- Mark seeded default units (same list as backend crmDefaultUnits)
+UPDATE `yz_backend_crm_unit`
+   SET `is_default` = 1
+ WHERE `name` IN ('套', '台', '个', '件', '批', '次', '项', '人月', '人天', '年', '月', '米', '平方米', '吨', '千克', '箱');
diff --git a/go/docs/sql/alter_payback_record_item.sql b/go/docs/sql/alter_payback_record_item.sql
new file mode 100644
index 0000000..6185d65
--- /dev/null
+++ b/go/docs/sql/alter_payback_record_item.sql
@@ -0,0 +1,16 @@
+-- =============================================================
+-- Payback records: mark which plan item (progress node / period)
+-- a received payment belongs to, so payments can be registered
+-- per progress node and shown as tree children under the plan.
+-- Table: yz_backend_crm_payback_record
+--   item_seq  : seq of the plan items entry (1-based), 0 = not specified
+--   item_name : node name snapshot (e.g. "预付款")
+-- Run: mysql -h<host> -P<port> -u<user> -p <db> < alter_payback_record_item.sql
+--      (re-running only reports "Duplicate column name", which is safe)
+-- =============================================================
+
+ALTER TABLE `yz_backend_crm_payback_record`
+  ADD COLUMN `item_seq` INT NOT NULL DEFAULT 0 COMMENT 'plan item seq (1-based), 0 = not specified' AFTER `payback_id`;
+
+ALTER TABLE `yz_backend_crm_payback_record`
+  ADD COLUMN `item_name` VARCHAR(50) NULL COMMENT 'plan item name snapshot' AFTER `item_seq`;
diff --git a/go/docs/sql/alter_project_contacts.sql b/go/docs/sql/alter_project_contacts.sql
new file mode 100644
index 0000000..3876847
--- /dev/null
+++ b/go/docs/sql/alter_project_contacts.sql
@@ -0,0 +1,21 @@
+-- =============================================================
+-- Project contacts: pick contacts from the linked companies
+-- (a project no longer shows ALL contacts of the customer)
+-- Table: yz_backend_crm_project
+--   1) upstream_contact_ids   : JSON array of contact IDs picked from
+--                               the customer's address book (upstream).
+--   2) downstream_contact_ids : JSON array of contact IDs picked from
+--                               the counterpart's address book
+--                               (downstream for type=2 / midstream for type=3).
+-- Contact details always come from yz_backend_erp_contact in real time;
+-- only the picked ID references are stored here. Empty array -> ''.
+-- Run: mysql -h<host> -P<port> -u<user> -p <db> < alter_project_contacts.sql
+--      (re-running only reports "Duplicate column name", which is safe)
+-- NOTE: keep this file ASCII-only; piping through some shells mangles non-ASCII.
+-- =============================================================
+
+ALTER TABLE `yz_backend_crm_project`
+  ADD COLUMN `upstream_contact_ids` TEXT NULL COMMENT 'picked contact IDs (JSON array) from customer address book' AFTER `downstream_phone`;
+
+ALTER TABLE `yz_backend_crm_project`
+  ADD COLUMN `downstream_contact_ids` TEXT NULL COMMENT 'picked contact IDs (JSON array) from counterpart address book (downstream/midstream)' AFTER `upstream_contact_ids`;
diff --git a/go/main.go b/go/main.go
index 4251303..039dc64 100644
--- a/go/main.go
+++ b/go/main.go
@@ -30,5 +30,8 @@ func main() {
 	// 启动自有域名证书续期任务（到期前 30 天自动续签 Let's Encrypt 证书）
 	services.StartCertRenewScheduler(make(chan struct{}))
 
+	// 启动回款逾期联动任务（回款逾期 → 合同「异常」→ 关联项目「异常」）
+	services.StartPaybackOverdueScheduler(make(chan struct{}))
+
 	beego.Run()
 }
diff --git a/go/models/contact.go b/go/models/contact.go
index 3845653..a3e3683 100644
--- a/go/models/contact.go
+++ b/go/models/contact.go
@@ -12,7 +12,9 @@ type BackendErpContact struct {
 	ContactType   int8       `orm:"column(contact_type);default(1)" json:"contact_type"`
 	ContactName   string     `orm:"column(contact_name);size(64)" json:"contact_name"`
 	Gender        int8       `orm:"column(gender);default(0)" json:"gender"`
-	Phone         *string    `orm:"column(phone);size(20);null" json:"phone"`
+	Phone         *string    `orm:"column(phone);size(20);null" json:"phone"` // 手机号（保留第一个，兼容旧逻辑）
+	// 手机号可登记多个（有的人有多个号码）：JSON 数组，最多 5 个，phone 始终与其中一个（第一个）保持一致
+	Mobiles       *string    `orm:"column(mobiles);type(text);null" json:"mobiles"`
 	WorkPhone     *string    `orm:"column(work_phone);size(20);null" json:"work_phone"`
 	Email         *string    `orm:"column(email);size(128);null" json:"email"`
 	Wechat        *string    `orm:"column(wechat);size(64);null" json:"wechat"`
diff --git a/go/models/init.go b/go/models/init.go
index 7fddd5f..72fd3e7 100644
--- a/go/models/init.go
+++ b/go/models/init.go
@@ -156,6 +156,7 @@ func Init(_ string) {
 	EnsureCrmPaybackRecordTable()
 	EnsureCrmProductDevColumns()
 	EnsureCrmUnitTable()
+	EnsureErpCompanyContactMobilesColumn()
 }
 
 // EnsureCrmPaybackTable 回款计划表建表（CREATE TABLE IF NOT EXISTS，可重复执行；
@@ -278,7 +279,7 @@ func EnsureCrmContractTable() {
   total_amount decimal(14,2) NOT NULL DEFAULT '0.00' COMMENT '合同总金额',
   total_cost decimal(14,2) NOT NULL DEFAULT '0.00' COMMENT '产品总成本',
   total_profit decimal(14,2) NOT NULL DEFAULT '0.00' COMMENT '合同总利润',
-  status tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态：1草稿/2已完成/3已作废/4履约中/5执行异常',
+  status tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态：1草稿/2已完成/3已作废/4履约中/5异常',
   step tinyint(4) NOT NULL DEFAULT '1' COMMENT '进度步骤：1合同信息/2产品清单',
   remark text COMMENT '备注',
   create_user_id varchar(64) NOT NULL DEFAULT '' COMMENT '创建人用户ID',
@@ -335,13 +336,30 @@ func EnsureCrmUnitTable() {
 	}
 }
 
-// EnsureCrmProductDevColumns 补齐产品表的软件开发字段（line_type / dev_unit_price / dev_tree）；
+// EnsureErpCompanyContactMobilesColumn 补齐公司联系人表（yz_backend_contact_company）的多手机号字段 mobiles。
+// 该表为客户/供应商正式联系人的共用库（项目联系人选择、通讯录、客户-供应商转化等均读取），
+// 早期多手机号升级遗漏了此表，缺列会导致查询报错（前端表现为「联系人不显示」）。
+// 表不存在或列已存在时忽略错误，可用 docs/sql/alter_contact_mobiles.sql 手动修复。
+func EnsureErpCompanyContactMobilesColumn() {
+	table := new(ErpCompanyContact).TableName()
+	sql := fmt.Sprintf("ALTER TABLE %s ADD COLUMN mobiles text NULL COMMENT '手机号 JSON 数组（最多5个），phone 保留座机语义'", table)
+	if _, err := Orm.Raw(sql).Exec(); err != nil {
+		// 列已存在或表不存在时忽略
+		return
+	}
+	// 历史数据回填：原 phone 中的号码作为第一个手机号（仅在 mobiles 为空时）
+	_, _ = Orm.Raw("UPDATE " + table +
+		" SET mobiles = JSON_ARRAY(phone) WHERE (mobiles IS NULL OR mobiles = '') AND phone IS NOT NULL AND phone <> ''").Exec()
+}
+
+// EnsureCrmProductDevColumns 补齐产品表的软件开发字段（line_type / dev_unit_price / dev_mode / dev_tree）；
 // 表不存在或列已存在时忽略错误，可用 docs/sql/alter_backend_crm_product_dev_columns.sql 手动修复。
 func EnsureCrmProductDevColumns() {
 	table := new(TenantCrmProduct).TableName()
 	cols := []string{
 		"line_type varchar(20) NOT NULL DEFAULT 'product' COMMENT '行类型：product成品/dev软件开发'",
 		"dev_unit_price decimal(14,2) NOT NULL DEFAULT '0.00' COMMENT '软件开发统一人天单价'",
+		"dev_mode varchar(20) NOT NULL DEFAULT 'self' COMMENT '软件开发研发方式：self自行研发/outsource外协研发'",
 		"dev_tree text COMMENT '软件开发模块树JSON（叶子人天×统一人天单价）'",
 	}
 	for _, col := range cols {
@@ -353,9 +371,6 @@ func EnsureCrmProductDevColumns() {
 	}
 }
 
-
-
-
 // EnsureCrmCreateUserColumn 补齐客户/供应商的创建人字段（用于删除权限校验）。
 // 同样兼容历史表名差异，表不存在或列已存在时忽略错误。
 func EnsureCrmCreateUserColumn() {
diff --git a/go/models/tenant_crm_clue.go b/go/models/tenant_crm_clue.go
index 260a63b..6e49135 100644
--- a/go/models/tenant_crm_clue.go
+++ b/go/models/tenant_crm_clue.go
@@ -22,7 +22,7 @@ type TenantCrmClue struct {
 	ContactWechat   string     `orm:"column(contact_wechat);size(64)" json:"contact_wechat"`  // 对接人微信
 	ContactQQ       string     `orm:"column(contact_qq);size(20)" json:"contact_qq"`          // 对接人QQ
 	Address         string     `orm:"column(address);size(255)" json:"address"`               // 公司地址
-	Status          int8       `orm:"column(status);default(1)" json:"status"`                // 1跟进中/2已转化/3已关闭
+	Status          int8       `orm:"column(status);default(1)" json:"status"`                // 1跟进中/2已转化/3已废弃
 	Locked          int8       `orm:"column(locked);default(0)" json:"locked"`                // 0否/1是（转化后锁定不可编辑）
 	BusinessID      *uint64    `orm:"column(business_id);null" json:"business_id"`            // 转化后的商机ID
 	ConvertTime     *time.Time `orm:"column(convert_time);type(datetime);null" json:"convert_time"` // 转化时间
diff --git a/go/models/tenant_crm_contract.go b/go/models/tenant_crm_contract.go
index aefa242..7b3379d 100644
--- a/go/models/tenant_crm_contract.go
+++ b/go/models/tenant_crm_contract.go
@@ -13,8 +13,8 @@ import "time"
 type TenantCrmContract struct {
 	ID               uint64     `orm:"column(id);pk;auto" json:"id"`
 	TenantID         string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
-	ContractNo       string     `orm:"column(contract_no);size(50)" json:"contract_no"`         // 合同编号
-	ContractName     string     `orm:"column(contract_name);size(100)" json:"contract_name"`    // 合同名称
+	ContractNo       string     `orm:"column(contract_no);size(50)" json:"contract_no"`             // 合同编号
+	ContractName     string     `orm:"column(contract_name);size(100)" json:"contract_name"`        // 合同名称
 	ContractCategory string     `orm:"column(contract_category);size(20)" json:"contract_category"` // 分类：1开发/2服务/3销售/4租赁/5采购/6运维/7咨询/8其他
 	OurRole          int8       `orm:"column(our_role);default(2)" json:"our_role"`                 // 我方角色：1甲方/2乙方/3丙方/4丁方
 	PartyCount       int8       `orm:"column(party_count);default(2)" json:"party_count"`           // 合同形式：2/3/4 方
@@ -33,7 +33,7 @@ type TenantCrmContract struct {
 	TotalAmount      float64    `orm:"column(total_amount);digits(14);decimals(2);default(0)" json:"total_amount"`
 	TotalCost        float64    `orm:"column(total_cost);digits(14);decimals(2);default(0)" json:"total_cost"`
 	TotalProfit      float64    `orm:"column(total_profit);digits(14);decimals(2);default(0)" json:"total_profit"`
-	Status           int8       `orm:"column(status);default(1)" json:"status"` // 1草稿/2已完成/3已作废/4履约中/5执行异常
+	Status           int8       `orm:"column(status);default(1)" json:"status"` // 1草稿/2已完成/3已作废/4履约中/5异常
 	Step             int8       `orm:"column(step);default(1)" json:"step"`     // 进度式创建步骤：1合同信息/2产品清单
 	Remark           string     `orm:"column(remark);type(text);null" json:"remark"`
 	CreateUserID     string     `orm:"column(create_user_id);size(64)" json:"create_user_id"`
diff --git a/go/models/tenant_crm_entity_contact.go b/go/models/tenant_crm_entity_contact.go
index b76ae71..e3717b9 100644
--- a/go/models/tenant_crm_entity_contact.go
+++ b/go/models/tenant_crm_entity_contact.go
@@ -11,7 +11,9 @@ type TenantCrmEntityContact struct {
 	RelatedID   uint64     `orm:"column(related_id)" json:"related_id"`
 	ContactName string     `orm:"column(contact_name);size(50)" json:"contact_name"`
 	Position    string     `orm:"column(position);size(50)" json:"position"`
-	Mobile      string     `orm:"column(mobile);size(20)" json:"mobile"`
+	Mobile      string     `orm:"column(mobile);size(20)" json:"mobile"` // 手机号（保留第一个，兼容旧逻辑）
+	// 手机号可登记多个（有的人有多个号码）：JSON 数组，最多 5 个，mobile 始终与其中一个（第一个）保持一致
+	Mobiles     string     `orm:"column(mobiles);type(text);null" json:"mobiles"`
 	Wechat      string     `orm:"column(wechat);size(64)" json:"wechat"`
 	QQ          string     `orm:"column(qq);size(20)" json:"qq"`
 	Email       string     `orm:"column(email);size(100)" json:"email"`
diff --git a/go/models/tenant_crm_payback_record.go b/go/models/tenant_crm_payback_record.go
index 3ce51e3..f36c184 100644
--- a/go/models/tenant_crm_payback_record.go
+++ b/go/models/tenant_crm_payback_record.go
@@ -9,12 +9,17 @@ import "time"
 //     contract_id 冗余存储，便于按合同直接查询进度列表；
 //   - 每次「新建回款」追加一条记录，构成回款进度（一笔笔实际到账），
 //     与计划内的 items（计划分期）区分开：前者是实际发生，后者是计划安排；
-//   - 计划表 received_amount 由本表记录金额汇总回写（refreshPlanReceived）。
+//   - 计划表 received_amount 由本表记录金额汇总回写（refreshPlanReceived）；
+//   - item_seq / item_name 标记本笔回款对应的计划明细节点（进度 / 分期）：
+//     item_seq 对应计划 items 中的 seq（1-based），0=未指定（按整单登记）；
+//     item_name 为节点名称快照，便于明细节点被改动后仍可追溯。
 type TenantCrmPaybackRecord struct {
 	ID            uint64     `orm:"column(id);pk;auto" json:"id"`
 	TenantID      string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
 	ContractID    *uint64    `orm:"column(contract_id);null" json:"contract_id"` // 关联合同ID
 	PaybackID     uint64     `orm:"column(payback_id)" json:"payback_id"`         // 关联回款计划ID
+	ItemSeq       int        `orm:"column(item_seq);default(0)" json:"item_seq"`  // 对应计划明细序号（1-based），0=未指定
+	ItemName      string     `orm:"column(item_name);size(50)" json:"item_name"`  // 计划明细节点名称快照
 	Amount        float64    `orm:"column(amount);digits(14);decimals(2);default(0)" json:"amount"` // 本次回款金额
 	ReceivedDate  string     `orm:"column(received_date);size(20)" json:"received_date"`            // 回款日期 YYYY-MM-DD
 	PayMethod     int8       `orm:"column(pay_method);default(1)" json:"pay_method"`                // 回款方式：1对公/2网银/3现金/4支票/5支付宝/6微信/7其他
diff --git a/go/models/tenant_crm_product.go b/go/models/tenant_crm_product.go
index d35d85c..7e0ad6e 100644
--- a/go/models/tenant_crm_product.go
+++ b/go/models/tenant_crm_product.go
@@ -23,6 +23,7 @@ type TenantCrmProduct struct {
 	TaxRate      float64    `orm:"column(tax_rate);digits(6);decimals(2);default(0)" json:"tax_rate"`       // 税率(%)
 	LineType     string  `orm:"column(line_type);size(20);default(product)" json:"line_type"`                 // 行类型 product/dev
 	DevUnitPrice float64 `orm:"column(dev_unit_price);digits(14);decimals(2);default(0)" json:"dev_unit_price"` // 软件开发统一人天单价
+	DevMode      string  `orm:"column(dev_mode);size(20);default(self)" json:"dev_mode"`                       // 软件开发研发方式：self自行研发/outsource外协研发（别人帮我们研发）
 	DevTree      string  `orm:"column(dev_tree);type(text);null" json:"dev_tree"`                            // 软件开发模块树JSON文本
 	Status       int8       `orm:"column(status);default(1)" json:"status"`             // 1启用/0停用
 	ProjectID    *uint64    `orm:"column(project_id);null" json:"project_id"`           // 来源项目ID（由项目生成时填入）
diff --git a/go/models/tenant_crm_product_category.go b/go/models/tenant_crm_product_category.go
index 1a36501..6bd6201 100644
--- a/go/models/tenant_crm_product_category.go
+++ b/go/models/tenant_crm_product_category.go
@@ -6,14 +6,16 @@ import "time"
 //
 // 说明：
 //   - 与 CMS 产品分类类似，是 CRM 产品台账的产品归类（如：服务器类 / 软件许可 / 实施服务 等）；
-//   - 产品表单的「产品分类」下拉取自该表；status 1启用/0停用。
+//   - 产品表单的「产品分类」下拉取自该表；status 1启用/0停用；
+//   - is_default 1=系统默认分类（「未分类」，由系统确保存在，不可编辑、不可删除，排序置顶）/0=租户自定义分类（可增删改）。
 type TenantCrmProductCategory struct {
 	ID         uint64     `orm:"column(id);pk;auto" json:"id"`
 	TenantID   string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
-	Name       string     `orm:"column(name);size(100)" json:"name"`         // 分类名称
-	Code       string     `orm:"column(code);size(50)" json:"code"`          // 分类编码（选填）
-	Sort       int        `orm:"column(sort);default(0)" json:"sort"`        // 排序
-	Status     int8       `orm:"column(status);default(1)" json:"status"`    // 1启用/0停用
+	Name       string     `orm:"column(name);size(100)" json:"name"`            // 分类名称
+	Code       string     `orm:"column(code);size(50)" json:"code"`             // 分类编码（选填）
+	Sort       int        `orm:"column(sort);default(0)" json:"sort"`           // 排序
+	Status     int8       `orm:"column(status);default(1)" json:"status"`       // 1启用/0停用
+	IsDefault  int8       `orm:"column(is_default);default(0)" json:"is_default"` // 1系统默认（不可编辑/删除）/0租户自定义
 	Remark     string     `orm:"column(remark);type(text);null" json:"remark"`
 	CreateTime time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
 	UpdateTime time.Time  `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
diff --git a/go/models/tenant_crm_project.go b/go/models/tenant_crm_project.go
index 4d97dd1..75c6804 100644
--- a/go/models/tenant_crm_project.go
+++ b/go/models/tenant_crm_project.go
@@ -16,18 +16,20 @@ type TenantCrmProject struct {
 	OwnerUserName string  `orm:"column(owner_user_name);size(128)" json:"owner_user_name"`
 	Industry      string  `orm:"column(industry);size(50)" json:"industry"`
 	// 项目类型：1=单一项目（只有上游客户） 2=上下游项目（上游客户 + 下游供应商）
+	// 3=上中游项目（上游 A 公司 + 中游 B 公司，下游固定为本公司）
 	ProjectType int8 `orm:"column(project_type);default(1)" json:"project_type"`
-	// 下游主体：可从供应商库或客户库选择（supplier_ref_type + supplier_id 标明来源），也允许手工填写名称
+	// 对方主体（2=上下游项目的下游 / 3=上中游项目的中游）：可从供应商库或客户库选择（supplier_ref_type + supplier_id 标明来源），也允许手工填写名称
 	SupplierID       *uint64 `orm:"column(supplier_id);null" json:"supplier_id"`
 	SupplierRefType  int8    `orm:"column(supplier_ref_type);default(0)" json:"supplier_ref_type"` // 0未关联 1客户 2供应商
 	SupplierName     string  `orm:"column(supplier_name);size(100)" json:"supplier_name"`
 	SupplierIndustry string  `orm:"column(supplier_industry);size(50)" json:"supplier_industry"`
-	// 金额拆分为上下游：上游=对客户的收入，下游=对供应商的成本（上下游项目毛利 = 上游 - 下游）
+	// 金额拆分为上下游：上游=对客户的收入，下游=对供应商的成本（上下游项目毛利 = 上游 - 下游）；
+	// 上中游项目：上游=上游 A 公司合同额，下游字段存中游 B 公司（与我方）合同额
 	UpstreamAmount   float64 `orm:"column(upstream_amount);digits(14);decimals(2);default(0)" json:"upstream_amount"`
 	DownstreamAmount float64 `orm:"column(downstream_amount);digits(14);decimals(2);default(0)" json:"downstream_amount"`
 	// Amount 为旧「项目金额」列，已由 UpstreamAmount 取代；写入时始终同步为上游金额，仅作历史兼容
 	Amount    float64    `orm:"column(amount);digits(14);decimals(2);default(0)" json:"amount"`
-	Status int8 `orm:"column(status);default(1)" json:"status"` // 1未开始/2进行中/3已完成/4已暂停
+	Status int8 `orm:"column(status);default(1)" json:"status"` // 1未开始/2进行中/3已完成/4已暂停/5异常
 	// StartDate / EndDate 为旧的手工维护列，已改由关联合同自动汇总，保留仅用于兼容历史数据
 	StartDate *time.Time `orm:"column(start_date);type(date);null" json:"start_date"`
 	EndDate   *time.Time `orm:"column(end_date);type(date);null" json:"end_date"`
@@ -39,6 +41,12 @@ type TenantCrmProject struct {
 	UpstreamPhone     string `orm:"column(upstream_phone);size(20)" json:"upstream_phone"`
 	DownstreamContact string `orm:"column(downstream_contact);size(50)" json:"downstream_contact"`
 	DownstreamPhone   string `orm:"column(downstream_phone);size(20)" json:"downstream_phone"`
+	// 项目联系人：从对应企业通讯录中挑选的联系人ID集合（JSON 数组字符串，如 [1,5,8]，空为未选）。
+	// 上游=客户方（yz_backend_erp_contact.company_type=customer & company_id=customer_id）；
+	// 下游/中游=对方主体方（company_type 按 supplier_ref_type：1=customer 2=supplier，company_id=supplier_id）。
+	// 单一项目只使用上游集合；联系人详情实时来自企业通讯录，此处仅存 ID 引用。
+	UpstreamContactIDs   string `orm:"column(upstream_contact_ids);type(text);null" json:"upstream_contact_ids"`
+	DownstreamContactIDs string `orm:"column(downstream_contact_ids);type(text);null" json:"downstream_contact_ids"`
 	// 以下为旧版单一对接人信息，已被上下游对接人取代，仅保留列以兼容历史数据
 	ContactPerson   string `orm:"column(contact_person);size(50)" json:"contact_person"`
 	ContactPosition string `orm:"column(contact_position);size(50)" json:"contact_position"` // 对接人职位（已废弃）
diff --git a/go/models/tenant_crm_unit.go b/go/models/tenant_crm_unit.go
index 40b6226..acdc4e3 100644
--- a/go/models/tenant_crm_unit.go
+++ b/go/models/tenant_crm_unit.go
@@ -7,15 +7,17 @@ import "time"
 // 说明：
 //   - 维护产品、合同等业务使用的计量单位（套 / 台 / 个 / 人天 …）；
 //   - 在「CRM -> 基本设置 -> 单位设置」中维护，产品表单的「单位」下拉取自该表；
+//   - is_default 1=系统默认单位（由系统写入，不可编辑、不可删除）/0=租户自定义单位（可增删改）；
 //   - status 1启用/0停用；同租户下单位名称唯一（uk_tenant_name）。
 type TenantCrmUnit struct {
 	ID           uint64     `orm:"column(id);pk;auto" json:"id"`
 	TenantID     string     `orm:"column(tenant_id);size(64)" json:"tenant_id"`
-	Name         string     `orm:"column(name);size(20)" json:"name"`          // 单位名称
-	Code         string     `orm:"column(code);size(50)" json:"code"`          // 单位编码（选填）
-	Sort         int        `orm:"column(sort);default(0)" json:"sort"`        // 排序
-	Status       int8       `orm:"column(status);default(1)" json:"status"`    // 1启用/0停用
-	Remark       string     `orm:"column(remark);size(255)" json:"remark"`     // 备注
+	Name         string     `orm:"column(name);size(20)" json:"name"`           // 单位名称
+	Code         string     `orm:"column(code);size(50)" json:"code"`           // 单位编码（选填）
+	Sort         int        `orm:"column(sort);default(0)" json:"sort"`         // 排序
+	Status       int8       `orm:"column(status);default(1)" json:"status"`     // 1启用/0停用
+	IsDefault    int8       `orm:"column(is_default);default(0)" json:"is_default"` // 1系统默认（不可编辑/删除）/0租户自定义
+	Remark       string     `orm:"column(remark);size(255)" json:"remark"`      // 备注
 	CreateUserID string     `orm:"column(create_user_id);size(64)" json:"create_user_id"`
 	CreateTime   time.Time  `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
 	UpdateTime   time.Time  `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
diff --git a/go/routers/backend/backend.go b/go/routers/backend/backend.go
index e829292..dd6772d 100644
--- a/go/routers/backend/backend.go
+++ b/go/routers/backend/backend.go
@@ -371,6 +371,8 @@ func registerOrganizationRoutes(module string) {
 	beego.Router("/backend/erp/customer", &controllers.BackendErpCustomerController{}, "post:Create")
 	beego.Router("/backend/erp/customer/:id", &controllers.BackendErpCustomerController{}, "get:Detail;put:Update;delete:Delete")
 	beego.Router("/backend/erp/customer/:id/status", &controllers.BackendErpCustomerController{}, "post:ToggleStatus")
+	// 客户转供应商（把客户档案含联系人复制一套到供应商库，原客户保留）
+	beego.Router("/backend/erp/customer/:id/convert-supplier", &controllers.BackendErpCustomerController{}, "post:ConvertToSupplier")
 
 	// CRM联系人（客户/供应商对接人）
 	beego.Router("/backend/crm/contact/list", &controllers.BackendCrmContactController{}, "get:List")
@@ -400,6 +402,10 @@ func registerOrganizationRoutes(module string) {
 	beego.Router("/backend/crm/project/list", &controllers.BackendCrmProjectController{}, "get:List")
 	beego.Router("/backend/crm/project", &controllers.BackendCrmProjectController{}, "post:Create")
 	beego.Router("/backend/crm/project/:id", &controllers.BackendCrmProjectController{}, "get:Detail;put:Update;delete:Delete")
+	// 项目状态流转：1未开始 / 2进行中 / 3已完成 / 4已暂停 / 5异常
+	beego.Router("/backend/crm/project/:id/status", &controllers.BackendCrmProjectController{}, "post:ChangeStatus")
+	// 项目联系人：从对应企业通讯录中挑选（上游=客户方，下游/中游=对方主体方），支持多选
+	beego.Router("/backend/crm/project/:id/contacts", &controllers.BackendCrmProjectController{}, "post:SaveContacts")
 
 	// CRM产品管理（产品台账/目录；可由项目生成时写入）
 	beego.Router("/backend/crm/product/list", &controllers.BackendCrmProductController{}, "get:List")
@@ -472,6 +478,8 @@ func registerOrganizationRoutes(module string) {
 	beego.Router("/backend/erp/supplier", &controllers.BackendErpSupplierController{}, "post:Create")
 	beego.Router("/backend/erp/supplier/:id", &controllers.BackendErpSupplierController{}, "get:Detail;put:Update;delete:Delete")
 	beego.Router("/backend/erp/supplier/:id/status", &controllers.BackendErpSupplierController{}, "post:ToggleStatus")
+	// 供应商转客户（把供应商档案含联系人复制一套到客户库，原供应商保留）
+	beego.Router("/backend/erp/supplier/:id/convert-customer", &controllers.BackendErpSupplierController{}, "post:ConvertToCustomer")
 
 	// ERP账套管理
 	beego.Router("/backend/erp/account-set/list", &controllers.BackendErpAccountSetController{}, "get:List")
diff --git a/go/services/payback_overdue_scheduler.go b/go/services/payback_overdue_scheduler.go
new file mode 100644
index 0000000..b522ecd
--- /dev/null
+++ b/go/services/payback_overdue_scheduler.go
@@ -0,0 +1,193 @@
+package services
+
+import (
+	"encoding/json"
+	"strings"
+	"time"
+
+	"server/models"
+)
+
+// ============================== 回款逾期联动 ==============================
+// 规则：回款计划存在「未收齐且已过计划回款日期」的明细（即逾期）时，
+//   - 对应合同状态置为「异常」(5)；已作废(3)合同不标记，已是异常(5)时幂等跳过；
+//   - 合同关联的项目状态联动置为「异常」(5)；已是异常(5)时幂等跳过。
+//
+// 已收齐判定与「新建回款」机制一致：
+//   - 回款记录按 item_seq 汇总（当前机制）；
+//   - 明细行内 received_amount（历史「进度登记」机制）。
+//
+// 说明：回款补齐后不自动恢复状态（无法区分「逾期导致的异常」与人工标注），
+// 需要恢复时在「状态流转」中手动调整即可。
+
+// paybackSchedulerItem 回款计划明细（items JSON 元素，仅取判定所需字段）。
+type paybackSchedulerItem struct {
+	Seq            int     `json:"seq"`
+	Amount         float64 `json:"amount"`
+	PlanDate       string  `json:"plan_date"`
+	ReceivedAmount float64 `json:"received_amount"` // 历史「进度登记」机制写入的已回款
+}
+
+// StartPaybackOverdueScheduler 启动回款逾期联动调度器：
+// 启动 30 秒后执行首次扫描（尽快让历史逾期数据生效），此后每 10 分钟扫描一次。
+func StartPaybackOverdueScheduler(stopChan chan struct{}) {
+	go func() {
+		select {
+		case <-time.After(30 * time.Second):
+			syncPaybackOverdueStatuses()
+		case <-stopChan:
+			return
+		}
+		ticker := time.NewTicker(10 * time.Minute)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-ticker.C:
+				syncPaybackOverdueStatuses()
+			case <-stopChan:
+				return
+			}
+		}
+	}()
+}
+
+// syncPaybackOverdueStatuses 扫描全部未收齐的回款计划并执行逾期联动，返回 (合同更新数, 项目更新数)。
+func syncPaybackOverdueStatuses() (int, int) {
+	if models.Orm == nil {
+		return 0, 0
+	}
+	today := time.Now().Format("2006-01-02")
+	// 未收齐的计划（status=2 已完成跳过；items 为空时无逾期概念）
+	var plans []models.TenantCrmPayback
+	if _, err := models.Orm.QueryTable(new(models.TenantCrmPayback)).
+		Filter("delete_time__isnull", true).
+		Filter("status__ne", 2).
+		All(&plans, "id", "tenant_id", "contract_id", "items"); err != nil {
+		return 0, 0
+	}
+	contractUpdated, projectUpdated := 0, 0
+	now := time.Now()
+	handledContracts := make(map[uint64]bool) // 同一合同只处理一次
+	for _, plan := range plans {
+		if plan.ContractID == nil || *plan.ContractID == 0 {
+			continue
+		}
+		contractID := *plan.ContractID
+		if handledContracts[contractID] {
+			continue
+		}
+		if !paybackPlanOverdueFor(plan, today) {
+			continue
+		}
+		handledContracts[contractID] = true
+		cu, pu := applyContractOverdue(plan.TenantID, contractID, now)
+		contractUpdated += cu
+		projectUpdated += pu
+	}
+	return contractUpdated, projectUpdated
+}
+
+// SyncPaybackOverdueForContract 立即检查指定合同的回款逾期联动
+// （供回款计划 / 回款记录变更后调用，让状态即时生效，无需等待定时扫描）。
+func SyncPaybackOverdueForContract(tenantID string, contractID uint64) {
+	if models.Orm == nil || contractID == 0 {
+		return
+	}
+	today := time.Now().Format("2006-01-02")
+	var plans []models.TenantCrmPayback
+	if _, err := models.Orm.QueryTable(new(models.TenantCrmPayback)).
+		Filter("tenant_id", tenantID).
+		Filter("contract_id", contractID).
+		Filter("delete_time__isnull", true).
+		Filter("status__ne", 2).
+		All(&plans, "id", "tenant_id", "contract_id", "items"); err != nil {
+		return
+	}
+	for _, plan := range plans {
+		if paybackPlanOverdueFor(plan, today) {
+			applyContractOverdue(tenantID, contractID, time.Now())
+			return
+		}
+	}
+}
+
+// paybackPlanOverdueFor 计划是否逾期：存在「未收齐」明细且计划回款日期已过。
+func paybackPlanOverdueFor(plan models.TenantCrmPayback, today string) bool {
+	items := make([]paybackSchedulerItem, 0)
+	if raw := strings.TrimSpace(plan.Items); raw != "" {
+		if err := json.Unmarshal([]byte(raw), &items); err != nil {
+			return false
+		}
+	}
+	if len(items) == 0 {
+		return false
+	}
+	// 回款记录按明细序号汇总（item_seq=0 视为整单登记，不计入任何明细）
+	receivedBySeq := make(map[int]float64)
+	var recs []models.TenantCrmPaybackRecord
+	_, _ = models.Orm.QueryTable(new(models.TenantCrmPaybackRecord)).
+		Filter("payback_id", plan.ID).
+		Filter("delete_time__isnull", true).
+		All(&recs, "item_seq", "amount")
+	for _, r := range recs {
+		if r.ItemSeq > 0 {
+			receivedBySeq[r.ItemSeq] += r.Amount
+		}
+	}
+	for _, it := range items {
+		received := receivedBySeq[it.Seq]
+		if it.ReceivedAmount > received {
+			received = it.ReceivedAmount
+		}
+		if it.Amount > 0 && received >= it.Amount {
+			continue // 已收齐
+		}
+		planDate := strings.TrimSpace(it.PlanDate)
+		if len(planDate) > 10 {
+			planDate = planDate[:10]
+		}
+		if planDate != "" && planDate < today {
+			return true
+		}
+	}
+	return false
+}
+
+// applyContractOverdue 合同置「异常」(5)，并联动项目置「异常」(5)。
+// 返回 (合同是否更新, 项目是否更新)。
+func applyContractOverdue(tenantID string, contractID uint64, now time.Time) (int, int) {
+	var contract models.TenantCrmContract
+	if err := models.Orm.QueryTable(new(models.TenantCrmContract)).
+		Filter("id", contractID).Filter("tenant_id", tenantID).
+		Filter("delete_time__isnull", true).One(&contract); err != nil {
+		return 0, 0
+	}
+	// 已作废合同不参与逾期提醒
+	if contract.Status == 3 {
+		return 0, 0
+	}
+	contractUpdated := 0
+	if contract.Status != 5 {
+		if _, err := models.Orm.QueryTable(new(models.TenantCrmContract)).
+			Filter("id", contractID).Filter("tenant_id", tenantID).
+			Update(map[string]interface{}{"status": int8(5), "update_time": now}); err != nil {
+			return 0, 0
+		}
+		contractUpdated = 1
+	}
+	// 合同关联项目联动置异常
+	projectUpdated := 0
+	if contract.ProjectID != nil && *contract.ProjectID > 0 {
+		var proj models.TenantCrmProject
+		if err := models.Orm.QueryTable(new(models.TenantCrmProject)).
+			Filter("id", *contract.ProjectID).Filter("tenant_id", tenantID).
+			Filter("delete_time__isnull", true).One(&proj); err == nil && proj.Status != 5 {
+			if _, err := models.Orm.QueryTable(new(models.TenantCrmProject)).
+				Filter("id", proj.ID).Filter("tenant_id", tenantID).
+				Update(map[string]interface{}{"status": int8(5), "update_time": now}); err == nil {
+				projectUpdated = 1
+			}
+		}
+	}
+	return contractUpdated, projectUpdated
+}