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

# Conflicts:
#	src/option/business/contract-manage.js

src/views/business/contract-manage.vue

@@ -138,7 +138,7 @@
             <el-descriptions-item label="甲方">{{ detailValue('partyA') }}</el-descriptions-item>
             <el-descriptions-item label="乙方">{{ detailValue('partyB') }}</el-descriptions-item>
             <el-descriptions-item label="合同期限">{{ detailContractPeriod }}</el-descriptions-item>
-            <el-descriptions-item label="所属组织">{{
+            <el-descriptions-item label="合同负责部门">{{
               detailValue('organizationName')
             }}</el-descriptions-item>
             <el-descriptions-item label="经办人">{{
@@ -150,6 +150,9 @@
             <el-descriptions-item label="签订日期">{{
               detailValue('signDate')
             }}</el-descriptions-item>
+            <el-descriptions-item label="申请日期">{{
+              detailValue('applyDate')
+            }}</el-descriptions-item>
             <el-descriptions-item label="合同格式">{{
               detailValue('contractFormat')
             }}</el-descriptions-item>
@@ -181,7 +184,10 @@
             <el-descriptions-item label="是否电子章">
               {{ detailElectronicSealText }}
             </el-descriptions-item>
-            <el-descriptions-item label="备注" :span="3">{{
+            <el-descriptions-item label="合同主要内容" :span="3">{{
+              detailValue('mainContent')
+            }}</el-descriptions-item>
+            <el-descriptions-item label="其他事项说明" :span="3">{{
               detailValue('remark')
             }}</el-descriptions-item>
             <el-descriptions-item v-if="detailRiskTipText" label="风险客商提示" :span="3">
@@ -197,7 +203,7 @@
         />
 
         <contract-attachment-section
-          title="合同文件"
+          title="用印材料"
           description
           attachment-type
           readonly
@@ -313,7 +319,7 @@
         </section>
 
         <contract-attachment-section
-          title="其它附件"
+          title="附件（佐证材料等）"
           description
           readonly
           :rows="detailAttachmentRows"
@@ -396,8 +402,14 @@
             <el-form-item label="合同编号">
               <el-input
                 v-model="form.contractNo"
-                :disabled="formMode === 'edit'"
-                placeholder="不填写，则系统自动生成"
+                disabled
+                :placeholder="
+                  formMode === 'add'
+                    ? form.organizationId
+                      ? '系统按部门规则自动生成'
+                      : '请先选择合同负责部门'
+                    : ''
+                "
               />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
@@ -436,7 +448,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="所属组织" prop="organizationName">
+            <el-form-item label="合同负责部门" prop="organizationName">
               <el-cascader
                 v-model="organizationCascaderValue"
                 :options="organizationOptions"
@@ -492,6 +504,16 @@
                 placeholder="请选择签订日期"
               />
             </el-form-item>
+            <el-form-item label="申请日期">
+              <el-date-picker
+                v-model="form.applyDate"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="提交正式合同时自动填充"
+                disabled
+              />
+            </el-form-item>
             <el-form-item label="合同期限" prop="startDate">
               <div class="contract-manage-form__date-range">
                 <el-date-picker
@@ -518,12 +540,13 @@
                 @input="value => integerInput('paymentDays', value)"
               ><template #suffix>天</template></el-input>
             </el-form-item>
-            <el-form-item label="合同金额">
+            <el-form-item label="合同金额" prop="contractAmount">
               <el-input
                 :model-value="contractAmountDisplay"
                 placeholder="请输入"
                 clearable
                 @input="handleContractAmountInput"
+                @blur="formatContractAmountField"
                 @clear="form.contractAmount = null"
               />
             </el-form-item>
@@ -578,7 +601,7 @@
               >
             </el-form-item>
             <el-form-item label="是否需要加盖法人章" prop="legalSealFlag">
-              <el-select v-model="form.legalSealFlag" placeholder="请选择">
+              <el-select v-model="form.legalSealFlag" placeholder="请选择" clearable>
                 <el-option label="否" :value="0" />
                 <el-option label="是" :value="1" />
               </el-select>
@@ -597,14 +620,24 @@
               <el-input v-model="form.handlerUserName" disabled />
             </el-form-item>
           </div>
-          <el-form-item label="备注" prop="remark" class="contract-manage-form__remark">
+          <el-form-item label="合同主要内容" prop="mainContent" class="contract-manage-form__remark">
+            <el-input
+              v-model="form.mainContent"
+              type="textarea"
+              :rows="4"
+              maxlength="1000"
+              show-word-limit
+              placeholder="请输入合同主要内容"
+            />
+          </el-form-item>
+          <el-form-item label="其他事项说明" prop="remark" class="contract-manage-form__remark">
             <el-input
               v-model="form.remark"
               type="textarea"
-              :rows="2"
-              maxlength="200"
+              :rows="4"
+              maxlength="1000"
               show-word-limit
-              placeholder="请输入备注"
+              placeholder="请输入其他事项说明"
             />
           </el-form-item>
           <!-- 风险客商提示（基本信息备注后）：外部客商高风险/黑名单时展示，文案由后端 riskTip 拼装 -->
@@ -615,7 +648,7 @@
         </section>
 
         <contract-attachment-section
-          title="合同文件"
+          title="用印材料"
           description
           attachment-type
           :attachment-location-options="contractAttachmentLocationOptions"
@@ -835,10 +868,11 @@
         </section>
 
         <contract-attachment-section
-          title="其它附件"
+          title="附件（佐证材料等）"
           description
           attachment-type
-          attachment-location="其它附件"
+          attachment-location="附件（佐证材料等）"
+          attachment-type-dict-code="contract_supporting_attachment_type"
           :attachment-location-options="contractAttachmentLocationOptions"
           :readonly="isAttachmentUploadMode"
           :rows="attachmentRows"
@@ -946,18 +980,19 @@
       v-model="billingPlanBox"
       :value="billingPlanForm"
       :index="billingPlanIndex"
+      :settlement-currency="form.settlementCurrency"
       @save="saveBillingPlan"
     />
 
     <contract-attachment-section
       ref="listAttachmentUploader"
       dialog-only
-      title="合同文件"
+      title="用印材料"
       description
       attachment-type
       use-upload-dialog
       mark-approved-on-upload
-      :attachment-location-options="['合同文件', '其它附件']"
+      :attachment-location-options="['用印材料', '附件（佐证材料等）']"
       :rows="listUploadContractFileRows"
       @update:rows="listUploadContractFileRows = $event"
       @upload-to-location="handleListAttachmentUploadToLocation"
@@ -1014,6 +1049,7 @@
       v-model="detailBillingPlanBox"
       :value="detailBillingPlanForm"
       :index="detailBillingPlanIndex"
+      :settlement-currency="detailRow.settlementCurrency || form.settlementCurrency"
       readonly
     />
 
@@ -1046,12 +1082,15 @@ import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { config, option } from '@/option/business/contract-manage';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import ContractAttachmentSection, {
   attachmentName as sharedAttachmentName,
   attachmentUrl as sharedAttachmentUrl,
+  isContractSealMaterialLocation,
+  isContractSupportingAttachmentLocation,
   normalizeContractFileRows,
 } from './components/contract-attachment-section.vue';
 import HcsContractPanel from './components/hcs-contract-panel.vue';
@@ -1088,6 +1127,19 @@ const normalizeOptionalAmount = (value, emptyValue = null) => {
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : emptyValue;
 };
+const formatContractAmountInput = (value, emptyValue = null) => {
+  if (
+    value === undefined ||
+    value === null ||
+    value === '' ||
+    Number(value) === -1 ||
+    String(value) === '-1'
+  ) {
+    return emptyValue;
+  }
+  const number = Number(value);
+  return Number.isFinite(number) && number >= 0 ? number.toFixed(2) : emptyValue;
+};
 const normalizeProjectValue = value => {
   if (value === undefined || value === null || value === '' || String(value) === '-1') return '';
   return value;
@@ -1120,8 +1172,9 @@ const defaultForm = () => ({
   partyB: '',
   handlerUserName: '',
   signDate: '',
+  applyDate: '',
   contractFormat: '',
-  legalSealFlag: 0,
+  legalSealFlag: null,
   copyCount: '',
   settlementCurrency: '',
   invoiceCycle: '',
@@ -1137,6 +1190,7 @@ const defaultForm = () => ({
   effectiveType: '',
   feeGenerationMode: 'system',
   archiveStatus: '未归档',
+  mainContent: '',
   remark: '',
 });
 // 复制新增：仅保留可编辑字段与明细，剔除主键、编号、审批与流程信息
@@ -1148,6 +1202,7 @@ const createCopiedDetail = (detail = {}) => {
   return {
     ...form,
     contractNo: '',
+    applyDate: '',
     archiveStatus: '未归档',
     feeGenerationMode: detail.feeGenerationMode || '',
     billingEnabled: detail.billingEnabled,
@@ -1243,13 +1298,12 @@ export default {
         signType: [{ required: true, message: '请选择签约类型', trigger: 'change' }],
         settlementCurrency: [{ required: true, message: '请选择结算币种', trigger: 'change' }],
         projectName: [{ required: true, message: '请选择所属项目', trigger: 'change' }],
-        organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
+        organizationName: [{ required: true, message: '请选择合同负责部门', trigger: 'change' }],
         partyA: [{ required: true, message: '请选择甲方', trigger: 'change' }],
         partyB: [{ required: true, message: '请选择乙方', trigger: 'change' }],
         signDate: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
         settlementMode: [{ required: true, message: '请选择结算方式', trigger: 'change' }],
         contractFormat: [{ required: true, message: '请选择合同格式', trigger: 'change' }],
-        legalSealFlag: [{ required: true, message: '请选择是否需要加盖法人章', trigger: 'change' }],
         invoiceCycle: [
           {
             validator: (rule, value, callback) => {
@@ -1264,6 +1318,22 @@ export default {
         ],
         startDate: [{ required: true, message: '请选择开始日期', trigger: 'change' }],
         endDate: [{ required: true, message: '请选择结束日期', trigger: 'change' }],
+        contractAmount: [
+          { required: true, message: '请输入合同金额', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (value === undefined || value === null || value === '') {
+                return callback(new Error('请输入合同金额'));
+              }
+              if (Number(value) < 0) {
+                return callback(new Error('合同金额不能小于0'));
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
+        mainContent: [{ max: 1000, message: '合同主要内容不能超过1000个字符', trigger: 'blur' }],
       },
       submitAction: '',
       projectOptions: [],
@@ -1335,6 +1405,7 @@ export default {
       flowBox: false,
       flowUrl: '',
       processInstanceId: '',
+      mkEnabled: false,
       // 页面形态在实例创建时锁定，避免 keep-alive 缓存后随全局 $route 翻转
       formPageLocked: false,
       detailPageLocked: false,
@@ -1377,8 +1448,8 @@ export default {
       return this.$route.query.attachmentUpload === '1';
     },
     contractAttachmentLocationOptions() {
-      if (this.isAttachmentUploadMode) return ['合同文件'];
-      return ['合同文件', '其它附件'];
+      if (this.isAttachmentUploadMode) return ['用印材料'];
+      return ['用印材料', '附件（佐证材料等）'];
     },
     contractAmountDisplay() {
       const value = this.form.contractAmount;
@@ -1445,7 +1516,7 @@ export default {
         expandTrigger: 'click',
       };
     },
-    // 所属组织级联：selectedOrganizationId 存部门 id，级联控件用根到节点的 id 路径，
+    // 合同负责部门级联：selectedOrganizationId 存部门 id，级联控件用根到节点的 id 路径，
     // 两者在此双向转换；依赖 organizationOptions，树加载完成后回显自动刷新
     organizationCascaderValue: {
       get() {
@@ -1580,6 +1651,13 @@ export default {
       this.loadProjectOptions();
       this.loadSettlementDictionaries();
       this.loadOrganizationOptions();
+      loadMkEnabled()
+        .then(enabled => {
+          this.mkEnabled = !!enabled;
+        })
+        .catch(() => {
+          this.mkEnabled = false;
+        });
     }
     if (this.isFormPage) this.initFormPage();
     if (this.isDetailPage) this.initDetailPage();
@@ -1828,7 +1906,7 @@ export default {
         copyCount: normalizeOptionalInteger(detail.copyCount, ''),
         invoiceCycle: normalizeOptionalInteger(detail.invoiceCycle, ''),
         paymentDays: normalizeOptionalInteger(detail.paymentDays, ''),
-        contractAmount: normalizeOptionalAmount(detail.contractAmount, null),
+        contractAmount: formatContractAmountInput(detail.contractAmount, null),
         archiveStatus: detail.archiveStatus || '未归档',
         feeGenerationMode:
           detail.feeGenerationMode || (Number(detail.billingEnabled) === 0 ? 'manual' : 'system'),
@@ -1864,6 +1942,7 @@ export default {
       this.applyDetail(createCopiedDetail(detail));
       this.form.handlerUserName =
         this.userInfo?.realName || this.userInfo?.userName || this.userInfo?.account || '';
+      this.refreshPreviewContractNo();
       this.$nextTick(() => this.$refs.contractForm?.clearValidate());
     },
     closeForm() {
@@ -1878,9 +1957,10 @@ export default {
           ['contractName', '合同名称'],
           ['contractCategory', '合同类型'],
           ['projectName', '所属项目'],
-          ['organizationName', '所属组织'],
+          ['organizationName', '合同负责部门'],
           ['partyA', '甲方'],
           ['partyB', '乙方'],
+          ['contractAmount', '合同金额'],
         ];
         const empty = required.find(([prop]) => {
           const value = this.form[prop];
@@ -1888,10 +1968,16 @@ export default {
         });
         if (empty) {
           this.$message.warning(
-            empty[0] === 'contractName' ? `请输入${empty[1]}` : `请选择${empty[1]}`
+            ['contractName', 'contractAmount'].includes(empty[0])
+              ? `请输入${empty[1]}`
+              : `请选择${empty[1]}`
           );
           return false;
         }
+        if (Number(this.form.contractAmount) < 0) {
+          this.$message.warning('合同金额不能小于0');
+          return false;
+        }
         return true;
       }
       if (!this.form.contractName?.trim()) {
@@ -1914,7 +2000,7 @@ export default {
       if (action !== 'formal' && action !== 'edit') return true;
       const required = [
         ['projectName', '所属项目'],
-        ['organizationName', '所属组织'],
+        ['organizationName', '合同负责部门'],
         ['partyA', '甲方'],
         ['partyB', '乙方'],
         ['startDate', '合同开始日期'],
@@ -1922,10 +2008,20 @@ export default {
         ['signDate', '签订日期'],
         ['settlementMode', '结算方式'],
         ['contractFormat', '合同格式'],
+        ['contractAmount', '合同金额'],
       ];
-      const empty = required.find(([prop]) => !this.form[prop]);
+      const empty = required.find(([prop]) => {
+        const value = this.form[prop];
+        return value === undefined || value === null || String(value).trim() === '';
+      });
       if (empty) {
-        this.$message.warning(`请选择或输入${empty[1]}`);
+        this.$message.warning(
+          empty[0] === 'contractAmount' ? `请输入${empty[1]}` : `请选择或输入${empty[1]}`
+        );
+        return false;
+      }
+      if (Number(this.form.contractAmount) < 0) {
+        this.$message.warning('合同金额不能小于0');
         return false;
       }
       return (
@@ -2115,11 +2211,11 @@ export default {
     },
     handleListAttachmentUploadToLocation({ location, rows = [] }) {
       if (!rows.length) return;
-      if (location === '合同文件') {
+      if (isContractSealMaterialLocation(location)) {
         this.listUploadContractFileRows = [...(this.listUploadContractFileRows || []), ...rows];
         return;
       }
-      if (location === '其它附件') {
+      if (isContractSupportingAttachmentLocation(location)) {
         this.listUploadAttachmentRows = [...(this.listUploadAttachmentRows || []), ...rows];
       }
     },
@@ -2277,6 +2373,9 @@ export default {
             column.renderSearch = scope => this.renderOrganizationSearch(scope);
           }
           this.syncCurrentOrganizationOption();
+          if (this.isFormPage && this.formMode === 'add' && this.form.organizationId) {
+            this.refreshPreviewContractNo();
+          }
         })
         .finally(() => {
           this.organizationLoading = false;
@@ -2339,6 +2438,29 @@ export default {
             }
           : { organizationId: '', organizationName: '' }
       );
+      if (this.formMode === 'add') {
+        this.refreshPreviewContractNo();
+      }
+    },
+    refreshPreviewContractNo() {
+      if (this.formMode !== 'add') return;
+      const organizationId = this.form.organizationId;
+      if (!organizationId) {
+        this.form.contractNo = '';
+        return;
+      }
+      const requestId = (this.contractNoPreviewRequestId =
+        (this.contractNoPreviewRequestId || 0) + 1);
+      api
+        .nextContractNo(organizationId)
+        .then(res => {
+          if (requestId !== this.contractNoPreviewRequestId) return;
+          this.form.contractNo = res.data?.data || '';
+        })
+        .catch(() => {
+          if (requestId !== this.contractNoPreviewRequestId) return;
+          this.form.contractNo = '';
+        });
     },
     syncCurrentOrganizationOption() {
       if (!this.form.organizationId || !this.form.organizationName) return;
@@ -2352,7 +2474,7 @@ export default {
       this.organizationFlatOptions.unshift(item);
     },
     renderOrganizationSearch(scope) {
-      // 搜索区所属组织：单选级联（与新增/编辑表单一致）
+      // 搜索区合同负责部门：单选级联（与新增/编辑表单一致）
       // 级联返回 id 路径数组，提交时由 normalizeSearch 取末级 id 转组织名称
       return h(ElCascader, {
         modelValue: Array.isArray(scope.row?.organizationName) ? scope.row.organizationName : [],
@@ -2371,7 +2493,7 @@ export default {
         filterable: true,
         clearable: true,
         style: 'width: 100%',
-        placeholder: '请选择 所属组织',
+        placeholder: '请选择 合同负责部门',
       });
     },
     integerInput(prop, value) {
@@ -2384,6 +2506,9 @@ export default {
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
       this.form.contractAmount = normalized === '' ? null : normalized;
     },
+    formatContractAmountField() {
+      this.form.contractAmount = formatContractAmountInput(this.form.contractAmount, null);
+    },
     positiveIntegerInput(prop, value) {
       const normalized = String(value || '').replace(/\D/g, '').replace(/^0+/, '');
       this.form[prop] = normalized;
@@ -2416,11 +2541,11 @@ export default {
     },
     handleAttachmentUploadToLocation({ location, rows = [] }) {
       if (!rows.length) return;
-      if (location === '合同文件') {
+      if (isContractSealMaterialLocation(location)) {
         this.contractFileRows = [...(this.contractFileRows || []), ...rows];
         return;
       }
-      if (location === '其它附件') {
+      if (isContractSupportingAttachmentLocation(location)) {
         this.attachmentRows = [...(this.attachmentRows || []), ...rows];
       }
     },
@@ -2781,15 +2906,16 @@ export default {
         templateFlag: '是否范本',
         originalContractNo: '原件合同编号',
         electronicSealFlag: '是否电子章',
-        remark: '备注',
+        mainContent: '合同主要内容',
+        remark: '其他事项说明',
         feeGenerationMode: '费用生成模式',
         billingPlanJson: '计费方案',
         settlementRuleJson: '结算单规则',
         preSettlementConfigJson: '预结算配置',
         formalSettlementConfigJson: '正式结算配置',
         paymentRatioJson: '付款比例设置',
-        contractFileJson: '合同文件',
-        attachmentsJson: '其它附件',
+        contractFileJson: '用印材料',
+        attachmentsJson: '附件（佐证材料等）',
         changeAttachmentsJson: '变更材料',
       };
       return labels[field] || field;
@@ -2956,13 +3082,8 @@ export default {
     detailValue(prop) {
       const value = this.detailRow[prop];
       if (prop === 'contractAmount') {
-        return value === undefined ||
-          value === null ||
-          value === '' ||
-          Number(value) === -1 ||
-          String(value) === '-1'
-          ? '-'
-          : value;
+        const amountText = formatContractAmountInput(value, '');
+        return amountText === '' ? '-' : amountText;
       }
       if (
         prop === 'contractStage' ||
@@ -2994,6 +3115,10 @@ export default {
         return;
       }
       if (operation.action === 'flow') {
+        if (this.mkEnabled) {
+          this.handleMkAudit(row);
+          return;
+        }
         this.openFlow(row);
         return;
       }
@@ -3047,6 +3172,24 @@ export default {
         query: { mode: 'add', copyId: row.id, name: '新增合同管理' },
       });
     },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('合同ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
     openFlow(row, loaded = false) {
       const processInstanceId = row.processInstanceId || row.processInstanceID || row.procInstId;
       if (!processInstanceId && !loaded && row.id) {
@@ -3276,7 +3419,11 @@ export default {
 
   &__remark {
     width: 100%;
-    margin-bottom: 0 !important;
+    margin-bottom: 24px !important;
+
+    &:last-child {
+      margin-bottom: 0 !important;
+    }
   }
 
   &__date-range {
@@ -3350,7 +3497,7 @@ export default {
 
   :deep(.el-form-item) {
     align-items: center;
-    margin-bottom: 14px;
+    margin-bottom: 24px;
   }
 
   :deep(.el-form-item__label) {