diff --git a/src/components/contractIntegration/index.vue b/src/components/contractIntegration/index.vue
index 9ba68a8..f800cf5 100644
--- a/src/components/contractIntegration/index.vue
+++ b/src/components/contractIntegration/index.vue
@@ -131,7 +131,7 @@
               </div>
               <div class="expense-info-item">
                 <span class="expense-info-label">已确认金额</span>
-                <span class="expense-info-value"></span>
+                <span class="expense-info-value">{{confirmedAmount}}</span>
               </div>
               <!-- <div class="expense-info-item">
                 <span class="expense-info-label">当前状态</span>
@@ -484,7 +484,6 @@
               </div>
             </div>
           </div>
-          </div>
         </div>
       </div>
     </div>
@@ -576,6 +575,14 @@ export default {
       if (files && files.length > 0) return '已上传'
       return '待上传'
     },
+    // 已确认金额：fundLogs中status=1的act_money之和
+    confirmedAmount() {
+      if (!this.fundLogs || !this.fundLogs.length) return 0
+      const total = this.fundLogs
+        .filter(item => item.status === 1)
+        .reduce((sum, item) => sum + (parseFloat(item.act_money) || 0), 0)
+      return total.toFixed(2)
+    },
     // 采购/事前流程头部状态计算（与列表页按钮口径一致）：
     // - 无任何流程数据且需要走采购流程 => 显示“待申请”
     //   需要采购的判定：detail.is_purchase 为真，且
diff --git a/src/views/contract/components/EditContract.vue b/src/views/contract/components/EditContract.vue
index 84c22a5..f979fc3 100644
--- a/src/views/contract/components/EditContract.vue
+++ b/src/views/contract/components/EditContract.vue
@@ -16,14 +16,37 @@
               style="width: 100%"
             />
           </el-form-item>
-          <el-form-item prop="meeting_flow_id" label="资金上会流程">
-            <el-select v-model="form.meeting_flow_id" style="width: 100%">
+          <el-form-item 
+            prop="meeting_flow_id" 
+            :label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
+          >
+            <!-- 调试信息 -->
+            <div style="font-size: 12px; color: #999; margin-bottom: 5px;">
+              调试: is_common_purchase={{form.is_common_purchase}}, 
+              total_money={{form.total_money}}, 
+              disabled={{isMeetingFlowDisabled}}, 
+              required={{isMeetingFlowRequired}}
+            </div>
+            <el-select 
+              v-model="form.meeting_flow_id" 
+              style="width: 100%"
+              :disabled="isMeetingFlowDisabled"
+              placeholder="请选择资金上会流程"
+              filterable
+              clearable
+            >
               <el-option
                 v-for="item in shList"
                 :key="item.id"
                 :value="item.id"
-                :label="item.title"
-              ></el-option>
+                :label="item.data.yiti+'-'+item.title"
+              >
+              <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
+              <span 
+                style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
+                @click.stop="viewOaFlow('other',item.id)"
+              >查看</span>
+            </el-option>
             </el-select>
           </el-form-item>
 
@@ -966,6 +989,26 @@ export default {
             },
             trigger: 'change'
           }
+        ],
+        meeting_flow_id: [
+          {
+            validator: (rule, value, callback) => {
+              // 如果是一般采购，则不是必选
+              if (this.form.is_common_purchase) {
+                callback()
+                return
+              }
+              // 如果合同金额大于等于10万，则必选
+              if (this.form.total_money && Number(this.form.total_money) >= 100000) {
+                if (!value) {
+                  callback(new Error('资金上会流程为必选项'))
+                  return
+                }
+              }
+              callback()
+            },
+            trigger: 'change'
+          }
         ]
       },
       contractTypes: [
@@ -1022,21 +1065,40 @@ export default {
         }
       }
     },
+    
+    // 资金上会流程是否必选
+    isMeetingFlowRequired() {
+      return !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
+    },
+    
+    // 资金上会流程是否禁用
+    isMeetingFlowDisabled() {
+      // 如果是一般采购，则不禁用
+      if (this.form.is_common_purchase) {
+        return false
+      }
+      // 如果不是一般采购，且金额小于10万，则禁用
+      return this.form.total_money && Number(this.form.total_money) < 100000
+    }
   },
   // 还原：不在此处强制加载上会列表，遵循原有调用链
   created() {
     this.getSh()
   },
   methods: {
+    // 查看OA流程
+    viewOaFlow(flowId) {
+      // 调用父组件的toOaDetail方法
+      this.$parent.toOaDetail('other', null, flowId)
+    },
     // 获取上会列表
     async getSh(){
       const res = await getShList({
         page:1,
         page_size:999,
         custom_model_id:103,
-        field_id:1225,
-        operator:'eq',
-        field_keyword:'采购事项'
+        sort_name:'created_at',
+        sort_type:'DESC'
       })
       this.shList = res.data.data
     },
@@ -1152,6 +1214,15 @@ export default {
     },
     submit() {
       this.$refs['elForm'].validate().then(_ => {
+        // 验证资金上会流程
+        if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
+          this.$message({
+            type: 'warning',
+            message: '资金上会流程为必选项'
+          })
+          return
+        }
+        
         this.form.contract_to_contracts = this.selections.map(i => {
           return {
             contract_id: this.contrantId,
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 6e0ed43..f3019b9 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -23,20 +23,31 @@
           <div class="payment-registration-row-content">{{ moneyFormat(form.contract.money) }} （元）</div>
         </div>
         <div class="payment-registration-row" style="align-items: center; margin-bottom: 5px">
-          <div class="payment-registration-row-title">资金上会流程</div>
+          <div class="payment-registration-row-title">
+            资金上会流程
+            <span v-if="isMeetingFlowRequired" style="color: red; font-weight: 600; padding-right: 4px">*</span>
+          </div>
           <div class="payment-registration-row-content">
             <el-select
               v-model="form.meeting_flow_id"
               placeholder="请选择资金上会流程"
               clearable
+              :disabled="isMeetingFlowDisabled"
               style="width: 320px"
+              filterable
             >
               <el-option
                 v-for="item in shList"
                 :key="item.id"
                 :value="item.id"
-                :label="item.title"
-              />
+                :label="item.data.yiti+'-'+item.title"
+              >
+                <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
+                <span 
+                  style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
+                  @click.stop="viewOaFlow(item.id)"
+                >查看</span>
+              </el-option>
             </el-select>
           </div>
         </div>
@@ -178,6 +189,21 @@
         <!--        </div>-->
       </template>
     </xy-dialog>
+    
+    <!-- OA流程Modal -->
+    <Modal
+      v-model="isShowOaModal"
+      :width="86"
+      class-name="oa-modal"
+      title="流程办理"
+      fullscreen
+      :mask-closable="false"
+      footer-hide
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
+      </div>
+    </Modal>
   </div>
 </template>
 
@@ -200,6 +226,7 @@ import {
   Message
 } from 'element-ui'
 import { getparameter } from '@/api/system/dictionary'
+import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
@@ -295,8 +322,25 @@ export default {
         type: [{
           required: true,
           message: '必选'
+        }],
+        meeting_flow_id: [{
+          required: true,
+          message: '资金上会流程为必选项',
+          validator: (rule, value, callback) => {
+            // 如果申请付款金额大于等于5万，则必选
+            if (this.form.apply_money && Number(this.form.apply_money) >= 50000) {
+              if (!value) {
+                callback(new Error('资金上会流程为必选项'))
+                return
+              }
+            }
+            callback()
+          }
         }]
-      }
+      },
+      // OA流程相关
+      oaUrl: '',
+      isShowOaModal: false
     }
   },
   computed: {
@@ -304,6 +348,16 @@ export default {
       return function(money) {
         return moneyFormatter(money)
       }
+    },
+    
+    // 资金上会流程是否必选
+    isMeetingFlowRequired() {
+      return this.form.apply_money && Number(this.form.apply_money) >= 50000
+    },
+    
+    // 资金上会流程是否禁用
+    isMeetingFlowDisabled() {
+      return this.form.apply_money && Number(this.form.apply_money) < 50000
     }
   },
   mounted() {
@@ -311,6 +365,13 @@ export default {
     this.getSh()
   },
   methods: {
+    // 查看OA流程
+    viewOaFlow(flowId) {
+      const url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
+      
+      this.oaUrl = url
+      this.isShowOaModal = true
+    },
     // 获取上会列表
     async getSh(){
       const { getShList } = await import('@/api/oatoken')
@@ -319,9 +380,8 @@ export default {
           page: 1,
           page_size: 999,
           custom_model_id: 103,
-          field_id: 1225,
-          operator: 'eq',
-          field_keyword: '采购事项'
+          sort_name: 'created_at',
+          sort_type: 'DESC'
         })
         this.shList = res?.data?.data || []
       } catch (e) {
@@ -364,6 +424,15 @@ export default {
     },
 
     editor() {
+      // 验证资金上会流程
+      if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
+        Message({
+          type: 'warning',
+          message: '资金上会流程为必选项'
+        })
+        return
+      }
+      
       editorFundLog(this.form).then(res => {
         this.$emit('success')
         this.isShow = false
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index aea0539..c1b3ffd 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -1,1133 +1,1202 @@
-<template>
-  <div>
-    <!--    付款登记-->
-    <xy-dialog
-      ref="paymentRegistration"
-      title="付款登记"
-      :is-show.sync="isShowPaymentRegistration"
-      type="form"
-      class="payment-registration"
-      :form="paymentRegistrationForm"
-      :rules="paymentRegistrationRules"
-      @submit="submit"
-    >
-      <template v-slot:extraFormTop>
-        <div class="payment-registration-row">
-          <div class="payment-registration-row-title">受款单位</div>
-          <div class="payment-registration-row-content">
-            {{ contract.supply }}
-          </div>
-        </div>
-        <div class="payment-registration-row">
-          <div class="payment-registration-row-title">{{ nameFormat($route.path.split('_')[1]) }}名称</div>
-          <div class="payment-registration-row-content">
-            {{ contract.name }}
-          </div>
-        </div>
-        
-        <div class="payment-registration-row">
-          <div class="payment-registration-row-title">{{ nameFormat($route.path.split('_')[1]) }}金额</div>
-          <div class="payment-registration-row-content">
-            {{ priceFormat(contract.money) }} （元）
-          </div>
-        </div>
-        <div style="display: flex">
-          <div class="payment-registration-row">
-            <div class="payment-registration-row-title">已申请金额</div>
-            <div class="payment-registration-row-content">
-              {{ totalApplyMoney() }} （元）
-            </div>
-          </div>
-          <div class="payment-registration-row">
-            <div class="payment-registration-row-title">已申请笔数</div>
-            <div class="payment-registration-row-content">
-              {{ payment.length }}
-            </div>
-          </div>
-        </div>
-        <div style="display: flex">
-          <div class="payment-registration-row">
-            <div class="payment-registration-row-title">已付金额</div>
-            <div class="payment-registration-row-content">
-              {{ totalMoney() }} （元）
-            </div>
-          </div>
-          <div class="payment-registration-row">
-            <div class="payment-registration-row-title">支付占比</div>
-            <div class="payment-registration-row-content">
-              {{ percentPay() }}%
-            </div>
-          </div>
-          <div class="payment-registration-row">
-            <div class="payment-registration-row-title">已付笔数</div>
-            <div class="payment-registration-row-content">
-              {{ actNumsTotal() }}
-            </div>
-            <div class="payment-registration-row-content" style="color: #ff0000; padding-left: 16px; cursor: pointer">
-              <Poptip :transfer="true">
-                <div>点击查看列表</div>
-                <template v-slot:content>
-                  <template v-if="payment && payment.length > 0">
-                    <xy-table :height="200" :list="payment" :table-item="payTable">
-                      <template v-slot:btns>
-                        <p />
-                      </template>
-                    </xy-table>
-                  </template>
-                  <template v-else>
-                    <div style="text-align: center">暂无已付笔数</div>
-                  </template>
-                </template>
-              </Poptip>
-            </div>
-          </div>
-        </div>
-        <!-- 预算计划 -->
-        <div />
-        <!-- 是否有借款 -->
-        <div v-if="contract.borrows && contract.borrows.length>0">
-          <div style="display: flex">
-            <div class="payment-registration-row">
-              <div class="payment-registration-row-title">借款金额</div>
-              <div class="payment-registration-row-content">
-                {{ priceFormat(contract.borrows[0]['money']) }} （元）
-              </div>
-            </div>
-            <div class="payment-registration-row">
-              <div class="payment-registration-row-title">剩余还款金额</div>
-              <div class="payment-registration-row-content">
-                {{ priceFormat(contract.borrows[0]['diff']) }}（元）
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- 是否有 -->
-        <div class="payment-registration-row" style="align-items: center;margin-bottom:5px">
-          <div class="payment-registration-row-title">资金上会流程</div>
-          <div class="payment-registration-row-content">
-            <el-select
-              v-model="paymentRegistrationForm.meeting_flow_id"
-              placeholder="请选择资金上会流程"
-              clearable
-              style="width: 320px"
-            >
-              <el-option
-                v-for="item in shList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.title"
-              />
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:applyMoney>
-        <div class="xy-table-item">
-          <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
-              v-model="paymentRegistrationForm.applyMoney"
-              clearable
-              placeholder="请填写付款金额"
-              style="width: 150px"
-            />
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:audit_money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">审计金额</div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input v-model="form.audit_money" clearable placeholder="请填写审计金额" style="width: 150px" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:deductionMoney>
-        <div class="xy-table-item">
-          <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
-              v-model="paymentRegistrationForm.deductionMoney"
-              clearable
-              placeholder="请填写扣款金额"
-              style="width: 150px"
-            />
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:remark>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">备注</div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="paymentRegistrationForm.remark"
-              type="textarea"
-              clearable
-              placeholder="进度款日期：2022.6.8-2022.7.7"
-              style="width: 300px"
-            />
-          </div>
-        </div>
-      </template>
-      <template v-slot:type>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="paymentRegistrationForm.type"
-              placeholder="选择款项类型或直接录入其他类型"
-              style="width: 150px"
-              filterable
-              allow-create
-              clearable
-              popper-append-to-body
-            >
-              <el-option v-for="item in paymentType" :key="item" :label="item" :value="item" />
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:isLast>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="paymentRegistrationForm.isLast" active-text="是" inactive-text="否" />
-            <!--                       @change="toggleSelection"-->
-          </div>
-        </div>
-      </template>
-      <template v-slot:property>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为资产
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="paymentRegistrationForm.property" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
-          </div>
-        </div>
-      </template>
-      <template v-if="paymentRegistrationForm.property" v-slot:property_type_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>资产类型
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="paymentRegistrationForm.property_type_id" style="width: 150px">
-              <el-option v-for="item in flowIds" :key="item.id" :value="item.id" :label="item.name" />
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-if="false" #files>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            附件 ：
-          </div>
-          <div class="xy-table-item-content">
-            <el-upload
-              ref="upload"
-              style="width: 300px"
-              multiple
-              :on-success="successHandle"
-              :before-upload="uploadBefore"
-              accept=".rar,.zip,.doc,.docx,.pdf,.jpg,.png,.gif,.mp4,.xls,.xlsx"
-              :action="action"
-              :file-list="fileList"
-              :auto-upload="false"
-              :on-remove="removeHande"
-              :limit="10"
-            >
-              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-              <el-button
-                style="margin-left: 10px"
-                size="small"
-                type="success"
-                @click="$refs['upload'].submit()"
-              >开始上传</el-button>
-              <div slot="tip" class="el-upload__tip">
-                支持文件格式：.rar .zip .doc .docx .pdf .jpg .png .gif .mp4 .xls
-                .xlsx
-                <br>单个文件不能超过20M
-              </div>
-            </el-upload>
-          </div>
-        </div>
-      </template>
-      <template v-slot:extraFormBottom>
-        <!-- v-if="paymentRegistrationForm.plan.length===0" -->
-        <div>
-          <div style="margin:5px 0;color:#000;">拟使用预算</div>
-          <div class="select-container">
-            <DatePicker
-              :value="planSelect.year"
-              placeholder="选择所属年份"
-              placement="bottom-start"
-              style="width: 180px;margin-right: 10px;"
-              type="year"
-              @on-change="(e) => {
-                planSelect.year = e
-                getBudgets('',true)
-              }"
-            />
-            <el-select
-              v-model="planSelect.plan_department_id"
-              placeholder="科室选择"
-              clearable
-              size="small"
-              style="width: 180px;margin-right: 10px;"
-              @change="getBudgets('',true)"
-            >
-              <el-option
-                v-for="item in departments"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-            <el-cascader
-              placeholder="资金类型选择"
-              :options="planTypes"
-              :props="{
-                checkStrictly: false,
-                label: 'name',
-                value: 'id',
-              }"
-              :value="planSelect.type"
-              clearable
-              size="small"
-              style="width: 220px;margin-right: 10px;"
-              @change="(e) => {
-                planSelect.type = e[e.length - 1] || '';
-                getBudgets('',true);
-              }"
-            />
-            <Input
-              v-model="planSelect.name"
-              search
-              enter-button="搜 索"
-              clearable
-              placeholder="搜索预算计划.."
-              @on-search="getBudgets('',true)"
-            />
-          </div>
-
-          <xy-table
-            ref="planTable"
-            key="planTable"
-            :header-cell-class-name="cellClassName"
-            :list="plans"
-            :show-index="false"
-            :table-item="planTable"
-            :height="300"
-            style="margin-top: 10px"
-            border
-            :tree-props="{ children: 'notchildren', hasChildren: 'hasChildren' }"
-            @select="planPick"
-          >
-            <template v-slot:btns>
-              <el-table-column
-                label="使用金额（元）"
-                :fixed="$store.getters.device === 'mobile'?false:'right'"
-                header-align="center"
-                width="144"
-              >
-                <template slot-scope="scope">
-                  <Input :value="scope.row.use_money" @input="inputMoney($event,scope.row)" />
-                  <!-- <InputNumber
-                        style="width: 120px"
-                        :min="0"
-                        :precision="2"
-                        :active-change="false"
-                        v-model="scope.row._inputMoney"
-                        :formatter="
-                          (value) => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-                        "
-                        :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
-                      ></InputNumber> -->
-                </template>
-              </el-table-column>
-            </template>
-          </xy-table>
-          <div style="display: flex; justify-content: flex-end">
-            <Page :total="planTotal" show-elevator @on-change="pageChange" />
-          </div>
-        </div>
-        <!-- <div v-else>
-          <xy-table :list="showPlanList" key="showPlanTable" :show-index="false" :table-item="showPlanTable" :height="200" style="margin-top: 10px"
-            ref="planTable1">
-            <template v-slot:type>
-              <el-table-column label="分类" width="120" header-align="center">
-                <template slot-scope="scope">
-                  {{findVal(planTypes,scope.row.type)}}
-                </template>
-              </el-table-column>
-            </template>
-            <template v-slot:btns>
-                <div></div>
-            </template>
-          </xy-table>
-        </div> -->
-
-      </template>
-    </xy-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  getparameter, getparameterTree
-} from '@/api/system/dictionary'
-import {
-  getFundLog,
-  addFundLog
-} from '@/api/paymentRegistration/fundLog'
-import { listdeptNoAuth } from '@/api/system/department'
-import {
-  getBudget
-} from '@/api/budget/budget'
-import {
-  detailContract,
-  editorContract
-} from '@/api/contract/contract'
-import {
-  Message
-} from 'element-ui'
-import {
-  deepCopy,
-  parseTime
-} from '@/utils'
-import { getShList } from '@/api/oatoken'
-
-export default {
-  data() {
-    return {
-      shList: [],
-      flowIds: [{
-        flow_id: 14,
-        name: '供应品验收'
-      },
-      {
-        flow_id: 57,
-        name: '固定资产验收'
-      }
-      ],
-      fileList: [],
-      action: process.env.VUE_APP_UPLOAD_API,
-      searchContent: '',
-      planTotal: 0,
-      pageIndex: 1,
-      // 付款登记
-      planSelect: {
-        name: '',
-        page_size: 20,
-        page: 1,
-        // is_tree: 1,
-        year: new Date().getFullYear().toString(),
-        plan_department_id: '',
-        type: '',
-        top_pid: 1
-      },
-      plans: [],
-      planTypes: [],
-      contract: {},
-      payment: [], // 合同关联的付款登记
-      payTable: [{
-        label: '申请金额',
-        prop: 'apply_money',
-        sortable: false,
-        width: 160,
-        align: 'right'
-      },
-      {
-        label: '已付金额',
-        prop: 'act_money',
-        sortable: false,
-        width: 160,
-        align: 'right'
-      },
-      {
-        label: '时间',
-        prop: 'created_at',
-        sortable: false,
-        width: 120,
-        formatter: (t1, t2, value) => {
-          return parseTime(new Date(value), '{y}-{m}-{d}')
-        }
-      }
-      ],
-      paymentType: ['进度款', '结算款', '质保金'],
-      isShowPaymentRegistration: false,
-      paymentRegistrationForm: {
-        applyMoney: '',
-        // deductionMoney: "",
-        // audit_money: "",
-        type: '',
-        isLast: false,
-        property: 0,
-        property_type_id: '',
-        plan: [],
-        remark: '',
-        files: [],
-        meeting_flow_id: ''
-      },
-      form: {
-        audit_money: 0
-      },
-      paymentRegistrationRules: {
-        applyMoney: [{
-          required: true,
-          message: '必填'
-        },
-        {
-          pattern: /^\d+(\.\d+)?$/,
-          message: '必须为数字'
-        }
-        ],
-        deductionMoney: [{
-          required: true,
-          message: '必填'
-        },
-        {
-          pattern: /^\d+(\.\d+)?$/,
-          message: '必须为数字'
-        }
-        ],
-        type: [{
-          required: true,
-          message: '必选'
-        }]
-      },
-      departments: [],
-      planTable: [
-        {
-          sortable: false,
-          width: 44,
-          type: 'selection',
-          reserveSelection: true,
-          fixed: 'left',
-          selectable: (row, index) => {
-            return row.pid > 0
-          }
-        },
-        {
-          label: '科室',
-          prop: 'plan_department.name',
-          width: 120,
-          align: 'center'
-        },
-        {
-          label: '年份',
-          prop: 'year',
-          width: 80,
-          align: 'center'
-        },
-        {
-          label: '分类',
-          prop: 'type_detail.value',
-          width: 120
-        },
-        {
-          label: '名称',
-          prop: 'name',
-          minWidth: 180,
-          align: 'left'
-        },
-        {
-          label: '内容',
-          prop: 'content',
-          minWidth: 240,
-          align: 'left',
-          showOverflowTooltip: true
-        },
-        {
-          label: '计划金额',
-          prop: 'money',
-          align: 'right',
-          width: 120,
-          formatter: (v1, v2, value) => {
-            return `${(value && parseFloat(value) !== 0) ? value : v1.update_money}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-          }
-        },
-        {
-          label: '实付金额',
-          prop: 'use_money_total',
-          width: 120,
-          align: 'right',
-          formatter: (v1, v2, value) =>
-            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
-        },
-        {
-          label: '已用金额',
-          prop: 'has_money_total',
-          width: 120,
-          align: 'right',
-          formatter: (v1, v2, value) =>
-            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
-        }],
-      showPlanList: [],
-      showPlanTable: [
-        {
-          label: '科室',
-          prop: 'plan_department_id',
-          width: 120,
-          align: 'center',
-          formatter: (row, column, value) => {
-            return this.departments.find(i => i.id === row.plan_department_id)?.name
-          }
-        },
-        {
-          label: '年份',
-          prop: 'year',
-          width: 80,
-          align: 'center'
-        },
-        {
-          label: '分类',
-          prop: 'type',
-          width: 120
-        },
-        {
-          label: '名称',
-          prop: 'name',
-          minWidth: 180,
-          align: 'left'
-        },
-        {
-          label: '内容',
-          prop: 'content',
-          minWidth: 240,
-          align: 'left',
-          showOverflowTooltip: true
-        },
-        {
-          label: '计划金额',
-          prop: 'money',
-          align: 'right',
-          width: 120,
-          formatter: (v1, v2, value) => {
-            return `${(value && parseFloat(value) !== 0) ? value : v1.update_money}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-          }
-        },
-        {
-          label: '使用金额',
-          prop: 'use_money',
-          width: 120,
-          align: 'right',
-          formatter: (v1, v2, value) =>
-            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
-        }]
-    }
-  },
-  computed: {
-    priceFormat() {
-      return function(price) {
-        return Number(price)
-          .toFixed(2)
-          .replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-      }
-    },
-
-    nameFormat() {
-      return function(index) {
-        if (index == 2) {
-          return '报销'
-        }
-        if (index == 3) {
-          return '其他支出'
-        }
-        return '合同'
-      }
-    }
-  },
-  watch: {
-    isShowPaymentRegistration(newVal) {
-      if (newVal) {
-        // this.getBudgets();
-      } else {
-        this.paymentRegistrationForm.plan = []
-        this.$refs.planTable.clearSelection()
-      }
-    }
-  },
-  mounted() {
-    this.getPlanTypes()
-    this.getSh()
-  },
-  created() {
-    this.getAssetsFlowIds()
-    this.getDepartment()
-  },
-  methods: {
-    // 获取上会列表
-    async getSh(){
-      try {
-        const res = await getShList({
-          page: 1,
-          page_size: 999,
-          custom_model_id: 103,
-          field_id: 1225,
-          operator: 'eq',
-          field_keyword: '采购事项'
-        })
-        this.shList = res?.data?.data || []
-      } catch (e) {
-        this.shList = []
-      }
-    },
-    findVal(arr, id) {
-      for (let i = 0; i < arr.length; i++) {
-        // 1. 找到匹配项，直接返回name
-        if (arr[i].id == id) {
-          console.log('arr[i].name', arr[i].name)
-          return arr[i].name
-        }
-        // 2. 有children数组，递归查找
-        else if (arr[i].children instanceof Array) {
-          // 接收递归的返回值
-          const childResult = this.findVal(arr[i].children, id)
-          // 若子数组中找到结果，直接返回（传递到上层）
-          if (childResult) {
-            return childResult
-          }
-        }
-      }
-      // 3. 所有层级都没找到，返回null或空字符串（可选）
-      return null
-    },
-    // 上传
-    successHandle(response, file, fileList) {
-      this.fileList = fileList
-    },
-    removeHande(file, fileList) {
-      this.fileList = fileList
-    },
-    uploadBefore(file) {
-      console.log(file)
-      if ((file.size / 1000) > (20 * 1024)) {
-        this.$message({
-          type: 'warning',
-          message: '上传图片大小超过2M！'
-        })
-        return false
-      }
-    },
-
-    // async getPlanTypes() {
-    //   const res = await getparameter({
-    //     number: "money_way",
-    //   });
-    //   this.planTypes = res.detail;
-    // },
-    async getPlanTypes() {
-      const res = await getparameterTree({
-        id: 3
-      })
-      const dataHandler = (data) => {
-        data.forEach(i => {
-          if (i.hasOwnProperty('detail')) {
-            i.children = i.detail.map(j => {
-              j.name = j.value
-              return j
-            })
-          } else {
-            dataHandler(i['children'])
-          }
-        })
-        return data
-      }
-      this.planTypes = dataHandler(res?.children) || []
-    },
-
-    // 翻页
-    pageChange(e) {
-      this.pageIndex = e
-      this.getBudgets()
-    },
-
-    // 合计申请金额
-    totalApplyMoney() {
-      let total = 0.0
-      this.payment.map((item) => {
-        total += Number(item.apply_money)
-      })
-      return total.toFixed(2)
-    },
-    // 合计金额
-    totalMoney() {
-      let total = 0.0
-      this.payment.map((item) => {
-        total += Number(item.act_money)
-      })
-      return total.toFixed(2)
-    },
-    // 已付笔数
-    actNumsTotal() {
-      let total = 0
-      this.payment.map((item) => {
-        if (Number(item.act_money)) {
-          total++
-        }
-      })
-      return total
-    },
-    // 支付占比
-    percentPay() {
-      const total = this.totalMoney()
-      return ((total / this.contract.money) * 100 || 0).toFixed(2) || 0
-    },
-
-    // 获取合同信息
-    mergePlanData(plans, planLink) {
-      // 创建 plans 的映射表，键为 plan_id，值为 use_money
-      const planMap = new Map(
-        plans.map(plan => [plan.plan_id, plan.use_money])
-      )
-
-      // 遍历 planLink，为每个项添加匹配的 use_money
-      return planLink.map(item => {
-        // 如果找到匹配的 plan_id，则添加 use_money，否则添加 null 或默认值
-        const useMoney = planMap.get(item.id) || null
-        return {
-          ...item,
-          use_money: useMoney
-        }
-      })
-    },
-    async getContract(info) {
-      this.contract = await detailContract({
-        id: info.id
-      })
-
-      this.paymentRegistrationForm.plan = this.contract.plan_link
-
-      // if(this.contract.plan_link,length>0){
-      //   this.showPlanList = this.mergePlanData(this.contract.plan_link,this.contract.plans)
-      // }
-      console.log('this.paymentRegistrationForm.plan', this.contract.plan_link, this.showPlanList)
-      if (this.contract.plan_link.legnth === 0) {
-        Message({
-          type: 'warning',
-          message: '该支出未关联预算计划，请在下方手动关联预算计划'
-        })
-      }
-
-      this.form.audit_money = this.contract.audit_money
-      if (this.contract.borrows && this.contract.borrows.length > 0) {
-        this.paymentRegistrationForm.applyMoney =
-          parseFloat(this.contract.money) - parseFloat(this.contract.borrows[0].money) + parseFloat(this.contract.borrows[0].diff)
-      }
-
-      this.getBudgets(this.contract.plans?.map(i => i.pid > 0 ? i.pid : i.id)?.toString())
-      const res = await getFundLog({
-        contract_id: this.contract.id,
-        show_type: 1
-      })
-
-      this.payment = res.data
-      this.fileList = res.files_detail?.map(i => {
-        return {
-          url: i?.url,
-          name: i?.original_name,
-          response: i
-        }
-      })
-    },
-    inputMoney(e, row) {
-      row.use_money = e
-      this.paymentRegistrationForm.plan.forEach(item => {
-        if (item.plan_id == row.id) {
-          item.use_money = e
-        }
-      })
-    },
-    submit() {
-      const data = {
-        contract_id: this.contract.id,
-        apply_money: this.paymentRegistrationForm.applyMoney,
-        discount_money: '',
-        // discount_money: this.paymentRegistrationForm.deductionMoney,
-        type: this.paymentRegistrationForm.type,
-        is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
-        remark: this.paymentRegistrationForm.remark,
-        audit_money: '',
-        // audit_money: this.paymentRegistrationForm.audit_money,
-        files: this.fileList ? this.fileList.map(i => i?.response?.id) : [],
-        property: this.paymentRegistrationForm.property,
-        property_type_id: this.paymentRegistrationForm.property_type_id,
-        meeting_flow_id: this.paymentRegistrationForm.meeting_flow_id
-      }
-      // 如果没有关联预算计划，需要选择
-      if (this.paymentRegistrationForm.plan.length === 0) {
-        const contract_plan_act_links = this.$refs.planTable.getSelection()
-        console.log('contract_plan_act_links', contract_plan_act_links)
-        if (contract_plan_act_links.length < 1) {
-          Message({
-            type: 'warning',
-            message: '请选择预算计划'
-          })
-          return
-        }
-        // 判断选择的预算计划金额是否不为0
-        let money0 = 0
-        contract_plan_act_links.map(i => {
-          if (parseFloat(i.use_money) <= 0 || !i.use_money) {
-            money0++
-          }
-        })
-        if (money0 > 0) {
-          Message({
-            type: 'warning',
-            message: '选择的预算计划的使用金额不能为0'
-          })
-          return
-        }
-        data.contract_plan_links = contract_plan_act_links.map(item => {
-          return {
-            plan_id: item.id,
-            new_money: this.contract.money,
-            use_money: item.use_money
-          }
-        })
-      }
-      console.log('data', data, data.contract_plan_links)
-      // return
-      addFundLog(data).then((res) => {
-        // 付款申请后同时更新一下合同中审计金额
-        editorContract({
-          id: this.contract.id,
-          audit_money: this.form.audit_money
-        }).then((r) => {
-          this.$emit('paid', {
-            name: this.contract?.name,
-            type: this.contract?.type,
-            number: this.contract?.number,
-            id: this.contract?.id,
-            reason: this.paymentRegistrationForm.remark,
-            yizhifucishu: this.actNumsTotal(),
-            yizhifujine: this.totalMoney(),
-            zongjia: this.contract?.money,
-            zhifucishu: this.contract?.sign_plan?.length || 0,
-            total: data.apply_money,
-            out_pay_id: res,
-            applyMoney: data.apply_money,
-            contract_id: this.contract.id
-          })
-          this.isShowPaymentRegistration = false
-          Message({
-            type: 'success',
-            message: '操作成功'
-          })
-        })
-        this.$refs['paymentRegistration'].reset()
-
-        this.$emit('refresh')
-      })
-    },
-    // 计划
-    // 获取预算计划
-    initInputMoney(list) {
-      if (!Array.isArray(list)) return []
-
-      return list.map(item => {
-        // 使用 Vue.set 确保响应式
-        this.$set(item, '_inputMoney', 0)
-
-        if (Array.isArray(item.children)) {
-          item.children = this.initInputMoney(item.children)
-        }
-
-        return item
-      })
-    },
-    cellClassName({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        return 'allSelect'
-      }
-    },
-    async getBudgets(pid, search) {
-      if (search) {
-        this.$refs.planTable.clearSelection()
-        this.paymentRegistrationForm.plan = []
-      }
-
-      const res = await getBudget({
-        top_pid: 1,
-        ...this.planSelect,
-        pid
-      })
-      this.initInputMoney(res.list.data)
-      this.plans = res.list.data
-      this.planTotal = res.list.total
-
-      this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
-        return item.plan_id
-      }))
-      // this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
-      //   return item.plan_id
-      // }))
-    },
-    getDepartment() {
-      listdeptNoAuth().then((res) => {
-        this.departments = res.data
-      })
-    },
-    planPageChange(e) {
-      this.plansPageIndex = e
-      this.getBudgets()
-    },
-    planPick(selection, row) {
-      if (row.year != new Date().getFullYear()) {
-        this.$confirm('您选择了非本年预算，是否继续？').catch(_ => {
-          this.$refs['planTable'].toggleRowSelection(row)
-        })
-      }
-    },
-    selectPlan(sel, row) {
-      if (sel) {
-        this.paymentRegistrationForm.plan = sel.map((item) => {
-          return {
-            plan_id: item.id,
-            use_money: item.useMoney,
-            new_money: item.money
-          }
-        })
-      } else {
-        this.paymentRegistrationForm.plan = []
-      }
-    },
-    toggleSelection(plans) {
-      if (plans) {
-        console.log('this.plans', plans, this.plans, this.paymentRegistrationForm)
-        const arr = this.plans.filter(plan => {
-          if (plans.includes(plan.id)) {
-            plan.use_money = parseFloat(this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money) == 0
-              ? this.totalApplyMoney() : this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money
-            return true
-          } else if (plans.includes(plan.pid)) {
-            plan.use_money = parseFloat(this.paymentRegistrationForm.plan[plans.indexOf(plan.pid)].use_money) == 0
-              ? this.totalApplyMoney() : this.paymentRegistrationForm.plan[plans.indexOf(plan.pid)].use_money
-            return true
-          } else {
-            plan.use_money = 0
-          }
-          // plan.use_money = this.paymentRegistrationForm.applyMoney
-        })
-        console.log('arr', arr)
-        arr.forEach(row => {
-          console.log('row', row)
-          this.$refs.planTable.toggleRowSelection(row)
-          this.paymentRegistrationForm.plan.push({
-            contract_id: this.contract.id,
-            plan_id: row.id,
-            use_money: row.use_money,
-            new_money: row.money,
-            label: row.name,
-            plan: row
-          })
-        })
-      } else {
-        this.$refs.planTable.clearSelection()
-      }
-
-      // if (!e) {
-      //   return;
-      // }
-      // let plans = this.paymentRegistrationForm.plan.map((item) => {
-      //   return item.plan_id;
-      // });
-      // if (plans) {
-      //   this.plans
-      //     .filter((plan) => {
-      //       return plans.includes(plan.id);
-      //     })
-      //     .map((row) => {
-      //       this.$nextTick(() => {
-      //         this.$refs["planTable"].toggleRowSelection(row);
-      //       });
-      //     });
-      // } else {
-      //   this.$refs["planTable"].clearSelection();
-      // }
-    },
-
-    async getAssetsFlowIds() {
-      const copy = deepCopy(this.flowIds)
-      const res = await getparameter({
-        number: 'asset_flow_ids'
-      })
-      try {
-        this.flowIds = res?.detail?.map(i => {
-          const data = JSON.parse(i.remark)
-          return {
-            id: i.id,
-            name: i.value,
-            ...data
-          }
-        })
-      } catch (e) {
-        this.flowIds = copy
-      }
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-  ::v-deep .ivu-input-group-append.ivu-input-search{
-    background-color: #409EFF;
-  }
-  ::v-deep .allSelect .cell {
-    display: none;
-  }
-  .select-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  .payment-registration {
-    &-row {
-      display: flex;
-      
-      padding: 6px 0;
-
-      &-title {
-        padding: 0 10px;
-      }
-
-      &-content {}
-    }
-  }
-
-  .xy-table-item-label {
-    width: 200px;
-  }
-
-  .xy-table-item-price {
-    position: relative;
-
-    &::after {
-      z-index: 1;
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: "（元）";
-    }
-
-    ::v-deep .el-input__clear {
-      position: relative;
-      right: 30px;
-      z-index: 2;
-    }
-  }
-</style>
+<template>
+  <div>
+    <!--    付款登记-->
+    <xy-dialog
+      ref="paymentRegistration"
+      title="付款登记"
+      :is-show.sync="isShowPaymentRegistration"
+      type="form"
+      class="payment-registration"
+      :form="paymentRegistrationForm"
+      :rules="paymentRegistrationRules"
+      @submit="submit"
+    >
+      <template v-slot:extraFormTop>
+        <div class="payment-registration-row">
+          <div class="payment-registration-row-title">受款单位</div>
+          <div class="payment-registration-row-content">
+            {{ contract.supply }}
+          </div>
+        </div>
+        <div class="payment-registration-row">
+          <div class="payment-registration-row-title">{{ nameFormat($route.path.split('_')[1]) }}名称</div>
+          <div class="payment-registration-row-content">
+            {{ contract.name }}
+          </div>
+        </div>
+        
+        <div class="payment-registration-row">
+          <div class="payment-registration-row-title">{{ nameFormat($route.path.split('_')[1]) }}金额</div>
+          <div class="payment-registration-row-content">
+            {{ priceFormat(contract.money) }} （元）
+          </div>
+        </div>
+        <div style="display: flex">
+          <div class="payment-registration-row">
+            <div class="payment-registration-row-title">已申请金额</div>
+            <div class="payment-registration-row-content">
+              {{ totalApplyMoney() }} （元）
+            </div>
+          </div>
+          <div class="payment-registration-row">
+            <div class="payment-registration-row-title">已申请笔数</div>
+            <div class="payment-registration-row-content">
+              {{ payment.length }}
+            </div>
+          </div>
+        </div>
+        <div style="display: flex">
+          <div class="payment-registration-row">
+            <div class="payment-registration-row-title">已付金额</div>
+            <div class="payment-registration-row-content">
+              {{ totalMoney() }} （元）
+            </div>
+          </div>
+          <div class="payment-registration-row">
+            <div class="payment-registration-row-title">支付占比</div>
+            <div class="payment-registration-row-content">
+              {{ percentPay() }}%
+            </div>
+          </div>
+          <div class="payment-registration-row">
+            <div class="payment-registration-row-title">已付笔数</div>
+            <div class="payment-registration-row-content">
+              {{ actNumsTotal() }}
+            </div>
+            <div class="payment-registration-row-content" style="color: #ff0000; padding-left: 16px; cursor: pointer">
+              <Poptip :transfer="true">
+                <div>点击查看列表</div>
+                <template v-slot:content>
+                  <template v-if="payment && payment.length > 0">
+                    <xy-table :height="200" :list="payment" :table-item="payTable">
+                      <template v-slot:btns>
+                        <p />
+                      </template>
+                    </xy-table>
+                  </template>
+                  <template v-else>
+                    <div style="text-align: center">暂无已付笔数</div>
+                  </template>
+                </template>
+              </Poptip>
+            </div>
+          </div>
+        </div>
+        <!-- 预算计划 -->
+        <div />
+        <!-- 是否有借款 -->
+        <div v-if="contract.borrows && contract.borrows.length>0">
+          <div style="display: flex">
+            <div class="payment-registration-row">
+              <div class="payment-registration-row-title">借款金额</div>
+              <div class="payment-registration-row-content">
+                {{ priceFormat(contract.borrows[0]['money']) }} （元）
+              </div>
+            </div>
+            <div class="payment-registration-row">
+              <div class="payment-registration-row-title">剩余还款金额</div>
+              <div class="payment-registration-row-content">
+                {{ priceFormat(contract.borrows[0]['diff']) }}（元）
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- 是否有 -->
+                 <div class="payment-registration-row" style="align-items: center;margin-bottom:5px">
+           <div class="payment-registration-row-title">
+             资金上会流程
+             <span v-if="isMeetingFlowRequired" style="color: red; font-weight: 600; padding-right: 4px">*</span>
+           </div>
+           <div class="payment-registration-row-content">
+                           <el-select
+                v-model="paymentRegistrationForm.meeting_flow_id"
+                placeholder="请选择资金上会流程"
+                clearable
+                :disabled="isMeetingFlowDisabled"
+                style="width: 320px"
+                filterable
+              >
+                <el-option
+                  v-for="item in shList"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.data.yiti+'-'+item.title"
+                >
+                  <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
+                  <span 
+                    style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
+                    @click.stop="viewOaFlow(item.id)"
+                  >查看</span>
+                </el-option>
+              </el-select>
+           </div>
+         </div>
+      </template>
+
+      <template v-slot:applyMoney>
+        <div class="xy-table-item">
+          <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
+              v-model="paymentRegistrationForm.applyMoney"
+              clearable
+              placeholder="请填写付款金额"
+              style="width: 150px"
+            />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:audit_money>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">审计金额</div>
+          <div class="xy-table-item-content xy-table-item-price">
+            <el-input v-model="form.audit_money" clearable placeholder="请填写审计金额" style="width: 150px" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:deductionMoney>
+        <div class="xy-table-item">
+          <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
+              v-model="paymentRegistrationForm.deductionMoney"
+              clearable
+              placeholder="请填写扣款金额"
+              style="width: 150px"
+            />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:remark>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">备注</div>
+          <div class="xy-table-item-content">
+            <el-input
+              v-model="paymentRegistrationForm.remark"
+              type="textarea"
+              clearable
+              placeholder="进度款日期：2022.6.8-2022.7.7"
+              style="width: 300px"
+            />
+          </div>
+        </div>
+      </template>
+      <template v-slot:type>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>款项类型
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="paymentRegistrationForm.type"
+              placeholder="选择款项类型或直接录入其他类型"
+              style="width: 150px"
+              filterable
+              allow-create
+              clearable
+              popper-append-to-body
+            >
+              <el-option v-for="item in paymentType" :key="item" :label="item" :value="item" />
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:isLast>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">
+            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为最后一笔
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="paymentRegistrationForm.isLast" active-text="是" inactive-text="否" />
+            <!--                       @change="toggleSelection"-->
+          </div>
+        </div>
+      </template>
+      <template v-slot:property>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">
+            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>是否为资产
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="paymentRegistrationForm.property" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
+          </div>
+        </div>
+      </template>
+      <template v-if="paymentRegistrationForm.property" v-slot:property_type_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">
+            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>资产类型
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="paymentRegistrationForm.property_type_id" style="width: 150px">
+              <el-option v-for="item in flowIds" :key="item.id" :value="item.id" :label="item.name" />
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-if="false" #files>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            附件 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-upload
+              ref="upload"
+              style="width: 300px"
+              multiple
+              :on-success="successHandle"
+              :before-upload="uploadBefore"
+              accept=".rar,.zip,.doc,.docx,.pdf,.jpg,.png,.gif,.mp4,.xls,.xlsx"
+              :action="action"
+              :file-list="fileList"
+              :auto-upload="false"
+              :on-remove="removeHande"
+              :limit="10"
+            >
+              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                type="success"
+                @click="$refs['upload'].submit()"
+              >开始上传</el-button>
+              <div slot="tip" class="el-upload__tip">
+                支持文件格式：.rar .zip .doc .docx .pdf .jpg .png .gif .mp4 .xls
+                .xlsx
+                <br>单个文件不能超过20M
+              </div>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+      <template v-slot:extraFormBottom>
+        <!-- v-if="paymentRegistrationForm.plan.length===0" -->
+        <div>
+          <div style="margin:5px 0;color:#000;">拟使用预算</div>
+          <div class="select-container">
+            <DatePicker
+              :value="planSelect.year"
+              placeholder="选择所属年份"
+              placement="bottom-start"
+              style="width: 180px;margin-right: 10px;"
+              type="year"
+              @on-change="(e) => {
+                planSelect.year = e
+                getBudgets('',true)
+              }"
+            />
+            <el-select
+              v-model="planSelect.plan_department_id"
+              placeholder="科室选择"
+              clearable
+              size="small"
+              style="width: 180px;margin-right: 10px;"
+              @change="getBudgets('',true)"
+            >
+              <el-option
+                v-for="item in departments"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+            <el-cascader
+              placeholder="资金类型选择"
+              :options="planTypes"
+              :props="{
+                checkStrictly: false,
+                label: 'name',
+                value: 'id',
+              }"
+              :value="planSelect.type"
+              clearable
+              size="small"
+              style="width: 220px;margin-right: 10px;"
+              @change="(e) => {
+                planSelect.type = e[e.length - 1] || '';
+                getBudgets('',true);
+              }"
+            />
+            <Input
+              v-model="planSelect.name"
+              search
+              enter-button="搜 索"
+              clearable
+              placeholder="搜索预算计划.."
+              @on-search="getBudgets('',true)"
+            />
+          </div>
+
+          <xy-table
+            ref="planTable"
+            key="planTable"
+            :header-cell-class-name="cellClassName"
+            :list="plans"
+            :show-index="false"
+            :table-item="planTable"
+            :height="300"
+            style="margin-top: 10px"
+            border
+            :tree-props="{ children: 'notchildren', hasChildren: 'hasChildren' }"
+            @select="planPick"
+          >
+            <template v-slot:btns>
+              <el-table-column
+                label="使用金额（元）"
+                :fixed="$store.getters.device === 'mobile'?false:'right'"
+                header-align="center"
+                width="144"
+              >
+                <template slot-scope="scope">
+                  <Input :value="scope.row.use_money" @input="inputMoney($event,scope.row)" />
+                  <!-- <InputNumber
+                        style="width: 120px"
+                        :min="0"
+                        :precision="2"
+                        :active-change="false"
+                        v-model="scope.row._inputMoney"
+                        :formatter="
+                          (value) => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+                        "
+                        :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                      ></InputNumber> -->
+                </template>
+              </el-table-column>
+            </template>
+          </xy-table>
+          <div style="display: flex; justify-content: flex-end">
+            <Page :total="planTotal" show-elevator @on-change="pageChange" />
+          </div>
+        </div>
+        <!-- <div v-else>
+          <xy-table :list="showPlanList" key="showPlanTable" :show-index="false" :table-item="showPlanTable" :height="200" style="margin-top: 10px"
+            ref="planTable1">
+            <template v-slot:type>
+              <el-table-column label="分类" width="120" header-align="center">
+                <template slot-scope="scope">
+                  {{findVal(planTypes,scope.row.type)}}
+                </template>
+              </el-table-column>
+            </template>
+            <template v-slot:btns>
+                <div></div>
+            </template>
+          </xy-table>
+        </div> -->
+
+      </template>
+    </xy-dialog>
+    
+    <!-- OA流程Modal -->
+    <Modal
+      v-model="isShowOaModal"
+      :width="86"
+      class-name="oa-modal"
+      title="流程办理"
+      fullscreen
+      :mask-closable="false"
+      footer-hide
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {
+  getparameter, getparameterTree
+} from '@/api/system/dictionary'
+import {
+  getFundLog,
+  addFundLog
+} from '@/api/paymentRegistration/fundLog'
+import { listdeptNoAuth } from '@/api/system/department'
+import {
+  getBudget
+} from '@/api/budget/budget'
+import {
+  detailContract,
+  editorContract
+} from '@/api/contract/contract'
+import {
+  Message
+} from 'element-ui'
+import {
+  deepCopy,
+  parseTime
+} from '@/utils'
+import { getShList } from '@/api/oatoken'
+import { getToken } from '@/utils/auth'
+
+export default {
+  data() {
+    return {
+      shList: [],
+      flowIds: [{
+        flow_id: 14,
+        name: '供应品验收'
+      },
+      {
+        flow_id: 57,
+        name: '固定资产验收'
+      }
+      ],
+      fileList: [],
+      action: process.env.VUE_APP_UPLOAD_API,
+      searchContent: '',
+      planTotal: 0,
+      pageIndex: 1,
+      // 付款登记
+      planSelect: {
+        name: '',
+        page_size: 20,
+        page: 1,
+        // is_tree: 1,
+        year: new Date().getFullYear().toString(),
+        plan_department_id: '',
+        type: '',
+        top_pid: 1
+      },
+      plans: [],
+      planTypes: [],
+      contract: {},
+      payment: [], // 合同关联的付款登记
+      payTable: [{
+        label: '申请金额',
+        prop: 'apply_money',
+        sortable: false,
+        width: 160,
+        align: 'right'
+      },
+      {
+        label: '已付金额',
+        prop: 'act_money',
+        sortable: false,
+        width: 160,
+        align: 'right'
+      },
+      {
+        label: '时间',
+        prop: 'created_at',
+        sortable: false,
+        width: 120,
+        formatter: (t1, t2, value) => {
+          return parseTime(new Date(value), '{y}-{m}-{d}')
+        }
+      }
+      ],
+      paymentType: ['进度款', '结算款', '质保金'],
+      isShowPaymentRegistration: false,
+      paymentRegistrationForm: {
+        applyMoney: '',
+        // deductionMoney: "",
+        // audit_money: "",
+        type: '',
+        isLast: false,
+        property: 0,
+        property_type_id: '',
+        plan: [],
+        remark: '',
+        files: [],
+        meeting_flow_id: ''
+      },
+      form: {
+        audit_money: 0
+      },
+      paymentRegistrationRules: {
+        applyMoney: [{
+          required: true,
+          message: '必填'
+        },
+        {
+          pattern: /^\d+(\.\d+)?$/,
+          message: '必须为数字'
+        }
+        ],
+        deductionMoney: [{
+          required: true,
+          message: '必填'
+        },
+        {
+          pattern: /^\d+(\.\d+)?$/,
+          message: '必须为数字'
+        }
+        ],
+        type: [{
+          required: true,
+          message: '必选'
+        }],
+        meeting_flow_id: [{
+          required: true,
+          message: '资金上会流程为必选项',
+          validator: (rule, value, callback) => {
+            // 如果申请付款金额大于等于5万，则必选
+            if (this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) >= 50000) {
+              if (!value) {
+                callback(new Error('资金上会流程为必选项'))
+                return
+              }
+            }
+            callback()
+          }
+        }]
+      },
+      departments: [],
+      planTable: [
+        {
+          sortable: false,
+          width: 44,
+          type: 'selection',
+          reserveSelection: true,
+          fixed: 'left',
+          selectable: (row, index) => {
+            return row.pid > 0
+          }
+        },
+        {
+          label: '科室',
+          prop: 'plan_department.name',
+          width: 120,
+          align: 'center'
+        },
+        {
+          label: '年份',
+          prop: 'year',
+          width: 80,
+          align: 'center'
+        },
+        {
+          label: '分类',
+          prop: 'type_detail.value',
+          width: 120
+        },
+        {
+          label: '名称',
+          prop: 'name',
+          minWidth: 180,
+          align: 'left'
+        },
+        {
+          label: '内容',
+          prop: 'content',
+          minWidth: 240,
+          align: 'left',
+          showOverflowTooltip: true
+        },
+        {
+          label: '计划金额',
+          prop: 'money',
+          align: 'right',
+          width: 120,
+          formatter: (v1, v2, value) => {
+            return `${(value && parseFloat(value) !== 0) ? value : v1.update_money}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+          }
+        },
+        {
+          label: '实付金额',
+          prop: 'use_money_total',
+          width: 120,
+          align: 'right',
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
+        },
+        {
+          label: '已用金额',
+          prop: 'has_money_total',
+          width: 120,
+          align: 'right',
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
+        }],
+      showPlanList: [],
+      showPlanTable: [
+        {
+          label: '科室',
+          prop: 'plan_department_id',
+          width: 120,
+          align: 'center',
+          formatter: (row, column, value) => {
+            return this.departments.find(i => i.id === row.plan_department_id)?.name
+          }
+        },
+        {
+          label: '年份',
+          prop: 'year',
+          width: 80,
+          align: 'center'
+        },
+        {
+          label: '分类',
+          prop: 'type',
+          width: 120
+        },
+        {
+          label: '名称',
+          prop: 'name',
+          minWidth: 180,
+          align: 'left'
+        },
+        {
+          label: '内容',
+          prop: 'content',
+          minWidth: 240,
+          align: 'left',
+          showOverflowTooltip: true
+        },
+        {
+          label: '计划金额',
+          prop: 'money',
+          align: 'right',
+          width: 120,
+          formatter: (v1, v2, value) => {
+            return `${(value && parseFloat(value) !== 0) ? value : v1.update_money}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+          }
+        },
+        {
+          label: '使用金额',
+          prop: 'use_money',
+          width: 120,
+          align: 'right',
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
+        }],
+      // OA流程相关
+      oaUrl: '',
+      isShowOaModal: false
+    }
+  },
+  computed: {
+    priceFormat() {
+      return function(price) {
+        return Number(price)
+          .toFixed(2)
+          .replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+      }
+    },
+
+    nameFormat() {
+      return function(index) {
+        if (index == 2) {
+          return '报销'
+        }
+        if (index == 3) {
+          return '其他支出'
+        }
+        return '合同'
+      }
+    },
+    
+    // 资金上会流程是否必选
+    isMeetingFlowRequired() {
+      return this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) >= 50000
+    },
+    
+    // 资金上会流程是否禁用
+    isMeetingFlowDisabled() {
+      return this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) < 50000
+    }
+  },
+  watch: {
+    isShowPaymentRegistration(newVal) {
+      if (newVal) {
+        // this.getBudgets();
+      } else {
+        this.paymentRegistrationForm.plan = []
+        this.$refs.planTable.clearSelection()
+      }
+    }
+  },
+  mounted() {
+    this.getPlanTypes()
+    this.getSh()
+  },
+  created() {
+    this.getAssetsFlowIds()
+    this.getDepartment()
+  },
+  methods: {
+    // 查看OA流程
+    viewOaFlow(flowId) {
+      const url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
+      
+      this.oaUrl = url
+      this.isShowOaModal = true
+    },
+    // 获取上会列表
+    async getSh(){
+      try {
+        const res = await getShList({
+          page: 1,
+          page_size: 999,
+          custom_model_id: 103,
+          sort_name: 'created_at',
+          sort_type: 'DESC'
+        })
+        this.shList = res?.data?.data || []
+      } catch (e) {
+        this.shList = []
+      }
+    },
+    findVal(arr, id) {
+      for (let i = 0; i < arr.length; i++) {
+        // 1. 找到匹配项，直接返回name
+        if (arr[i].id == id) {
+          console.log('arr[i].name', arr[i].name)
+          return arr[i].name
+        }
+        // 2. 有children数组，递归查找
+        else if (arr[i].children instanceof Array) {
+          // 接收递归的返回值
+          const childResult = this.findVal(arr[i].children, id)
+          // 若子数组中找到结果，直接返回（传递到上层）
+          if (childResult) {
+            return childResult
+          }
+        }
+      }
+      // 3. 所有层级都没找到，返回null或空字符串（可选）
+      return null
+    },
+    // 上传
+    successHandle(response, file, fileList) {
+      this.fileList = fileList
+    },
+    removeHande(file, fileList) {
+      this.fileList = fileList
+    },
+    uploadBefore(file) {
+      console.log(file)
+      if ((file.size / 1000) > (20 * 1024)) {
+        this.$message({
+          type: 'warning',
+          message: '上传图片大小超过2M！'
+        })
+        return false
+      }
+    },
+
+    // async getPlanTypes() {
+    //   const res = await getparameter({
+    //     number: "money_way",
+    //   });
+    //   this.planTypes = res.detail;
+    // },
+    async getPlanTypes() {
+      const res = await getparameterTree({
+        id: 3
+      })
+      const dataHandler = (data) => {
+        data.forEach(i => {
+          if (i.hasOwnProperty('detail')) {
+            i.children = i.detail.map(j => {
+              j.name = j.value
+              return j
+            })
+          } else {
+            dataHandler(i['children'])
+          }
+        })
+        return data
+      }
+      this.planTypes = dataHandler(res?.children) || []
+    },
+
+    // 翻页
+    pageChange(e) {
+      this.pageIndex = e
+      this.getBudgets()
+    },
+
+    // 合计申请金额
+    totalApplyMoney() {
+      let total = 0.0
+      this.payment.map((item) => {
+        total += Number(item.apply_money)
+      })
+      return total.toFixed(2)
+    },
+    // 合计金额
+    totalMoney() {
+      let total = 0.0
+      this.payment.map((item) => {
+        total += Number(item.act_money)
+      })
+      return total.toFixed(2)
+    },
+    // 已付笔数
+    actNumsTotal() {
+      let total = 0
+      this.payment.map((item) => {
+        if (Number(item.act_money)) {
+          total++
+        }
+      })
+      return total
+    },
+    // 支付占比
+    percentPay() {
+      const total = this.totalMoney()
+      return ((total / this.contract.money) * 100 || 0).toFixed(2) || 0
+    },
+
+    // 获取合同信息
+    mergePlanData(plans, planLink) {
+      // 创建 plans 的映射表，键为 plan_id，值为 use_money
+      const planMap = new Map(
+        plans.map(plan => [plan.plan_id, plan.use_money])
+      )
+
+      // 遍历 planLink，为每个项添加匹配的 use_money
+      return planLink.map(item => {
+        // 如果找到匹配的 plan_id，则添加 use_money，否则添加 null 或默认值
+        const useMoney = planMap.get(item.id) || null
+        return {
+          ...item,
+          use_money: useMoney
+        }
+      })
+    },
+    async getContract(info) {
+      this.contract = await detailContract({
+        id: info.id
+      })
+
+      this.paymentRegistrationForm.plan = this.contract.plan_link
+
+      // if(this.contract.plan_link,length>0){
+      //   this.showPlanList = this.mergePlanData(this.contract.plan_link,this.contract.plans)
+      // }
+      console.log('this.paymentRegistrationForm.plan', this.contract.plan_link, this.showPlanList)
+      if (this.contract.plan_link.legnth === 0) {
+        Message({
+          type: 'warning',
+          message: '该支出未关联预算计划，请在下方手动关联预算计划'
+        })
+      }
+
+      this.form.audit_money = this.contract.audit_money
+      if (this.contract.borrows && this.contract.borrows.length > 0) {
+        this.paymentRegistrationForm.applyMoney =
+          parseFloat(this.contract.money) - parseFloat(this.contract.borrows[0].money) + parseFloat(this.contract.borrows[0].diff)
+      }
+
+      this.getBudgets(this.contract.plans?.map(i => i.pid > 0 ? i.pid : i.id)?.toString())
+      const res = await getFundLog({
+        contract_id: this.contract.id,
+        show_type: 1
+      })
+
+      this.payment = res.data
+      this.fileList = res.files_detail?.map(i => {
+        return {
+          url: i?.url,
+          name: i?.original_name,
+          response: i
+        }
+      })
+    },
+    inputMoney(e, row) {
+      row.use_money = e
+      this.paymentRegistrationForm.plan.forEach(item => {
+        if (item.plan_id == row.id) {
+          item.use_money = e
+        }
+      })
+    },
+    submit() {
+      // 验证资金上会流程
+      if (this.isMeetingFlowRequired && !this.paymentRegistrationForm.meeting_flow_id) {
+        Message({
+          type: 'warning',
+          message: '资金上会流程为必选项'
+        })
+        return
+      }
+      
+      const data = {
+        contract_id: this.contract.id,
+        apply_money: this.paymentRegistrationForm.applyMoney,
+        discount_money: '',
+        // discount_money: this.paymentRegistrationForm.deductionMoney,
+        type: this.paymentRegistrationForm.type,
+        is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
+        remark: this.paymentRegistrationForm.remark,
+        audit_money: '',
+        // audit_money: this.paymentRegistrationForm.audit_money,
+        files: this.fileList ? this.fileList.map(i => i?.response?.id) : [],
+        property: this.paymentRegistrationForm.property,
+        property_type_id: this.paymentRegistrationForm.property_type_id,
+        meeting_flow_id: this.paymentRegistrationForm.meeting_flow_id
+      }
+      // 如果没有关联预算计划，需要选择
+      if (this.paymentRegistrationForm.plan.length === 0) {
+        const contract_plan_act_links = this.$refs.planTable.getSelection()
+        console.log('contract_plan_act_links', contract_plan_act_links)
+        if (contract_plan_act_links.length < 1) {
+          Message({
+            type: 'warning',
+            message: '请选择预算计划'
+          })
+          return
+        }
+        // 判断选择的预算计划金额是否不为0
+        let money0 = 0
+        contract_plan_act_links.map(i => {
+          if (parseFloat(i.use_money) <= 0 || !i.use_money) {
+            money0++
+          }
+        })
+        if (money0 > 0) {
+          Message({
+            type: 'warning',
+            message: '选择的预算计划的使用金额不能为0'
+          })
+          return
+        }
+        data.contract_plan_links = contract_plan_act_links.map(item => {
+          return {
+            plan_id: item.id,
+            new_money: this.contract.money,
+            use_money: item.use_money
+          }
+        })
+      }
+      console.log('data', data, data.contract_plan_links)
+      // return
+      addFundLog(data).then((res) => {
+        // 付款申请后同时更新一下合同中审计金额
+        editorContract({
+          id: this.contract.id,
+          audit_money: this.form.audit_money
+        }).then((r) => {
+          this.$emit('paid', {
+            name: this.contract?.name,
+            type: this.contract?.type,
+            number: this.contract?.number,
+            id: this.contract?.id,
+            reason: this.paymentRegistrationForm.remark,
+            yizhifucishu: this.actNumsTotal(),
+            yizhifujine: this.totalMoney(),
+            zongjia: this.contract?.money,
+            zhifucishu: this.contract?.sign_plan?.length || 0,
+            total: data.apply_money,
+            out_pay_id: res,
+            applyMoney: data.apply_money,
+            contract_id: this.contract.id
+          })
+          this.isShowPaymentRegistration = false
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+        })
+        this.$refs['paymentRegistration'].reset()
+
+        this.$emit('refresh')
+      })
+    },
+    // 计划
+    // 获取预算计划
+    initInputMoney(list) {
+      if (!Array.isArray(list)) return []
+
+      return list.map(item => {
+        // 使用 Vue.set 确保响应式
+        this.$set(item, '_inputMoney', 0)
+
+        if (Array.isArray(item.children)) {
+          item.children = this.initInputMoney(item.children)
+        }
+
+        return item
+      })
+    },
+    cellClassName({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        return 'allSelect'
+      }
+    },
+    async getBudgets(pid, search) {
+      if (search) {
+        this.$refs.planTable.clearSelection()
+        this.paymentRegistrationForm.plan = []
+      }
+
+      const res = await getBudget({
+        top_pid: 1,
+        ...this.planSelect,
+        pid
+      })
+      this.initInputMoney(res.list.data)
+      this.plans = res.list.data
+      this.planTotal = res.list.total
+
+      this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
+        return item.plan_id
+      }))
+      // this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
+      //   return item.plan_id
+      // }))
+    },
+    getDepartment() {
+      listdeptNoAuth().then((res) => {
+        this.departments = res.data
+      })
+    },
+    planPageChange(e) {
+      this.plansPageIndex = e
+      this.getBudgets()
+    },
+    planPick(selection, row) {
+      if (row.year != new Date().getFullYear()) {
+        this.$confirm('您选择了非本年预算，是否继续？').catch(_ => {
+          this.$refs['planTable'].toggleRowSelection(row)
+        })
+      }
+    },
+    selectPlan(sel, row) {
+      if (sel) {
+        this.paymentRegistrationForm.plan = sel.map((item) => {
+          return {
+            plan_id: item.id,
+            use_money: item.useMoney,
+            new_money: item.money
+          }
+        })
+      } else {
+        this.paymentRegistrationForm.plan = []
+      }
+    },
+    toggleSelection(plans) {
+      if (plans) {
+        console.log('this.plans', plans, this.plans, this.paymentRegistrationForm)
+        const arr = this.plans.filter(plan => {
+          if (plans.includes(plan.id)) {
+            plan.use_money = parseFloat(this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money) == 0
+              ? this.totalApplyMoney() : this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money
+            return true
+          } else if (plans.includes(plan.pid)) {
+            plan.use_money = parseFloat(this.paymentRegistrationForm.plan[plans.indexOf(plan.pid)].use_money) == 0
+              ? this.totalApplyMoney() : this.paymentRegistrationForm.plan[plans.indexOf(plan.pid)].use_money
+            return true
+          } else {
+            plan.use_money = 0
+          }
+          // plan.use_money = this.paymentRegistrationForm.applyMoney
+        })
+        console.log('arr', arr)
+        arr.forEach(row => {
+          console.log('row', row)
+          this.$refs.planTable.toggleRowSelection(row)
+          this.paymentRegistrationForm.plan.push({
+            contract_id: this.contract.id,
+            plan_id: row.id,
+            use_money: row.use_money,
+            new_money: row.money,
+            label: row.name,
+            plan: row
+          })
+        })
+      } else {
+        this.$refs.planTable.clearSelection()
+      }
+
+      // if (!e) {
+      //   return;
+      // }
+      // let plans = this.paymentRegistrationForm.plan.map((item) => {
+      //   return item.plan_id;
+      // });
+      // if (plans) {
+      //   this.plans
+      //     .filter((plan) => {
+      //       return plans.includes(plan.id);
+      //     })
+      //     .map((row) => {
+      //       this.$nextTick(() => {
+      //         this.$refs["planTable"].toggleRowSelection(row);
+      //       });
+      //     });
+      // } else {
+      //   this.$refs["planTable"].clearSelection();
+      // }
+    },
+
+    async getAssetsFlowIds() {
+      const copy = deepCopy(this.flowIds)
+      const res = await getparameter({
+        number: 'asset_flow_ids'
+      })
+      try {
+        this.flowIds = res?.detail?.map(i => {
+          const data = JSON.parse(i.remark)
+          return {
+            id: i.id,
+            name: i.value,
+            ...data
+          }
+        })
+      } catch (e) {
+        this.flowIds = copy
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .ivu-input-group-append.ivu-input-search{
+    background-color: #409EFF;
+  }
+  ::v-deep .allSelect .cell {
+    display: none;
+  }
+  .select-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .payment-registration {
+    &-row {
+      display: flex;
+
+      padding: 6px 0;
+
+      &-title {
+        padding: 0 10px;
+      }
+
+      &-content {}
+    }
+  }
+
+  .xy-table-item-label {
+    width: 200px;
+  }
+
+  .xy-table-item-price {
+    position: relative;
+
+    &::after {
+      z-index: 1;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: "（元）";
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 30px;
+      z-index: 2;
+    }
+  }
+</style>
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index 625d9d4..b3e3f35 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -2,111 +2,111 @@
   <div>
     <div v-if="showEdit">
       <el-steps :active="step" align-center v-if="myPurchaseType === 1">
-        <el-step v-if="!isWeixiu" title="选择预算计划"> </el-step>
-        <el-step title="新增预算支出事项"> </el-step>
-        <el-step title="新增成功"> </el-step>
-      </el-steps>
-
-      <div style="padding: 20px">
-        <div v-show="step === 1">
-          <div class="select-container">
-            <DatePicker
-              :value="planSelect.year"
-              placeholder="选择所属年份"
-              placement="bottom-start"
+            <el-step v-if="!isWeixiu" title="选择预算计划"> </el-step>
+            <el-step title="新增预算支出事项"> </el-step>
+            <el-step title="新增成功"> </el-step>
+          </el-steps>
+
+          <div style="padding: 20px">
+            <div v-show="step === 1">
+              <div class="select-container">
+                <DatePicker
+                  :value="planSelect.year"
+                  placeholder="选择所属年份"
+                  placement="bottom-start"
               style="width: 180px; margin-right: 10px"
-              type="year"
+                  type="year"
               @on-change="
                 (e) => {
                   planSelect.year = e;
                   getBudgets(true);
                 }
               "
-            ></DatePicker>
-            <el-select
-              placeholder="科室选择"
-              clearable
-              size="small"
-              v-model="planSelect.plan_department_id"
+                ></DatePicker>
+                <el-select
+                  placeholder="科室选择"
+                  clearable
+                  size="small"
+                  v-model="planSelect.plan_department_id"
               style="width: 180px; margin-right: 10px"
-              @change="getBudgets(true)"
-            >
-              <el-option
-                v-for="item in departments"
-                :label="item.name"
-                :value="item.id"
-                :key="item.id"
-              >
-              </el-option>
-            </el-select>
-            <el-cascader
-              placeholder="资金类型选择"
-              :options="planTypes"
-              :props="{
-                checkStrictly: false,
-                label: 'name',
-                value: 'id',
-              }"
-              :value="planSelect.type"
-              clearable
-              size="small"
+                  @change="getBudgets(true)"
+                >
+                  <el-option
+                    v-for="item in departments"
+                    :label="item.name"
+                    :value="item.id"
+                    :key="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <el-cascader
+                  placeholder="资金类型选择"
+                  :options="planTypes"
+                  :props="{
+                      checkStrictly: false,
+                      label: 'name',
+                      value: 'id',
+                    }"
+                  :value="planSelect.type"
+                  clearable
+                  size="small"
               style="width: 220px; margin-right: 10px"
               @change="
                 (e) => {
-                  planSelect.type = e[e.length - 1] || '';
-                  getBudgets(true);
+                    planSelect.type = e[e.length - 1] || '';
+                    getBudgets(true);
                 }
               "
-            />
-            <Input
-              v-model="planSelect.name"
-              search
-              enter-button="搜 索"
-              clearable
-              placeholder="搜索预算计划.."
-              @on-search="getBudgets(true)"
-            />
-          </div>
-
-          <xy-table
-            :header-cell-class-name="cellClassName"
-            :list="plans"
-            :show-index="false"
-            :table-item="planTable"
-            :height="boxheight"
-            style="margin-top: 10px"
-            ref="editorPlanTable"
-            row-key="id"
-            border
-            default-expand-all
-            @select="planPick"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-          >
-            <template v-slot:btns>
-              <el-table-column
-                label="使用金额（元）"
-                :fixed="$store.getters.device === 'mobile' ? false : 'right'"
-                header-align="center"
-                width="144"
+                />
+                <Input
+                  v-model="planSelect.name"
+                  search
+                  enter-button="搜 索"
+                  clearable
+                  placeholder="搜索预算计划.."
+                  @on-search="getBudgets(true)"
+                />
+              </div>
+
+              <xy-table
+                :header-cell-class-name="cellClassName"
+                :list="plans"
+                :show-index="false"
+                :table-item="planTable"
+                :height="boxheight"
+                style="margin-top: 10px"
+                ref="editorPlanTable"
+                row-key="id"
+                border
+                default-expand-all
+                @select="planPick"
+                :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
               >
-                <template slot-scope="scope" v-if="scope.row.pid > 0">
-                  <InputNumber
-                    style="width: 120px"
-                    :min="0"
-                    :precision="2"
-                    :active-change="false"
-                    v-model="scope.row._inputMoney"
-                    :formatter="
+                <template v-slot:btns>
+                  <el-table-column
+                    label="使用金额（元）"
+                :fixed="$store.getters.device === 'mobile' ? false : 'right'"
+                    header-align="center"
+                    width="144"
+                  >
+                    <template slot-scope="scope" v-if="scope.row.pid > 0">
+                      <InputNumber
+                        style="width: 120px"
+                        :min="0"
+                        :precision="2"
+                        :active-change="false"
+                        v-model="scope.row._inputMoney"
+                        :formatter="
                       (value) =>
                         `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-                    "
-                    :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
-                  ></InputNumber>
+                        "
+                        :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                      ></InputNumber>
+                    </template>
+                  </el-table-column>
                 </template>
-              </el-table-column>
-            </template>
-          </xy-table>
-          <!-- <div style="display: flex; justify-content: flex-end">
+              </xy-table>
+              <!-- <div style="display: flex; justify-content: flex-end">
                 <Page
                   :total="planTotal"
                   show-elevator
@@ -118,346 +118,363 @@
                   "
                 />
               </div> -->
-          <div style="text-align: center">
+              <div style="text-align: center">
             <el-button
               type="primary"
               style="margin-top: 12px"
               @click="() => nextStep()"
-              >下一步</el-button
-            >
-          </div>
-        </div>
+                  >下一步</el-button
+                >
+              </div>
+            </div>
 
-        <el-card v-show="step === 2">
+            <el-card v-show="step === 2">
           <el-popover
             placement="right-start"
             width="660"
             trigger="click"
             v-if="myPurchaseType === 1 && !isWeixiu"
           >
-            <xy-table
-              :list="planSelections"
-              size="mini"
-              :table-item="[
-                ...planTable.slice(1),
-                {
-                  width: 120,
-                  align: 'right',
-                  label: '使用金额（元）',
-                  prop: '_inputMoney',
-                  formatter: (v1, v2, value) =>
-                    `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
-                },
-              ]"
-              :height="400"
-              style="width: 100%"
-              row-key="id"
-              border
-              :tree-props="{
-                children: 'notChildren',
-                hasChildren: 'hasChildren',
-              }"
-            >
-              <template #btns></template>
-            </xy-table>
-            <el-button
-              icon="el-icon-s-order"
-              size="small"
-              type="primary"
-              slot="reference"
-              >查看已选预算计划</el-button
-            >
-          </el-popover>
+                <xy-table
+                  :list="planSelections"
+                  size="mini"
+                  :table-item="[
+                    ...planTable.slice(1),
+                    {
+                      width: 120,
+                      align: 'right',
+                      label: '使用金额（元）',
+                      prop: '_inputMoney',
+                      formatter: (v1, v2, value) =>
+                        `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
+                    },
+                  ]"
+                  :height="400"
+                  style="width: 100%"
+                  row-key="id"
+                  border
+                  :tree-props="{
+                    children: 'notChildren',
+                    hasChildren: 'hasChildren',
+                  }"
+                >
+                  <template #btns></template>
+                </xy-table>
+                <el-button
+                  icon="el-icon-s-order"
+                  size="small"
+                  type="primary"
+                  slot="reference"
+                  >查看已选预算计划</el-button
+                >
+              </el-popover>
           <br />
           <Tag v-show="form.use_framework_buy" checkable color="warning"
             >已使用框架协议</Tag
           >
 
-          <Divider></Divider>
-
-          <template v-if="myPurchaseType === 1">
-            <el-form
-              ref="form"
-              class="el-form-body"
-              label-position="left"
-              size="small"
-              :model="form"
-              :rules="rules"
-              label-width="180px"
-            >
-              <el-form-item prop="name" label="项目名称">
-                <el-input
-                  placeholder="请填写项目名称"
-                  v-model="form.name"
+              <Divider></Divider>
+
+              <template v-if="myPurchaseType === 1">
+                <el-form
+                  ref="form"
+                  class="el-form-body"
+                  label-position="left"
+                  size="small"
+                  :model="form"
+                  :rules="rules"
+                  label-width="180px"
+                >
+                  <el-form-item prop="name" label="项目名称">
+                    <el-input
+                      placeholder="请填写项目名称"
+                      v-model="form.name"
+                      style="width: 100%"
+                    />
+                  </el-form-item>
+                  <el-form-item 
+                prop="meeting_flow_id" 
+                :label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
+              >
+                <!-- 调试信息 -->
+                
+                <el-select 
+                  v-model="form.meeting_flow_id" 
                   style="width: 100%"
-                />
-              </el-form-item>
-              <el-form-item prop="meeting_flow_id" label="资金上会流程">
-                <el-select v-model="form.meeting_flow_id" style="width: 100%">
+                  :disabled="isMeetingFlowDisabled"
+                  placeholder="请选择资金上会流程"
+                  filterable
+                  clearable
+                >
                   <el-option
                     v-for="item in shList"
                     :key="item.id"
                     :value="item.id"
-                    :label="item.title"
-                  ></el-option>
+                    :label="item.data.yiti+'-'+item.title"
+                  >
+                    <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
+                    <span 
+                      style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
+                      @click.stop="viewOaFlow('other', item.id)"
+                    >查看</span>
+                  </el-option>
                 </el-select>
-              </el-form-item>
-              <template v-if="!isLedger">
+                  </el-form-item>
+                  <template v-if="!isLedger">
                 <el-form-item
                   v-if="!isOtherFlow"
                   prop="is_contract"
                   label="是否需要签订合同"
                 >
-                  <el-switch
-                    v-model="form.is_contract"
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                  />
-                </el-form-item>
+                      <el-switch
+                        v-model="form.is_contract"
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                      />
+                    </el-form-item>
 
                 <el-form-item
                   v-if="!isOtherFlow"
                   prop="is_simple"
                   label="是否为直接支付"
                 >
-                  <el-switch
-                    v-model="form.is_simple"
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                    @change="isSimpleChange"
-                  />
+                      <el-switch
+                        v-model="form.is_simple"
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                        @change="isSimpleChange"
+                      />
                   <span style="flex: 1; text-align: right"
                     >（无需采购流程，如水电邮寄费等）</span
                   >
-                </el-form-item>
-                <!-- 维修的预算计划 -->
-                <el-form-item v-if="isWeixiu" prop="is_simple" label="预算计划">
-                  <div>
+                    </el-form-item>
+                    <!-- 维修的预算计划 -->
+                    <el-form-item v-if="isWeixiu" prop="is_simple" label="预算计划">
+                      <div>
                     <el-popover
                       placement="right-start"
                       width="660"
                       trigger="hover"
                       v-if="isWeixiu && weixiuSelection != ''"
                     >
-                      <xy-table
-                        v-if="isWeixiu"
-                        :list="weixiuSelectionList"
-                        size="mini"
-                        :table-item="[
-                          ...planTable.slice(1),
-                          {
-                            width: 120,
-                            align: 'right',
-                            label: '使用金额（元）',
-                            prop: '_inputMoney',
-                            formatter: (v1, v2, value) =>
-                              `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
-                          },
-                        ]"
-                        :height="100"
-                        style="width: 100%"
-                        row-key="id"
-                        border
-                        :tree-props="{
-                          children: 'notChildren',
-                          hasChildren: 'hasChildren',
-                        }"
-                      >
-                        <template #btns></template>
-                      </xy-table>
-                      <el-button
-                        @click="openOtherPlan"
-                        icon="el-icon-s-order"
-                        size="small"
-                        type="primary"
-                        slot="reference"
+                          <xy-table
+                            v-if="isWeixiu"
+                            :list="weixiuSelectionList"
+                            size="mini"
+                            :table-item="[
+                              ...planTable.slice(1),
+                              {
+                                width: 120,
+                                align: 'right',
+                                label: '使用金额（元）',
+                                prop: '_inputMoney',
+                                formatter: (v1, v2, value) =>
+                                  `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
+                              },
+                            ]"
+                            :height="100"
+                            style="width: 100%"
+                            row-key="id"
+                            border
+                            :tree-props="{
+                              children: 'notChildren',
+                              hasChildren: 'hasChildren',
+                            }"
+                          >
+                            <template #btns></template>
+                          </xy-table>
+                          <el-button
+                          @click="openOtherPlan"
+                            icon="el-icon-s-order"
+                            size="small"
+                            type="primary"
+                            slot="reference"
                         >{{
                           weixiuSelection ? weixiuSelection : "选择预算计划"
                         }}</el-button
-                      >
-                    </el-popover>
-                    <el-button
-                      v-else
-                      @click="openOtherPlan"
-                      icon="el-icon-s-order"
-                      size="small"
-                      type="primary"
-                      slot="reference"
-                      >选择预算计划</el-button
-                    >
-                  </div>
-                  <!-- <el-input v-model="weixiuyusuan" placeholder="请选择预算计划" @focus=""></el-input> -->
-                </el-form-item>
+                          >
+                        </el-popover>
+                        <el-button
+                        v-else
+                        @click="openOtherPlan"
+                          icon="el-icon-s-order"
+                          size="small"
+                          type="primary"
+                          slot="reference"
+                          >选择预算计划</el-button
+                        >
+                      </div>
+                      <!-- <el-input v-model="weixiuyusuan" placeholder="请选择预算计划" @focus=""></el-input> -->
+                    </el-form-item>
 
                 <el-form-item
                   v-if="!isOtherFlow"
                   prop="is_trade"
                   label="是否为工会项目"
                 >
-                  <el-switch
-                    v-model="form.is_trade"
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                  />
-                </el-form-item>
+                      <el-switch
+                        v-model="form.is_trade"
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                      />
+                    </el-form-item>
 
                 <el-form-item
                   prop="flow_mod_id"
                   label="事前流程"
                   v-if="!form.is_simple"
                 >
-                  <el-select v-model="form.flow_mod_id" style="width: 100%">
+                      <el-select v-model="form.flow_mod_id" style="width: 100%">
                     <el-option
                       v-for="item in flowIdsFormat"
                       :key="item.id"
                       :value="item.id"
                       :label="item.name"
                     ></el-option>
-                  </el-select>
-                </el-form-item>
+                      </el-select>
+                    </el-form-item>
 
                 <el-form-item
                   v-if="!isWeixiu"
                   prop="money_way_id"
                   label="资金渠道"
                 >
-                  <el-select
-                    multiple
-                    size="small"
-                    v-if="!isWeixiu"
-                    clearable
-                    disabled
-                    placeholder="请选择资金渠道"
-                    :value="
-                      form.money_way_id
-                        ? form.money_way_id.split(',').map((i) => Number(i))
-                        : []
-                    "
-                    style="width: 100%"
-                    @change="
-                      (e) => {
-                        form.money_way_id = e.length > 0 ? e.toString() : '';
-                      }
-                    "
-                  >
-                    <el-option
-                      v-for="item in moneyWay"
-                      :value="item.id"
-                      :label="item.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-
-                <template v-if="form.is_simple">
-                  <el-form-item prop="supply" label="承包商/供货商">
-                    <el-input
-                      v-model="form.supply"
-                      placeholder="请填写承包商/供货商"
-                      style="width: 100%"
-                    />
-                  </el-form-item>
-
-                  <el-form-item prop="money" label="金额（元）">
-                    <InputNumber
-                      style="width: 100%"
-                      :min="0"
-                      :step="10000"
-                      :precision="2"
-                      :active-change="false"
-                      v-model="form.money"
-                      :formatter="
+                      <el-select
+                        multiple
+                        size="small"
+                        v-if="!isWeixiu"
+                        clearable
+                        disabled
+                        placeholder="请选择资金渠道"
+                        :value="
+                        form.money_way_id
+                          ? form.money_way_id.split(',').map((i) => Number(i))
+                          : []
+                      "
+                        style="width: 100%"
+                        @change="
+                        (e) => {
+                          form.money_way_id = e.length > 0 ? e.toString() : '';
+                        }
+                      "
+                      >
+                        <el-option
+                          v-for="item in moneyWay"
+                          :value="item.id"
+                          :label="item.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <template v-if="form.is_simple">
+                      <el-form-item prop="supply" label="承包商/供货商">
+                        <el-input
+                          v-model="form.supply"
+                          placeholder="请填写承包商/供货商"
+                          style="width: 100%"
+                        />
+                      </el-form-item>
+
+                      <el-form-item prop="money" label="金额（元）">
+                        <InputNumber
+                          style="width: 100%"
+                          :min="0"
+                          :step="10000"
+                          :precision="2"
+                          :active-change="false"
+                          v-model="form.money"
+                          :formatter="
                         (value) =>
                           `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
                       "
-                      :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
-                    ></InputNumber>
-                  </el-form-item>
-                </template>
-                <template v-else>
-                  <el-form-item prop="type" label="项目类型" v-if="isNeedMore">
-                    <el-select
-                      clearable
-                      placeholder="请选择项目类型"
-                      v-model="form.type"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in types"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
+                          :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                        ></InputNumber>
+                      </el-form-item>
+                    </template>
+                    <template v-else>
+                      <el-form-item prop="type" label="项目类型" v-if="isNeedMore">
+                        <el-select
+                          clearable
+                          placeholder="请选择项目类型"
+                          v-model="form.type"
+                          style="width: 100%"
+                        >
+                          <el-option
+                            v-for="item in types"
+                            :label="item.label"
+                            :value="item.value"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
 
                   <el-form-item
                     prop="purchase_type_id"
                     label="采购形式"
                     v-if="isNeedMore"
                   >
-                    <el-select
-                      ref="purchaseTypeInput"
-                      clearable
-                      placeholder="请选择采购形式"
-                      v-model="form.purchase_type_id"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in purchaseType"
-                        :label="item.value"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
+                        <el-select
+                          ref="purchaseTypeInput"
+                          clearable
+                          placeholder="请选择采购形式"
+                          v-model="form.purchase_type_id"
+                          style="width: 100%"
+                        >
+                          <el-option
+                            v-for="item in purchaseType"
+                            :label="item.value"
+                            :value="item.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
 
                   <el-form-item
                     prop="purchase_way_id"
                     label="采购方式"
                     v-if="isNeedMore"
                   >
-                    <el-select
-                      clearable
-                      placeholder="请选择采购方式"
-                      v-model="form.purchase_way_id"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in purchaseWay"
-                        :label="item.value"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
+                        <el-select
+                          clearable
+                          placeholder="请选择采购方式"
+                          v-model="form.purchase_way_id"
+                          style="width: 100%"
+                        >
+                          <el-option
+                            v-for="item in purchaseWay"
+                            :label="item.value"
+                            :value="item.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
 
                   <el-form-item
                     prop="group_type"
                     label="组织形式"
                     v-if="isNeedMore"
                   >
-                    <el-select
-                      clearable
-                      placeholder="请选择组织形式"
-                      v-model="form.group_type"
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in groupType"
-                        :label="item.value"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
+                        <el-select
+                          clearable
+                          placeholder="请选择组织形式"
+                          v-model="form.group_type"
+                          style="width: 100%"
+                        >
+                          <el-option
+                            v-for="item in groupType"
+                            :label="item.value"
+                            :value="item.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
 
 
                   <el-form-item
                     prop="total_money"
                     label="项目金额（元）"
-                    v-if="!isWeixiu"
                   >
                     <InputNumber
                       style="width: 100%"
@@ -477,16 +494,15 @@
                   <el-form-item
                     prop="plan_price"
                     label="本年预算金额（元）"
-                    v-if="!isWeixiu"
                   >
-                    <InputNumber
-                      style="width: 100%"
-                      :min="0"
-                      :step="10000"
-                      :precision="2"
-                      :active-change="false"
-                      v-model="form.plan_price"
-                      :formatter="
+                        <InputNumber
+                          style="width: 100%"
+                          :min="0"
+                          :step="10000"
+                          :precision="2"
+                          :active-change="false"
+                          v-model="form.plan_price"
+                          :formatter="
                         (value) =>
                           `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
                       "
@@ -496,7 +512,6 @@
                   <el-form-item
                     prop="next_year_money"
                     label="次年预算金额（元）"
-                    v-if="!isWeixiu"
                   >
                     <InputNumber
                       style="width: 100%"
@@ -509,615 +524,633 @@
                         (value) =>
                           `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
                       "
-                      :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
-                    ></InputNumber>
-                  </el-form-item>
-                </template>
-
-                <el-form-item
-                  v-if="!isOtherFlow"
-                  prop="use_framework_buy"
-                  label="是否使用框架协议采购内容"
-                >
-                  <el-switch
-                    v-model="form.use_framework_buy"
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                  />
-                </el-form-item>
-                <el-form-item
-                  v-if="!isOtherFlow"
-                  prop="is_framework"
-                  label="是否新生成框架协议"
-                  v-show="isShowIsFramework"
-                >
-                  <el-switch
-                    v-model="form.is_framework"
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                  />
-                </el-form-item>
-                <el-form-item
-                  prop="contract_to_contracts"
-                  label="关联的框架协议合同"
-                  v-show="form.use_framework_buy"
-                >
-                  <div
-                    class="form__contract-to-contracts--no"
-                    @click="isShowContractToContracts = true"
-                  >
-                    请选择关联的框架协议合同
-                  </div>
-                  <div v-if="contractToContractsSelections.length > 0">
+                          :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                        ></InputNumber>
+                      </el-form-item>
+                    </template>
+
+                    <el-form-item
+                      v-if="!isOtherFlow"
+                      prop="use_framework_buy"
+                      label="是否使用框架协议采购内容"
+                    >
+                      <el-switch
+                        v-model="form.use_framework_buy"
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      v-if="!isOtherFlow"
+                      prop="is_framework"
+                      label="是否新生成框架协议"
+                      v-show="isShowIsFramework"
+                    >
+                      <el-switch
+                        v-model="form.is_framework"
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                      />
+                    </el-form-item>
+                    <el-form-item
+                      prop="contract_to_contracts"
+                      label="关联的框架协议合同"
+                      v-show="form.use_framework_buy"
+                    >
+                      <div
+                        class="form__contract-to-contracts--no"
+                        @click="isShowContractToContracts = true"
+                      >
+                        请选择关联的框架协议合同
+                      </div>
+                      <div v-if="contractToContractsSelections.length > 0">
                     <Tag
                       type="dot"
-                      closable
+                             closable
                       v-for="(i, index) in contractToContractsSelections"
                       :color="
                         ['primary', 'success', 'error', 'warning'][index % 4]
                       "
-                      :key="i.id"
+                             :key="i.id"
                       @on-close="closeTag(i)"
                       >{{ i.name.slice(0, 17) }}</Tag
                     >
-                  </div>
-                </el-form-item>
-              </template>
-              <template v-else>
-                <el-form-item prop="is_contract" label="是否需要签订合同">
-                  <el-switch
-                    disabled
-                    :value="true"
-                    active-text="是"
-                    inactive-text="否"
-                  />
-                </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </template>
+                  <template v-else>
+                    <el-form-item prop="is_contract" label="是否需要签订合同">
+                      <el-switch
+                        disabled
+                        :value="true"
+                        active-text="是"
+                        inactive-text="否"
+                      />
+                    </el-form-item>
 
-                <el-form-item prop="contract_type" label="是否需要签订合同">
-                  <el-select style="width: 100%" v-model="form.contract_type">
+                    <el-form-item prop="contract_type" label="是否需要签订合同">
+                      <el-select style="width: 100%" v-model="form.contract_type">
                     <el-option
                       v-for="(item, index) in contractTypes"
                       :label="item.label"
                       :value="item.value"
                     ></el-option>
-                  </el-select>
-                </el-form-item>
+                      </el-select>
+                    </el-form-item>
 
-                <el-form-item prop="supply" label="承包商\供应商">
+                    <el-form-item prop="supply" label="承包商\供应商">
                   <el-input
                     style="width: 100%"
                     placeholder="请填写承包商\供应商"
                     v-model="form.supply"
                   />
-                </el-form-item>
+                    </el-form-item>
 
-                <el-form-item prop="money" label="金额（元）">
-                  <InputNumber
-                    style="width: 100%"
-                    :min="0"
-                    :step="10000"
-                    :precision="2"
-                    :active-change="false"
-                    v-model="form.money"
-                    :formatter="
+                    <el-form-item prop="money" label="金额（元）">
+                      <InputNumber
+                        style="width: 100%"
+                        :min="0"
+                        :step="10000"
+                        :precision="2"
+                        :active-change="false"
+                        v-model="form.money"
+                        :formatter="
                       (value) =>
                         `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-                    "
-                    :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
-                  ></InputNumber>
-                </el-form-item>
-
-                <el-form-item
-                  prop="is_framework"
-                  label="是否新生成框架协议"
-                  v-show="isShowIsFramework"
-                >
-                  <el-switch
-                    active-text="是"
-                    inactive-text="否"
-                    :active-value="1"
-                    :inactive-value="0"
-                  />
-                </el-form-item>
-              </template>
-              <el-form-item prop="pay_user_id" label="发起支付人">
-                <el-select
-                  placeholder="请填写发起支付人"
-                  v-model="form.pay_user_id"
-                  style="width: 100%"
-                  filterable
-                  default-first-option
-                  clearable
-                >
+                      "
+                        :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                      ></InputNumber>
+                    </el-form-item>
+
+                    <el-form-item
+                      prop="is_framework"
+                      label="是否新生成框架协议"
+                      v-show="isShowIsFramework"
+                    >
+                      <el-switch
+                        active-text="是"
+                        inactive-text="否"
+                        :active-value="1"
+                        :inactive-value="0"
+                      />
+                    </el-form-item>
+                  </template>
+                  <el-form-item prop="pay_user_id" label="发起支付人">
+                    <el-select
+                      placeholder="请填写发起支付人"
+                      v-model="form.pay_user_id"
+                      style="width: 100%"
+                      filterable
+                      default-first-option
+                      clearable
+                    >
                   <el-option
                     v-for="item in commonPurchasePeople"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
                   />
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </template>
-
-          <template v-if="myPurchaseType === 2">
-            <el-form
-              ref="form"
-              class="el-form-body"
-              label-position="left"
-              size="small"
-              :model="form"
-              :rules="rules"
-              label-width="180px"
-            >
-              <el-form-item prop="common_type" label="采购内容">
-                <el-select
-                  placeholder="请填写采购内容"
-                  v-model="form.common_type"
-                  style="width: 100%"
-                  filterable
-                  allow-create
-                  default-first-option
-                  clearable
+                    </el-select>
+                  </el-form-item>
+                </el-form>
+              </template>
+
+              <template v-if="myPurchaseType === 2">
+                <el-form
+                  ref="form"
+                  class="el-form-body"
+                  label-position="left"
+                  size="small"
+                  :model="form"
+                  :rules="rules"
+                  label-width="180px"
                 >
-                  <!--                                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD HHmm')}）` : ''"-->
+                  <el-form-item prop="common_type" label="采购内容">
+                    <el-select
+                      placeholder="请填写采购内容"
+                      v-model="form.common_type"
+                      style="width: 100%"
+                      filterable
+                      allow-create
+                      default-first-option
+                      clearable
+                    >
+      <!--                                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD HHmm')}）` : ''"-->
                   <el-option
                     v-for="item in commonPurchaseTypes"
                     :key="item.value"
                     :label="item.value"
                     :value="item.value"
                   />
-                </el-select>
-              </el-form-item>
-              <el-form-item prop="name" label="项目名称">
-                <el-input
-                  placeholder="请填写项目名称"
-                  v-model="form.name"
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="name" label="项目名称">
+                    <el-input
+                      placeholder="请填写项目名称"
+                      v-model="form.name"
+                      style="width: 100%"
+                    />
+                  </el-form-item>
+              <el-form-item 
+                prop="meeting_flow_id" 
+                :label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
+              >
+                <!-- 调试信息 -->
+                
+                <el-select 
+                  v-model="form.meeting_flow_id" 
                   style="width: 100%"
-                />
-              </el-form-item>
-              <el-form-item prop="meeting_flow_id" label="资金上会流程">
-                <el-select v-model="form.meeting_flow_id" style="width: 100%">
+                  :disabled="isMeetingFlowDisabled"
+                  placeholder="请选择资金上会流程"
+                  filterable
+                  clearable
+                >
                   <el-option
                     v-for="item in shList"
                     :key="item.id"
                     :value="item.id"
-                    :label="item.title"
-                  ></el-option>
+                    :label="item.data.yiti+'-'+item.title"
+                  >
+                    <span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
+                    <span 
+                      style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;" 
+                      @click.stop="viewOaFlow('other', item.id)"
+                    >查看</span>
+                  </el-option>
                 </el-select>
-              </el-form-item>
-              <el-form-item prop="apply_user_id" label="申购人">
-                <el-select
-                  placeholder="请填写申购人"
-                  v-model="form.apply_user_id"
-                  style="width: 100%"
-                  filterable
-                  default-first-option
-                  clearable
-                >
-                  <!--                                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD HHmm')}）` : ''"-->
+                  </el-form-item>
+                  <el-form-item prop="apply_user_id" label="申购人">
+                      <el-select
+                        placeholder="请填写申购人"
+                        v-model="form.apply_user_id"
+                        style="width: 100%"
+                        filterable
+                        default-first-option
+                        clearable
+                      >
+        <!--                                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD HHmm')}）` : ''"-->
                   <el-option
                     v-for="item in commonPurchasePeople"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
                   />
-                </el-select>
-              </el-form-item>
-              <el-form-item prop="remark" label="备注">
-                <el-input
-                  placeholder="请填写备注"
-                  type="textarea"
-                  :autosize="{ minRows: 2 }"
-                  v-model="form.remark"
-                  style="width: 100%"
-                />
-              </el-form-item>
-              <el-form-item prop="pay_user_id" label="发起支付人">
-                <el-select
-                  placeholder="请填写发起支付人"
-                  v-model="form.pay_user_id"
-                  style="width: 100%"
-                  filterable
-                  default-first-option
-                  clearable
-                >
+                      </el-select>
+                    </el-form-item>
+                  <el-form-item prop="remark" label="备注">
+                    <el-input
+                      placeholder="请填写备注"
+                      type="textarea"
+                      :autosize="{ minRows: 2 }"
+                      v-model="form.remark"
+                      style="width: 100%"
+                    />
+                  </el-form-item>
+                  <el-form-item prop="pay_user_id" label="发起支付人">
+                    <el-select
+                      placeholder="请填写发起支付人"
+                      v-model="form.pay_user_id"
+                      style="width: 100%"
+                      filterable
+                      default-first-option
+                      clearable
+                    >
                   <el-option
                     v-for="item in commonPurchasePeople"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
                   />
-                </el-select>
-              </el-form-item>
-            </el-form>
-          </template>
+                    </el-select>
+                  </el-form-item>
+                </el-form>
+              </template>
 
-          <div style="text-align: center">
+              <div style="text-align: center">
             <el-button
               style="margin-top: 12px"
               v-if="myPurchaseType === 1 && !isWeixiu"
               @click="forwardStep"
-              >上一步</el-button
-            >
-            <el-button
-              style="margin-top: 12px"
-              type="warning"
-              plain
-              @click="resetForm"
-              >重置</el-button
-            >
+                  >上一步</el-button
+                >
+                <el-button
+                  style="margin-top: 12px"
+                  type="warning"
+                  plain
+                  @click="resetForm"
+                  >重置</el-button
+                >
             <el-button
               :loading="btnLoading"
               style="margin-top: 12px"
               type="primary"
               @click="() => nextStep()"
-              >提交</el-button
-            >
-          </div>
-        </el-card>
+                  >提交</el-button
+                >
+              </div>
+            </el-card>
 
-        <el-card v-show="step === 3">
-          <div class="done">
+            <el-card v-show="step === 3">
+              <div class="done">
             <i
               class="el-icon-success"
               style="color: #58bb73; font-size: 40px"
             ></i>
             <p>{{ type === "add" ? "创建" : "编辑" }}完成</p>
-            <svg
-              height="230"
-              viewBox="0 0 230 230"
-              width="230"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <defs>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-1"
-                  node-id="5"
-                  spreadMethod="pad"
-                  x1="-0.19665861"
-                  x2="1.0436114"
-                  y1="0.5"
-                  y2="0.5"
-                >
-                  <stop offset="0" stop-color="#56c6fb" />
-                  <stop offset="1" stop-color="#56c6fb" stop-opacity="0" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-2"
-                  node-id="8"
-                  spreadMethod="pad"
-                  x1="0"
-                  x2="1.0564857"
-                  y1="0.40330252"
-                  y2="0.6062147"
-                >
-                  <stop offset="0" stop-color="#7983d6" />
-                  <stop offset="1" stop-color="#242c83" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-3"
-                  node-id="11"
-                  spreadMethod="pad"
-                  x1="0.6815462"
-                  x2="0"
-                  y1="0.44933662"
-                  y2="0.62995005"
-                >
-                  <stop offset="0" stop-color="#7dd2fb" />
-                  <stop offset="1" stop-color="#3797e2" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-4"
-                  node-id="14"
-                  spreadMethod="pad"
-                  x1="1.0198022"
-                  x2="0"
-                  y1="0.42886087"
-                  y2="0.64435285"
-                >
-                  <stop offset="0" stop-color="#eeeeee" />
-                  <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-5"
-                  node-id="17"
-                  spreadMethod="pad"
-                  x1="-0.019802213"
-                  x2="1"
-                  y1="0.44724947"
-                  y2="0.60703945"
-                >
-                  <stop offset="0" stop-color="#eeeeee" />
-                  <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-6"
-                  node-id="20"
-                  spreadMethod="pad"
-                  x1="0"
-                  x2="1.0564857"
-                  y1="0.4574653"
-                  y2="0.5467211"
-                >
-                  <stop offset="0" stop-color="#7983d6" />
-                  <stop offset="1" stop-color="#242c83" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-7"
-                  node-id="23"
-                  spreadMethod="pad"
-                  x1="0.7455665"
-                  x2="0"
-                  y1="0.4161634"
-                  y2="0.70934254"
-                >
-                  <stop offset="0" stop-color="#e5e7fc" />
-                  <stop offset="1" stop-color="#b4b7d5" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-8"
-                  node-id="26"
-                  spreadMethod="pad"
-                  x1="0.6362425"
-                  x2="0.23553719"
-                  y1="0.28847575"
-                  y2="1"
-                >
-                  <stop offset="0" stop-color="#c4caf6" />
-                  <stop offset="1" stop-color="#b8beed" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-9"
-                  node-id="29"
-                  spreadMethod="pad"
-                  x1="1"
-                  x2="-0.05648565"
-                  y1="0.455"
-                  y2="0.549429"
+                <svg
+                  height="230"
+                  viewBox="0 0 230 230"
+                  width="230"
+                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <stop offset="0" stop-color="#7983d6" />
-                  <stop offset="1" stop-color="#242c83" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-10"
-                  node-id="32"
-                  spreadMethod="pad"
-                  x1="0.7575835"
-                  x2="0"
-                  y1="0.4590923"
-                  y2="0.5966975"
-                >
-                  <stop offset="0" stop-color="#aeb4e0" />
-                  <stop offset="1" stop-color="#7b84cd" />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="objectBoundingBox"
-                  id="linearGradient-11"
-                  node-id="35"
-                  spreadMethod="pad"
-                  x1="0.73618025"
-                  x2="0.012557022"
-                  y1="0.4830155"
-                  y2="0.54331756"
-                >
-                  <stop offset="0" stop-color="#9da3d6" />
-                  <stop offset="1" stop-color="#757fcd" />
-                </linearGradient>
-              </defs>
-              <g node-id="128">
-                <g node-id="129">
-                  <g node-id="130">
-                    <path
-                      d="M 40.84 148.59 L 40.84 155.58 L 47.83 155.58 L 47.83 148.59 L 40.84 148.59 Z M 51.33 148.59 L 51.33 155.58 L 99.40 155.58 L 99.40 148.59 L 51.33 148.59 Z"
-                      fill="url(#linearGradient-1)"
-                      fill-opacity="0.4"
-                      fill-rule="evenodd"
-                      group-id="1,2,3"
-                      id="形状结合"
-                      node-id="41"
-                      stroke="none"
-                      target-height="6.991913"
-                      target-width="58.557228"
-                      target-x="40.842773"
-                      target-y="148.58554"
-                    />
-                  </g>
-                  <g node-id="131">
-                    <g node-id="132">
-                      <path
-                        d="M 84.10 93.80 L 48.10 93.80 L 61.60 115.40 L 97.22 115.40 Z"
-                        fill="url(#linearGradient-2)"
-                        fill-rule="evenodd"
-                        group-id="1,2,4,5"
-                        id="矩形"
-                        node-id="43"
-                        stroke="none"
-                        target-height="21.599998"
-                        target-width="49.116924"
-                        target-x="48.099995"
-                        target-y="93.8"
-                      />
-                    </g>
-                    <g node-id="133">
-                      <path
-                        d="M 69.70 71.30 L 161.50 71.30 L 161.50 118.10 L 69.70 118.10 Z"
-                        fill="url(#linearGradient-3)"
-                        fill-rule="evenodd"
-                        group-id="1,2,4,6"
-                        id="矩形"
-                        node-id="45"
-                        stroke="none"
-                        target-height="46.799995"
-                        target-width="91.8"
-                        target-x="69.7"
-                        target-y="71.3"
-                      />
-                      <g node-id="135">
+                  <defs>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-1"
+                      node-id="5"
+                      spreadMethod="pad"
+                      x1="-0.19665861"
+                      x2="1.0436114"
+                      y1="0.5"
+                      y2="0.5"
+                    >
+                      <stop offset="0" stop-color="#56c6fb" />
+                      <stop offset="1" stop-color="#56c6fb" stop-opacity="0" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-2"
+                      node-id="8"
+                      spreadMethod="pad"
+                      x1="0"
+                      x2="1.0564857"
+                      y1="0.40330252"
+                      y2="0.6062147"
+                    >
+                      <stop offset="0" stop-color="#7983d6" />
+                      <stop offset="1" stop-color="#242c83" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-3"
+                      node-id="11"
+                      spreadMethod="pad"
+                      x1="0.6815462"
+                      x2="0"
+                      y1="0.44933662"
+                      y2="0.62995005"
+                    >
+                      <stop offset="0" stop-color="#7dd2fb" />
+                      <stop offset="1" stop-color="#3797e2" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-4"
+                      node-id="14"
+                      spreadMethod="pad"
+                      x1="1.0198022"
+                      x2="0"
+                      y1="0.42886087"
+                      y2="0.64435285"
+                    >
+                      <stop offset="0" stop-color="#eeeeee" />
+                      <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-5"
+                      node-id="17"
+                      spreadMethod="pad"
+                      x1="-0.019802213"
+                      x2="1"
+                      y1="0.44724947"
+                      y2="0.60703945"
+                    >
+                      <stop offset="0" stop-color="#eeeeee" />
+                      <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-6"
+                      node-id="20"
+                      spreadMethod="pad"
+                      x1="0"
+                      x2="1.0564857"
+                      y1="0.4574653"
+                      y2="0.5467211"
+                    >
+                      <stop offset="0" stop-color="#7983d6" />
+                      <stop offset="1" stop-color="#242c83" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-7"
+                      node-id="23"
+                      spreadMethod="pad"
+                      x1="0.7455665"
+                      x2="0"
+                      y1="0.4161634"
+                      y2="0.70934254"
+                    >
+                      <stop offset="0" stop-color="#e5e7fc" />
+                      <stop offset="1" stop-color="#b4b7d5" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-8"
+                      node-id="26"
+                      spreadMethod="pad"
+                      x1="0.6362425"
+                      x2="0.23553719"
+                      y1="0.28847575"
+                      y2="1"
+                    >
+                      <stop offset="0" stop-color="#c4caf6" />
+                      <stop offset="1" stop-color="#b8beed" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-9"
+                      node-id="29"
+                      spreadMethod="pad"
+                      x1="1"
+                      x2="-0.05648565"
+                      y1="0.455"
+                      y2="0.549429"
+                    >
+                      <stop offset="0" stop-color="#7983d6" />
+                      <stop offset="1" stop-color="#242c83" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-10"
+                      node-id="32"
+                      spreadMethod="pad"
+                      x1="0.7575835"
+                      x2="0"
+                      y1="0.4590923"
+                      y2="0.5966975"
+                    >
+                      <stop offset="0" stop-color="#aeb4e0" />
+                      <stop offset="1" stop-color="#7b84cd" />
+                    </linearGradient>
+                    <linearGradient
+                      gradientUnits="objectBoundingBox"
+                      id="linearGradient-11"
+                      node-id="35"
+                      spreadMethod="pad"
+                      x1="0.73618025"
+                      x2="0.012557022"
+                      y1="0.4830155"
+                      y2="0.54331756"
+                    >
+                      <stop offset="0" stop-color="#9da3d6" />
+                      <stop offset="1" stop-color="#757fcd" />
+                    </linearGradient>
+                  </defs>
+                  <g node-id="128">
+                    <g node-id="129">
+                      <g node-id="130">
                         <path
-                          d="M 77.80 83.00 L 138.10 83.00 L 138.10 115.40 L 77.80 115.40 Z"
-                          fill="url(#linearGradient-4)"
-                          fill-opacity="0.25150117"
+                          d="M 40.84 148.59 L 40.84 155.58 L 47.83 155.58 L 47.83 148.59 L 40.84 148.59 Z M 51.33 148.59 L 51.33 155.58 L 99.40 155.58 L 99.40 148.59 L 51.33 148.59 Z"
+                          fill="url(#linearGradient-1)"
+                          fill-opacity="0.4"
                           fill-rule="evenodd"
-                          group-id="1,2,4,6,8"
-                          id="矩形备份-26"
-                          node-id="46"
+                          group-id="1,2,3"
+                          id="形状结合"
+                          node-id="41"
                           stroke="none"
-                          target-height="32.4"
-                          target-width="60.30001"
-                          target-x="77.799995"
-                          target-y="83"
+                          target-height="6.991913"
+                          target-width="58.557228"
+                          target-x="40.842773"
+                          target-y="148.58554"
                         />
                       </g>
-                      <g node-id="136">
+                      <g node-id="131">
+                        <g node-id="132">
+                          <path
+                            d="M 84.10 93.80 L 48.10 93.80 L 61.60 115.40 L 97.22 115.40 Z"
+                            fill="url(#linearGradient-2)"
+                            fill-rule="evenodd"
+                            group-id="1,2,4,5"
+                            id="矩形"
+                            node-id="43"
+                            stroke="none"
+                            target-height="21.599998"
+                            target-width="49.116924"
+                            target-x="48.099995"
+                            target-y="93.8"
+                          />
+                        </g>
+                        <g node-id="133">
+                          <path
+                            d="M 69.70 71.30 L 161.50 71.30 L 161.50 118.10 L 69.70 118.10 Z"
+                            fill="url(#linearGradient-3)"
+                            fill-rule="evenodd"
+                            group-id="1,2,4,6"
+                            id="矩形"
+                            node-id="45"
+                            stroke="none"
+                            target-height="46.799995"
+                            target-width="91.8"
+                            target-x="69.7"
+                            target-y="71.3"
+                          />
+                          <g node-id="135">
+                            <path
+                              d="M 77.80 83.00 L 138.10 83.00 L 138.10 115.40 L 77.80 115.40 Z"
+                              fill="url(#linearGradient-4)"
+                              fill-opacity="0.25150117"
+                              fill-rule="evenodd"
+                              group-id="1,2,4,6,8"
+                              id="矩形备份-26"
+                              node-id="46"
+                              stroke="none"
+                              target-height="32.4"
+                              target-width="60.30001"
+                              target-x="77.799995"
+                              target-y="83"
+                            />
+                          </g>
+                          <g node-id="136">
+                            <path
+                              d="M 161.50 71.30 L 101.20 71.30 L 101.20 99.20 L 161.50 99.20 Z"
+                              fill="url(#linearGradient-5)"
+                              fill-opacity="0.21880595"
+                              fill-rule="evenodd"
+                              group-id="1,2,4,6,9"
+                              id="矩形备份-30"
+                              node-id="47"
+                              stroke="none"
+                              target-height="27.899994"
+                              target-width="60.300003"
+                              target-x="101.2"
+                              target-y="71.3"
+                            />
+                          </g>
+                          <path
+                            d="M 134.50 84.22 L 128.20 78.50 L 111.23 96.22 L 101.08 87.43 L 94.90 94.08 L 111.20 108.20 Z"
+                            fill="#ffffff"
+                            fill-rule="nonzero"
+                            group-id="1,2,4,6"
+                            id="路径"
+                            node-id="48"
+                            stroke="none"
+                            target-height="29.699997"
+                            target-width="39.600006"
+                            target-x="94.899994"
+                            target-y="78.5"
+                          />
+                          <path
+                            d="M 69.70 71.30 L 161.50 71.30 L 161.50 65.00 L 69.70 65.00 Z"
+                            fill="#4da3df"
+                            fill-rule="evenodd"
+                            group-id="1,2,4,6,10"
+                            id="矩形"
+                            node-id="49"
+                            stroke="none"
+                            target-height="6.300003"
+                            target-width="91.8"
+                            target-x="69.7"
+                            target-y="65"
+                          />
+                        </g>
+                        <g node-id="134">
+                          <path
+                            d="M 175.00 115.40 L 98.50 115.40 L 106.60 140.60 L 184.90 140.60 Z"
+                            fill="url(#linearGradient-6)"
+                            fill-rule="evenodd"
+                            stroke="none"
+                          />
+                        </g>
+                        <path
+                          d="M 61.60 115.40 L 138.10 115.40 L 138.10 164.90 L 61.60 164.90 Z"
+                          fill="url(#linearGradient-7)"
+                          fill-rule="evenodd"
+                          group-id="1,2,4"
+                          id="矩形"
+                          stroke="none"
+                        />
+                        <path
+                          d="M 73.30 150.50 L 120.10 150.50 L 120.10 154.10 L 73.30 154.10 Z"
+                          fill="#f8f8fa"
+                          fill-rule="evenodd"
+                          stroke="none"
+                        />
                         <path
-                          d="M 161.50 71.30 L 101.20 71.30 L 101.20 99.20 L 161.50 99.20 Z"
-                          fill="url(#linearGradient-5)"
-                          fill-opacity="0.21880595"
+                          d="M 138.10 115.40 L 174.10 115.40 L 174.10 164.90 L 138.10 164.90 Z"
+                          fill="url(#linearGradient-8)"
                           fill-rule="evenodd"
-                          group-id="1,2,4,6,9"
-                          id="矩形备份-30"
-                          node-id="47"
                           stroke="none"
-                          target-height="27.899994"
-                          target-width="60.300003"
-                          target-x="101.2"
-                          target-y="71.3"
+                        />
+                        <path
+                          d="M 148.00 121.70 L 166.00 121.70 L 166.00 127.10 L 148.00 127.10 Z"
+                          fill="url(#linearGradient-9)"
+                          fill-rule="evenodd"
+                          stroke="none"
+                        />
+                        <path
+                          d="M 151.22 93.80 L 187.22 93.80 L 174.10 115.40 L 138.10 115.40 Z"
+                          fill="url(#linearGradient-10)"
+                          fill-rule="evenodd"
+                          stroke="none"
+                        />
+                        <path
+                          d="M 61.60 115.40 L 138.10 115.40 L 130.00 140.60 L 53.50 140.60 Z"
+                          fill="url(#linearGradient-11)"
+                          fill-rule="evenodd"
+                          stroke="none"
+                        />
+                        <path
+                          d="M 54.40 141.50 L 129.10 141.50"
+                          fill="none"
+                          stroke="#d7dbff"
+                          stroke-linecap="square"
+                          stroke-width="1.8"
+                        />
+                        <path
+                          d="M 175.00 141.50 L 184.00 141.50"
+                          fill="none"
+                          stroke="#6a72c9"
+                          stroke-linecap="square"
+                          stroke-width="1.8"
                         />
                       </g>
-                      <path
-                        d="M 134.50 84.22 L 128.20 78.50 L 111.23 96.22 L 101.08 87.43 L 94.90 94.08 L 111.20 108.20 Z"
-                        fill="#ffffff"
-                        fill-rule="nonzero"
-                        group-id="1,2,4,6"
-                        id="路径"
-                        node-id="48"
-                        stroke="none"
-                        target-height="29.699997"
-                        target-width="39.600006"
-                        target-x="94.899994"
-                        target-y="78.5"
-                      />
-                      <path
-                        d="M 69.70 71.30 L 161.50 71.30 L 161.50 65.00 L 69.70 65.00 Z"
-                        fill="#4da3df"
-                        fill-rule="evenodd"
-                        group-id="1,2,4,6,10"
-                        id="矩形"
-                        node-id="49"
-                        stroke="none"
-                        target-height="6.300003"
-                        target-width="91.8"
-                        target-x="69.7"
-                        target-y="65"
-                      />
                     </g>
-                    <g node-id="134">
-                      <path
-                        d="M 175.00 115.40 L 98.50 115.40 L 106.60 140.60 L 184.90 140.60 Z"
-                        fill="url(#linearGradient-6)"
-                        fill-rule="evenodd"
-                        stroke="none"
-                      />
-                    </g>
-                    <path
-                      d="M 61.60 115.40 L 138.10 115.40 L 138.10 164.90 L 61.60 164.90 Z"
-                      fill="url(#linearGradient-7)"
-                      fill-rule="evenodd"
-                      group-id="1,2,4"
-                      id="矩形"
-                      stroke="none"
-                    />
-                    <path
-                      d="M 73.30 150.50 L 120.10 150.50 L 120.10 154.10 L 73.30 154.10 Z"
-                      fill="#f8f8fa"
-                      fill-rule="evenodd"
-                      stroke="none"
-                    />
-                    <path
-                      d="M 138.10 115.40 L 174.10 115.40 L 174.10 164.90 L 138.10 164.90 Z"
-                      fill="url(#linearGradient-8)"
-                      fill-rule="evenodd"
-                      stroke="none"
-                    />
                     <path
-                      d="M 148.00 121.70 L 166.00 121.70 L 166.00 127.10 L 148.00 127.10 Z"
-                      fill="url(#linearGradient-9)"
-                      fill-rule="evenodd"
-                      stroke="none"
-                    />
-                    <path
-                      d="M 151.22 93.80 L 187.22 93.80 L 174.10 115.40 L 138.10 115.40 Z"
-                      fill="url(#linearGradient-10)"
-                      fill-rule="evenodd"
-                      stroke="none"
-                    />
-                    <path
-                      d="M 61.60 115.40 L 138.10 115.40 L 130.00 140.60 L 53.50 140.60 Z"
-                      fill="url(#linearGradient-11)"
-                      fill-rule="evenodd"
-                      stroke="none"
-                    />
-                    <path
-                      d="M 54.40 141.50 L 129.10 141.50"
+                      d="M 168.03 65.00 L 168.03 78.50 L 181.53 78.50"
                       fill="none"
-                      stroke="#d7dbff"
-                      stroke-linecap="square"
-                      stroke-width="1.8"
-                    />
-                    <path
-                      d="M 175.00 141.50 L 184.00 141.50"
-                      fill="none"
-                      stroke="#6a72c9"
-                      stroke-linecap="square"
-                      stroke-width="1.8"
+                      stroke="#979797"
+                      stroke-linecap="butt"
+                      stroke-width="2.7"
                     />
                   </g>
-                </g>
-                <path
-                  d="M 168.03 65.00 L 168.03 78.50 L 181.53 78.50"
-                  fill="none"
-                  stroke="#979797"
-                  stroke-linecap="butt"
-                  stroke-width="2.7"
-                />
-              </g>
-            </svg>
-
-            <div class="done__btns">
-              <Button shape="circle" @click="nextStep(true)">新建</Button>
-              <Button
-                type="primary"
-                style="margin-left: 40px"
-                shape="circle"
-                @click="
-                  $router.push({
-                    path: '/contract/contract/contractList',
-                    query: {
-                      keyword: form.name,
-                    },
-                  })
-                "
-                >查看</Button
-              >
-            </div>
+                </svg>
+
+                <div class="done__btns">
+                  <Button shape="circle" @click="nextStep(true)">新建</Button>
+                  <Button
+                    type="primary"
+                    style="margin-left: 40px"
+                    shape="circle"
+                    @click="
+                      $router.push({
+                        path: '/contract/contract/contractList',
+                        query: {
+                          keyword: form.name,
+                        },
+                      })
+                    "
+                    >查看</Button
+                  >
+                </div>
+              </div>
+            </el-card>
           </div>
-        </el-card>
-      </div>
     </div>
 
     <el-drawer
@@ -1146,8 +1179,8 @@
             :total="contractTotal"
             @current-change="
               (e) => {
-                contractSelect.page = e;
-                getContractToContracts();
+              contractSelect.page = e;
+              getContractToContracts();
               }
             "
           >
@@ -1176,7 +1209,7 @@
         <div class="typeFlex-list">
           <div class="typeFlex-title">从已有的支出列表中选择</div>
           <div style="height: 500px; overflow: scroll">
-            <listAll ref="listAll" :isOpt="true"></listAll>
+              <listAll ref="listAll" :isOpt="true"></listAll>
           </div>
         </div>
         <div class="typeFlex-types">
@@ -1227,6 +1260,22 @@
         </div>
       </div>
       <otherPlan ref="otherPlan" @getPlan="getSelectionPlan"></otherPlan>
+      
+      <!-- OA流程Modal -->
+      <Modal
+      v-model="isShowOaModal"
+      :width="86"
+      class-name="oa-modal"
+      title="流程办理"
+      fullscreen
+      :mask-closable="false"
+      footer-hide
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
+      </div>
+    </Modal>
+      
       <!-- <span>请选择类型</span>
       <span slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;">
         <el-button @click="step = 2,myPurchaseType = 2,isWeixiu=false,form.is_common_purchase = 1,form.flow_mod_id = 99,showTypes = false,showEdit=true">一般采购</el-button>
@@ -1254,6 +1303,7 @@ import {getShList} from "@/api/oatoken"
 import { getInfo } from "@/api/me.js";
 import { listdeptNoAuth } from "@/api/system/department";
 import { deepCopy } from "@/utils";
+import { getToken } from "@/utils/auth";
 
 import listAll from "@/views/contract/contractList.vue";
 import otherPlan from "@/components/PlanPicker/otherPlan.vue";
@@ -1353,6 +1403,9 @@ export default {
       isShowPlan: false,
       detail: {},
       plan: [],
+      // OA流程相关
+      oaUrl: '',
+      isShowOaModal: false,
       options: [
         {
           value: 1,
@@ -1538,6 +1591,26 @@ export default {
             trigger: "change",
           },
         ],
+        meeting_flow_id: [
+          {
+            validator: (rule, value, callback) => {
+              // 如果是一般采购，则不是必选
+              if (this.form.is_common_purchase) {
+                callback()
+                return
+              }
+              // 如果合同金额大于等于10万，则必选
+              if (this.form.total_money && Number(this.form.total_money) >= 100000) {
+                if (!value) {
+                  callback(new Error('资金上会流程为必选项'))
+                  return
+                }
+              }
+              callback()
+            },
+            trigger: "change",
+          },
+        ],
       },
       plans: [],
       planSelect: {
@@ -1672,15 +1745,23 @@ export default {
     };
   },
   methods: {
+    // 查看OA流程
+    viewOaFlow(flowId) {
+      // 调用本地的toOaDetail方法
+      let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
+      
+      this.oaUrl = url
+      this.isShowOaModal = true
+    },
+
     // 获取上会列表
     async getSh(){
       const res = await getShList({
         page:1,
         page_size:999,
         custom_model_id:103,
-        field_id:1225,
-        operator:'eq',
-        field_keyword:'采购事项'
+        sort_name:'created_at',
+        sort_type:'DESC'
       })
       this.shList = res.data.data
     },
@@ -1858,8 +1939,8 @@ export default {
           ?.filter((i) => i.status)
           ?.map((i) => {
             let data = JSON.parse(i.remark);
-            return {
-              name: i.value,
+          return {
+            name: i.value,
               ...data,
             };
           });
@@ -1962,6 +2043,15 @@ export default {
         //submit
         this.$refs["form"].validate((valid) => {
           if (valid) {
+            // 验证资金上会流程
+            if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
+              this.$message({
+                type: 'warning',
+                message: '资金上会流程为必选项'
+              })
+              return
+            }
+            
             this.btnLoading = true;
             if (!this.form.use_framework_buy) {
               this.form.contract_to_contracts = [];
@@ -1983,7 +2073,7 @@ export default {
               this.form.is_contract = 0;
               this.form.is_tender_audit = 0;
             }
-            // this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1;
+           // this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1;
             if (!this.form.money) {
               this.form.money = this.form.plan_price;
             }
@@ -1991,15 +2081,15 @@ export default {
               addContrant(this.form, true)
                 .then((res) => {
                   this.btnLoading = false;
-                  //this.step = 3;
-                  this.$router.push({
+                //this.step = 3;
+                this.$router.push({
                     path:
                       this.form.is_simple || !this.form.is_purchase
                         ? "/contract/contractAll"
                         : "/contract/contractList",
-                    query: {
-                      keyword: this.form.name,
-                    },
+                  query: {
+                    keyword: this.form.name,
+                  },
                   });
                 })
                 .catch((_) => (this.btnLoading = false));
@@ -2011,7 +2101,7 @@ export default {
               })
                 .then((res) => {
                   this.btnLoading = false;
-                  this.step = 3;
+                this.step = 3;
                 })
                 .catch((_) => (this.btnLoading = false));
             }
@@ -2074,8 +2164,8 @@ export default {
             .map((i) => {
               return this.id
                 ? {
-                    contract_id: this.contractId,
-                    to_contract_id: i.id,
+              contract_id: this.contractId,
+              to_contract_id: i.id,
                     use_money: this.form.plan_price,
                   }
                 : {
@@ -2226,6 +2316,37 @@ export default {
       let temp = this.form.contract_to_contracts;
       return this.$refs["contractToContractsTable"]?.getSelection() || [];
     },
+    
+    // 资金上会流程是否必选
+    isMeetingFlowRequired() {
+      console.log("isMeetingFlowRequired triggered:", {
+        is_common_purchase: this.form.is_common_purchase,
+        total_money: this.form.total_money,
+        result: !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
+      })
+      return !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
+    },
+    
+    // 资金上会流程是否禁用
+    isMeetingFlowDisabled() {
+      console.log("isMeetingFlowDisabled triggered:", {
+        is_common_purchase: this.form.is_common_purchase,
+        total_money: this.form.total_money,
+        is_common_purchase_result: this.form.is_common_purchase,
+        amount_check: this.form.total_money && Number(this.form.total_money) < 100000
+      })
+      
+      // 如果是一般采购，则不禁用
+      if (this.form.is_common_purchase) {
+        console.log("is_common_purchase is true, returning false")
+        return false
+      }
+      
+      // 如果不是一般采购，且金额小于10万，则禁用
+      const result = this.form.total_money && Number(this.form.total_money) < 100000
+      console.log("Final result:", result)
+      return result
+    }
   },
   created() {
     this.window.width = screen.availWidth * 0.95;
@@ -2323,15 +2444,15 @@ export default {
 <style scoped lang="scss">
 ::v-deep .ivu-input-group-append.ivu-input-search {
   background-color: #409eff;
-}
-::v-deep .allSelect .cell {
-  display: none;
-}
+  }
+  ::v-deep .allSelect .cell {
+    display: none;
+  }
 .typeFlex {
-  display: flex;
-  justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
   &-title {
-    font-size: 16px;
+      font-size: 16px;
     margin-bottom: 10px;
   }
   &-list {
@@ -2341,9 +2462,9 @@ export default {
     width: 30%;
     .el-button {
       margin-bottom: 10px;
+      }
     }
   }
-}
 .select-container {
   display: flex;
   justify-content: space-between;
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 7317fc5..789243b 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1199,15 +1199,43 @@ export default {
               width: 158,
               prop: 'purchase_status',
               customFn: row => {
-                return (
-                  <div>
-                    <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) || '无' }</span>
-                    <br/>
-                    {
-                      (row.FLOWSTATUS.caigou.getStatus() !== 2 && row.FLOWSTATUS.caigou.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('caigou', row) }}>查看</a> : ''
-                    }
-                  </div>
-                )
+              const flows = row.contract_flow_links.filter(i => i.custom_model_id === 99)
+            return (
+             flows.length > 0
+                ? flows.map((item, index) => {
+                  return (
+                    <div>
+                      <p style={{ 'text-align': 'left' }} >
+                        <span>
+                          {index + 1}、
+                          {
+                            item.flow_title
+                          }
+                        </span>
+                        {
+                          row.is_purchase ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>[{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) ?? '待申请' }]</span>):'-'
+                        }
+                        {
+                          (this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) ? <a style={{ 'color': 'blue', 'cursor': 'pointer', 'margin-left': '5px' }} on={{ 'click': () => this.toOaDetail('caigou', row, item.flow_id) }}>查看</a> : '')
+                        }
+                      </p>
+
+                    </div>
+                  )
+                })
+                : <div>
+                  {'-'}
+                </div>
+            )
+                // return (
+                //   <div>
+                //     <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) || '无' }</span>
+                //     <br/>
+                //     {
+                //       (row.FLOWSTATUS.caigou.getStatus() !== 2 && row.FLOWSTATUS.caigou.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('caigou', row) }}>查看</a> : ''
+                //     }
+                //   </div>
+                // )
               }
             },
             {
@@ -1255,10 +1283,12 @@ export default {
               width: 145,
               prop: 'join_status',
               customFn: row => {
+                const flows = row.contract_flow_links.filter(i => i.tag === 'contract')
+
                 return (
                   <div>
                     <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
-                      <span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span>
+                      <span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus())==='待申请'?'待申请':'-' }</span>
                       {
                         row.is_purchase ? (
                           <el-popover title='是否需要合同审批' placement='bottom-start' width='160'>
@@ -1281,7 +1311,34 @@ export default {
                       }
                     </div>
                     {
-                      (row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('hetong', row) }}>查看</a> : ''
+                      // (row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('hetong', row) }}>查看</a> : ''
+            
+             flows.length > 0
+                ? flows.map((item, index) => {
+                  return (
+                    <div>
+                      <p style={{ 'text-align': 'left' }} >
+                        <span>
+                          {index + 1}、
+                          {
+                            item.flow_title
+                          }
+                        </span>
+                        {
+                          row.is_purchase ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()) }}>[{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) ?? '待申请' }]</span>):''
+                        }
+                        {
+                          (this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) ? <a style={{ 'color': 'blue', 'cursor': 'pointer', 'margin-left': '5px' }} on={{ 'click': () => this.toOaDetail('hetong', row, item.flow_id) }}>查看</a> : '')
+                        }
+                      </p>
+
+                    </div>
+                  )
+                })
+                : <div>
+                  {''}
+                </div>
+            
                     }
                   </div>
                 )