diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 93e8920..ad990c6 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -1,742 +1,782 @@
-<template>
-  <div>
-    <xy-dialog :is-show.sync="isShow" title="合同签订" type="form" :form="form" :rules="rules" ok-text="提交" @submit="sign">
-      <template v-slot:extraFormTop>
-        <div class="base-info" style="margin-bottom: 20px;">
-          <div class="base-info-title">合同信息</div>
-          <div class="base-info-item">
-            <div class="base-info-item-title">合同名称</div>
-            <div class="base-info-item-content">{{ contract.name }}</div>
-          </div>
-        </div>
-      </template>
-      <template v-slot:number>
-        <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-input v-model="form.number" placeholder="请填写合同编号" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:supply>
-        <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-input v-model="form.supply" placeholder="请填写承包商\供应商" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:carryDepartment>
-        <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-input v-model="form.carryDepartment" placeholder="请填写执行部门" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:money>
-        <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="form.money" placeholder="请填写合同金额" style="width: 300px;" @change="planMonthLists" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:time>
-        <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-date-picker
-              v-model="form.time"
-              style="width: 300px;"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="dateRangePick"
-            />
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:is_assurance>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">是否收取履约保函
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.is_assurance" />
-          </div>
-        </div>
-      </template>
-      <template v-if="form.is_assurance" v-slot:assurance_money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">保函金额
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input-number v-model="form.assurance_money" :controls="false" :precision="2" placeholder="请输入保函金额" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-if="form.is_assurance" v-slot:assurance_expire>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">保函有效期
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker v-model="form.assurance_expire" value-format="yyyy-MM-dd" placeholder="请输入保函有效期" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-
-      <template v-if="contract.contract_type !== 160" v-slot:guaranteeMoney>
-        <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-number
-              v-model="form.guaranteeMoney"
-              :precision="2"
-              :controls="false"
-              placeholder="请填写质保金"
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-      </template>
-      <template #has_continue>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px;">
-            是否为延续类项目
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.has_continue" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-
-            <span style="color: red;">*</span>
-            签订日期
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker v-model="form.date" style="width: 300px;" value-format="yyyy-MM-dd" type="date" />
-          </div>
-        </div>
-      </template>
-      <template v-if="contract.contract_type !== 160" v-slot:guaranteeYear>
-        <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-year">
-            <el-input-number
-              v-model="form.guaranteeYear"
-              :controls="false"
-              placeholder="请填写质保期"
-              style="width: 300px;"
-            />
-          </div>
-        </div>
-      </template>
-      <template v-if="contract.contract_type !== 160" v-slot:extraFormBottom>
-        <div class="base-info add-plan" style="margin-top: 20px;margin-bottom: 20px">
-          <div class="base-info-title">付款计划</div>
-          <Button type="primary" style="margin-left: 50px;" @click="isShowAddPlan = true">新增计划</Button>
-          <Button type="primary" style="margin-left: 20px;" @click="isShowAddManyPlan = true">批量添加</Button>
-        </div>
-
-        <xy-table
-          :list="signList"
-          :table-item="signTable"
-          :show-index="false"
-          :height="240"
-          @delete="deleteContractSign"
-          @editor="(row)=>{$refs['detailContractSign'].planId = row.id;$refs['detailContractSign'].isShow = true}"
-        />
-      </template>
-    </xy-dialog>
-
-    <!--    新增计划-->
-    <xy-dialog
-      :is-show.sync="isShowAddPlan"
-      type="form"
-      title="新增计划"
-      :form="planForm"
-      :rules="planRules"
-      :width="48"
-      @submit="submit"
-    >
-      <template v-slot:date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;">*</span>
-            <span>日期</span>
-          </div>
-          <div class="xy-table-item-content">
-            <el-datePicker v-model="planForm.date" style="width: 300px" type="date" placeholder="请选择日期" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:content>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;">*</span>
-            <span>内容</span>
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="planForm.content" style="width: 300px" type="textarea" placeholder="请输入内容" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;">*</span>
-            <span>金额</span>
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input v-model="planForm.money" style="width: 300px" placeholder="请输入金额" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:remark>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span>备注</span>
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="planForm.remark" style="width: 300px" type="textarea" placeholder="请输入备注" />
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-
-    <Modal
-      v-model="isShowAddManyPlan"
-      title="计划任务"
-      @on-ok="manyCreate"
-    >
-
-      <div class="many-plan">
-        <div class="many-plan-item">
-          <p>合同总金额</p>
-          <div>{{ form.money }}</div>
-        </div>
-
-        <div class="many-plan-item">
-          <p>开始日期</p>
-          <el-date-picker v-model="manySetting.startMonth" size="mini" value-format="yyyy-MM-dd" @change="planMonthLists" />
-        </div>
-
-        <div class="many-plan-item">
-          <p>付款月份数</p>
-          <el-input-number v-model="manySetting.lastMonth" :controls="false" size="mini" :precision="0" :min="1" :max="12" @change="planMonthLists" />
-        </div>
-
-        <div class="many-plan-item">
-          <p>付款日期</p>
-          <el-input-number v-model="manySetting.day" :controls="false" size="mini" :precision="0" :min="1" :max="31" @change="planMonthLists" />
-        </div>
-
-        <div class="many-plan-item">
-          <p>生成付款日期</p>
-          <div>
-            <div style="display: none;">{{ planMonthLists }}</div>
-            <xy-table :list="manyForm" :height="300" :table-item="manyTable">
-              <template #btns />
-            </xy-table>
-          </div>
-        </div>
-      </div>
-
-    </Modal>
-
-    <detailContractSign ref="detailContractSign" @editorSuccess="getContractSignList" />
-  </div>
-</template>
-
-<script>
-import { MessageBox } from 'element-ui'
-import {
-  addContractSign,
-  getContractSign,
-  delContractSign,
-  httpCurl
-} from '@/api/contractSign/contractSign'
-import {
-  detailContract,
-  editorContract
-} from '@/api/contract/contract'
-import {
-  Message
-} from 'element-ui'
-import {
-  parseTime,
-  moneyFormatter
-} from '@/utils'
-
-import detailContractSign from '@/views/contract/components/detailContractSign'
-import {
-  getOatoken
-} from '@/api/oatoken'
-import axios from 'axios'
-export default {
-  components: {
-    detailContractSign
-  },
-  data() {
-    return {
-      isShowAddManyPlan: false,
-      manySetting: {
-        day: 1,
-        lastMonth: 1,
-        startMonth: ''
-      },
-      manyForm: [],
-      manyTable: [
-        {
-          prop: 'date',
-          label: '付款日期',
-          width: 160,
-          customFn: row => {
-            return (
-              <el-date-picker style='width: 130px;' vModel={row.date} size='mini' value-format='yyyy-MM-dd'></el-date-picker>
-            )
-          }
-        },
-        {
-          prop: 'money',
-          label: '金额',
-          width: 180,
-          customFn: row => {
-            return (
-              <el-input-number size='mini' vModel={row.money} precision={2} controls={false}></el-input-number>
-            )
-          }
-        },
-        {
-          prop: 'operate',
-          label: '操作',
-          customFn: (row, { $index }) => {
-            return (
-              <Button type='error'
-                size='small'
-                on={{
-                  'click': _ => {
-                    this.manyForm.splice($index, 1)
-                  }
-                }}>移除</Button>
-            )
-          }
-        }
-      ],
-
-      form: {
-        number: '',
-        supply: '',
-        has_continue: 0,
-        carryDepartment: '',
-        money: '',
-        time: [],
-        guaranteeMoney: '',
-        guaranteeYear: '',
-        date: '',
-        is_assurance: false,
-        assurance_money: '',
-        assurance_expire: ''
-      },
-      rules: {
-        number: [{ required: true, message: '必填' }],
-        date: [{ required: true, message: '必填' }],
-        supply: [{ required: true, message: '必填' }],
-        carryDepartment: [{ required: true, message: '必填' }],
-        money: [
-          { required: true, message: '必填' },
-          { pattern: /^\d+(\.\d+)?$/, message: '必须为数字' }
-        ],
-        time: [{ required: true, message: '必选' }],
-        guaranteeMoney: [],
-        guaranteeYear: []
-      },
-
-      isShow: false,
-      contractId: null,
-      contract: {},
-      signList: [],
-      signTable: [{
-        prop: 'date',
-        label: '日期',
-        width: 170,
-        sortable: false
-      },
-      {
-        prop: 'money',
-        label: '金额',
-        align: 'right',
-        width: 120,
-        sortable: false,
-        formatter: (v1, v2, value) => {
-          return moneyFormatter(value)
-        }
-      },
-      {
-        prop: 'content',
-        label: '内容',
-        minWidth: 180,
-        align: 'left',
-        sortable: false
-      },
-      {
-        prop: 'remark',
-        label: '备注',
-        minWidth: 180,
-        align: 'left',
-        sortable: false
-      }
-      ],
-
-      isShowAddPlan: false,
-      planForm: {
-        date: '',
-        money: '',
-        content: '',
-        remark: ''
-      },
-      planRules: {
-        date: [{
-          required: true,
-          message: '必填'
-        }],
-        content: [{
-          required: true,
-          message: '必填'
-        }],
-        money: [{
-          required: true,
-          message: '必填'
-        },
-        {
-          pattern: /^\d+(\.\d+)?$/,
-          message: '必须为数字'
-        }
-        ]
-      }
-    }
-  },
-  computed: {
-  },
-  watch: {
-    async contractId() {
-      await this.getContractSignList()
-      await this.getContract()
-      await this.getOaContractInfo()
-    }
-  },
-  methods: {
-    dateRangePick(e) {
-      if (e[0] && e[1]) {
-        this.manySetting.startMonth = e[0] ? e[0] : ''
-        this.manySetting.lastMonth = this.$moment(e[1]).diff(this.$moment(e[0]), 'months')
-      } else {
-        this.manySetting.startMonth = ''
-        this.manySetting.lastMonth = 1
-      }
-
-      this.planMonthLists()
-    },
-
-    // 合同签订
-    sign() {
-      {/* if (this.signList.length == 0) {
-        Message({
-          type: 'error',
-          message: '该项目未设置付款计划，请设置付款计划后保存'
-        })
-        return false
-      } */}
-
-      const signMoneyTotal = this.signList.reduce((pre, cur) => (pre + Number(cur.money || 0)), 0)
-      if (signMoneyTotal !== Number(this.form.money)) {
-        Message({
-          type: 'warning',
-          message: '付款计划总金额与合同总金额不相等'
-        })
-        return
-      }
-
-      editorContract({
-        id: this.contractId,
-        number: this.form.number,
-        supply: this.form.supply,
-        has_continue: this.form.has_continue,
-        carry_department: this.form.carryDepartment,
-        money: this.form.money,
-        status: 2,
-        guarantee_money: this.form.guaranteeMoney,
-        guarantee_year: this.form.guaranteeYear,
-        start_date: this.form.time[0],
-        end_date: this.form.time[1],
-        date: this.form.date,
-        is_assurance: this.form.is_assurance,
-        assurance_money: this.form.assurance_money,
-        assurance_expire: this.form.assurance_expire
-      }).then(res => {
-        this.isShow = false
-        Message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.$emit('signSuccess')
-      })
-    },
-
-    async getContractSignList() {
-      const res = await getContractSign({
-        contract_id: this.contractId,
-        page: 1,
-        page_size: 999
-      })
-      this.signList = res.data
-    },
-    async getContract() {
-      const res = await detailContract({
-        id: this.contractId
-      })
-      this.contract = res
-      Object.assign(this.form, res)
-      if (res.start_date && res.end_date) {
-        this.form.time = [res.start_date, res.end_date]
-      } else {
-        this.form.time = []
-      }
-      this.form.carryDepartment = res.carry_department
-      this.form.guaranteeMoney = res.guarantee_money
-      this.form.guaranteeYear = res.guarantee_year
-      this.form.is_assurance = res.is_assurance === 1
-      this.form.assurance_expire = res.assurance_expire
-      this.form.assurance_money = res.assurance_money
-      // 动态设置质保金和质保期校验规则
-      if (res.contract_type !== 160) {
-        this.rules.guaranteeMoney = [{ required: true, message: '必填' }]
-        this.rules.guaranteeYear = [{ required: true, message: '必填' }]
-      } else {
-        this.rules.guaranteeMoney = []
-        this.rules.guaranteeYear = []
-      }
-      console.log(this.form)
-    },
-    deleteContractSign(row) {
-      delContractSign({
-        id: row.id
-      }).then(res => {
-        this.getContractSignList()
-        Message({
-          type: 'success',
-          message: '操作成功'
-        })
-      })
-    },
-    submit() {
-      console.log(this.planForm)
-
-      addContractSign({
-        contract_id: this.contract.id,
-        date: `${new Date(this.planForm.date).getFullYear()}-${new Date(this.planForm.date).getMonth() + 1}-${new Date(this.planForm.date).getDate()}`,
-        content: this.planForm.content,
-        money: this.planForm.money,
-        remark: this.planForm.remark
-      }).then(res => {
-        this.isShowAddPlan = false
-        this.getContractSignList()
-        console.log(res)
-        Message({
-          type: 'success',
-          message: '操作成功'
-        })
-      })
-    },
-
-    manyCreate() {
-      Promise.all(this.manyForm.map(i => {
-        return addContractSign({
-          contract_id: this.contract.id,
-          date: i.date,
-          content: '',
-          money: i.money,
-          remark: ''
-        })
-      })).then(res => {
-        this.getContractSignList()
-        Message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.isShowAddManyPlan = false
-      })
-    },
-
-    // 获取oa合同信息
-    async getOaContractInfo() {
-      try {
-        const resToken = await getOatoken()
-        const ourl = `/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${resToken.oatoken}&get_raw=1`
-
-        console.log(ourl)
-        const url =
-            `${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}`
-            // ?oatoken=${res.oatoken}&get_raw=1
-        const paras = { oatoken: resToken.oatoken, get_raw: 1 }
-        const res = await httpCurl(paras, true, '/Api/flowDetail', 'GET', url)
-        console.log(res)
-        this.form.money = Number(res.flow['合同金额（元）'])
-        this.form.number = res.flow['合同编号']
-        this.form.supply = res.flow['承包商\\供应商']
-        this.form.carryDepartment = res.flow['执行部门']
-
-        // let res = await getOatoken()
-        // let url =
-        //   `/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
-        // const oaInfo = await axios.get(url)
-        // this.form.money = Number(oaInfo.data.flow['合同金额（元）'])
-        // this.form.number = oaInfo.data.flow['合同编号']
-        // this.form.supply = oaInfo.data.flow['承包商\\供应商']
-        // this.form.carryDepartment = oaInfo.data.flow['执行部门']
-      } catch {
-
-      }
-    },
-
-    planMonthLists() {
-      const [startDate, endDate] = this.form.time
-      const actStartDate = this.manySetting.startMonth
-      const actStartYear = new Date(actStartDate).getFullYear()
-      const actStartMonth = new Date(actStartDate).getMonth()
-      const dates = []
-      if (actStartDate && this.manySetting.day) {
-        let index = 0
-        let nowDate = this.$moment(new Date(actStartYear, actStartMonth, this.manySetting.day)).add(index, 'months')
-
-        while ((nowDate.valueOf() <= this.$moment(endDate).valueOf())) {
-          if (nowDate.valueOf() >= this.$moment(actStartDate).valueOf()) {
-            dates.push(nowDate.format('YYYY-MM-DD'))
-          }
-          index++
-          nowDate = this.$moment(new Date(actStartYear, actStartMonth, this.manySetting.day)).add(index, 'months')
-        }
-
-        const returnRes = dates.slice(0, this.manySetting.lastMonth)
-        this.manyForm = returnRes.map(i => ({
-          money: (Number(this.form.money || 0) / returnRes.length).toFixed(2),
-          date: i,
-          content: ''
-        }))
-      }
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-  .many-plan {
-    &-item {
-      display: flex;
-
-      margin-bottom: 20px;
-      & > p {
-        flex-basis: 30%;
-        flex-shrink: 0;
-      }
-    }
-  }
-  .base-info {
-
-    &-title {
-      font-weight: 600;
-
-      padding: 0 10px;
-    }
-
-    &-item {
-      display: flex;
-
-      margin-top: 8px;
-
-      &-title {
-
-        padding: 0 20px;
-      }
-
-      &-content {}
-
-      &-unit {
-
-        margin-left: 20px;
-      }
-    }
-  }
-
-  .add-plan {
-    display: flex;
-    align-items: center;
-  }
-
-  .xy-table-item-label {
-    width: 200px;
-  }
-
-  .xy-table-item-price {
-    position: relative;
-
-    &::after {
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（元）'
-    }
-  }
-
-  .xy-table-item-price-wan {
-    position: relative;
-
-    &::after {
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（万元）'
-    }
-
-    ::v-deep .el-input__clear {
-      position: relative;
-      right: 46px;
-      z-index: 2;
-    }
-  }
-
-  .xy-table-item-year {
-    position: relative;
-
-    &::after {
-      position: absolute;
-      right: 4%;
-      top: 0;
-      content: '年'
-    }
-  }
-
-  ::v-deep .el-input__inner {
-    text-align: left;
-  }
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" title="合同签订" type="form" :form="form" :rules="rules" ok-text="提交" @submit="sign">
+      <template v-slot:extraFormTop>
+        <div class="base-info" style="margin-bottom: 20px;">
+          <div class="base-info-title">合同信息</div>
+          <div class="base-info-item">
+            <div class="base-info-item-title">合同名称</div>
+            <div class="base-info-item-content">{{ contract.name }}</div>
+          </div>
+        </div>
+      </template>
+      <template v-slot:number>
+        <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-input v-model="form.number" placeholder="请填写合同编号" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:supply>
+        <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-input v-model="form.supply" placeholder="请填写承包商\供应商" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:carryDepartment>
+        <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-input v-model="form.carryDepartment" placeholder="请填写执行部门" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:money>
+        <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="form.money" placeholder="请填写合同金额" style="width: 300px;" @change="planMonthLists" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:time>
+        <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-date-picker v-model="form.time" style="width: 300px;" value-format="yyyy-MM-dd" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="dateRangePick" />
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:is_assurance>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">是否收取履约保函
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.is_assurance" />
+          </div>
+        </div>
+      </template>
+      <template v-if="form.is_assurance" v-slot:assurance_money>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">保函金额
+          </div>
+          <div class="xy-table-item-content xy-table-item-price">
+            <el-input-number v-model="form.assurance_money" :controls="false" :precision="2" placeholder="请输入保函金额"
+              style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-if="form.is_assurance" v-slot:assurance_expire>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">保函有效期
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker v-model="form.assurance_expire" value-format="yyyy-MM-dd" placeholder="请输入保函有效期"
+              style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+
+      <template v-if="contract.contract_type !== 160" v-slot:guaranteeMoney>
+        <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-number v-model="form.guaranteeMoney" :precision="2" :controls="false" placeholder="请填写质保金"
+              style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template #has_continue>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            是否为延续类项目
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.has_continue" active-text="是" inactive-text="否" :active-value="1"
+              :inactive-value="0" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:date>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+
+            <span style="color: red;">*</span>
+            签订日期
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker v-model="form.date" style="width: 300px;" value-format="yyyy-MM-dd" type="date" />
+          </div>
+        </div>
+      </template>
+      <template v-if="contract.contract_type !== 160" v-slot:guaranteeYear>
+        <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-year">
+            <el-input-number v-model="form.guaranteeYear" :controls="false" placeholder="请填写质保期"
+              style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-if="contract.contract_type !== 160" v-slot:extraFormBottom>
+        <div class="base-info add-plan" style="margin-top: 20px;margin-bottom: 20px">
+          <div class="base-info-title">付款计划</div>
+          <Button type="primary" style="margin-left: 50px;" @click="isShowAddPlan = true">新增计划</Button>
+          <Button type="primary" style="margin-left: 20px;" @click="isShowAddManyPlan = true">批量添加</Button>
+        </div>
+
+        <xy-table :list="signList" :table-item="signTable" :show-index="false" :height="240"
+          @delete="deleteContractSign"
+          @editor="(row)=>{$refs['detailContractSign'].planId = row.id;$refs['detailContractSign'].isShow = true}" />
+      </template>
+    </xy-dialog>
+
+    <!--    新增计划-->
+    <xy-dialog :is-show.sync="isShowAddPlan" type="form" title="新增计划" :form="planForm" :rules="planRules" :width="48"
+      @submit="submit">
+      <template v-slot:date>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;">*</span>
+            <span>日期</span>
+          </div>
+          <div class="xy-table-item-content">
+            <el-datePicker v-model="planForm.date" style="width: 300px" type="date" placeholder="请选择日期" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:content>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;">*</span>
+            <span>内容</span>
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="planForm.content" style="width: 300px" type="textarea" placeholder="请输入内容" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:money>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;">*</span>
+            <span>金额</span>
+          </div>
+          <div class="xy-table-item-content xy-table-item-price">
+            <el-input v-model="planForm.money" style="width: 300px" placeholder="请输入金额" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:remark>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span>备注</span>
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="planForm.remark" style="width: 300px" type="textarea" placeholder="请输入备注" />
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+
+    <Modal v-model="isShowAddManyPlan" title="计划任务" @on-ok="manyCreate">
+
+      <div class="many-plan">
+        <div class="many-plan-item">
+          <p>合同总金额</p>
+          <div>{{ form.money }}</div>
+        </div>
+
+        <div class="many-plan-item">
+          <p>开始日期</p>
+          <el-date-picker v-model="manySetting.startMonth" size="mini" value-format="yyyy-MM-dd"
+            @change="planMonthLists" />
+        </div>
+
+        <div class="many-plan-item">
+          <p>付款月份数</p>
+          <el-input-number v-model="manySetting.lastMonth" :controls="false" size="mini" :precision="0" :min="1"
+            :max="12" @change="planMonthLists" />
+        </div>
+
+        <div class="many-plan-item">
+          <p>付款日期</p>
+          <el-input-number v-model="manySetting.day" :controls="false" size="mini" :precision="0" :min="1" :max="31"
+            @change="planMonthLists" />
+        </div>
+
+        <div class="many-plan-item">
+          <p>生成付款日期</p>
+          <div>
+            <div style="display: none;">{{ planMonthLists }}</div>
+            <xy-table :list="manyForm" :height="300" :table-item="manyTable">
+              <template #btns />
+            </xy-table>
+          </div>
+        </div>
+      </div>
+
+    </Modal>
+
+    <detailContractSign ref="detailContractSign" @editorSuccess="getContractSignList" />
+  </div>
+</template>
+
+<script>
+  import {
+    MessageBox
+  } from 'element-ui'
+  import {
+    addContractSign,
+    getContractSign,
+    delContractSign,
+    httpCurl
+  } from '@/api/contractSign/contractSign'
+  import {
+    detailContract,
+    editorContract
+  } from '@/api/contract/contract'
+  import {
+    Message
+  } from 'element-ui'
+  import {
+    parseTime,
+    moneyFormatter
+  } from '@/utils'
+
+  import detailContractSign from '@/views/contract/components/detailContractSign'
+  import {
+    getOatoken
+  } from '@/api/oatoken'
+  import axios from 'axios'
+  export default {
+    components: {
+      detailContractSign
+    },
+    data() {
+      return {
+        isShowAddManyPlan: false,
+        manySetting: {
+          day: 1,
+          lastMonth: 1,
+          startMonth: ''
+        },
+        manyForm: [],
+        manyTable: [{
+            prop: 'date',
+            label: '付款日期',
+            width: 160,
+            customFn: row => {
+              return ( <
+                el - date - picker style = 'width: 130px;'
+                vModel = {
+                  row.date
+                }
+                size = 'mini'
+                value - format = 'yyyy-MM-dd' > < /el-date-picker>
+              )
+            }
+          },
+          {
+            prop: 'money',
+            label: '金额',
+            width: 180,
+            customFn: row => {
+              return ( <
+                el - input - number size = 'mini'
+                vModel = {
+                  row.money
+                }
+                precision = {
+                  2
+                }
+                controls = {
+                  false
+                } > < /el-input-number>
+              )
+            }
+          },
+          {
+            prop: 'operate',
+            label: '操作',
+            customFn: (row, {
+              $index
+            }) => {
+              return ( <
+                Button type = 'error'
+                size = 'small'
+                on = {
+                  {
+                    'click': _ => {
+                      this.manyForm.splice($index, 1)
+                    }
+                  }
+                } > 移除 < /Button>
+              )
+            }
+          }
+        ],
+
+        form: {
+          number: '',
+          supply: '',
+          has_continue: 0,
+          carryDepartment: '',
+          money: '',
+          time: [],
+          guaranteeMoney: '',
+          guaranteeYear: '',
+          date: '',
+          is_assurance: false,
+          assurance_money: '',
+          assurance_expire: ''
+        },
+        rules: {
+          number: [{
+            required: true,
+            message: '必填'
+          }],
+          date: [{
+            required: true,
+            message: '必填'
+          }],
+          supply: [{
+            required: true,
+            message: '必填'
+          }],
+          carryDepartment: [{
+            required: true,
+            message: '必填'
+          }],
+          money: [{
+              required: true,
+              message: '必填'
+            },
+            {
+              pattern: /^\d+(\.\d+)?$/,
+              message: '必须为数字'
+            }
+          ],
+          time: [{
+            required: true,
+            message: '必选'
+          }],
+          guaranteeMoney: [],
+          guaranteeYear: []
+        },
+
+        isShow: false,
+        contractId: null,
+        contract: {},
+        signList: [],
+        signTable: [{
+            prop: 'date',
+            label: '日期',
+            width: 170,
+            sortable: false
+          },
+          {
+            prop: 'money',
+            label: '金额',
+            align: 'right',
+            width: 120,
+            sortable: false,
+            formatter: (v1, v2, value) => {
+              return moneyFormatter(value)
+            }
+          },
+          {
+            prop: 'content',
+            label: '内容',
+            minWidth: 180,
+            align: 'left',
+            sortable: false
+          },
+          {
+            prop: 'remark',
+            label: '备注',
+            minWidth: 180,
+            align: 'left',
+            sortable: false
+          }
+        ],
+
+        isShowAddPlan: false,
+        planForm: {
+          date: '',
+          money: '',
+          content: '',
+          remark: ''
+        },
+        planRules: {
+          date: [{
+            required: true,
+            message: '必填'
+          }],
+          content: [{
+            required: true,
+            message: '必填'
+          }],
+          money: [{
+              required: true,
+              message: '必填'
+            },
+            {
+              pattern: /^\d+(\.\d+)?$/,
+              message: '必须为数字'
+            }
+          ]
+        }
+      }
+    },
+    computed: {},
+    watch: {
+      async contractId() {
+        await this.getContractSignList()
+        await this.getContract()
+        await this.getOaContractInfo()
+      }
+    },
+    methods: {
+      dateRangePick(e) {
+        if (e[0] && e[1]) {
+          this.manySetting.startMonth = e[0] ? e[0] : ''
+          this.manySetting.lastMonth = this.$moment(e[1]).diff(this.$moment(e[0]), 'months')
+        } else {
+          this.manySetting.startMonth = ''
+          this.manySetting.lastMonth = 1
+        }
+
+        this.planMonthLists()
+      },
+
+      // 合同签订
+      sign() {
+        {
+          /* if (this.signList.length == 0) {
+                  Message({
+                    type: 'error',
+                    message: '该项目未设置付款计划，请设置付款计划后保存'
+                  })
+                  return false
+                } */
+        }
+
+        const signMoneyTotal = this.signList.reduce((pre, cur) => (pre + Number(cur.money || 0)), 0)
+        if (signMoneyTotal !== Number(this.form.money)) {
+          Message({
+            type: 'warning',
+            message: '付款计划总金额与合同总金额不相等'
+          })
+          return
+        }
+
+        editorContract({
+          id: this.contractId,
+          number: this.form.number,
+          supply: this.form.supply,
+          has_continue: this.form.has_continue,
+          carry_department: this.form.carryDepartment,
+          money: this.form.money,
+          status: 2,
+          guarantee_money: this.form.guaranteeMoney,
+          guarantee_year: this.form.guaranteeYear,
+          start_date: this.form.time[0],
+          end_date: this.form.time[1],
+          date: this.form.date,
+          is_assurance: this.form.is_assurance,
+          assurance_money: this.form.assurance_money,
+          assurance_expire: this.form.assurance_expire
+        }).then(res => {
+          this.isShow = false
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.$emit('signSuccess')
+        })
+      },
+      // 假设这是子页面的操作完成函数（如提交成功后）
+      handleOperationSuccess() {
+        // 1. 准备要发送给父页面的数据（包含操作结果等信息）
+        const message = {
+          type: 'operationCompleted', // 消息类型：标识“操作已完成”
+          data: {
+            status: 'success',
+            result: '合同签署成功',
+          }
+        };
+
+        // 2. 发送消息给父页面
+        // 第一个参数：要传递的数据
+        // 第二个参数：父页面的域名（必须准确，* 不安全，不推荐）
+        parent.postMessage(message, 'http://192.168.60.18:8001');
+        // 例如父页面是 http://192.168.60.99:8080，则填这个地址
+      },
+      async getContractSignList() {
+        const res = await getContractSign({
+          contract_id: this.contractId,
+          page: 1,
+          page_size: 999
+        })
+        this.signList = res.data
+      },
+      async getContract() {
+        const res = await detailContract({
+          id: this.contractId
+        })
+        this.contract = res
+        Object.assign(this.form, res)
+        if (res.start_date && res.end_date) {
+          this.form.time = [res.start_date, res.end_date]
+        } else {
+          this.form.time = []
+        }
+        this.form.carryDepartment = res.carry_department
+        this.form.guaranteeMoney = res.guarantee_money
+        this.form.guaranteeYear = res.guarantee_year
+        this.form.is_assurance = res.is_assurance === 1
+        this.form.assurance_expire = res.assurance_expire
+        this.form.assurance_money = res.assurance_money
+        // 动态设置质保金和质保期校验规则
+        if (res.contract_type !== 160) {
+          this.rules.guaranteeMoney = [{
+            required: true,
+            message: '必填'
+          }]
+          this.rules.guaranteeYear = [{
+            required: true,
+            message: '必填'
+          }]
+        } else {
+          this.rules.guaranteeMoney = []
+          this.rules.guaranteeYear = []
+        }
+        console.log(this.form)
+      },
+      deleteContractSign(row) {
+        delContractSign({
+          id: row.id
+        }).then(res => {
+          this.getContractSignList()
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+        })
+      },
+      submit() {
+        console.log(this.planForm)
+
+        addContractSign({
+          contract_id: this.contract.id,
+          date: `${new Date(this.planForm.date).getFullYear()}-${new Date(this.planForm.date).getMonth() + 1}-${new Date(this.planForm.date).getDate()}`,
+          content: this.planForm.content,
+          money: this.planForm.money,
+          remark: this.planForm.remark
+        }).then(res => {
+          this.isShowAddPlan = false
+          this.getContractSignList()
+          console.log(res)
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+        })
+      },
+
+      manyCreate() {
+        Promise.all(this.manyForm.map(i => {
+          return addContractSign({
+            contract_id: this.contract.id,
+            date: i.date,
+            content: '',
+            money: i.money,
+            remark: ''
+          })
+        })).then(res => {
+          this.getContractSignList()
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.isShowAddManyPlan = false
+        })
+      },
+
+      // 获取oa合同信息
+      async getOaContractInfo() {
+        try {
+          const resToken = await getOatoken()
+          const ourl = `/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${resToken.oatoken}&get_raw=1`
+
+          console.log(ourl)
+          const url =
+            `${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}`
+          // ?oatoken=${res.oatoken}&get_raw=1
+          const paras = {
+            oatoken: resToken.oatoken,
+            get_raw: 1
+          }
+          const res = await httpCurl(paras, true, '/Api/flowDetail', 'GET', url)
+          console.log(res)
+          this.form.money = Number(res.flow['合同金额（元）'])
+          this.form.number = res.flow['合同编号']
+          this.form.supply = res.flow['承包商\\供应商']
+          this.form.carryDepartment = res.flow['执行部门']
+
+          // let res = await getOatoken()
+          // let url =
+          //   `/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
+          // const oaInfo = await axios.get(url)
+          // this.form.money = Number(oaInfo.data.flow['合同金额（元）'])
+          // this.form.number = oaInfo.data.flow['合同编号']
+          // this.form.supply = oaInfo.data.flow['承包商\\供应商']
+          // this.form.carryDepartment = oaInfo.data.flow['执行部门']
+        } catch {
+
+        }
+      },
+
+      planMonthLists() {
+        const [startDate, endDate] = this.form.time
+        const actStartDate = this.manySetting.startMonth
+        const actStartYear = new Date(actStartDate).getFullYear()
+        const actStartMonth = new Date(actStartDate).getMonth()
+        const dates = []
+        if (actStartDate && this.manySetting.day) {
+          let index = 0
+          let nowDate = this.$moment(new Date(actStartYear, actStartMonth, this.manySetting.day)).add(index, 'months')
+
+          while ((nowDate.valueOf() <= this.$moment(endDate).valueOf())) {
+            if (nowDate.valueOf() >= this.$moment(actStartDate).valueOf()) {
+              dates.push(nowDate.format('YYYY-MM-DD'))
+            }
+            index++
+            nowDate = this.$moment(new Date(actStartYear, actStartMonth, this.manySetting.day)).add(index, 'months')
+          }
+
+          const returnRes = dates.slice(0, this.manySetting.lastMonth)
+          this.manyForm = returnRes.map(i => ({
+            money: (Number(this.form.money || 0) / returnRes.length).toFixed(2),
+            date: i,
+            content: ''
+          }))
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .many-plan {
+    &-item {
+      display: flex;
+
+      margin-bottom: 20px;
+
+      &>p {
+        flex-basis: 30%;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  .base-info {
+
+    &-title {
+      font-weight: 600;
+
+      padding: 0 10px;
+    }
+
+    &-item {
+      display: flex;
+
+      margin-top: 8px;
+
+      &-title {
+
+        padding: 0 20px;
+      }
+
+      &-content {}
+
+      &-unit {
+
+        margin-left: 20px;
+      }
+    }
+  }
+
+  .add-plan {
+    display: flex;
+    align-items: center;
+  }
+
+  .xy-table-item-label {
+    width: 200px;
+  }
+
+  .xy-table-item-price {
+    position: relative;
+
+    &::after {
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（元）'
+    }
+  }
+
+  .xy-table-item-price-wan {
+    position: relative;
+
+    &::after {
+      position: absolute;
+      right: 0;
+      top: 0;
+      content: '（万元）'
+    }
+
+    ::v-deep .el-input__clear {
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
+
+  .xy-table-item-year {
+    position: relative;
+
+    &::after {
+      position: absolute;
+      right: 4%;
+      top: 0;
+      content: '年'
+    }
+  }
+
+  ::v-deep .el-input__inner {
+    text-align: left;
+  }
 </style>
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ee0cec0..c66bff0 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1342,7 +1342,7 @@ export default {
         prop: 'date',
         formatter: (cell, data, value) => {
           if (value) {
-            return parseTime(new Date(value), '{y}-{m}-{d}') 
+            return parseTime(new Date(value), '{y}-{m}-{d}')
           }
         }
       },
@@ -1569,6 +1569,12 @@ export default {
       }
     }).catch(error => {
     })
+    // oa 过来的合同会签
+    if(this.$route.query.oaType==='contractSign'){
+      let contractId = this.$route.query.contractId
+      this.$refs['contractSign'].isShow = true
+      this.$refs['contractSign'].contractId = contractId
+    }
     this.getPurchaseType()
     this.getContracts()
     this.getDepartment(-1)
@@ -2003,7 +2009,7 @@ export default {
     },
     // 获取合同列表
     async getContracts(is_export, noloading = false) {
-      
+
       const res = await getContract({
         page_size: this.select.pageSize,
         page: this.select.pageIndex,