Merge branch 'refs/heads/feature/bfi-api-rate' into feature/hcs-api-p0-web

# Conflicts: # src/option/business/contract-manage.js
2026-10-15 04:13:05 +08:00
parent b7af496a43 7887ae2342
commit 7ea96bcdc0
120 changed files with 10791 additions and 2542 deletions
@@ -117,6 +117,7 @@ export const contractCategoryOptions = [
 export const signTypeOptions = [
  { label: '新签', value: '新签' },
  { label: '续签', value: '续签' },
+  { label: '补充协议', value: '补充协议' },
 ];

 export const contractStageOptions = [
@@ -6,6 +6,7 @@ import {
  contractStageOptions,
  createCrudOption,
  effectiveTypeOptions,
+  nonNegativeRule,
  hcsSyncStatusOptions,
  selectRule,
  signTypeOptions,
@@ -62,13 +63,14 @@ export const config = {
        ['contractNo', '合同编号'],
        ['contractName', '合同名称'],
        ['projectName', '所属项目'],
-        ['organizationName', '所属组织'],
+        ['organizationName', '合同负责部门'],
        ['contractCategory', '合同类别'],
        ['signType', '签约类型'],
        ['partyA', '甲方'],
        ['partyB', '乙方'],
        ['handlerUserName', '经办人'],
        ['signDate', '签订日期'],
+        ['applyDate', '申请日期'],
        ['contractFormat', '合同格式'],
        ['legalSealFlag', '是否需要加盖法人章'],
        ['copyCount', '一式（份）'],
@@ -77,7 +79,8 @@ export const config = {
        ['templateFlag', '是否范本'],
        ['originalContractNo', '原件合同编号'],
        ['electronicSealFlag', '是否电子章'],
-        ['remark', '备注', 2],
+        ['mainContent', '合同主要内容', 2],
+        ['remark', '其他事项说明', 2],
      ],
    },
    {
@@ -210,7 +213,7 @@ export const config = {
      label: '流程',
      statusProp: 'approvalStatus',
      status: ['approved', 'change_approved'],
-      stage: ['formal', 'terminated'],
+      stage: ['temporary', 'formal', 'terminated'],
      permission: 'contract_manage_view',
    },
    {
@@ -295,17 +298,17 @@ export const option = createCrudOption([
    display: false,
  },
  {
-    label: '所属组织',
+    label: '合同负责部门',
    prop: 'organizationName',
    search: true,
    searchOrder: 3,
    searchslot: true,
-    searchPlaceholder: '请选择 所属组织',
+    searchPlaceholder: '请选择 合同负责部门',
    formslot: true,
    order: 120,
    dicData: [],
    minWidth: 150,
-    rules: selectRule('所属组织'),
+    rules: selectRule('合同负责部门'),
  },
  {
    label: '合同类别',
@@ -436,6 +439,17 @@ export const option = createCrudOption([
    minWidth: 130,
    rules: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
  },
+  {
+    label: '申请日期',
+    prop: 'applyDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    sortable: true,
+    minWidth: 130,
+    addDisplay: false,
+    editDisplay: false,
+  },
  {
    label: '结算类型',
    prop: 'settlementMode',
@@ -469,11 +483,10 @@ export const option = createCrudOption([
      { label: '否', value: 0 },
      { label: '是', value: 1 },
    ],
-    value: 0,
+    clearable: true,
    hide: true,
    order: 70,
    minWidth: 100,
-    rules: selectRule('是否需要加盖法人章'),
  },
  {
    label: '一式（份）',
@@ -501,6 +514,10 @@ export const option = createCrudOption([
    hide: true,
    order: 45,
    minWidth: 130,
+    rules: [
+      { required: true, message: '请输入合同金额', trigger: 'blur' },
+      nonNegativeRule('合同金额'),
+    ],
  },
  {
    label: '是否范本',
@@ -631,7 +648,19 @@ export const option = createCrudOption([
    minWidth: 110,
  },
  {
-    label: '备注',
+    label: '合同主要内容',
+    prop: 'mainContent',
+    type: 'textarea',
+    span: 24,
+    minRows: 4,
+    hide: true,
+    order: 41,
+    maxlength: 1000,
+    showWordLimit: true,
+    rules: textRule('合同主要内容', 1000),
+  },
+  {
+    label: '其他事项说明',
    prop: 'remark',
    type: 'textarea',
    span: 24,
@@ -640,7 +669,7 @@ export const option = createCrudOption([
    order: 40,
    maxlength: 2000,
    showWordLimit: true,
-    rules: textRule('备注', 2000),
+    rules: textRule('其他事项说明', 2000),
  },
  {
    label: '',
@@ -72,7 +72,7 @@ export const config = {
      action: 'mkAudit',
      label: '流程',
      statusProp: 'approvalStatus',
-      status: ['reviewing', 'change_reviewing'],
+      status: ['reviewing', 'change_reviewing', 'approved', 'change_approved'],
      permission: 'project_apply_approve',
      mkOnly: true,
    },
@@ -186,7 +186,7 @@ export const option = createCrudOption([
    searchPlaceholder: '请输入',
    searchOrder: 8,
    minWidth: 150,
-    rules: textRule('平台公司', 50, true),
+    rules: textRule('平台公司', 500, true),
  },
  {
    label: '平台公司ID',
@@ -400,7 +400,6 @@ export const option = {
        span: 6,
        order: 350,
        minWidth: 150,
-        rules: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
      },
      {
        label: '计划结束日期',
@@ -411,7 +410,6 @@ export const option = {
        span: 6,
        order: 340,
        minWidth: 150,
-        rules: [{ required: true, message: '请选择计划结束日期', trigger: 'change' }],
      },
      {
        label: '数据来源',
@@ -98,6 +98,24 @@ const getProcessConfigNodes = row => {

 const isAcceptProcessNode = node => node.key === 'accept' || node.name === '接单';

+/**
+ * 过程节点列显示文案。
+ *
+ * 该列在库里存的是「原始值」，且历史上写入了两种格式：司机打卡推进写的是配置的
+ * key（unload / dispatch / load …），配载单新建默认值写的是中文名（接单）。
+ * 故这里按两种格式都认一次，认不出就原样显示，不把值吞掉。
+ *
+ * 运单创建后、司机首次打卡前该字段为空，属正常——显示「-」，避免留白看不出是没值还是没渲染。
+ */
+const formatCurrentProcessNode = row => {
+  const value = String(getFirstValue(row, ['currentProcessNode', 'currentNode']) || '').trim();
+  if (!value) return '-';
+  const node = getProcessConfigNodes(row).find(
+    item => item.key === value || item.name === value
+  );
+  return node?.name || node?.key || value;
+};
+
 const isTruthyFlag = value => {
  if (value === true || value === 1) return true;
  if (value === false || value === 0 || value === null || value === undefined || value === '') {
@@ -608,6 +626,7 @@ export const option = {
      {
        label: '过程节点',
        prop: 'currentProcessNode',
+        formatter: row => formatCurrentProcessNode(row),
        minWidth: 140,
        addDisplay: false,
        editDisplay: false,