Merge remote-tracking branch 'refs/remotes/origin/master' into feature/bfi-api-rate

# Conflicts:
#	pnpm-lock.yaml
#	src/axios.js
#	src/views/settlement/formal-settlement.vue
#	src/views/vehicle/customer-archive.vue

src/views/payment/invoice-receipt-form.vue

@@ -134,7 +134,7 @@
         </el-form-item>
       </section-card>
 
-      <div class="receipt-form-page__actions">
+      <div v-if="!isPublicViewPage" class="receipt-form-page__actions">
         <el-button @click="goBack">取消</el-button>
         <el-button v-if="!readonly" type="primary" plain @click="syncReferenceData">同步</el-button>
         <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft"
@@ -212,6 +212,8 @@ import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
+import { getMkPublicDetail } from '@/api/mk-process';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyForm = () => ({
   id: null,
@@ -274,7 +276,10 @@ export default {
       return this.$route.query.id || '';
     },
     readonly() {
-      return this.$route.query.mode === 'view';
+      return this.$route.query.mode === 'view' || this.isPublicViewPage;
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/payment/invoice-receipt/public-view';
     },
     canSave() {
       const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
@@ -323,6 +328,10 @@ export default {
         .filter(Boolean);
     },
     async initialize() {
+      if (this.isPublicViewPage) {
+        await this.loadPublicDetail();
+        return;
+      }
       const userInfo = this.$store.getters.userInfo || {};
       const userEmail = userInfo.email || '';
       this.departmentEmailOptions = userEmail ? [userEmail] : [];
@@ -331,6 +340,15 @@ export default {
         return;
       }
       const data = this.unwrapData(await api.getDetail(this.recordId));
+      this.applyDetail(data);
+      if (this.settlementIds.length) await this.loadReferenceInformation();
+    },
+    async loadPublicDetail() {
+      if (!this.recordId) return;
+      const data = this.unwrapData(await getMkPublicDetail('invoice-receipt', this.recordId));
+      this.applyDetail(data);
+    },
+    applyDetail(data) {
       this.form = {
         ...emptyForm(),
         ...data,
@@ -342,7 +360,6 @@ export default {
         })),
         attachments: this.parse(data.attachmentsJson),
       };
-      if (this.settlementIds.length) await this.loadReferenceInformation();
     },
     validateInvoice(rule, value, callback) {
       if (!value) {
@@ -541,7 +558,14 @@ export default {
     async submitForm() {
       const saved = await this.saveDraft();
       if (!saved) return;
+      const previousApprovalStatus = this.form.approvalStatus || '';
       await api.submit({ id: this.form.id });
+      await submitMkApprovalFlow({
+        bizType: 'invoice-receipt',
+        bizId: this.form.id,
+        subjectName: this.form.invoiceNo || '',
+        approvalStatus: previousApprovalStatus,
+      });
       this.$message.success('提交成功');
       this.goBack();
     },