Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/business/components/business-crud-page.vue
2026-08-25 00:11:14 +08:00
parent 1ef050dda6 21c4168867
commit e5992a0c63
36 changed files with 560 additions and 330 deletions
@@ -63,8 +63,8 @@ export const config = {
        ['signDate', '签订日期'],
        ['contractFormat', '合同格式'],
        ['legalSealFlag', '是否需要加盖法人章'],
-        ['copyCount', '一式'],
-        ['paymentDays', '回款账期'],
+        ['copyCount', '一式（份）'],
+        ['paymentDays', '回款账期（天）'],
        ['remark', '备注', 2],
      ],
    },
@@ -158,7 +158,7 @@ export const config = {
    },
    {
      action: 'startChange',
-      label: '发起变更',
+      label: '变更',
      statusProp: 'approvalStatus',
      status: ['approved'],
      stage: ['formal'],
@@ -167,7 +167,7 @@ export const config = {
    },
    {
      action: 'startChange',
-      label: '再次发起变更',
+      label: '变更',
      statusProp: 'approvalStatus',
      status: ['change_approved'],
      stage: ['formal'],
@@ -459,7 +459,7 @@ export const option = createCrudOption([
    rules: selectRule('是否需要加盖法人章'),
  },
  {
-    label: '一式',
+    label: '一式（份）',
    prop: 'copyCount',
    labelWidth: '72px',
    formslot: true,
@@ -468,7 +468,7 @@ export const option = createCrudOption([
    minWidth: 110,
  },
  {
-    label: '回款账期',
+    label: '回款账期（天）',
    prop: 'paymentDays',
    formslot: true,
    hide: true,
@@ -219,7 +219,7 @@ export const option = createCrudOption([
    minWidth: 120,
  },
  {
-    label: '项目资金使用额度(万元)',
+    label: '项目资金使用额度（万元）',
    prop: 'fundLimit',
    type: 'number',
    precision: 2,
@@ -228,7 +228,7 @@ export const option = createCrudOption([
    rules: amountRules('项目资金使用额度'),
  },
  {
-    label: '项目应收账款额度(万元)',
+    label: '项目应收账款额度（万元）',
    prop: 'receivableLimit',
    type: 'number',
    precision: 2,
@@ -237,7 +237,7 @@ export const option = createCrudOption([
    rules: amountRules('项目应收账款额度'),
  },
  {
-    label: '应收账款回款期限(天)',
+    label: '应收账款回款期限（天）',
    prop: 'receivableDays',
    type: 'number',
    hide: true,
@@ -245,7 +245,7 @@ export const option = createCrudOption([
    rules: [{ required: true, message: '请输入应收账款回款期限', trigger: 'blur' }],
  },
  {
-    label: '回款账期(天)',
+    label: '回款账期（天）',
    prop: 'paymentDays',
    type: 'number',
    hide: true,
@@ -311,7 +311,7 @@ export const option = createCrudOption([
    minWidth: 130,
  },
  {
-    label: '项目规模(万元)',
+    label: '项目规模（万元）',
    prop: 'projectScale',
    type: 'number',
    precision: 2,
@@ -320,7 +320,7 @@ export const option = createCrudOption([
    rules: [nonNegativeRule('项目规模')],
  },
  {
-    label: '预计利润(万元)',
+    label: '预计利润（万元）',
    prop: 'estimatedProfit',
    type: 'number',
    precision: 2,
@@ -329,7 +329,7 @@ export const option = createCrudOption([
    rules: [nonNegativeRule('预计利润')],
  },
  {
-    label: '资金需求(万元)',
+    label: '资金需求（万元）',
    prop: 'fundDemand',
    type: 'number',
    precision: 2,
@@ -15,6 +15,40 @@ const templateTypeOptions = [
 export const config = {
  title: '发货模板',
  permission: 'shipping_template',
+  detailButton: true,
+  detailButtonIgnoreDraftStatus: true,
+  detailSections: [
+    {
+      title: '模板信息',
+      fields: [
+        ['templateCode', '模板编号'],
+        ['templateName', '模板名称'],
+        ['templateType', '模板类型'],
+        ['transportType', '运输方式'],
+        ['remark', '备注', 2],
+      ],
+    },
+    {
+      title: '基本信息',
+      fields: [
+        ['projectName', '项目'],
+        ['contractName', '客户合同'],
+        ['transportType', '运输方式'],
+        ['basicRemark', '备注', 2],
+      ],
+    },
+    {
+      title: '收发货信息',
+      fields: [
+        ['departureContact', '发货联系人'],
+        ['departurePhone', '发货联系方式'],
+        ['departureAddress', '发货地址', 2],
+        ['arrivalContact', '收货联系人'],
+        ['arrivalPhone', '收货联系方式'],
+        ['arrivalAddress', '收货地址', 2],
+      ],
+    },
+  ],
  tableColumnOrder: [
    'templateCode',
    'templateName',
@@ -52,7 +52,7 @@ export const config = {
    {
      title: '申请信息',
      fields: [
-        ['applicationNo', '申请单号', 2],
+        ['applicationNo', '申请单号', 1],
        ['projectName', '项目', 1],
        ['projectCode', '项目编号', 1],
        ['undertakeDeptName', '承办部门', 1],
@@ -62,7 +62,7 @@ export const config = {
        ['currentNode', '当前节点', 1],
        ['currentProcessor', '当前处理人', 1],
        ['validUntil', '申请有效期至', 1],
-        ['remark', '备注', 2],
+        ['remark', '备注', 1],
      ],
    },
    {
@@ -578,7 +578,7 @@ export const option = {
        viewDisplay: false,
      },
      {
-        label: '单价(计价单位)',
+        label: '单价（计价单位）',
        prop: 'unitPrice',
        formatter: row => formatUnitPrice(row),
        minWidth: 140,
@@ -8,11 +8,11 @@ export const timeExpressionTypeDic = [
    value: 2,
  },
  {
-    label: '固定频率(毫秒)',
+    label: '固定频率（毫秒）',
    value: 3,
  },
  {
-    label: '固定延迟(毫秒)',
+    label: '固定延迟（毫秒）',
    value: 4,
  },
  {
@@ -428,14 +428,14 @@ export default {
          value: 0,
        },
        {
-          label: '最低内存(GB)',
+          label: '最低内存（GB）',
          labelTip: '可用内存小于该值的Worker 将不会执行该任务，0 代表无任何限制',
          prop: 'minMemorySpace',
          type: 'number',
          value: 0,
        },
        {
-          label: '最低磁盘空间(GB)',
+          label: '最低磁盘空间（GB）',
          labelTip: '可用磁盘空间小于该值的Worker 将不会执行该任务，0 代表无任何限制',
          prop: 'minDiskSpace',
          type: 'number',
@@ -475,14 +475,14 @@ export default {
          value: 0,
        },
        {
-          label: '统计窗口(s)',
+          label: '统计窗口（s）',
          labelTip: '统计的窗口长度(s)，0代表不限制',
          prop: 'statisticWindowLen',
          type: 'number',
          value: 0,
        },
        {
-          label: '沉默窗口(s)',
+          label: '沉默窗口（s）',
          labelTip: '沉默时间窗口(s)，0代表不限制',
          prop: 'silenceWindowLen',
          type: 'number',
@@ -27,7 +27,7 @@ export const searchFields = [
 ];

 export const tableColumns = [
-  { label: '单据号', prop: 'documentNo', minWidth: 180, link: true },
+  { label: '单据号', prop: 'documentNo', minWidth: 180, link: true, fixed: 'left' },
  { label: '项目名称', prop: 'projectName', minWidth: 120 },
  { label: '所属组织', prop: 'deptName', minWidth: 120 },
  { label: '费用日期', prop: 'feeDate', minWidth: 120 },
@@ -71,7 +71,7 @@ export const option = {
      align: 'center',
    },
    {
-      label: '核定载质量(KG)',
+      label: '核定载质量（KG）',
      prop: 'approvedLoadKg',
      minWidth: 140,
      align: 'right',
@@ -156,7 +156,7 @@ export const option = {
      ],
    },
    {
-      label: '评定(复核)单位',
+      label: '评定（复核）单位',
      prop: 'assessmentUnit',
      minWidth: 160,
      overHidden: true,