From d20e7f971e0e3734b773cd584b6eeeefcd9205d1 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Fri, 19 Dec 2025 16:31:52 +0800
Subject: [PATCH] 20251219

---
 .env.development                              |    3 +-
 .env.production                               |    1 +
 package.json                                  |    2 +-
 src/api/meetingMinutes.js                     |   45 +
 src/components/OnlineFile/index.vue           |    3 +
 src/main.js                                   |    6 +-
 src/router/index.js                           |   15 +
 src/utils/formBuilder.js                      |    4 +
 .../components/AddDocumentMenu.vue            |    3 +
 .../components/AddMeetingMinutes.vue          |  520 +++++++
 src/views/MeetingMinutes/index.vue            |  380 +++++
 .../MeetingRoom/components/AddMeetingRoom.vue |    3 +
 .../SpecialDays/components/AddSpecialDays.vue |    3 +
 .../components/AddVehicleCertificate.vue      |    3 +
 src/views/attendance/components/AddSign.vue   |    3 +
 .../attendance/components/MonthStatics.vue    |    3 +
 .../attendance/components/addYearHoliday.vue  |    3 +
 src/views/attendance/index.vue                |    3 +
 src/views/config/components/AddConfig.vue     |    3 +
 src/views/dashboard/index.vue                 |    5 +
 src/views/document/components/AddDocument.vue |    3 +
 src/views/flow/components/FieldExport.vue     |    3 +
 src/views/flow/components/MultiDeal.vue       |    3 +
 src/views/flow/components/assign.vue          |    3 +
 src/views/flow/components/forward.vue         |    4 +-
 src/views/flow/components/payMx copy.vue      | 1062 ++++++-------
 src/views/flow/components/payMx.vue           | 1356 +++++++++--------
 src/views/flow/components/rollback.vue        |    4 +-
 src/views/flow/components/share.vue           |    4 +-
 src/views/flow/create.vue                     |   82 +-
 src/views/flow/payList.vue                    |    3 +
 src/views/meeting/components/AddMeeting.vue   |    3 +
 src/views/notice/components/AddNotice.vue     |    3 +
 src/views/vehicle/components/AddVehicle.vue   |    3 +
 vue.config.js                                 |    2 +-
 35 files changed, 2328 insertions(+), 1221 deletions(-)
 create mode 100644 src/api/meetingMinutes.js
 create mode 100644 src/views/MeetingMinutes/components/AddMeetingMinutes.vue
 create mode 100644 src/views/MeetingMinutes/index.vue

diff --git a/.env.development b/.env.development
index 74eb4a1..725d42d 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,8 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API='http://192.167.20.118:8080/'
-VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net'
+VUE_APP_BASE_API='http://czemc.localhost'
 VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file'
 VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview
 VUE_APP_MODULE_NAME=oa
+VUE_APP_OUTPUT_DIR='../backend/public/oa/'
diff --git a/.env.production b/.env.production
index e9a2f44..d177213 100644
--- a/.env.production
+++ b/.env.production
@@ -6,3 +6,4 @@ VUE_APP_BASE_API=''
 VUE_APP_UPLOAD_API='/api/upload-file'
 VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview
 VUE_APP_MODULE_NAME=oa
+VUE_APP_OUTPUT_DIR='../backend/public/oa/'
diff --git a/package.json b/package.json
index b8d26b6..644fdfe 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
     "vxe-pc-ui": "^3.1.0",
-    "vxe-table": "^3.8.25",
+    "vxe-table": "3.8.25",
     "vxe-table-plugin-export-xlsx": "^3.3.4",
     "xlsx": "^0.18.5"
   },
diff --git a/src/api/meetingMinutes.js b/src/api/meetingMinutes.js
new file mode 100644
index 0000000..15b934d
--- /dev/null
+++ b/src/api/meetingMinutes.js
@@ -0,0 +1,45 @@
+import request from "@/utils/request";
+
+export function index(params) {
+  return request({
+    method: 'get',
+    url: '/api/oa/meeting-minutes/index',
+    params
+  })
+}
+
+export function show(params) {
+  return request({
+    method: 'get',
+    url: '/api/oa/meeting-minutes/show',
+    params
+  })
+}
+
+export function save(data, isLoading = true) {
+  return request({
+    method: 'post',
+    url: '/api/oa/meeting-minutes/save',
+    data,
+    isLoading
+  })
+}
+
+export function destroy(params, isLoading = true) {
+  return request({
+    method: 'get',
+    url: '/api/oa/meeting-minutes/destroy',
+    params,
+    isLoading
+  })
+}
+
+export function getFlows(params, isLoading = true) {
+  return request({
+    method: 'get',
+    url: '/api/oa/meeting-minutes/get-flows',
+    params,
+    isLoading
+  })
+}
+
diff --git a/src/components/OnlineFile/index.vue b/src/components/OnlineFile/index.vue
index bd7e3dc..bdac3e0 100644
--- a/src/components/OnlineFile/index.vue
+++ b/src/components/OnlineFile/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :width="defaultModalSize.width"
       :height="defaultModalSize.height"
       show-zoom
@@ -34,6 +35,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `online-file-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       showModal:false,
       codeUri: "",
diff --git a/src/main.js b/src/main.js
index 9390d5a..2943c8a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,12 +33,14 @@ if (process.env.NODE_ENV === 'production') {
 // 如果想要中文版 element-ui，按如下方式声明
 Vue.use(ElementUI)
 
-// vxe-table
-import { VxeUI, VxeUpload, VxeDatePicker,VxeNumberInput } from 'vxe-pc-ui'
+// vxe-table / vxe-pc-ui
+// 注意：vxe-pc-ui 的部分组件（如 vxe-modal）需要显式 Vue.use 注册，否则会退化成“未知标签”，其内容会直接渲染在页面里
+import { VxeUI, VxeUpload, VxeDatePicker, VxeNumberInput, VxeModal } from 'vxe-pc-ui'
 import 'vxe-pc-ui/lib/style.css'
 Vue.use(VxeUpload)
 Vue.use(VxeDatePicker)
 Vue.use(VxeNumberInput)
+Vue.use(VxeModal)
 import VxeTable from 'vxe-table'
 import "vxe-table/styles/index.scss"
 import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
diff --git a/src/router/index.js b/src/router/index.js
index 06bec6b..7a32247 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,6 +90,21 @@ export const constantRoutes = [
       }
     ],
   },
+  {
+    path: "/meeting-minutes",
+    component: Layout,
+    redirect: "/meeting-minutes/index",
+    hidden: true, // 隐藏硬编码的菜单，由后端配置的菜单控制显示
+    meta: { title: "会议纪要管理", icon: "el-icon-document" },
+    children: [
+      {
+        path: "index",
+        name: "MeetingMinutes",
+        component: () => import("@/views/MeetingMinutes/index"),
+        meta: { title: "会议纪要管理", icon: "el-icon-document" },
+      },
+    ],
+  },
 
   // 404 page must be placed at the end !!!
   //{ path: '*', redirect: '/404', hidden: true }
diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index 0619a63..7499266 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -760,6 +760,10 @@ export default function formBuilder(
                             const $table = this.$refs[`subForm-${info.name}`];
                             if ($table) {
                               const record = {};
+                              // 确保子表数据为数组，避免空值时调用 unshift 报错
+                              if (!Array.isArray(this.form[info.name])) {
+                                this.$set(this.form, info.name, []);
+                              }
                               this.form[info.name].unshift(record);
                               // 临时数据不好验证长度
                               // const { row: newRow } = await $table.insert(
diff --git a/src/views/DocumentMenu/components/AddDocumentMenu.vue b/src/views/DocumentMenu/components/AddDocumentMenu.vue
index 5be3bf0..adb1360 100644
--- a/src/views/DocumentMenu/components/AddDocumentMenu.vue
+++ b/src/views/DocumentMenu/components/AddDocumentMenu.vue
@@ -2,6 +2,7 @@
   <div>
     <vxe-modal
       :z-index="zIndex"
+      :id="modalId"
       :value="isShow"
       show-footer
       title="公共文件柜栏目"
@@ -76,6 +77,8 @@ export default {
     return {
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `document-menu-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       form: {
         pid: 0,
diff --git a/src/views/MeetingMinutes/components/AddMeetingMinutes.vue b/src/views/MeetingMinutes/components/AddMeetingMinutes.vue
new file mode 100644
index 0000000..4dcbc0c
--- /dev/null
+++ b/src/views/MeetingMinutes/components/AddMeetingMinutes.vue
@@ -0,0 +1,520 @@
+<template>
+  <div>
+    <vxe-modal
+      :id="modalId"
+      :value="isShow"
+      show-footer
+      :z-index="zIndex"
+      :title="type === 'add' ? '新增会议纪要' : type === 'edit' ? '编辑会议纪要' : '查看会议纪要'"
+      :show-confirm-button="type !== 'view'"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
+      esc-closable
+      transfer
+      show-zoom
+      resize
+      :fullscreen="$store.getters.device === 'mobile'"
+      @input="(e) => $emit('update:isShow', e)"
+    >
+      <el-form
+        ref="elForm"
+        :model="form"
+        :rules="rules"
+        label-position="top"
+        label-width="100"
+      >
+        <el-form-item label="会议纪要标题" prop="title">
+          <el-input v-model="form.title" :disabled="true" placeholder="上传附件后自动填充文件名" />
+        </el-form-item>
+        <el-form-item label="关联上会审议流程" prop="flow_ids">
+          <el-select
+            v-model="form.flow_ids"
+            multiple
+            filterable
+            placeholder="请选择要关联的上会审议流程"
+            style="width: 100%;"
+            :disabled="type === 'view'"
+            @focus="loadFlows"
+          >
+            <el-option
+              v-for="flow in availableFlows"
+              :key="flow.id"
+              :label="(flow.title || flow.no || ('流程' + flow.id)) + ' (' + (flow.no || '') + ')'"
+              :value="flow.id"
+            >
+              <span style="float: left">{{ flow.title || flow.no || ('流程' + flow.id) }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ flow.no || '' }}</span>
+            </el-option>
+          </el-select>
+          <div style="margin-top: 8px; color: #909399; font-size: 12px;">
+            提示：可以关联多个上会审议审批流程
+          </div>
+        </el-form-item>
+        <el-form-item label="附件上传" prop="files" v-if="type !== 'view'">
+          <el-upload
+            :action="action"
+            :headers="{
+                Authorization: `Bearer ${getToken()}`,
+              }"
+            :before-upload="beforeUpload"
+            :on-success="uploadSuccess"
+            :on-remove="uploadRemove"
+            :on-error="uploadError"
+            :on-progress="uploadProgress"
+            :limit="1"
+            :file-list="fileList"
+          >
+            <el-button size="small" type="primary" :disabled="uploadingFile">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              <span v-if="uploadingFile" style="color: #409EFF;">文件正在上传中，请稍候...</span>
+              <span v-else>必须上传一个附件，上传文件不超过10Mb，上传成功后标题将自动填充为文件名</span>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="附件" v-if="type === 'view' && fileList.length > 0">
+          <div v-for="(file, index) in fileList" :key="index" style="margin-bottom: 8px;">
+            <el-link 
+              type="primary" 
+              style="margin-right: 10px; cursor: pointer;"
+              @click="previewFile(file)"
+            >
+              <i class="el-icon-view"></i> {{ file.name }}
+            </el-link>
+            <el-link 
+              type="primary" 
+              style="cursor: pointer;"
+              @click="downloadFile(file)"
+            >
+              <i class="el-icon-download"></i> 下载
+            </el-link>
+          </div>
+        </el-form-item>
+        <el-form-item label="内容清单" prop="items">
+          <div v-for="(item, index) in form.items" :key="index" style="margin-bottom: 15px; padding: 15px; border: 1px solid #e4e7ed; border-radius: 4px;">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-select
+                  v-model="item.type"
+                  placeholder="请选择类型"
+                  style="width: 100%;"
+                  :disabled="type === 'view'"
+                >
+                  <el-option label="&ldquo;三重一大&rdquo;事项" value="&ldquo;三重一大&rdquo;事项"></el-option>
+                  <el-option label="资金申请" value="资金申请"></el-option>
+                  <el-option label="资金支付" value="资金支付"></el-option>
+                  <el-option label="其他" value="其他"></el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="16">
+                <el-input
+                  v-model="item.content"
+                  type="textarea"
+                  :autosize="{ minRows: 2 }"
+                  placeholder="请输入内容"
+                  :disabled="type === 'view'"
+                />
+              </el-col>
+              <el-col :span="2" v-if="type !== 'view'">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  size="small"
+                  @click="removeItem(index)"
+                  :disabled="form.items.length <= 1"
+                ></el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button
+            v-if="type !== 'view'"
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            @click="addItem"
+          >添加内容项</el-button>
+        </el-form-item>
+      </el-form>
+
+      <template #footer v-if="type !== 'view'">
+        <el-button type="primary" :loading="loading" @click="submit"
+          >确认</el-button
+        >
+        <el-button @click="$emit('update:isShow', false)">取消</el-button>
+      </template>
+      <template #footer v-else>
+        <el-button @click="$emit('update:isShow', false)">关闭</el-button>
+      </template>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+import { save, show, getFlows } from "@/api/meetingMinutes";
+import { PopupManager } from "element-ui/lib/utils/popup";
+import { defaultModalSize, uploadSize } from "@/settings";
+import { formatFileSize } from "@/utils"
+export default {
+  props: {
+    type: {
+      type: String,
+      default: 'add',
+      required: true
+    },
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      uploadSize,
+      defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `meeting-minutes-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      zIndex: PopupManager.nextZIndex(),
+      loading: false,
+      form: {
+        id: "",
+        title: "",
+        files: [],
+        flow_ids: [],
+        items: [
+          {
+            type: "",
+            content: ""
+          }
+        ]
+      },
+      uploadingFile: false, // 标记是否有文件正在上传
+      action: process.env.VUE_APP_UPLOAD_API,
+      fileList: [],
+      availableFlows: [],
+      rules: {
+        files: [
+          { validator: this.validateFiles, trigger: 'change' }
+        ],
+      },
+    };
+  },
+  computed: {},
+  watch: {
+    isShow(newVal) {
+      if(newVal) {
+        this.zIndex = PopupManager.nextZIndex()
+        if (this.type === 'add') {
+          this.resetForm()
+        }
+      } else {
+        this.fileList = []
+        this.availableFlows = []
+      }
+    }
+  },
+  created() {
+    this.loadFlows()
+  },
+  methods: {
+    formatFileSize,
+    resetForm() {
+      this.form = {
+        id: "",
+        title: "",
+        files: [],
+        flow_ids: [],
+        items: [
+          {
+            type: "",
+            content: ""
+          }
+        ]
+      }
+      this.fileList = []
+      this.uploadingFile = false
+      if (this.$refs.elForm) {
+        this.$refs.elForm.resetFields()
+      }
+    },
+    validateFiles(rule, value, callback) {
+      // 检查是否有文件正在上传
+      if (this.uploadingFile || window.$_uploading) {
+        callback(new Error('文件正在上传中，请稍候...'))
+        return
+      }
+      
+      // 检查是否有已成功上传的文件
+      const uploadedFiles = this.fileList.filter(file => {
+        // 已上传成功的文件：有 response.data.id 或者有 url（查看模式）
+        return (file.response && file.response.data && file.response.data.id) || file.url
+      })
+      
+      if (uploadedFiles.length === 0) {
+        callback(new Error('必须上传一个附件'))
+      } else if (uploadedFiles.length > 1) {
+        callback(new Error('只能上传一个附件'))
+      } else {
+        callback() // 验证通过
+      }
+    },
+    addItem() {
+      this.form.items.push({
+        type: "",
+        content: ""
+      })
+    },
+    removeItem(index) {
+      if (this.form.items.length > 1) {
+        this.form.items.splice(index, 1)
+      }
+    },
+    async loadFlows() {
+      if (this.availableFlows.length > 0) {
+        return // 已经加载过了
+      }
+      try {
+        const params = {}
+        // 如果是编辑模式，传递当前会议纪要ID，允许显示已关联的流程
+        if (this.type === 'edit' && this.form.id) {
+          params.meeting_minute_id = this.form.id
+        }
+        const res = await getFlows(params)
+        this.availableFlows = res || []
+      } catch (err) {
+        console.error('加载流程列表失败:', err)
+      }
+    },
+    getDetail (data) {
+      this.resetForm()
+      for (let key in this.form) {
+        if (data[key] !== undefined && key !== 'items') {
+          this.form[key] = data[key]
+        }
+      }
+      // 处理关联的流程
+      if (data.flows && data.flows instanceof Array) {
+        this.form.flow_ids = data.flows.map(i => i.id)
+      }
+      // 处理附件
+      this.fileList = (data['files_details'] && data['files_details'] instanceof Array) 
+        ? data['files_details'].map(i => ({
+            name: i.original_name,
+            url: i.url,
+            response: {
+              data: i
+            }
+          }))
+        : []
+      // 处理内容清单
+      if (data.items && data.items instanceof Array && data.items.length > 0) {
+        this.form.items = data.items.map(i => ({
+          type: i.type || "",
+          content: i.content || ""
+        }))
+      } else {
+        this.form.items = [{
+          type: "",
+          content: ""
+        }]
+      }
+      // 编辑模式下，重新加载流程列表（包含已关联的流程）
+      if (this.type === 'edit' && this.form.id) {
+        this.availableFlows = [] // 清空列表，强制重新加载
+        this.loadFlows()
+      }
+    },
+    uploadRemove(file, fileList) {
+      this.fileList = fileList
+      // 移除附件后，清空标题
+      if (fileList.length === 0) {
+        this.form.title = ""
+      }
+      // 触发表单验证
+      this.$nextTick(() => {
+        if (this.$refs.elForm) {
+          this.$refs.elForm.validateField('files')
+        }
+      })
+    },
+    beforeUpload(file) {
+      const isLt = file.size < uploadSize
+      if (!isLt) {
+        this.$message.error(`上传文件大小不能超过${formatFileSize(uploadSize)}!`)
+        return false
+      }
+      // 标记开始上传
+      this.uploadingFile = true
+      window.$_uploading = true
+      // 触发表单验证（显示上传中提示）
+      this.$nextTick(() => {
+        if (this.$refs.elForm) {
+          this.$refs.elForm.validateField('files')
+        }
+      })
+      return true
+    },
+    uploadProgress(event, file, fileList) {
+      // 上传进度中，保持上传状态
+      this.uploadingFile = true
+    },
+    uploadSuccess(response, file, fileList) {
+      this.uploadingFile = false
+      window.$_uploading = false
+      
+      if (response.code) {
+        // 上传失败
+        const index = fileList.indexOf(file)
+        if (index > -1) {
+          fileList.splice(index, 1)
+        }
+        this.$message.warning(response.msg)
+        this.fileList = fileList
+        // 触发表单验证
+        this.$nextTick(() => {
+          if (this.$refs.elForm) {
+            this.$refs.elForm.validateField('files')
+          }
+        })
+      } else {
+        // 上传成功
+        this.fileList = fileList
+        // 上传成功后，如果只有一个文件，自动填充标题
+        if (fileList.length === 1 && fileList[0].response && fileList[0].response.data) {
+          const fileName = fileList[0].response.data.original_name || fileList[0].name
+          this.form.title = fileName
+        }
+        // 如果文件超过一个，只保留最后一个
+        if (fileList.length > 1) {
+          this.$message.warning('只能上传一个附件，已自动移除之前的附件')
+          this.fileList = [fileList[fileList.length - 1]]
+          // 更新标题
+          if (this.fileList[0].response && this.fileList[0].response.data) {
+            const fileName = this.fileList[0].response.data.original_name || this.fileList[0].name
+            this.form.title = fileName
+          }
+        }
+        // 触发表单验证（清除错误提示）
+        this.$nextTick(() => {
+          if (this.$refs.elForm) {
+            this.$refs.elForm.validateField('files')
+          }
+        })
+      }
+    },
+    uploadError(err, file, fileList) {
+      this.uploadingFile = false
+      window.$_uploading = false
+      this.$message.error('文件上传失败，请重试')
+      // 移除失败的文件
+      const index = fileList.indexOf(file)
+      if (index > -1) {
+        fileList.splice(index, 1)
+      }
+      this.fileList = fileList
+      // 触发表单验证
+      this.$nextTick(() => {
+        if (this.$refs.elForm) {
+          this.$refs.elForm.validateField('files')
+        }
+      })
+    },
+
+    getToken,
+    previewFile(file) {
+      let fileUrl = null;
+      if (file.url) {
+        fileUrl = file.url;
+      } else if (file.response && file.response.data && file.response.data.url) {
+        fileUrl = file.response.data.url;
+      }
+      
+      if (!fileUrl) return;
+      
+      // 在查看模式下，在新窗口打开预览，避免弹窗叠加
+      if (this.type === 'view') {
+        const previewUrl = `${window.location.origin}/admin/#/preview?url=${encodeURIComponent(fileUrl)}`;
+        window.open(previewUrl, '_blank');
+      } else {
+        // 编辑模式下使用弹窗预览
+        this.$bus.$emit("online-file", fileUrl);
+      }
+    },
+    downloadFile(file) {
+      // 下载直接在新窗口打开，不需要关闭查看弹窗
+      let fileId = null;
+      if (file.id) {
+        fileId = file.id;
+      } else if (file.response && file.response.data && file.response.data.id) {
+        fileId = file.response.data.id;
+      }
+      if (fileId) {
+        this.$bus.$emit("online-download", fileId);
+      }
+    },
+    submit() {
+      // 检查是否有文件正在上传
+      if (this.uploadingFile || window.$_uploading) {
+        this.$message.warning("文件正在上传中，请稍候...")
+        return
+      }
+      
+      // 验证附件：检查是否有已成功上传的文件
+      const uploadedFiles = this.fileList.filter(file => {
+        return (file.response && file.response.data && file.response.data.id) || file.url
+      })
+      
+      if (uploadedFiles.length === 0) {
+        this.$message.error('必须上传一个附件')
+        // 触发表单验证以显示错误提示
+        this.$nextTick(() => {
+          if (this.$refs.elForm) {
+            this.$refs.elForm.validateField('files')
+          }
+        })
+        return
+      }
+      
+      if (uploadedFiles.length > 1) {
+        this.$message.error('只能上传一个附件')
+        return
+      }
+      
+      this.$refs["elForm"].validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          try {
+            // 只使用已成功上传的文件ID
+            this.form.files = uploadedFiles.map(i => {
+              if (i.response && i.response.data && i.response.data.id) {
+                return i.response.data.id
+              } else if (i.url && i.id) {
+                return i.id
+              }
+              return null
+            }).filter(i => !!i)
+            
+            // 过滤掉空的内容清单项
+            this.form.items = this.form.items.filter(item => item.type && item.content)
+            if (this.form.items.length === 0) {
+              this.$message.error('至少需要添加一个内容清单项')
+              this.loading = false;
+              return
+            }
+            await save(this.form);
+            this.$message.success(this.form.id ? "更新成功" : "新增成功");
+            this.$emit("refresh");
+            this.$emit("update:isShow", false);
+            this.loading = false;
+            this.resetForm()
+          } catch (err) {
+            this.loading = false;
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>
+
diff --git a/src/views/MeetingMinutes/index.vue b/src/views/MeetingMinutes/index.vue
new file mode 100644
index 0000000..88d9781
--- /dev/null
+++ b/src/views/MeetingMinutes/index.vue
@@ -0,0 +1,380 @@
+<template>
+  <div>
+    <card-container>
+      <vxe-toolbar export print ref="toolbar">
+        <template #buttons>
+          <el-button
+            icon="el-icon-plus"
+            type="primary"
+            size="small"
+            @click="isShowAdd = true"
+            >新增</el-button
+          >
+          <el-button
+            icon="el-icon-search"
+            type="primary"
+            plain
+            size="small"
+            @click="getList"
+            >搜索</el-button
+          >
+        </template>
+      </vxe-toolbar>
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        keep-source
+        show-overflow
+        :column-config="{ resizable: true }"
+        :edit-rules="validRules"
+        :edit-config="{
+          trigger: 'manual',
+          mode: 'row',
+          showStatus: true,
+          isHover: true,
+          autoClear: false,
+        }"
+        :align="allAlign"
+        :data="tableData"
+      >
+        <vxe-column type="seq" width="58" align="center" />
+        <vxe-column
+          field="title"
+          width="200"
+          title="会议纪要标题"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+        <vxe-column 
+          field="items" 
+          min-width="250" 
+          title="内容清单"
+          :formatter="({ cellValue }) => {
+            if (cellValue && cellValue instanceof Array && cellValue.length > 0) {
+              return cellValue.map(i => (i.type || '') + '：' + (i.content || '')).join('；')
+            }
+            return '无'
+          }"
+        />
+        <vxe-column 
+          field="flows" 
+          width="200" 
+          title="关联流程"
+          :formatter="({ cellValue }) => {
+            if (cellValue && cellValue instanceof Array && cellValue.length > 0) {
+              return cellValue.map(i => i.title || i.no || ('流程' + i.id)).join('、')
+            }
+            return '未关联'
+          }"
+        />
+        <vxe-column field="files_details" title="附件" min-width="220" header-align="center" align="left" :edit-render="{}">
+          <template #default="{ row }">
+            <div v-if="row.files_details && row.files_details.length > 0">
+              <div v-for="(file, index) in row.files_details" :key="index" style="margin-bottom: 4px;">
+                <el-link 
+                  type="primary" 
+                  style="margin-right: 10px; cursor: pointer;"
+                  @click="previewFile(file)"
+                >
+                  <i class="el-icon-view"></i> {{ file.original_name || file.name }}
+                </el-link>
+                <el-link 
+                  type="primary" 
+                  style="cursor: pointer;"
+                  @click="downloadFile(file)"
+                >
+                  <i class="el-icon-download"></i> 下载
+                </el-link>
+              </div>
+            </div>
+            <span v-else style="color: #909399;">无附件</span>
+          </template>
+          <template #edit="{ row }">
+            <vxe-upload 
+              v-model="row.files_details" 
+              name-field="original_name" 
+              progress-text="{percent}%" 
+              :more-config="{ maxCount: 1, layout: 'horizontal' }" 
+              :limit-size="uploadSize / 1024 / 1024" 
+              :show-button-text="false" 
+              :upload-method="({file}) => uploadMethod(file, row)" 
+            />
+          </template>
+        </vxe-column>
+        <vxe-column field="admin" title="创建人" width="100" :formatter="({ cellValue }) => (cellValue && cellValue.name) || ''" />
+        <vxe-column field="operate" title="操作" min-width="220" fixed="right">
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button size="small" type="primary" @click="saveRowEvent(row)"
+                >保存</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+                >取消</el-button
+              >
+            </template>
+            <template v-else>
+              <el-button size="small" type="primary" @click="viewRowEvent(row)"
+                >查看</el-button
+              >
+              <el-button size="small" type="warning" @click="editRowEvent(row)"
+                >编辑</el-button
+              >
+              <el-button
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+                >删除</el-button
+              >
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination
+        style="margin-top: 10px"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
+          (e) => {
+            select.page_size = e;
+            select.page = 1;
+            getList();
+          }
+        "
+        @current-change="
+          (e) => {
+            select.page = e;
+            getList();
+          }
+        "
+      />
+    </card-container>
+    <add-meeting-minutes
+      ref="AddMeetingMinutes"
+      :type="isShowType"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { deepCopy } from "@/utils";
+import { destroy, index, save, show } from "@/api/meetingMinutes";
+import AddMeetingMinutes from "./components/AddMeetingMinutes.vue";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { uploadSize } from '@/settings';
+import { formatFileSize } from '@/utils'
+
+export default {
+  components: {
+    AddMeetingMinutes
+  },
+  data() {
+    return {
+      uploadSize,
+      isShowAdd: false,
+      isShowType: 'add',
+      loading: false,
+      select: {
+        page: 1,
+        page_size: 20,
+        show_relation: ['admin', 'flows', 'items']
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      validRules: {},
+      form: {
+        id: "",
+        title: "",
+        meeting_time: "",
+        files: [],
+        flow_ids: [],
+        files_details: [],
+        items: []
+      },
+    };
+  },
+  computed: {
+    isActiveStatus() {
+      return function (row) {
+        if (this.$refs["table"]) {
+          return this.$refs["table"].isEditByRow(row);
+        }
+      };
+    },
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.bindToolbar()
+  },
+  methods: {
+    formatFileSize,
+    previewFile(file) {
+      // 触发预览事件
+      if (file.url) {
+        this.$bus.$emit("online-file", file.url);
+      } else if (file.response && file.response.data && file.response.data.url) {
+        this.$bus.$emit("online-file", file.response.data.url);
+      }
+    },
+    downloadFile(file) {
+      // 触发下载事件
+      let fileId = null;
+      if (file.id) {
+        fileId = file.id;
+      } else if (file.response && file.response.data && file.response.data.id) {
+        fileId = file.response.data.id;
+      }
+      if (fileId) {
+        this.$bus.$emit("online-download", fileId);
+      }
+    },
+    uploadMethod(file, row) {
+      const formData = new FormData()
+      formData.append('file', file)
+      window.$_uploading = true
+      return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+        headers: {
+          Authorization: `Bearer ${getToken()}`,
+        }
+      }).then((response) => {
+        window.$_uploading = false
+        if (response.status === 200 && !response.data.code) {
+          if (!(row.files_details instanceof Array)) {
+            row.files_details = []
+          }
+          row.files_details.push({
+            response: response.data.data,
+            name: response.data.data.original_name,
+            url: response.data.data.url
+          })
+        } else {
+          this.$message.error("上传失败")
+        }
+      }).catch(err => {
+        window.$_uploading = false
+      })
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
+        }
+      });
+    },
+
+    editRowEvent(row) {
+      this.isShowType = 'edit'
+      this.$refs['AddMeetingMinutes'].getDetail(row)
+      this.isShowAdd = true
+    },
+    viewRowEvent(row) {
+      this.isShowType = 'view'
+      this.$refs['AddMeetingMinutes'].getDetail(row)
+      this.isShowAdd = true
+    },
+    cancelRowEvent(row) {
+      if (this.$refs["table"]) {
+        this.$refs["table"].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs["table"].revertData(row);
+        });
+      }
+    },
+
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await index(this.select);
+        this.tableData = res.data;
+        this.total = res.total;
+        this.loading = false;
+      } catch (err) {
+        console.error(err);
+        this.loading = false;
+      }
+    },
+
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning("文件正在上传中")
+        return
+      }
+      try {
+        const errMap = await this.$refs["table"].validate();
+        if (errMap) {
+          throw new Error(errMap);
+        }
+        await this.$confirm("确认保存？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        await this.$refs["table"].clearEdit();
+        const form = deepCopy(this.form);
+        for (const key in form) {
+          form[key] = row[key];
+        }
+        this.loading = true;
+        form['files'] = (row.files_details && row.files_details instanceof Array) 
+          ? row.files_details.map(i => (i.response && i.response.id) || i.id).filter(i => !!i)
+          : []
+        await save(form);
+        await this.getList();
+        this.loading = false;
+        this.$message.success("保存成功");
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm("确认删除？", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+        });
+        this.loading = true;
+        if (row.id) {
+          await destroy({
+            id: row.id,
+          });
+          await this.getList();
+          this.$message.success("删除成功");
+        } else {
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          );
+        }
+        this.loading = false;
+      } catch (err) {
+        this.loading = false;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.total {
+  color: #666;
+  text-align: right;
+  line-height: 3;
+}
+::v-deep .el-tag + .el-tag {
+  margin-left: 4px;
+}
+</style>
+
diff --git a/src/views/MeetingRoom/components/AddMeetingRoom.vue b/src/views/MeetingRoom/components/AddMeetingRoom.vue
index 69c40fc..86118db 100644
--- a/src/views/MeetingRoom/components/AddMeetingRoom.vue
+++ b/src/views/MeetingRoom/components/AddMeetingRoom.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       transfer
@@ -49,6 +50,8 @@ export default {
       defaultModalSize,
       loading: false,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `meeting-room-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       form: {
         name: '',
         myindex: 0
diff --git a/src/views/SpecialDays/components/AddSpecialDays.vue b/src/views/SpecialDays/components/AddSpecialDays.vue
index a469458..72c6fb8 100644
--- a/src/views/SpecialDays/components/AddSpecialDays.vue
+++ b/src/views/SpecialDays/components/AddSpecialDays.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       title="特殊日期"
@@ -55,6 +56,8 @@ export default {
     return {
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `special-days-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       form: {
         date: '',
diff --git a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
index 71713df..ea51756 100644
--- a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
+++ b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
@@ -2,6 +2,7 @@
   <div>
     <vxe-modal
       :z-index="zIndex"
+      :id="modalId"
       :value="isShow"
       show-footer
       title="车辆证照管理"
@@ -92,6 +93,8 @@ export default {
       action: process.env.VUE_APP_UPLOAD_API,
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `vehicle-certificate-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
 
       loading: false,
       form: {
diff --git a/src/views/attendance/components/AddSign.vue b/src/views/attendance/components/AddSign.vue
index ed5c52b..e470803 100644
--- a/src/views/attendance/components/AddSign.vue
+++ b/src/views/attendance/components/AddSign.vue
@@ -2,6 +2,7 @@
   <div>
     <vxe-modal
       :z-index="zIndex"
+      :id="modalId"
       :value="isShow"
       show-footer
       title="补卡"
@@ -69,6 +70,8 @@ export default {
     return {
       zIndex: PopupManager.nextZIndex(),
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `attendance-addsign-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       form: {
         user_id: '',
diff --git a/src/views/attendance/components/MonthStatics.vue b/src/views/attendance/components/MonthStatics.vue
index 567bfca..67f344b 100644
--- a/src/views/attendance/components/MonthStatics.vue
+++ b/src/views/attendance/components/MonthStatics.vue
@@ -26,6 +26,7 @@
     </el-calendar>
 
     <vxe-modal
+      :id="modalId"
       v-model="isShow"
       show-footer
       :z-index="zIndex"
@@ -130,6 +131,8 @@ export default {
       isShow: false,
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `attendance-month-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
 
       day: new Date(),
       selectDay: '',
diff --git a/src/views/attendance/components/addYearHoliday.vue b/src/views/attendance/components/addYearHoliday.vue
index 24d4ff0..6952a75 100644
--- a/src/views/attendance/components/addYearHoliday.vue
+++ b/src/views/attendance/components/addYearHoliday.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       title="年休假"
@@ -58,6 +59,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `year-holiday-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       action: process.env.VUE_APP_UPLOAD_API,
       fileList: [],
       loading: false,
diff --git a/src/views/attendance/index.vue b/src/views/attendance/index.vue
index 38111eb..4bd419d 100644
--- a/src/views/attendance/index.vue
+++ b/src/views/attendance/index.vue
@@ -53,6 +53,7 @@
     </CardContainer>
 
     <vxe-modal
+      :id="modalId"
       v-model="isShow"
       show-footer
       :z-index="zIndex"
@@ -109,6 +110,8 @@ export default {
       isShow: false,
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `attendance-outsign-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       imageId: '',
       remark: '',
       // end
diff --git a/src/views/config/components/AddConfig.vue b/src/views/config/components/AddConfig.vue
index bcf051a..42f934f 100644
--- a/src/views/config/components/AddConfig.vue
+++ b/src/views/config/components/AddConfig.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       title="特殊日期"
@@ -48,6 +49,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `config-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       form: {
         name: '',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 383bed2..452223a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -278,6 +278,7 @@
 
     <!--    办理-->
     <vxe-modal
+      :id="dealModalId"
       v-model="isShowModal"
       :z-index="zIndex"
       transfer
@@ -298,6 +299,7 @@
     </vxe-modal>
     <!-- 编辑菜单 -->
     <vxe-modal
+      :id="quickModalId"
       v-model="isShowQuick"
       :z-index="zIndex"
       transfer
@@ -363,6 +365,9 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      dealModalId: `dashboard-deal-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      quickModalId: `dashboard-quick-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       modalUrl: "",
       zIndex: PopupManager.nextZIndex(),
       isShowModal: false,
diff --git a/src/views/document/components/AddDocument.vue b/src/views/document/components/AddDocument.vue
index 8e8ede2..844a31d 100644
--- a/src/views/document/components/AddDocument.vue
+++ b/src/views/document/components/AddDocument.vue
@@ -2,6 +2,7 @@
   <div>
     <vxe-modal
       :z-index="zIndex"
+      :id="modalId"
       :value="isShow"
       show-footer
       title="公共文件柜"
@@ -91,6 +92,8 @@ export default {
 
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `document-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       form: {
         document_menu_id: '',
diff --git a/src/views/flow/components/FieldExport.vue b/src/views/flow/components/FieldExport.vue
index d5d03a6..e1cc8e5 100644
--- a/src/views/flow/components/FieldExport.vue
+++ b/src/views/flow/components/FieldExport.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :z-index="zIndex"
       :value="isShow"
       show-footer
@@ -67,6 +68,8 @@ export default {
     return {
       zIndex: PopupManager.nextZIndex(),
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `flow-field-export-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       loading: false,
       config: {
         fields: []
diff --git a/src/views/flow/components/MultiDeal.vue b/src/views/flow/components/MultiDeal.vue
index 06248dd..575fcaa 100644
--- a/src/views/flow/components/MultiDeal.vue
+++ b/src/views/flow/components/MultiDeal.vue
@@ -2,6 +2,7 @@
   <div>
     <vxe-modal
       title="批量审批"
+      :id="modalId"
       :z-index="zIndex"
       :value="isShow"
       @input="e => $emit('update:isShow', e)"
@@ -168,6 +169,8 @@ export default {
   data() {
     return {
       loading: false,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `flow-multideal-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
 
diff --git a/src/views/flow/components/assign.vue b/src/views/flow/components/assign.vue
index eace25f..3b05377 100644
--- a/src/views/flow/components/assign.vue
+++ b/src/views/flow/components/assign.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="visible"
       show-footer
       :z-index="zIndex"
@@ -141,6 +142,8 @@ export default {
   },
   data() {
     return {
+      // vxe-ui v3.5+ 要求 modal.id，避免缺参导致弹窗行为异常/警告刷屏
+      modalId: `flow-assign-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       isIndeterminate: false,
       checkAll: false,
 
diff --git a/src/views/flow/components/forward.vue b/src/views/flow/components/forward.vue
index d3b35f1..6eb7321 100644
--- a/src/views/flow/components/forward.vue
+++ b/src/views/flow/components/forward.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vxe-modal :value="isShow"
+    <vxe-modal :id="modalId" :value="isShow"
                show-footer
                :z-index="zIndex"
                title="转办"
@@ -62,6 +62,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `flow-forward-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       form: {
         id: "",
diff --git a/src/views/flow/components/payMx copy.vue b/src/views/flow/components/payMx copy.vue
index d593e00..6034e1f 100644
--- a/src/views/flow/components/payMx copy.vue	
+++ b/src/views/flow/components/payMx copy.vue	
@@ -1,529 +1,533 @@
-<template>
-  <div>
-    <vxe-modal :value="isShow" show-footer :z-index="zIndex" title="支付审批明细" show-zoom show-confirm-button transfer
-      resize :width="defaultModalSize.width" :height="defaultModalSize.height" @input="e => $emit('update:isShow',e)">
-      <div>
-        <!-- 历史支付记录查看 -->
-        <h3>历史支付记录查看</h3>
-        <vxe-table ref="tables" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
-          :print-config="{}" :export-config="{}" :expand-config="{
-              accordion: true,
-              padding: true,
-            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="paymentsList">
-
-          <vxe-column title="项目名称" width="250" align="left" field="contract.name">
-            <template #default="{ row }">
-              {{row.contract_id ? (row.contract?row.contract.name:'') : row.away.title}}
-            </template>
-          </vxe-column>
-          <vxe-column title="付款申请金额(元)" width="180" align="right" field="apply_money">
-            <template #default="{ row }">
-              {{Number(row.apply_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
-            </template>
-          </vxe-column>
-          <vxe-column title="实际支付金额(元)" width="180" align="right" field="act_money">
-            <template #default="{ row }">
-              {{Number(row.act_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
-            </template>
-          </vxe-column>
-          <vxe-column title="款项类型" width="120" align="center" field="type"></vxe-column>
-          <vxe-column title="预算计划" width="330" align="left" field="act_plan_link">
-            <template #default="{ row }">
-              <template v-if="row.act_plan_link && row.act_plan_link.length > 0">
-                <div v-for="item in row.act_plan_link">
-                  [{{item.plan?item.plan.year:''}}] {{(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''}}
-                  - {{item.plan?item.plan.name:''}}
-                  <br />
-                  [使用金额] {{item.use_money}}元
-                </div>
-              </template>
-            </template>
-          </vxe-column>
-          <vxe-column title="审核状态" width="120" align="center" field="status">
-            <template #default="{ row }">
-              <div v-if="row.status===0">待审核</div>
-              <div v-else>已审核</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="流程状态" width="120" align="center" field="fund_log_flow_links">
-            <template #default="{ row }">
-              <template v-for="item in row.fund_log_flow_links">
-                <div v-if="item.tag === 'pay'">
-                  {{flowStatus[item.flow_status]}}
-                </div>
-              </template>
-            </template>
-          </vxe-column>
-          <vxe-column title="次数" width="80" align="center" field="pay_count">
-            <template #default="{ row }">
-              {{row.contract_id ? row.pay_count : row.pay_count_away}}
-            </template>
-          </vxe-column>
-          <vxe-column title="是否为最后一笔" width="120" align="center" field="is_end">
-            <template #default="{ row }">
-              <div v-if="row.is_end===1">是</div>
-              <div v-else>否</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="经办人" width="120" align="center" field="admin.name">
-            <template #default="{ row }">
-              {{row.admin?row.admin.name:''}}
-            </template>
-          </vxe-column>
-          <vxe-column title="业务科室" width="160" align="center" field="department.name">
-            <template #default="{ row }">
-              {{row.department?row.department.name:''}}
-            </template>
-          </vxe-column>
-          <vxe-column title="备注" width="460" align="left" field="remark">
-          </vxe-column>
-          <vxe-column title="创建信息" width="180" align="center" field="created_at">
-          </vxe-column>
-          <vxe-column
-            min-width="120"
-            header-align="center"
-            field="operate"
-            title="操作"
-            fixed="right"
-          >
-          <template #default="{ row }">
-            <el-button type="primary" size="small" @click="showDetail(row)"
-            >查看</el-button>
-          </template>
-
-          </vxe-column>
-        </vxe-table>
-        <div style="display: flex;justify-content: center;margin-top:15px">
-          <el-button :disabled="paymentsList.length>0?false:true" type="primary" size="small" @click="payClose">设为已支付完毕 <i class="el-icon-arrow-right"></i> </el-button>
-        </div>
-
-
-        <h3>发起新的支付审批</h3>
-        <div style="display: flex;align-items: center;justify-content: space-between;">
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>申请付款金额
-            </div>
-            <div class="xy-table-item-content xy-table-item-price">
-              <el-input clearable type="number" placeholder="请填写付款金额" v-model="fundlogForm.applyMoney"
-                style="width: 150px;margin-left:10px" />
-            </div>
-          </div>
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
-            </div>
-            <div style="display: flex;align-items: center;">
-              <el-select placeholder="选择款项类型或直接录入其他类型" v-model="fundlogForm.type" style="width: 200px;margin-left:10px"
-                filterable allow-create clearable popper-append-to-body>
-                <el-option v-for="item in paymentType" :key="item" :label="item" :value="item">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
-            </div>
-            <div class="xy-table-item-content" style="margin-left:10px">
-              <el-switch v-model="fundlogForm.isLast" />
-              <!--                       @change="toggleSelection"-->
-            </div>
-          </div>
-        </div>
-        <vxe-table ref="table" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
-          :print-config="{}" :export-config="{}" :expand-config="{
-              accordion: true,
-              padding: true,
-            }" :checkbox-config="{
-              reserve: true,
-              highlight: true,
-              range: true,
-              checkMethod: ({ row }) => {
-                return parseFloat(row.hasPayNum) < parseFloat(row.num)
-              }
-            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="list">
-          <vxe-column type="checkbox" width="50" align="center"></vxe-column>
-          <vxe-column title="本次报销数量" width="120" align="center" field="payNum">
-            <template #default="{ row }">
-
-              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum"
-                placeholder="数量"></vxe-number-input>
-              <div v-else>-</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="已报销数量" width="100" align="center" field="hasPayNum">
-          </vxe-column>
-          <vxe-column align="center" v-for="item in table_item" :title="item.label" :field="item.prop"></vxe-column>
-
-        </vxe-table>
-      </div>
-
-      <template #footer>
-        <div style="margin-top: 20px;display: flex;justify-content: center;">
-          <el-button type="primary" size="small" @click="submit">发起支付审批 <i class="el-icon-arrow-right"></i> </el-button>
-        </div>
-      </template>
-    </vxe-modal>
-    <vxe-modal
-      fullscreen
-      :remember="true"
-      class-name="oa-modal"
-      title="流程查看"
-      v-model="isShowOaModal"
-      :z-index="zIndex+100"
-    >
-      <div style="width: 100%;height: 100%;">
-        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
-      </div>
-    </vxe-modal>
-  </div>
-</template>
-
-<script>
-  import {
-    view,
-    fieldConfig
-  } from '@/api/flow'
-  import {
-    getItems,
-    detailContract,
-    getFundLog,
-    fundLogEnd
-  } from '@/api/flow/pay'
-  import {
-    PopupManager
-  } from 'element-ui/lib/utils/popup'
-  import {
-    defaultModalSize
-  } from "@/settings";
-import {getToken} from "@/utils/auth";
-  export default {
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-    },
-    data() {
-      return {
-        payId: '',
-        payList:'',
-        defaultModalSize,
-        zIndex: PopupManager.nextZIndex(),
-        list: [],
-        table_item: [],
-        flowDetail: {},
-        fundlogForm: {
-          applyMoney: 0,
-          type: '',
-          isLast: false,
-        },
-        paymentType: ["进度款", "结算款", "质保金"],
-        oaUrl: '',
-        isShowOaModal: false,
-        paymentsList: [],
-        flowStatus: {
-          '-1': '已退回',
-          '0': '办理中',
-          '1': '已完成'
-        }
-      }
-    },
-    methods: {
-      async getConfig() {
-        const loading = this.$loading({
-          lock: true,
-          text: "拼命加载中",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.8)",
-        });
-        try {
-          const res = await view(this.payId);
-
-          const {
-            fields
-          } = res?.customModel;
-          this.flowDetail = res?.flow
-          const {
-            data
-          } = res?.flow
-          
-          fields.forEach((field) => {
-            if (field.type === 'relation') {
-              // 增加 自己提交的数量 和 已提交的数量
-              this.list = JSON.parse(data[field.name])
-              this.list.map(item => {
-                item.payNum = 0
-                item.hasPayNum = 0
-              })
-              this.getItemNum(this.payId)
-              this.getFieldConfig(field.sub_custom_model_id)
-            }
-          });
-          this.getFundLogList()
-          console.log("this.list", this.list)
-          loading.close();
-        } catch (err) {
-          console.error(err)
-          this.$message.error("配置失败");
-          loading.close();
-        }
-      },
-      // 获取历史支付明细
-      async getFundLogList() {
-        let payments =
-          (
-            await getFundLog({
-              contract_id: this.flowDetail.out_contract_id,
-              show_type: 1
-            })
-          )?.data || [];
-        this.paymentsList = payments
-        console.log("paymentsList", this.paymentsList)
-      },
-      // 获取采购明细
-      async getFieldConfig(id) {
-        try {
-          const res = await fieldConfig(id)
-          console.log("res", res)
-          const fields = res?.customModel?.fields
-          fields.forEach((field) => {
-            this.table_item.push({
-              label: field.label,
-              prop: field.name
-            })
-          });
-
-
-        } catch (err) {
-          console.error(err)
-        }
-
-      },
-      // 获取已提交的物资数量
-      async getItemNum(id) {
-        try {
-          const item = await getItems({
-            flow_id: id
-          })
-          console.log("item", item)
-          if (item.length > 0) {
-            const itemMap = new Map();
-            item.forEach(item => {
-              itemMap.set(item.wuzicaigou_item_id, item.total_num);
-            });
-            // 遍历 list 数组，根据 id 从 Map 中获取 total_num 并赋值给 hasPayNum
-            this.list.forEach(item => {
-              if (itemMap.has(item.id)) {
-                item.hasPayNum = itemMap.get(item.id);
-              }
-            });
-          }
-        } catch (err) {
-          console.error(err)
-        }
-      },
-      showDetail(row){
-        let url = `/oa/#/flow/detail?module_name=oa&auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
-        let pay = row.fund_log_flow_links.find(i => i.tag === 'pay')
-        //url += `&to=/flow/detail?flow_id=${caigou.id}`
-        url += pay?.flow_id
-        this.oaUrl = url
-        this.isShowOaModal = true
-      },
-      payClose(){
-        this.$confirm('将此采购记录设为“已⽀付完毕”，同时会将最后⼀笔⽀付记录的“是否为最后⼀笔”属性设置为“是”，请确认是否要进⾏此操作', '提示', {
-          confirmButtonText: '确定',
-          callback: action => {
-            if(action==='confirm'){
-              fundLogEnd({
-                contract_id:this.flowDetail.out_contract_id,
-              }).then(res=>{
-                this.$emit('update:isShow', false)
-                this.$emit('refresh')
-              })
-            }
-
-
-            // this.fundlogForm.isLast = true
-          }
-        });
-      },
-      async submit() {
-        try {
-          if (!this.fundlogForm.applyMoney) {
-            this.$message({
-              message: '请填写本次申请付款金额',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.fundlogForm.type) {
-            this.$message({
-              message: '请选择款项类型',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          const records = this.$refs.table.getCheckboxRecords()
-          console.log("records", records)
-          let count = 0
-          let totalCount = 0
-          let allCount = 0 // 每一条本次报销数量+已报销数量 = 数量
-          if (records.length < 1) {
-            this.$message({
-              message: '请选择需要报销的明细',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          records.map(item => {
-            if (parseFloat(item.payNum) === 0 || parseFloat(item.payNum) > parseFloat(item.num)) {
-              count++
-            }
-            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) > parseFloat(item.num)) {
-              totalCount++
-            }
-            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) === parseFloat(item.num)) {
-              allCount++
-            }
-          })
-          if (count > 0) {
-            this.$message({
-              message: '报销数量不能为0或报销数量大于总数量',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          if (totalCount > 0) {
-            this.$message({
-              message: '本次报销数量大于剩余可报销数量',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          if (allCount === records.length) {
-            this.$alert('本次报销数量已等于总数量，默认为最后一笔', '提示', {
-              confirmButtonText: '确定',
-              callback: action => {
-                this.fundlogForm.isLast = true
-              }
-            });
-          }
-          // return
-          //wuzicaigou_items 报销的物资明细数组
-          let wuzicaigou_items = []
-          let zhifutitle = ''
-          records.map(item => {
-            wuzicaigou_items.push({
-              flow_id: this.payId,
-              wuzicaigou_id: item.belongs_id,
-              wuzicaigou_item_id: item.id,
-              name: item.pinminghuofuwuxuqiu,
-              num: item.payNum,
-              total: item.num
-            })
-            zhifutitle += item.pinminghuofuwuxuqiu + '*' + item.payNum + ','
-          })
-
-          // 跳转到支付审批流程
-          let payments = this.paymentsList;
-          const actNumsTotal = () => {
-            return payments.reduce((pre, cur) => {
-              return pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0);
-            }, 0);
-          };
-          let contract;
-          if (this.flowDetail.out_contract_id) {
-            contract = await detailContract({
-              id: this.flowDetail.out_contract_id
-            });
-          }
-
-          // payments = this.paymentsList
-          // (
-          //   await getFundLog({
-          //     contract_id: this.flowDetail.out_contract_id,
-          //     show_type: 1
-          //   })
-          // )?.data || [];
-          // 付款登记的字段
-          let zhifutitle2 = zhifutitle.slice(0, -1)
-          zhifutitle += "（" + this.flowDetail.title + '）'
-          let baseInfo = {
-            "oaUrl": contract?.number,
-            "zhifutitle": zhifutitle,
-            // ?contract?.name
-            "contract_id": contract.id,
-            "type": this.fundlogForm.type,
-            "is_end": this.fundlogForm.isLast ? 1 : 0,
-            "amt": this.fundlogForm.applyMoney,
-            // out_pay_id: row?.id,
-            "xiangxishuoming": zhifutitle,
-            "yifujine": actNumsTotal(),
-            "xiangmuzonge": contract.money,
-            "zhifucishu": contract?.sign_plan?.length,
-            "cishu": payments.length,
-
-            "liezhiqudao": contract?.plans.map(i => i.name)?.toString(),
-            "contractno": contract?.number,
-            "guanlianliucheng": contract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
-            "wuzicaigou_items": wuzicaigou_items
-          };
-          console.log(baseInfo, baseInfo)
-          let url =
-            `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`;
-          this.$router.push(
-            url
-          );
-          // this.oaUrl = url;
-          // this.isShowOaModal = true;
-          this.$emit('update:isShow', false)
-        } catch (err) {
-          console.error(err)
-        }
-      }
-    },
-    computed: {},
-    watch: {
-      isShow(newVal) {
-        if (newVal) {
-          this.zIndex = PopupManager.nextZIndex()
-
-          if (this.payId) {
-            this.getConfig()
-
-          }
-        } else {
-          this.list = []
-          this.payId = ''
-          this.payList = []
-          this.oaUrl = ''
-          this.isShowOaModal = false
-          this.table_item = []
-          this.paymentsList = []
-          this.flowDetail = {}
-          this.fundlogForm = {
-            applyMoney: 0,
-            type: '',
-            isLast: false,
-          }
-          this.$refs.table.clearCheckboxRow()
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  ::v-deep .el-checkbox-group {
-    font-size: inherit;
-  }
-</style>
+<template>
+  <div>
+    <vxe-modal :id="modalId" :value="isShow" show-footer :z-index="zIndex" title="支付审批明细" show-zoom show-confirm-button transfer
+      resize :width="defaultModalSize.width" :height="defaultModalSize.height" @input="e => $emit('update:isShow',e)">
+      <div>
+        <!-- 历史支付记录查看 -->
+        <h3>历史支付记录查看</h3>
+        <vxe-table ref="tables" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
+          :print-config="{}" :export-config="{}" :expand-config="{
+              accordion: true,
+              padding: true,
+            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="paymentsList">
+
+          <vxe-column title="项目名称" width="250" align="left" field="contract.name">
+            <template #default="{ row }">
+              {{row.contract_id ? (row.contract?row.contract.name:'') : row.away.title}}
+            </template>
+          </vxe-column>
+          <vxe-column title="付款申请金额(元)" width="180" align="right" field="apply_money">
+            <template #default="{ row }">
+              {{Number(row.apply_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="实际支付金额(元)" width="180" align="right" field="act_money">
+            <template #default="{ row }">
+              {{Number(row.act_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="款项类型" width="120" align="center" field="type"></vxe-column>
+          <vxe-column title="预算计划" width="330" align="left" field="act_plan_link">
+            <template #default="{ row }">
+              <template v-if="row.act_plan_link && row.act_plan_link.length > 0">
+                <div v-for="item in row.act_plan_link">
+                  [{{item.plan?item.plan.year:''}}] {{(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''}}
+                  - {{item.plan?item.plan.name:''}}
+                  <br />
+                  [使用金额] {{item.use_money}}元
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="审核状态" width="120" align="center" field="status">
+            <template #default="{ row }">
+              <div v-if="row.status===0">待审核</div>
+              <div v-else>已审核</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="流程状态" width="120" align="center" field="fund_log_flow_links">
+            <template #default="{ row }">
+              <template v-for="item in row.fund_log_flow_links">
+                <div v-if="item.tag === 'pay'">
+                  {{flowStatus[item.flow_status]}}
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="次数" width="80" align="center" field="pay_count">
+            <template #default="{ row }">
+              {{row.contract_id ? row.pay_count : row.pay_count_away}}
+            </template>
+          </vxe-column>
+          <vxe-column title="是否为最后一笔" width="120" align="center" field="is_end">
+            <template #default="{ row }">
+              <div v-if="row.is_end===1">是</div>
+              <div v-else>否</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="经办人" width="120" align="center" field="admin.name">
+            <template #default="{ row }">
+              {{row.admin?row.admin.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="业务科室" width="160" align="center" field="department.name">
+            <template #default="{ row }">
+              {{row.department?row.department.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="备注" width="460" align="left" field="remark">
+          </vxe-column>
+          <vxe-column title="创建信息" width="180" align="center" field="created_at">
+          </vxe-column>
+          <vxe-column
+            min-width="120"
+            header-align="center"
+            field="operate"
+            title="操作"
+            fixed="right"
+          >
+          <template #default="{ row }">
+            <el-button type="primary" size="small" @click="showDetail(row)"
+            >查看</el-button>
+          </template>
+
+          </vxe-column>
+        </vxe-table>
+        <div style="display: flex;justify-content: center;margin-top:15px">
+          <el-button :disabled="paymentsList.length>0?false:true" type="primary" size="small" @click="payClose">设为已支付完毕 <i class="el-icon-arrow-right"></i> </el-button>
+        </div>
+
+
+        <h3>发起新的支付审批</h3>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>申请付款金额
+            </div>
+            <div class="xy-table-item-content xy-table-item-price">
+              <el-input clearable type="number" placeholder="请填写付款金额" v-model="fundlogForm.applyMoney"
+                style="width: 150px;margin-left:10px" />
+            </div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
+            </div>
+            <div style="display: flex;align-items: center;">
+              <el-select placeholder="选择款项类型或直接录入其他类型" v-model="fundlogForm.type" style="width: 200px;margin-left:10px"
+                filterable allow-create clearable popper-append-to-body>
+                <el-option v-for="item in paymentType" :key="item" :label="item" :value="item">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
+            </div>
+            <div class="xy-table-item-content" style="margin-left:10px">
+              <el-switch v-model="fundlogForm.isLast" />
+              <!--                       @change="toggleSelection"-->
+            </div>
+          </div>
+        </div>
+        <vxe-table ref="table" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
+          :print-config="{}" :export-config="{}" :expand-config="{
+              accordion: true,
+              padding: true,
+            }" :checkbox-config="{
+              reserve: true,
+              highlight: true,
+              range: true,
+              checkMethod: ({ row }) => {
+                return parseFloat(row.hasPayNum) < parseFloat(row.num)
+              }
+            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="list">
+          <vxe-column type="checkbox" width="50" align="center"></vxe-column>
+          <vxe-column title="本次报销数量" width="120" align="center" field="payNum">
+            <template #default="{ row }">
+
+              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum"
+                placeholder="数量"></vxe-number-input>
+              <div v-else>-</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="已报销数量" width="100" align="center" field="hasPayNum">
+          </vxe-column>
+          <vxe-column align="center" v-for="item in table_item" :title="item.label" :field="item.prop"></vxe-column>
+
+        </vxe-table>
+      </div>
+
+      <template #footer>
+        <div style="margin-top: 20px;display: flex;justify-content: center;">
+          <el-button type="primary" size="small" @click="submit">发起支付审批 <i class="el-icon-arrow-right"></i> </el-button>
+        </div>
+      </template>
+    </vxe-modal>
+    <vxe-modal
+      :id="oaModalId"
+      fullscreen
+      :remember="true"
+      class-name="oa-modal"
+      title="流程查看"
+      v-model="isShowOaModal"
+      :z-index="zIndex+100"
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
+      </div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+  import {
+    view,
+    fieldConfig
+  } from '@/api/flow'
+  import {
+    getItems,
+    detailContract,
+    getFundLog,
+    fundLogEnd
+  } from '@/api/flow/pay'
+  import {
+    PopupManager
+  } from 'element-ui/lib/utils/popup'
+  import {
+    defaultModalSize
+  } from "@/settings";
+import {getToken} from "@/utils/auth";
+  export default {
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false,
+        required: true
+      },
+    },
+    data() {
+      return {
+        // vxe-ui v3.5+ 要求 modal.id
+        modalId: `flow-paymx-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        oaModalId: `flow-paymx-oa-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        payId: '',
+        payList:'',
+        defaultModalSize,
+        zIndex: PopupManager.nextZIndex(),
+        list: [],
+        table_item: [],
+        flowDetail: {},
+        fundlogForm: {
+          applyMoney: 0,
+          type: '',
+          isLast: false,
+        },
+        paymentType: ["进度款", "结算款", "质保金"],
+        oaUrl: '',
+        isShowOaModal: false,
+        paymentsList: [],
+        flowStatus: {
+          '-1': '已退回',
+          '0': '办理中',
+          '1': '已完成'
+        }
+      }
+    },
+    methods: {
+      async getConfig() {
+        const loading = this.$loading({
+          lock: true,
+          text: "拼命加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.8)",
+        });
+        try {
+          const res = await view(this.payId);
+
+          const {
+            fields
+          } = res?.customModel;
+          this.flowDetail = res?.flow
+          const {
+            data
+          } = res?.flow
+          
+          fields.forEach((field) => {
+            if (field.type === 'relation') {
+              // 增加 自己提交的数量 和 已提交的数量
+              this.list = JSON.parse(data[field.name])
+              this.list.map(item => {
+                item.payNum = 0
+                item.hasPayNum = 0
+              })
+              this.getItemNum(this.payId)
+              this.getFieldConfig(field.sub_custom_model_id)
+            }
+          });
+          this.getFundLogList()
+          console.log("this.list", this.list)
+          loading.close();
+        } catch (err) {
+          console.error(err)
+          this.$message.error("配置失败");
+          loading.close();
+        }
+      },
+      // 获取历史支付明细
+      async getFundLogList() {
+        let payments =
+          (
+            await getFundLog({
+              contract_id: this.flowDetail.out_contract_id,
+              show_type: 1
+            })
+          )?.data || [];
+        this.paymentsList = payments
+        console.log("paymentsList", this.paymentsList)
+      },
+      // 获取采购明细
+      async getFieldConfig(id) {
+        try {
+          const res = await fieldConfig(id)
+          console.log("res", res)
+          const fields = res?.customModel?.fields
+          fields.forEach((field) => {
+            this.table_item.push({
+              label: field.label,
+              prop: field.name
+            })
+          });
+
+
+        } catch (err) {
+          console.error(err)
+        }
+
+      },
+      // 获取已提交的物资数量
+      async getItemNum(id) {
+        try {
+          const item = await getItems({
+            flow_id: id
+          })
+          console.log("item", item)
+          if (item.length > 0) {
+            const itemMap = new Map();
+            item.forEach(item => {
+              itemMap.set(item.wuzicaigou_item_id, item.total_num);
+            });
+            // 遍历 list 数组，根据 id 从 Map 中获取 total_num 并赋值给 hasPayNum
+            this.list.forEach(item => {
+              if (itemMap.has(item.id)) {
+                item.hasPayNum = itemMap.get(item.id);
+              }
+            });
+          }
+        } catch (err) {
+          console.error(err)
+        }
+      },
+      showDetail(row){
+        let url = `/oa/#/flow/detail?module_name=oa&auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
+        let pay = row.fund_log_flow_links.find(i => i.tag === 'pay')
+        //url += `&to=/flow/detail?flow_id=${caigou.id}`
+        url += pay?.flow_id
+        this.oaUrl = url
+        this.isShowOaModal = true
+      },
+      payClose(){
+        this.$confirm('将此采购记录设为“已⽀付完毕”，同时会将最后⼀笔⽀付记录的“是否为最后⼀笔”属性设置为“是”，请确认是否要进⾏此操作', '提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            if(action==='confirm'){
+              fundLogEnd({
+                contract_id:this.flowDetail.out_contract_id,
+              }).then(res=>{
+                this.$emit('update:isShow', false)
+                this.$emit('refresh')
+              })
+            }
+
+
+            // this.fundlogForm.isLast = true
+          }
+        });
+      },
+      async submit() {
+        try {
+          if (!this.fundlogForm.applyMoney) {
+            this.$message({
+              message: '请填写本次申请付款金额',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.fundlogForm.type) {
+            this.$message({
+              message: '请选择款项类型',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          const records = this.$refs.table.getCheckboxRecords()
+          console.log("records", records)
+          let count = 0
+          let totalCount = 0
+          let allCount = 0 // 每一条本次报销数量+已报销数量 = 数量
+          if (records.length < 1) {
+            this.$message({
+              message: '请选择需要报销的明细',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          records.map(item => {
+            if (parseFloat(item.payNum) === 0 || parseFloat(item.payNum) > parseFloat(item.num)) {
+              count++
+            }
+            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) > parseFloat(item.num)) {
+              totalCount++
+            }
+            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) === parseFloat(item.num)) {
+              allCount++
+            }
+          })
+          if (count > 0) {
+            this.$message({
+              message: '报销数量不能为0或报销数量大于总数量',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          if (totalCount > 0) {
+            this.$message({
+              message: '本次报销数量大于剩余可报销数量',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          if (allCount === records.length) {
+            this.$alert('本次报销数量已等于总数量，默认为最后一笔', '提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.fundlogForm.isLast = true
+              }
+            });
+          }
+          // return
+          //wuzicaigou_items 报销的物资明细数组
+          let wuzicaigou_items = []
+          let zhifutitle = ''
+          records.map(item => {
+            wuzicaigou_items.push({
+              flow_id: this.payId,
+              wuzicaigou_id: item.belongs_id,
+              wuzicaigou_item_id: item.id,
+              name: item.pinminghuofuwuxuqiu,
+              num: item.payNum,
+              total: item.num
+            })
+            zhifutitle += item.pinminghuofuwuxuqiu + '*' + item.payNum + ','
+          })
+
+          // 跳转到支付审批流程
+          let payments = this.paymentsList;
+          const actNumsTotal = () => {
+            return payments.reduce((pre, cur) => {
+              return pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0);
+            }, 0);
+          };
+          let contract;
+          if (this.flowDetail.out_contract_id) {
+            contract = await detailContract({
+              id: this.flowDetail.out_contract_id
+            });
+          }
+
+          // payments = this.paymentsList
+          // (
+          //   await getFundLog({
+          //     contract_id: this.flowDetail.out_contract_id,
+          //     show_type: 1
+          //   })
+          // )?.data || [];
+          // 付款登记的字段
+          let zhifutitle2 = zhifutitle.slice(0, -1)
+          zhifutitle += "（" + this.flowDetail.title + '）'
+          let baseInfo = {
+            "oaUrl": contract?.number,
+            "zhifutitle": zhifutitle,
+            // ?contract?.name
+            "contract_id": contract.id,
+            "type": this.fundlogForm.type,
+            "is_end": this.fundlogForm.isLast ? 1 : 0,
+            "amt": this.fundlogForm.applyMoney,
+            // out_pay_id: row?.id,
+            "xiangxishuoming": zhifutitle,
+            "yifujine": actNumsTotal(),
+            "xiangmuzonge": contract.money,
+            "zhifucishu": contract?.sign_plan?.length,
+            "cishu": payments.length,
+
+            "liezhiqudao": contract?.plans.map(i => i.name)?.toString(),
+            "contractno": contract?.number,
+            "guanlianliucheng": contract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
+            "wuzicaigou_items": wuzicaigou_items
+          };
+          console.log(baseInfo, baseInfo)
+          let url =
+            `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`;
+          this.$router.push(
+            url
+          );
+          // this.oaUrl = url;
+          // this.isShowOaModal = true;
+          this.$emit('update:isShow', false)
+        } catch (err) {
+          console.error(err)
+        }
+      }
+    },
+    computed: {},
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.zIndex = PopupManager.nextZIndex()
+
+          if (this.payId) {
+            this.getConfig()
+
+          }
+        } else {
+          this.list = []
+          this.payId = ''
+          this.payList = []
+          this.oaUrl = ''
+          this.isShowOaModal = false
+          this.table_item = []
+          this.paymentsList = []
+          this.flowDetail = {}
+          this.fundlogForm = {
+            applyMoney: 0,
+            type: '',
+            isLast: false,
+          }
+          this.$refs.table.clearCheckboxRow()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .el-checkbox-group {
+    font-size: inherit;
+  }
+</style>
diff --git a/src/views/flow/components/payMx.vue b/src/views/flow/components/payMx.vue
index fbb70bb..0ea6963 100644
--- a/src/views/flow/components/payMx.vue
+++ b/src/views/flow/components/payMx.vue
@@ -1,676 +1,680 @@
-<template>
-  <div>
-    <vxe-modal :value="isShow" show-footer :z-index="zIndex" title="支付审批明细" show-zoom show-confirm-button transfer
-      resize :width="defaultModalSize.width" :height="defaultModalSize.height" @input="e => $emit('update:isShow',e)">
-      <div>
-        <!-- 历史支付记录查看 -->
-        <h3>历史支付记录查看</h3>
-        <vxe-table ref="tables" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
-          :print-config="{}" :export-config="{}" :expand-config="{
-              accordion: true,
-              padding: true,
-            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="paymentsList">
-
-          <vxe-column title="项目名称" width="250" align="left" field="contract.name">
-            <template #default="{ row }">
-              {{row.contract_id ? (row.contract?row.contract.name:'') : row.away.title}}
-            </template>
-          </vxe-column>
-          <vxe-column title="付款申请金额(元)" width="180" align="right" field="apply_money">
-            <template #default="{ row }">
-              {{Number(row.apply_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
-            </template>
-          </vxe-column>
-          <vxe-column title="实际支付金额(元)" width="180" align="right" field="act_money">
-            <template #default="{ row }">
-              {{Number(row.act_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
-            </template>
-          </vxe-column>
-          <vxe-column title="款项类型" width="120" align="center" field="type"></vxe-column>
-          <vxe-column title="预算计划" width="330" align="left" field="act_plan_link">
-            <template #default="{ row }">
-              <template v-if="row.act_plan_link && row.act_plan_link.length > 0">
-                <div v-for="item in row.act_plan_link">
-                  [{{item.plan?item.plan.year:''}}] {{(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''}}
-                  - {{item.plan?item.plan.name:''}}
-                  <br />
-                  [使用金额] {{item.use_money}}元
-                </div>
-              </template>
-            </template>
-          </vxe-column>
-          <vxe-column title="审核状态" width="120" align="center" field="status">
-            <template #default="{ row }">
-              <div v-if="row.status===0">待审核</div>
-              <div v-else>已审核</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="流程状态" width="120" align="center" field="fund_log_flow_links">
-            <template #default="{ row }">
-              <template v-for="item in row.fund_log_flow_links">
-                <div v-if="item.tag === 'pay'">
-                  {{flowStatus[item.flow_status]}}
-                </div>
-              </template>
-            </template>
-          </vxe-column>
-          <vxe-column title="次数" width="80" align="center" field="pay_count">
-            <template #default="{ row }">
-              {{row.contract_id ? row.pay_count : row.pay_count_away}}
-            </template>
-          </vxe-column>
-          <vxe-column title="是否为最后一笔" width="120" align="center" field="is_end">
-            <template #default="{ row }">
-              <div v-if="row.is_end===1">是</div>
-              <div v-else>否</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="经办人" width="120" align="center" field="admin.name">
-            <template #default="{ row }">
-              {{row.admin?row.admin.name:''}}
-            </template>
-          </vxe-column>
-          <vxe-column title="业务科室" width="160" align="center" field="department.name">
-            <template #default="{ row }">
-              {{row.department?row.department.name:''}}
-            </template>
-          </vxe-column>
-          <vxe-column title="备注" width="460" align="left" field="remark">
-          </vxe-column>
-          <vxe-column title="创建信息" width="180" align="center" field="created_at">
-          </vxe-column>
-          <vxe-column
-            min-width="120"
-            header-align="center"
-            field="operate"
-            title="操作"
-            fixed="right"
-          >
-          <template #default="{ row }">
-            <el-button type="primary" size="small" @click="showDetail(row)"
-            >查看</el-button>
-          </template>
-
-          </vxe-column>
-        </vxe-table>
-        <div style="display: flex;justify-content: center;margin-top:15px">
-          <el-button :disabled="paymentsList.length>0?false:true" type="primary" size="small" @click="payClose">设为已支付完毕 <i class="el-icon-arrow-right"></i> </el-button>
-        </div>
-
-
-        <h3>发起新的支付审批</h3>
-   
-        <div v-for="pay in payList" :key="pay.id" style="margin-top: 12px;">
-          <div style="font-weight: 600; margin: 6px 0;">{{ pay.title }}</div>
-        <div style="display: flex;align-items: center;justify-content: space-between;">
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>申请付款金额
-            </div>
-            <div class="xy-table-item-content xy-table-item-price">
-                <el-input clearable type="number" placeholder="请填写付款金额" v-model="fundlogFormMap[pay.id].applyMoney"
-                style="width: 150px;margin-left:10px" />
-            </div>
-          </div>
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
-            </div>
-            <div style="display: flex;align-items: center;">
-                <el-select placeholder="选择款项类型或直接录入其他类型" v-model="fundlogFormMap[pay.id].type" style="width: 200px;margin-left:10px"
-                filterable allow-create clearable popper-append-to-body>
-                <el-option v-for="item in paymentType" :key="item" :label="item" :value="item">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-          <div style="display: flex;align-items: center;">
-            <div class="xy-table-item-label">
-              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
-            </div>
-            <div class="xy-table-item-content" style="margin-left:10px">
-                <el-switch v-model="fundlogFormMap[pay.id].isLast" />
-            </div>
-          </div>
-        </div>
-          <vxe-table :ref="'table_' + pay.id" stripe style="margin-top: 6px" keep-source :column-config="{ resizable: true }"
-          :print-config="{}" :export-config="{}" :expand-config="{
-              accordion: true,
-              padding: true,
-            }" :checkbox-config="{
-              reserve: true,
-              highlight: true,
-              range: true,
-              checkMethod: ({ row }) => {
-                return parseFloat(row.hasPayNum) < parseFloat(row.num)
-              }
-              }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="getGroupList(pay.id)">
-          <vxe-column type="checkbox" width="50" align="center"></vxe-column>
-          <vxe-column title="本次报销数量" width="120" align="center" field="payNum">
-            <template #default="{ row }">
-              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum"
-                placeholder="数量"></vxe-number-input>
-              <div v-else>-</div>
-            </template>
-          </vxe-column>
-          <vxe-column title="已报销数量" width="100" align="center" field="hasPayNum">
-          </vxe-column>
-            <vxe-column align="center" v-for="item in table_item" :key="item.prop + '_' + pay.id" :title="item.label" :field="item.prop"></vxe-column>
-        </vxe-table>
-        </div>
-      </div>
-
-      <template #footer>
-        <div style="margin-top: 20px;display: flex;justify-content: center;">
-          <el-button type="primary" size="small" @click="submit">发起支付审批 <i class="el-icon-arrow-right"></i> </el-button>
-        </div>
-      </template>
-    </vxe-modal>
-    <vxe-modal
-      fullscreen
-      :remember="true"
-      class-name="oa-modal"
-      title="流程查看"
-      v-model="isShowOaModal"
-      :z-index="zIndex+100"
-    >
-      <div style="width: 100%;height: 100%;">
-        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
-      </div>
-    </vxe-modal>
-  </div>
-</template>
-
-<script>
-  import {
-    view,
-    fieldConfig
-  } from '@/api/flow'
-  import {
-    getItems,
-    detailContract,
-    getFundLog,
-    fundLogEnd
-  } from '@/api/flow/pay'
-  import {
-    PopupManager
-  } from 'element-ui/lib/utils/popup'
-  import {
-    defaultModalSize
-  } from "@/settings";
-import {getToken} from "@/utils/auth";
-  export default {
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-      // 新增：接收支付列表，包含各项的 out_contract_id
-      // payList: {
-      //   type: Array,
-      //   default: () => []
-      // }
-    },
-    data() {
-      return {
-        payId: '',
-        payList:[],
-        defaultModalSize,
-        zIndex: PopupManager.nextZIndex(),
-        list: [],
-        // 每个区块（pay.id）对应的表单：申请金额/类型/是否最后一笔
-        fundlogFormMap: {},
-        table_item: [],
-        flowDetail: {},
-        fundlogForm: {
-          applyMoney: 0,
-          type: '',
-          isLast: false,
-        },
-        paymentType: ["进度款", "结算款", "质保金"],
-        oaUrl: '',
-        isShowOaModal: false,
-        paymentsList: [],
-        flowStatus: {
-          '-1': '已退回',
-          '0': '办理中',
-          '1': '已完成'
-        }
-      }
-    },
-    methods: {
-      // 获取某一 pay 的分组数据
-      getGroupList(flowId) {
-        return (this.list || []).filter(r => r.sourceFlowId === flowId)
-      },
-      async getConfig() {
-        // 改造：不再通过 view 接口获取，直接使用传入的 payList
-        const loading = this.$loading({
-          lock: true,
-          text: "拼命加载中",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.8)",
-        });
-        try {
-          console.log('this.payList', this.payList)
-          // 初始化本地可编辑列表（聚合 payList 的各自明细：JSON.parse(data.caigoumingxi)）
-          this.list = [];
-          (this.payList || []).forEach(pay => {
-            let subList = []
-            try {
-              subList = JSON.parse(pay?.data?.caigoumingxi || '[]')
-            } catch(e) {
-              subList = []
-            }
-            // 初始化每个区块的表单默认值
-            if (!this.fundlogFormMap[pay.id]) {
-              this.$set(this.fundlogFormMap, pay.id, {
-                applyMoney: 0,
-                type: '',
-                isLast: false
-              })
-            }
-            subList.forEach(item => {
-              const newItem = Object.assign({}, item, {
-                payNum: 0,
-                hasPayNum: 0,
-                sourceFlowId: pay.id
-              })
-              this.list.push(newItem)
-            })
-          })
-          console.log('this.list', this.list)
-
-          // 组装逗号分隔的明细 id 字符串用于 getItemNum（从 payList 的 data.caigoumingxi 中提取）
-          const ids = []
-          ;(this.payList || []).forEach(pay => {
-            try {
-              const subList = JSON.parse(pay?.data?.caigoumingxi || '[]')
-              subList.forEach(item => {
-                if (item && item.id) ids.push(item.id)
-              })
-            } catch(e) {
-              // 忽略解析错误
-            }
-          })
-          const idsStr = ids.join(',')
-
-          if (idsStr) {
-            await this.getItemNum(idsStr)
-          }
-
-          // 获取字段配置：取第一条的 sub_custom_model_id
-          // const firstSubModelId = this.payList && this.payList[0] && (this.payList[0].sub_custom_model_id || this.payList[0].field?.sub_custom_model_id)
-          // if (firstSubModelId) {
-            await this.getFieldConfig(81)
-          // }
-
-          // 历史支付记录由 payList 汇总的 out_contract_id 直接获取
-          await this.getFundLogList()
-
-          // 确保子表渲染到最新数据
-          this.$nextTick(() => {
-            try {
-              (this.payList || []).forEach(pay => {
-                const refKey = 'table_' + pay.id
-                const tableRef = this.$refs[refKey]
-                const data = this.getGroupList(pay.id)
-                if (tableRef && data) {
-                  if (typeof tableRef.reloadData === 'function') {
-                    tableRef.reloadData(data)
-                  } else if (typeof tableRef.loadData === 'function') {
-                    tableRef.loadData(data)
-                  }
-                }
-              })
-            } catch(e) {
-              console.warn('vxe-table reloadData failed', e)
-            }
-          })
-
-          loading.close()
-        } catch (err) {
-          console.error(err)
-          this.$message.error("配置失败")
-          loading.close()
-        }
-      },
-      // 获取历史支付明细
-      async getFundLogList() {
-        // 从传入的 payList 中汇总 out_contract_id，用逗号连接
-        const contractIds = (this.payList || [])
-          .map(i => i && i.out_contract_id)
-          .filter(id => !!id)
-          .join(',');
-
-        let payments = []
-        if (contractIds) {
-          payments = (
-            await getFundLog({
-              contract_id: contractIds,
-              show_type: 1
-            })
-          )?.data || []
-        }
-        this.paymentsList = payments
-        console.log("paymentsList", this.paymentsList)
-      },
-      // 获取采购明细
-      async getFieldConfig(id) {
-        try {
-          const res = await fieldConfig(id)
-          console.log("res", res)
-          const fields = res?.customModel?.fields
-          fields.forEach((field) => {
-            this.table_item.push({
-              label: field.label,
-              prop: field.name
-            })
-          });
-
-
-        } catch (err) {
-          console.error(err)
-        }
-
-      },
-      // 获取已提交的物资数量
-      async getItemNum(id) {
-        try {
-          const item = await getItems({
-            wuzicaigou_item_id: id
-          })
-          console.log("item", item)
-          if (item.length > 0) {
-            const itemMap = new Map();
-            item.forEach(item => {
-              itemMap.set(item.wuzicaigou_item_id, parseFloat(item.total_num));
-            });
-            // 遍历合并后的 list，根据 id 从 Map 中获取 total_num 并赋值给 hasPayNum
-            this.list.forEach(row => {
-              if (itemMap.has(row.id)) {
-                row.hasPayNum = itemMap.get(row.id)
-              }
-            })
-          }
-        } catch (err) {
-          console.error(err)
-        }
-      },
-      showDetail(row){
-        let url = `/oa/#/flow/detail?module_name=oa&auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
-        let pay = row.fund_log_flow_links.find(i => i.tag === 'pay')
-        //url += `&to=/flow/detail?flow_id=${caigou.id}`
-        url += pay?.flow_id
-        this.oaUrl = url
-        this.isShowOaModal = true
-      },
-      payClose(){
-        this.$confirm('将此采购记录设为“已⽀付完毕”，同时会将最后⼀笔⽀付记录的“是否为最后⼀笔”属性设置为“是”，请确认是否要进⾏此操作', '提示', {
-          confirmButtonText: '确定',
-          callback: action => {
-            if(action==='confirm'){
-              fundLogEnd({
-                contract_id:this.flowDetail.out_contract_id,
-              }).then(res=>{
-                this.$emit('update:isShow', false)
-                this.$emit('refresh')
-              })
-            }
-
-
-            // this.fundlogForm.isLast = true
-          }
-        });
-      },
-      async submit() {
-        try {
-
-          // 收集所有子表勾选记录
-          let records = []
-          this.payList.forEach(pay => {
-            const refKey = 'table_' + pay.id
-            let tableRef = this.$refs[refKey]
-            // 兼容 v-for 下 ref 可能为数组的情况
-            if (Array.isArray(tableRef)) tableRef = tableRef[0]
-            if (tableRef) {
-              const sel = typeof tableRef.getCheckboxRecords === 'function' ? (tableRef.getCheckboxRecords() || []) : []
-              const reserveSel = typeof tableRef.getCheckboxReserveRecords === 'function' ? (tableRef.getCheckboxReserveRecords() || []) : []
-              records = records.concat(sel, reserveSel)
-            }
-          })
-          console.log("records", records)
-          // 分组逐块校验数量
-          if (records.length < 1) {
-            this.$message({
-              message: '请选择需要报销的明细',
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          // 校验每个分组（pay.id）的区块表单是否填写（金额、类型）
-          const idToTitle = {}
-          ;(this.payList || []).forEach(p => { idToTitle[p.id] = p.title })
-          const groupIds = Array.from(new Set(records.map(r => r.sourceFlowId)))
-          for (const gid of groupIds) {
-            const form = this.fundlogFormMap[gid] || {}
-            if (!form.applyMoney || Number(form.applyMoney) <= 0) {
-            this.$message({
-                message: `【${idToTitle[gid] || gid}】请填写本次申请付款金额`,
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-            if (!form.type) {
-            this.$message({
-                message: `【${idToTitle[gid] || gid}】请选择款项类型`,
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          }
-          // 数量校验：按分组逐块处理，并在“所有明细都等于总数量”时自动设置该块为最后一笔
-          const groupMap = records.reduce((acc, row) => {
-            const gid = row.sourceFlowId
-            if (!acc[gid]) acc[gid] = []
-            acc[gid].push(row)
-            return acc
-          }, {})
-          const groupsToAutoEnd = []
-          for (const gid of Object.keys(groupMap)) {
-            const rows = groupMap[gid]
-            let count = 0
-            let totalCount = 0
-            // 判断"所有明细数量都完全补齐"：需要检查该分组下的所有明细
-            console.log(`当前分组gid: ${gid}`)
-            console.log(`this.list中所有sourceFlowId:`, this.list.map(r => r.sourceFlowId))
-            const allItemsInGroup = this.list.filter(r => r.sourceFlowId == gid)
-            console.log(`匹配到的明细数量: ${allItemsInGroup.length}`)
-            let allCompleted = true
-            
-            // 先检查勾选行的数量校验
-            rows.forEach(item => {
-              const payNum = Number(item.payNum)
-              const num = Number(item.num)
-              const hasPay = Number(item.hasPayNum)
-              if (isNaN(payNum) || payNum === 0 || payNum > num) count++
-              if (payNum + hasPay > num) totalCount++
-            })
-            
-            // 检查该分组下所有明细是否都已完成（勾选的+未勾选的）
-            allItemsInGroup.forEach(item => {
-              const hasPay = Number(item.hasPayNum)
-              const num = Number(item.num)
-              // 如果这条明细在勾选列表中，需要加上本次报销数量
-              const selectedItem = rows.find(r => r.id === item.id)
-              const totalPay = hasPay + (selectedItem ? Number(selectedItem.payNum) : 0)
-              console.log(`分组${gid}明细${item.id}: hasPay=${hasPay}, payNum=${selectedItem ? selectedItem.payNum : 0}, totalPay=${totalPay}, num=${num}, 是否完成=${totalPay >= num}`)
-              if (totalPay < num) {
-                allCompleted = false
-              }
-            })
-            
-            console.log(`分组${gid} allCompleted:`, allCompleted, `总明细数:${allItemsInGroup.length}`)
-            
-            if (count > 0) {
-            this.$message({
-                message: `【${idToTitle[gid] || gid}】报销数量不能为0或报销数量大于总数量`,
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-          if (totalCount > 0) {
-            this.$message({
-                message: `【${idToTitle[gid] || gid}】本次报销数量大于剩余可报销数量`,
-              duration: 2000,
-              type: 'warning'
-            })
-            return
-          }
-            // 记录需要自动置为“最后一笔”的分组，统一在提交前弹一次提示
-            if (allCompleted && this.fundlogFormMap[gid] && !this.fundlogFormMap[gid].isLast) {
-              groupsToAutoEnd.push(gid)
-            }
-          }
-          if (groupsToAutoEnd.length > 0) {
-            // 等待用户确认后再继续，避免先跳转
-            await this.$alert('本次报销数量已等于总数量，默认为最后一笔', '提示', {
-              confirmButtonText: '确定'
-            })
-            groupsToAutoEnd.forEach(gid => {
-              if (this.fundlogFormMap[gid]) this.$set(this.fundlogFormMap[gid], 'isLast', true)
-            })
-          }
-          // 组合成单个审批
-          let wuzicaigou_items = []
-          let zhifutitle = ''
-          // 建立 flowId -> contractId 映射
-          const flowIdToContractId = {}
-          ;(this.payList || []).forEach(p => {
-            const fid = p.id
-            if (fid) flowIdToContractId[fid] = p.out_contract_id
-          })
-          records.forEach(item => {
-            const form = this.fundlogFormMap[item.sourceFlowId] || { applyMoney: 0, type: '', isLast: false }
-            wuzicaigou_items.push({
-              flow_id: item.sourceFlowId || this.payId,
-              contract_id: flowIdToContractId[item.sourceFlowId] || undefined,
-              wuzicaigou_id: item.belongs_id,
-              wuzicaigou_item_id: item.id,
-              name: item.pinminghuofuwuxuqiu,
-              num: item.payNum,
-              total: item.num,
-              // 区块级的额外字段注入到每条明细，便于后端识别
-              apply_money: form.applyMoney,
-              type: form.type,
-              is_end: form.isLast ? 1 : 0
-            })
-            zhifutitle += item.pinminghuofuwuxuqiu + '*' + item.payNum + ','
-          })
-          console.log("wuzicaigou_items",wuzicaigou_items)
-          // return
-          // 聚合相关合同信息：从 payList 收集 contract_id，逐个请求 detailContract 并整合为数组
-          const contractIds = Array.from(new Set((this.payList || []).map(p => p.out_contract_id).filter(Boolean)))
-          let contracts = []
-          if (contractIds.length > 0) {
-            try {
-              contracts = await Promise.all(contractIds.map(id => detailContract({ id })))
-            } catch (e) {
-              console.warn('fetch contracts failed', e)
-            }
-          }
-          // 仍以第一份合同作为展示主合同（标题等），其余信息通过聚合参与计算
-          const mainContract = contracts && contracts.length > 0 ? contracts[0] : null
-
-          let payments = this.paymentsList;
-          const actNumsTotal = () => payments.reduce((pre, cur) => pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0), 0)
-
-          let zhifutitle2 = zhifutitle.slice(0, -1)
-          if (mainContract?.name) zhifutitle += `（${mainContract.name} 等${contractIds.length}个合同）`
-
-          // 从明细中聚合主数据：合同ID串与金额合计
-          const contractIdStr = Array.from(new Set(wuzicaigou_items.map(i => i.contract_id).filter(Boolean))).join(',')
-          const amtTotal = wuzicaigou_items.reduce((sum, i) => sum + (Number(i.group_apply_money || i.apply_money) || 0), 0)
-
-          // 从合同列表聚合展示数据
-          const sumMoney = (contracts || []).reduce((sum, c) => sum + (Number(c?.money) || 0), 0)
-          const sumPlanLen = (contracts || []).reduce((sum, c) => sum + ((c?.sign_plan?.length) || 0), 0)
-          const plansNames = Array.from(new Set((contracts || []).flatMap(c => (c?.plans || []).map(p => p?.name)).filter(Boolean))).join(',')
-          const contractNos = (contracts || []).map(c => c?.number).filter(Boolean).join(',')
-          const relatedFlows = Array.from(new Set((contracts || []).flatMap(c => (c?.contract_flow_links || []).map(l => l?.flow_id)).filter(Boolean))).join(',')
-
-          const baseInfo = {
-            // oaUrl: mainContract?.number,
-            zhifutitle,
-            contract_id: contractIdStr,
-            type: '',
-            is_end: '',
-            amt: amtTotal,
-            xiangxishuoming: zhifutitle,
-            yifujine: actNumsTotal(),
-            cishu: payments.length,
-
-            xiangmuzonge: sumMoney,
-            zhifucishu: sumPlanLen,
-            liezhiqudao: plansNames,
-            contractno: contractNos,
-            guanlianliucheng: relatedFlows,
-            
-            // xiangmuzonge: mainContract?.money,
-            // zhifucishu: mainContract?.sign_plan?.length,
-            // liezhiqudao: mainContract?.plans.map(i => i.name)?.toString(),
-            // contractno: mainContract?.number,
-            // guanlianliucheng: mainContract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
-            
-            wuzicaigou_items
-          }
-          const url = `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`
-          this.$router.push(url)
-          this.$emit('update:isShow', false)
-        } catch (err) {
-          console.error(err)
-        }
-      }
-    },
-    computed: {},
-    watch: {
-      isShow(newVal) {
-        if (newVal) {
-          this.zIndex = PopupManager.nextZIndex()
-
-          // 直接拉取历史支付记录（无需依赖 getConfig）
-          console.log("this.payList123", this.payList)
-          this.getFundLogList()
-          // 加载表格字段配置与数量统计（基于传入的 payList）
-            this.getConfig()
-        } else {
-          this.list = []
-          this.payId = ''
-          this.oaUrl = ''
-          this.payList = []
-          this.isShowOaModal = false
-          this.table_item = []
-          this.paymentsList = []
-          this.flowDetail = {}
-          this.fundlogForm = {
-            applyMoney: 0,
-            type: '',
-            isLast: false,
-          }
-          this.$refs.table.clearCheckboxRow()
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  ::v-deep .el-checkbox-group {
-    font-size: inherit;
-  }
-</style>
+<template>
+  <div>
+    <vxe-modal :id="modalId" :value="isShow" show-footer :z-index="zIndex" title="支付审批明细" show-zoom show-confirm-button transfer
+      resize :width="defaultModalSize.width" :height="defaultModalSize.height" @input="e => $emit('update:isShow',e)">
+      <div>
+        <!-- 历史支付记录查看 -->
+        <h3>历史支付记录查看</h3>
+        <vxe-table ref="tables" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
+          :print-config="{}" :export-config="{}" :expand-config="{
+              accordion: true,
+              padding: true,
+            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="paymentsList">
+
+          <vxe-column title="项目名称" width="250" align="left" field="contract.name">
+            <template #default="{ row }">
+              {{row.contract_id ? (row.contract?row.contract.name:'') : row.away.title}}
+            </template>
+          </vxe-column>
+          <vxe-column title="付款申请金额(元)" width="180" align="right" field="apply_money">
+            <template #default="{ row }">
+              {{Number(row.apply_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="实际支付金额(元)" width="180" align="right" field="act_money">
+            <template #default="{ row }">
+              {{Number(row.act_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="款项类型" width="120" align="center" field="type"></vxe-column>
+          <vxe-column title="预算计划" width="330" align="left" field="act_plan_link">
+            <template #default="{ row }">
+              <template v-if="row.act_plan_link && row.act_plan_link.length > 0">
+                <div v-for="item in row.act_plan_link">
+                  [{{item.plan?item.plan.year:''}}] {{(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''}}
+                  - {{item.plan?item.plan.name:''}}
+                  <br />
+                  [使用金额] {{item.use_money}}元
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="审核状态" width="120" align="center" field="status">
+            <template #default="{ row }">
+              <div v-if="row.status===0">待审核</div>
+              <div v-else>已审核</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="流程状态" width="120" align="center" field="fund_log_flow_links">
+            <template #default="{ row }">
+              <template v-for="item in row.fund_log_flow_links">
+                <div v-if="item.tag === 'pay'">
+                  {{flowStatus[item.flow_status]}}
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="次数" width="80" align="center" field="pay_count">
+            <template #default="{ row }">
+              {{row.contract_id ? row.pay_count : row.pay_count_away}}
+            </template>
+          </vxe-column>
+          <vxe-column title="是否为最后一笔" width="120" align="center" field="is_end">
+            <template #default="{ row }">
+              <div v-if="row.is_end===1">是</div>
+              <div v-else>否</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="经办人" width="120" align="center" field="admin.name">
+            <template #default="{ row }">
+              {{row.admin?row.admin.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="业务科室" width="160" align="center" field="department.name">
+            <template #default="{ row }">
+              {{row.department?row.department.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="备注" width="460" align="left" field="remark">
+          </vxe-column>
+          <vxe-column title="创建信息" width="180" align="center" field="created_at">
+          </vxe-column>
+          <vxe-column
+            min-width="120"
+            header-align="center"
+            field="operate"
+            title="操作"
+            fixed="right"
+          >
+          <template #default="{ row }">
+            <el-button type="primary" size="small" @click="showDetail(row)"
+            >查看</el-button>
+          </template>
+
+          </vxe-column>
+        </vxe-table>
+        <div style="display: flex;justify-content: center;margin-top:15px">
+          <el-button :disabled="paymentsList.length>0?false:true" type="primary" size="small" @click="payClose">设为已支付完毕 <i class="el-icon-arrow-right"></i> </el-button>
+        </div>
+
+
+        <h3>发起新的支付审批</h3>
+   
+        <div v-for="pay in payList" :key="pay.id" style="margin-top: 12px;">
+          <div style="font-weight: 600; margin: 6px 0;">{{ pay.title }}</div>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>申请付款金额
+            </div>
+            <div class="xy-table-item-content xy-table-item-price">
+                <el-input clearable type="number" placeholder="请填写付款金额" v-model="fundlogFormMap[pay.id].applyMoney"
+                style="width: 150px;margin-left:10px" />
+            </div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
+            </div>
+            <div style="display: flex;align-items: center;">
+                <el-select placeholder="选择款项类型或直接录入其他类型" v-model="fundlogFormMap[pay.id].type" style="width: 200px;margin-left:10px"
+                filterable allow-create clearable popper-append-to-body>
+                <el-option v-for="item in paymentType" :key="item" :label="item" :value="item">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <div class="xy-table-item-label">
+              <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
+            </div>
+            <div class="xy-table-item-content" style="margin-left:10px">
+                <el-switch v-model="fundlogFormMap[pay.id].isLast" />
+            </div>
+          </div>
+        </div>
+          <vxe-table :ref="'table_' + pay.id" stripe style="margin-top: 6px" keep-source :column-config="{ resizable: true }"
+          :print-config="{}" :export-config="{}" :expand-config="{
+              accordion: true,
+              padding: true,
+            }" :checkbox-config="{
+              reserve: true,
+              highlight: true,
+              range: true,
+              checkMethod: ({ row }) => {
+                return parseFloat(row.hasPayNum) < parseFloat(row.num)
+              }
+              }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="getGroupList(pay.id)">
+          <vxe-column type="checkbox" width="50" align="center"></vxe-column>
+          <vxe-column title="本次报销数量" width="120" align="center" field="payNum">
+            <template #default="{ row }">
+              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum"
+                placeholder="数量"></vxe-number-input>
+              <div v-else>-</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="已报销数量" width="100" align="center" field="hasPayNum">
+          </vxe-column>
+            <vxe-column align="center" v-for="item in table_item" :key="item.prop + '_' + pay.id" :title="item.label" :field="item.prop"></vxe-column>
+        </vxe-table>
+        </div>
+      </div>
+
+      <template #footer>
+        <div style="margin-top: 20px;display: flex;justify-content: center;">
+          <el-button type="primary" size="small" @click="submit">发起支付审批 <i class="el-icon-arrow-right"></i> </el-button>
+        </div>
+      </template>
+    </vxe-modal>
+    <vxe-modal
+      :id="oaModalId"
+      fullscreen
+      :remember="true"
+      class-name="oa-modal"
+      title="流程查看"
+      v-model="isShowOaModal"
+      :z-index="zIndex+100"
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
+      </div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+  import {
+    view,
+    fieldConfig
+  } from '@/api/flow'
+  import {
+    getItems,
+    detailContract,
+    getFundLog,
+    fundLogEnd
+  } from '@/api/flow/pay'
+  import {
+    PopupManager
+  } from 'element-ui/lib/utils/popup'
+  import {
+    defaultModalSize
+  } from "@/settings";
+import {getToken} from "@/utils/auth";
+  export default {
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false,
+        required: true
+      },
+      // 新增：接收支付列表，包含各项的 out_contract_id
+      // payList: {
+      //   type: Array,
+      //   default: () => []
+      // }
+    },
+    data() {
+      return {
+        // vxe-ui v3.5+ 要求 modal.id
+        modalId: `flow-paymx-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        oaModalId: `flow-paymx-oa-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        payId: '',
+        payList:[],
+        defaultModalSize,
+        zIndex: PopupManager.nextZIndex(),
+        list: [],
+        // 每个区块（pay.id）对应的表单：申请金额/类型/是否最后一笔
+        fundlogFormMap: {},
+        table_item: [],
+        flowDetail: {},
+        fundlogForm: {
+          applyMoney: 0,
+          type: '',
+          isLast: false,
+        },
+        paymentType: ["进度款", "结算款", "质保金"],
+        oaUrl: '',
+        isShowOaModal: false,
+        paymentsList: [],
+        flowStatus: {
+          '-1': '已退回',
+          '0': '办理中',
+          '1': '已完成'
+        }
+      }
+    },
+    methods: {
+      // 获取某一 pay 的分组数据
+      getGroupList(flowId) {
+        return (this.list || []).filter(r => r.sourceFlowId === flowId)
+      },
+      async getConfig() {
+        // 改造：不再通过 view 接口获取，直接使用传入的 payList
+        const loading = this.$loading({
+          lock: true,
+          text: "拼命加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.8)",
+        });
+        try {
+          console.log('this.payList', this.payList)
+          // 初始化本地可编辑列表（聚合 payList 的各自明细：JSON.parse(data.caigoumingxi)）
+          this.list = [];
+          (this.payList || []).forEach(pay => {
+            let subList = []
+            try {
+              subList = JSON.parse(pay?.data?.caigoumingxi || '[]')
+            } catch(e) {
+              subList = []
+            }
+            // 初始化每个区块的表单默认值
+            if (!this.fundlogFormMap[pay.id]) {
+              this.$set(this.fundlogFormMap, pay.id, {
+                applyMoney: 0,
+                type: '',
+                isLast: false
+              })
+            }
+            subList.forEach(item => {
+              const newItem = Object.assign({}, item, {
+                payNum: 0,
+                hasPayNum: 0,
+                sourceFlowId: pay.id
+              })
+              this.list.push(newItem)
+            })
+          })
+          console.log('this.list', this.list)
+
+          // 组装逗号分隔的明细 id 字符串用于 getItemNum（从 payList 的 data.caigoumingxi 中提取）
+          const ids = []
+          ;(this.payList || []).forEach(pay => {
+            try {
+              const subList = JSON.parse(pay?.data?.caigoumingxi || '[]')
+              subList.forEach(item => {
+                if (item && item.id) ids.push(item.id)
+              })
+            } catch(e) {
+              // 忽略解析错误
+            }
+          })
+          const idsStr = ids.join(',')
+
+          if (idsStr) {
+            await this.getItemNum(idsStr)
+          }
+
+          // 获取字段配置：取第一条的 sub_custom_model_id
+          // const firstSubModelId = this.payList && this.payList[0] && (this.payList[0].sub_custom_model_id || this.payList[0].field?.sub_custom_model_id)
+          // if (firstSubModelId) {
+            await this.getFieldConfig(81)
+          // }
+
+          // 历史支付记录由 payList 汇总的 out_contract_id 直接获取
+          await this.getFundLogList()
+
+          // 确保子表渲染到最新数据
+          this.$nextTick(() => {
+            try {
+              (this.payList || []).forEach(pay => {
+                const refKey = 'table_' + pay.id
+                const tableRef = this.$refs[refKey]
+                const data = this.getGroupList(pay.id)
+                if (tableRef && data) {
+                  if (typeof tableRef.reloadData === 'function') {
+                    tableRef.reloadData(data)
+                  } else if (typeof tableRef.loadData === 'function') {
+                    tableRef.loadData(data)
+                  }
+                }
+              })
+            } catch(e) {
+              console.warn('vxe-table reloadData failed', e)
+            }
+          })
+
+          loading.close()
+        } catch (err) {
+          console.error(err)
+          this.$message.error("配置失败")
+          loading.close()
+        }
+      },
+      // 获取历史支付明细
+      async getFundLogList() {
+        // 从传入的 payList 中汇总 out_contract_id，用逗号连接
+        const contractIds = (this.payList || [])
+          .map(i => i && i.out_contract_id)
+          .filter(id => !!id)
+          .join(',');
+
+        let payments = []
+        if (contractIds) {
+          payments = (
+            await getFundLog({
+              contract_id: contractIds,
+              show_type: 1
+            })
+          )?.data || []
+        }
+        this.paymentsList = payments
+        console.log("paymentsList", this.paymentsList)
+      },
+      // 获取采购明细
+      async getFieldConfig(id) {
+        try {
+          const res = await fieldConfig(id)
+          console.log("res", res)
+          const fields = res?.customModel?.fields
+          fields.forEach((field) => {
+            this.table_item.push({
+              label: field.label,
+              prop: field.name
+            })
+          });
+
+
+        } catch (err) {
+          console.error(err)
+        }
+
+      },
+      // 获取已提交的物资数量
+      async getItemNum(id) {
+        try {
+          const item = await getItems({
+            wuzicaigou_item_id: id
+          })
+          console.log("item", item)
+          if (item.length > 0) {
+            const itemMap = new Map();
+            item.forEach(item => {
+              itemMap.set(item.wuzicaigou_item_id, parseFloat(item.total_num));
+            });
+            // 遍历合并后的 list，根据 id 从 Map 中获取 total_num 并赋值给 hasPayNum
+            this.list.forEach(row => {
+              if (itemMap.has(row.id)) {
+                row.hasPayNum = itemMap.get(row.id)
+              }
+            })
+          }
+        } catch (err) {
+          console.error(err)
+        }
+      },
+      showDetail(row){
+        let url = `/oa/#/flow/detail?module_name=oa&auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
+        let pay = row.fund_log_flow_links.find(i => i.tag === 'pay')
+        //url += `&to=/flow/detail?flow_id=${caigou.id}`
+        url += pay?.flow_id
+        this.oaUrl = url
+        this.isShowOaModal = true
+      },
+      payClose(){
+        this.$confirm('将此采购记录设为“已⽀付完毕”，同时会将最后⼀笔⽀付记录的“是否为最后⼀笔”属性设置为“是”，请确认是否要进⾏此操作', '提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            if(action==='confirm'){
+              fundLogEnd({
+                contract_id:this.flowDetail.out_contract_id,
+              }).then(res=>{
+                this.$emit('update:isShow', false)
+                this.$emit('refresh')
+              })
+            }
+
+
+            // this.fundlogForm.isLast = true
+          }
+        });
+      },
+      async submit() {
+        try {
+
+          // 收集所有子表勾选记录
+          let records = []
+          this.payList.forEach(pay => {
+            const refKey = 'table_' + pay.id
+            let tableRef = this.$refs[refKey]
+            // 兼容 v-for 下 ref 可能为数组的情况
+            if (Array.isArray(tableRef)) tableRef = tableRef[0]
+            if (tableRef) {
+              const sel = typeof tableRef.getCheckboxRecords === 'function' ? (tableRef.getCheckboxRecords() || []) : []
+              const reserveSel = typeof tableRef.getCheckboxReserveRecords === 'function' ? (tableRef.getCheckboxReserveRecords() || []) : []
+              records = records.concat(sel, reserveSel)
+            }
+          })
+          console.log("records", records)
+          // 分组逐块校验数量
+          if (records.length < 1) {
+            this.$message({
+              message: '请选择需要报销的明细',
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          // 校验每个分组（pay.id）的区块表单是否填写（金额、类型）
+          const idToTitle = {}
+          ;(this.payList || []).forEach(p => { idToTitle[p.id] = p.title })
+          const groupIds = Array.from(new Set(records.map(r => r.sourceFlowId)))
+          for (const gid of groupIds) {
+            const form = this.fundlogFormMap[gid] || {}
+            if (!form.applyMoney || Number(form.applyMoney) <= 0) {
+            this.$message({
+                message: `【${idToTitle[gid] || gid}】请填写本次申请付款金额`,
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+            if (!form.type) {
+            this.$message({
+                message: `【${idToTitle[gid] || gid}】请选择款项类型`,
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          }
+          // 数量校验：按分组逐块处理，并在“所有明细都等于总数量”时自动设置该块为最后一笔
+          const groupMap = records.reduce((acc, row) => {
+            const gid = row.sourceFlowId
+            if (!acc[gid]) acc[gid] = []
+            acc[gid].push(row)
+            return acc
+          }, {})
+          const groupsToAutoEnd = []
+          for (const gid of Object.keys(groupMap)) {
+            const rows = groupMap[gid]
+            let count = 0
+            let totalCount = 0
+            // 判断"所有明细数量都完全补齐"：需要检查该分组下的所有明细
+            console.log(`当前分组gid: ${gid}`)
+            console.log(`this.list中所有sourceFlowId:`, this.list.map(r => r.sourceFlowId))
+            const allItemsInGroup = this.list.filter(r => r.sourceFlowId == gid)
+            console.log(`匹配到的明细数量: ${allItemsInGroup.length}`)
+            let allCompleted = true
+            
+            // 先检查勾选行的数量校验
+            rows.forEach(item => {
+              const payNum = Number(item.payNum)
+              const num = Number(item.num)
+              const hasPay = Number(item.hasPayNum)
+              if (isNaN(payNum) || payNum === 0 || payNum > num) count++
+              if (payNum + hasPay > num) totalCount++
+            })
+            
+            // 检查该分组下所有明细是否都已完成（勾选的+未勾选的）
+            allItemsInGroup.forEach(item => {
+              const hasPay = Number(item.hasPayNum)
+              const num = Number(item.num)
+              // 如果这条明细在勾选列表中，需要加上本次报销数量
+              const selectedItem = rows.find(r => r.id === item.id)
+              const totalPay = hasPay + (selectedItem ? Number(selectedItem.payNum) : 0)
+              console.log(`分组${gid}明细${item.id}: hasPay=${hasPay}, payNum=${selectedItem ? selectedItem.payNum : 0}, totalPay=${totalPay}, num=${num}, 是否完成=${totalPay >= num}`)
+              if (totalPay < num) {
+                allCompleted = false
+              }
+            })
+            
+            console.log(`分组${gid} allCompleted:`, allCompleted, `总明细数:${allItemsInGroup.length}`)
+            
+            if (count > 0) {
+            this.$message({
+                message: `【${idToTitle[gid] || gid}】报销数量不能为0或报销数量大于总数量`,
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+          if (totalCount > 0) {
+            this.$message({
+                message: `【${idToTitle[gid] || gid}】本次报销数量大于剩余可报销数量`,
+              duration: 2000,
+              type: 'warning'
+            })
+            return
+          }
+            // 记录需要自动置为“最后一笔”的分组，统一在提交前弹一次提示
+            if (allCompleted && this.fundlogFormMap[gid] && !this.fundlogFormMap[gid].isLast) {
+              groupsToAutoEnd.push(gid)
+            }
+          }
+          if (groupsToAutoEnd.length > 0) {
+            // 等待用户确认后再继续，避免先跳转
+            await this.$alert('本次报销数量已等于总数量，默认为最后一笔', '提示', {
+              confirmButtonText: '确定'
+            })
+            groupsToAutoEnd.forEach(gid => {
+              if (this.fundlogFormMap[gid]) this.$set(this.fundlogFormMap[gid], 'isLast', true)
+            })
+          }
+          // 组合成单个审批
+          let wuzicaigou_items = []
+          let zhifutitle = ''
+          // 建立 flowId -> contractId 映射
+          const flowIdToContractId = {}
+          ;(this.payList || []).forEach(p => {
+            const fid = p.id
+            if (fid) flowIdToContractId[fid] = p.out_contract_id
+          })
+          records.forEach(item => {
+            const form = this.fundlogFormMap[item.sourceFlowId] || { applyMoney: 0, type: '', isLast: false }
+            wuzicaigou_items.push({
+              flow_id: item.sourceFlowId || this.payId,
+              contract_id: flowIdToContractId[item.sourceFlowId] || undefined,
+              wuzicaigou_id: item.belongs_id,
+              wuzicaigou_item_id: item.id,
+              name: item.pinminghuofuwuxuqiu,
+              num: item.payNum,
+              total: item.num,
+              // 区块级的额外字段注入到每条明细，便于后端识别
+              apply_money: form.applyMoney,
+              type: form.type,
+              is_end: form.isLast ? 1 : 0
+            })
+            zhifutitle += item.pinminghuofuwuxuqiu + '*' + item.payNum + ','
+          })
+          console.log("wuzicaigou_items",wuzicaigou_items)
+          // return
+          // 聚合相关合同信息：从 payList 收集 contract_id，逐个请求 detailContract 并整合为数组
+          const contractIds = Array.from(new Set((this.payList || []).map(p => p.out_contract_id).filter(Boolean)))
+          let contracts = []
+          if (contractIds.length > 0) {
+            try {
+              contracts = await Promise.all(contractIds.map(id => detailContract({ id })))
+            } catch (e) {
+              console.warn('fetch contracts failed', e)
+            }
+          }
+          // 仍以第一份合同作为展示主合同（标题等），其余信息通过聚合参与计算
+          const mainContract = contracts && contracts.length > 0 ? contracts[0] : null
+
+          let payments = this.paymentsList;
+          const actNumsTotal = () => payments.reduce((pre, cur) => pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0), 0)
+
+          let zhifutitle2 = zhifutitle.slice(0, -1)
+          if (mainContract?.name) zhifutitle += `（${mainContract.name} 等${contractIds.length}个合同）`
+
+          // 从明细中聚合主数据：合同ID串与金额合计
+          const contractIdStr = Array.from(new Set(wuzicaigou_items.map(i => i.contract_id).filter(Boolean))).join(',')
+          const amtTotal = wuzicaigou_items.reduce((sum, i) => sum + (Number(i.group_apply_money || i.apply_money) || 0), 0)
+
+          // 从合同列表聚合展示数据
+          const sumMoney = (contracts || []).reduce((sum, c) => sum + (Number(c?.money) || 0), 0)
+          const sumPlanLen = (contracts || []).reduce((sum, c) => sum + ((c?.sign_plan?.length) || 0), 0)
+          const plansNames = Array.from(new Set((contracts || []).flatMap(c => (c?.plans || []).map(p => p?.name)).filter(Boolean))).join(',')
+          const contractNos = (contracts || []).map(c => c?.number).filter(Boolean).join(',')
+          const relatedFlows = Array.from(new Set((contracts || []).flatMap(c => (c?.contract_flow_links || []).map(l => l?.flow_id)).filter(Boolean))).join(',')
+
+          const baseInfo = {
+            // oaUrl: mainContract?.number,
+            zhifutitle,
+            contract_id: contractIdStr,
+            type: '',
+            is_end: '',
+            amt: amtTotal,
+            xiangxishuoming: zhifutitle,
+            yifujine: actNumsTotal(),
+            cishu: payments.length,
+
+            xiangmuzonge: sumMoney,
+            zhifucishu: sumPlanLen,
+            liezhiqudao: plansNames,
+            contractno: contractNos,
+            guanlianliucheng: relatedFlows,
+            
+            // xiangmuzonge: mainContract?.money,
+            // zhifucishu: mainContract?.sign_plan?.length,
+            // liezhiqudao: mainContract?.plans.map(i => i.name)?.toString(),
+            // contractno: mainContract?.number,
+            // guanlianliucheng: mainContract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
+            
+            wuzicaigou_items
+          }
+          const url = `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`
+          this.$router.push(url)
+          this.$emit('update:isShow', false)
+        } catch (err) {
+          console.error(err)
+        }
+      }
+    },
+    computed: {},
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.zIndex = PopupManager.nextZIndex()
+
+          // 直接拉取历史支付记录（无需依赖 getConfig）
+          console.log("this.payList123", this.payList)
+          this.getFundLogList()
+          // 加载表格字段配置与数量统计（基于传入的 payList）
+            this.getConfig()
+        } else {
+          this.list = []
+          this.payId = ''
+          this.oaUrl = ''
+          this.payList = []
+          this.isShowOaModal = false
+          this.table_item = []
+          this.paymentsList = []
+          this.flowDetail = {}
+          this.fundlogForm = {
+            applyMoney: 0,
+            type: '',
+            isLast: false,
+          }
+          this.$refs.table.clearCheckboxRow()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .el-checkbox-group {
+    font-size: inherit;
+  }
+</style>
diff --git a/src/views/flow/components/rollback.vue b/src/views/flow/components/rollback.vue
index 46cf667..555b679 100644
--- a/src/views/flow/components/rollback.vue
+++ b/src/views/flow/components/rollback.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vxe-modal :value="isShow"
+    <vxe-modal :id="modalId" :value="isShow"
                show-footer
                :z-index="zIndex"
                title="退回"
@@ -56,6 +56,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `flow-rollback-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       form: {
         id: "",
diff --git a/src/views/flow/components/share.vue b/src/views/flow/components/share.vue
index d4152fa..72337eb 100644
--- a/src/views/flow/components/share.vue
+++ b/src/views/flow/components/share.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <vxe-modal :value="isShow"
+    <vxe-modal :id="modalId" :value="isShow"
                show-footer
                :z-index="zIndex"
                title="抄送"
@@ -54,6 +54,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `flow-share-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       config: {
         cc_users: []
diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue
index f814c6d..10b2cb5 100644
--- a/src/views/flow/create.vue
+++ b/src/views/flow/create.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="container" :class="{ 'is-single-page': isSinglePage }">
     <el-card
       :shadow="device === 'desktop' ? 'always' : 'never'"
       class="card"
@@ -303,6 +303,7 @@
     </el-dialog>
     <!-- 打开支出 详情 -->
     <vxe-modal
+      :id="contractModalId"
       v-model="isShowModal"
       :z-index="999999"
       transfer
@@ -346,7 +347,7 @@ import { deepCopy } from "@/utils";
 import { validation, validationName } from "@/utils/validate";
 import { print } from "@/utils/print";
 import JSONBigint from 'json-bigint'
-import { getToken } from "@/utils/auth";
+import { getToken, setToken } from "@/utils/auth";
 export default {
   components: {
     Steps,
@@ -358,6 +359,8 @@ export default {
   },
   data() {
     return {
+      // vxe-ui v3.5+ 要求 modal.id
+      contractModalId: `flow-contract-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       isShowModal:false,
       contractUrl:'',
       printKey: 0,
@@ -420,7 +423,13 @@ export default {
       console.log("123")
       this.form['form_canal'] = 'oa'
       try {
-        if(!this.$route.query?.default_json) return
+        if(!this.$route.query?.default_json) {
+          // 即使没有default_json，也要处理form_canal参数
+          if(this.$route.query?.form_canal) {
+            this.form['form_canal'] = this.$route.query.form_canal
+          }
+          return
+        }
         const res = JSON.parse(this.$route.query?.default_json)
         for (let key in this.$route.query) {
           if(/^out_(.*)_id/.test(key)) {
@@ -939,10 +948,37 @@ export default {
         } else {
           copyForm['csrf_token'] = this.csrf_token
           this.result = await create(this.$route.query.module_id, copyForm);
+          
+          // 如果流程创建成功且在iframe中，发送postMessage通知父窗口
+          if (this.result && this.result.id && window.self !== window.top) {
+            try {
+              window.parent.postMessage({
+                type: 'OA_FLOW_CREATED',
+                flowId: this.result.id,
+                success: true,
+                message: '流程创建成功'
+              }, '*')
+            } catch (error) {
+              console.error('发送postMessage失败:', error)
+            }
+          }
         }
         callback();
       } catch (err) {
         console.error(err);
+        // 如果流程创建失败且在iframe中，发送postMessage通知父窗口
+        if (window.self !== window.top) {
+          try {
+            window.parent.postMessage({
+              type: 'OA_FLOW_CREATED',
+              flowId: null,
+              success: false,
+              message: err.message || '流程创建失败'
+            }, '*')
+          } catch (postError) {
+            console.error('发送postMessage失败:', postError)
+          }
+        }
       }
     },
 
@@ -1050,12 +1086,29 @@ export default {
     },
     isFirstNode() {
       return this.config?.logs?.length === 0 || this.config?.currentNode?.category === 'start'
+    },
+    isSinglePage() {
+      return this.$route.query.isSinglePage === '1' || this.$route.query.isSinglePage === 1 || window.self !== window.top
     }
   },
   created() {
     this.getConfig();
+    // 如果是单页模式且在iframe中，调整样式
+    if (this.isSinglePage && window.self !== window.top) {
+      document.body.style.margin = '0'
+      document.body.style.padding = '0'
+    }
+  },
+  mounted() {
+    // 如果是单页模式且在iframe中，调整样式
+    if (this.isSinglePage && window.self !== window.top) {
+      const container = this.$el
+      if (container) {
+        container.style.margin = '0'
+        container.style.padding = '0'
+      }
+    }
   },
-  mounted() {},
 };
 </script>
 
@@ -1074,8 +1127,7 @@ export default {
 ::v-deep .el-step.is-center .el-step__line {
   top: 50%;
 }
-::v-deep .el-card__header {
-}
+ 
 .container {
   padding: 20px;
 
@@ -1088,9 +1140,23 @@ export default {
     margin-top: 10px;
     flex-wrap: wrap;
   }
+
+  // 单页模式（弹窗模式）
+  &.is-single-page {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+    overflow-y: auto;
+
+    .card {
+      border: none;
+      box-shadow: none;
+      min-height: 100vh;
+      background: #f7f8fa;
+    }
+  }
 }
-.form-container {
-}
+
 @media (max-width: 768px) {
   .container {
     padding: 0;
diff --git a/src/views/flow/payList.vue b/src/views/flow/payList.vue
index d880218..a1f95aa 100644
--- a/src/views/flow/payList.vue
+++ b/src/views/flow/payList.vue
@@ -853,6 +853,7 @@
     <payMx ref="payMx" :is-show.sync="isShowPay"></payMx>
 
     <vxe-modal
+      :id="modalId"
       v-model="isShowModal"
       :z-index="zIndex"
       transfer
@@ -1047,6 +1048,8 @@ export default {
   },
   data() {
     return {
+      // vxe-ui v3.5+ 要求 modal.id，避免缺参警告/潜在异常
+      modalId: `flow-paylist-view-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       isShowModal: false,
       modalUrl: "",
       zIndex: PopupManager.nextZIndex(),
diff --git a/src/views/meeting/components/AddMeeting.vue b/src/views/meeting/components/AddMeeting.vue
index 37e0524..d137e5f 100644
--- a/src/views/meeting/components/AddMeeting.vue
+++ b/src/views/meeting/components/AddMeeting.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       :z-index="zIndex"
@@ -148,6 +149,8 @@ export default {
       uploadSize,
       users: [],
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `meeting-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/notice/components/AddNotice.vue b/src/views/notice/components/AddNotice.vue
index ca9853f..8d81f37 100644
--- a/src/views/notice/components/AddNotice.vue
+++ b/src/views/notice/components/AddNotice.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       :z-index="zIndex"
@@ -129,6 +130,8 @@ export default {
       id: '',
       users: [],
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `notice-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/vehicle/components/AddVehicle.vue b/src/views/vehicle/components/AddVehicle.vue
index 689f029..72445a5 100644
--- a/src/views/vehicle/components/AddVehicle.vue
+++ b/src/views/vehicle/components/AddVehicle.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <vxe-modal
+      :id="modalId"
       :value="isShow"
       show-footer
       title="车船管理"
@@ -103,6 +104,8 @@ export default {
   data() {
     return {
       defaultModalSize,
+      // vxe-ui v3.5+ 要求 modal.id
+      modalId: `vehicle-add-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
       action: process.env.VUE_APP_UPLOAD_API,
       fileList: [],
       loading: false,
diff --git a/vue.config.js b/vue.config.js
index 59b176d..7bdf42b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: `/${process.env.VUE_APP_MODULE_NAME}`,
-  outputDir: `../cz_hjjc/public/${process.env.VUE_APP_MODULE_NAME}`,
+  outputDir: process.env.VUE_APP_OUTPUT_DIR || `../cz_hjjc/public/${process.env.VUE_APP_MODULE_NAME}`,
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,