diff --git a/src/views/achievements/components/addPlanEvaluate.vue b/src/views/achievements/components/addPlanEvaluate.vue
index b6fbabb..62d6c33 100644
--- a/src/views/achievements/components/addPlanEvaluate.vue
+++ b/src/views/achievements/components/addPlanEvaluate.vue
@@ -15,6 +15,36 @@
       >
         <template v-slot:btns> </template>
       </xy-table>
+
+      <el-popover placement="left" width="200" trigger="click" v-if="plan.year_midst_status == 1">
+        <div style="margin-bottom: 15px;">确认年中自评确认?</div>
+        <div style="margin-top:15px; display: flex;justify-content: flex-end;">
+          <Button type="primary" ghost size="small" @click="() => edit(plan,'year_midst_status')">确认</Button>
+        </div>
+        <Button
+          slot="reference"
+          type="primary"
+          class="slot-btns-item"
+          style="margin: 10px;"
+        >
+          年中自评确认
+        </Button>
+      </el-popover>
+
+      <el-popover placement="left" width="200" trigger="click" v-if="plan.year_end_status == 1">
+        <div style="margin-bottom: 15px;">确认年末自评确认?</div>
+        <div style="margin-top:15px; display: flex;justify-content: flex-end;">
+          <Button type="primary" ghost size="small" @click="() => edit(plan,'year_end_status')">确认</Button>
+        </div>
+        <Button
+          style="margin-right: 5px;"
+          slot="reference"
+          type="primary"
+          class="slot-btns-item"
+        >
+          年末自评确认
+        </Button>
+      </el-popover>
     </el-drawer>
   </div>
 </template>
@@ -22,8 +52,9 @@
 <script>
 import { index } from "@/api/budget/planTarget";
 import { save, show, index as evaluateIndex } from "@/api/achievements/evaluate"
-import { resetSelect } from "@/utils";
+import { deepCopy, resetSelect } from '@/utils'
 import { getToken } from "@/utils/auth";
+import { editorBudget } from '@/api/budget/budget'
 
 export default {
   data() {
@@ -173,6 +204,7 @@ export default {
         page_size: 999,
         plan_id: "",
       },
+      plan: {}
     };
   },
   methods: {
@@ -188,6 +220,9 @@ export default {
     setPlanId(plan_id) {
       this.select.plan_id = plan_id;
     },
+    setPlan (plan) {
+     this.plan = plan
+    },
 
     //上传
     successHandle(response, file, fileList, row) {
@@ -280,6 +315,18 @@ export default {
       console.log(this.list);
     },
 
+    edit(row, key) {
+      let rowCopy = deepCopy(row)
+      rowCopy[key] = 2
+      editorBudget(rowCopy).then(res => {
+        this.$message({
+          type: 'success',
+          message: '确认成功'
+        })
+        this.getList()
+      })
+    },
+
     submit() {},
   },
   computed: {},
diff --git a/src/views/budget/components/addEvaluate.vue b/src/views/budget/components/addEvaluate.vue
index b7718bc..52cc359 100644
--- a/src/views/budget/components/addEvaluate.vue
+++ b/src/views/budget/components/addEvaluate.vue
@@ -44,6 +44,12 @@ export default {
     },
 
     submit() {
+      if (this.form.year_midst) {
+        this.form.year_midst_status = 1
+      }
+      if (this.form.year_end) {
+        this.form.year_end_status = 1
+      }
       editorBudget(this.form).then(res => {
         this.$message({
           type: 'success',
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 298d069..b0fab03 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -5,6 +5,7 @@
       :is-show.sync="isShowDetail"
       type="normal"
       title="详情"
+
       class="contract-detail"
     >
       <template v-slot:default>
diff --git a/src/views/contract/contractProgress.vue b/src/views/contract/contractProgress.vue
new file mode 100644
index 0000000..5fea905
--- /dev/null
+++ b/src/views/contract/contractProgress.vue
@@ -0,0 +1,1630 @@
+<template>
+  <div ref="contractList" style="padding: 0 20px">
+    <lx-header
+      icon="md-apps"
+      style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+      :text="pageTitle"
+    >
+      <div slot="content"></div>
+      <slot>
+        <div class="selects">
+          <div>
+            <span style="padding: 0 6px; word-break: keep-all">关键字</span>
+            <span>
+              <Input
+                v-model="select.keyword"
+                clearable
+                placeholder="关键字搜索"
+                style="width: 200px"
+              />
+            </span>
+          </div>
+          <xy-selectors
+            style="margin-left: 10px"
+            @search="getContracts"
+            @reset="reset"
+          >
+            <div class="select-content">
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all"
+                  >服务商/供应商</span
+                >
+                <span>
+                  <Input
+                    v-model="select.supply"
+                    clearable
+                    placeholder="请输入服务商/供应商"
+                    style="width: 200px"
+                  />
+                </span>
+              </div>
+
+              <div v-if="type != 1">
+                <span style="padding: 0 6px; word-break: keep-all"
+                  >创建日期</span
+                >
+                <span>
+                  <DatePicker
+                    v-model="select.showDatePicker"
+                    clearable
+                    placeholder="请选择日期"
+                    placement="bottom-start"
+                    style="width: 200px"
+                    type="daterange"
+                    @on-change="datePick"
+                  ></DatePicker>
+                </span>
+              </div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                项目类型
+              </span>
+              <Select
+                v-model="select.type"
+                clearable
+                placeholder="请选择项目类型"
+                style="width: 140px"
+              >
+                <Option
+                  v-for="item in types"
+                  :key="item.value"
+                  :value="item.value"
+                  >{{ item.label }}</Option
+                >
+              </Select>
+            </div>
+
+            <div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                业务科室
+              </span>
+              <el-select
+                v-model="select.department_id"
+                clearable
+                placeholder="业务科室选择"
+                size="small"
+                style="width: 120px"
+              >
+                <el-option
+                  v-for="item in departments"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </div>
+
+            <div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                采购形式
+              </span>
+              <Select
+                v-model="select.purchase_type_id"
+                clearable
+                placeholder="请选择采购形式"
+                style="width: 140px"
+              >
+                <Option
+                  v-for="item in purchaseType"
+                  :key="item.id"
+                  :value="item.id"
+                  >{{ item.value }}</Option
+                >
+              </Select>
+            </div>
+
+            <div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                采购方式
+              </span>
+              <Select
+                v-model="select.purchase_way_id"
+                clearable
+                placeholder="请选择采购方式"
+                style="width: 200px"
+              >
+                <Option
+                  v-for="item in purchaseWay"
+                  :key="item.id"
+                  :value="item.id"
+                  >{{ item.value }}</Option
+                >
+              </Select>
+            </div>
+
+            <div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                预算金额
+              </span>
+              <InputNumber
+                v-model="select.start_plan_price"
+                :min="0"
+                placeholder="最小金额"
+                style="width: 100px"
+              />
+              <span style="padding: 0 5px">-</span>
+              <InputNumber
+                v-model="select.end_plan_price"
+                :min="0"
+                placeholder="最大金额"
+                style="width: 100px"
+              />
+            </div>
+
+            <div>
+              <span style="padding: 0 6px; word-break: keep-all">
+                合同状态
+              </span>
+              <Select
+                v-model="select.status"
+                clearable
+                placeholder="请选择"
+                style="width: 100px"
+              >
+                <Option
+                  v-for="item in [
+                    { label: '待签订', value: 1 },
+                    { label: '已签订', value: 2 },
+                  ]"
+                  :key="item.value"
+                  :value="item.value"
+                  >{{ item.label }}
+                </Option>
+              </Select>
+            </div>
+          </xy-selectors>
+
+          <Button
+            style="margin-left: 10px"
+            type="primary"
+            @click="searchContracts"
+            >查询</Button
+          >
+          <Button
+            ghost
+            style="margin-left: 10px"
+            type="primary"
+            @click="
+              select = {
+                showDatePicker: '',
+                ageIndex: 1,
+                startDate: '',
+                endDate: '',
+                type: '',
+                department: '',
+                purchaseModality: '',
+                purchaseMethods: '',
+                priceMin: null,
+                priceMax: null,
+                status: '',
+              }
+            "
+          >
+            重置
+          </Button>
+          <!--          <Button type="primary"  style="margin-left: 10px">导出</Button>-->
+        </div>
+      </slot>
+    </lx-header>
+
+    <xy-table
+      ref="xyTable"
+      :cell-style="cellStyle"
+      :list="list"
+      :show-summary="true"
+      :summary-method="summary"
+      :table-item="table"
+      @cellClick="showPaymentPlan"
+      @delete="(row) => deleteContract(row.id)"
+      @editor=""
+    >
+      <template v-slot:btns>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          label="操作"
+          width="200"
+        >
+          <template slot-scope="scope">
+            <div class="slot-btns">
+              <Button
+                class="slot-btns-item"
+                size="small"
+                type="primary"
+                @click="
+                  $refs['detailContract'].getDetail(scope.row.id),
+                    ($refs['detailContract'].isShowDetail = true)
+                "
+              >
+                查看
+              </Button>
+              <Button
+                class="slot-btns-item"
+                @click="switchAssurance(scope.row.id, 1)"
+                size="small"
+                type="primary"
+                v-if="
+                  scope.row.assurance_status == 0 &&
+                  type == 1 &&
+                  scope.row.is_assurance == 1
+                "
+              >
+                确认登记
+              </Button>
+              <Button
+                class="slot-btns-item"
+                @click="switchAssurance(scope.row.id, 0)"
+                size="small"
+                type="danger"
+                v-if="
+                  scope.row.assurance_status == 1 &&
+                  type == 1 &&
+                  scope.row.is_assurance == 1
+                "
+              >
+                取消登记
+              </Button>
+            </div>
+          </template>
+        </el-table-column>
+      </template>
+    </xy-table>
+
+    <div style="display: flex; justify-content: flex-end">
+      <Page
+        :total="total"
+        show-elevator
+        @on-change="pageChange"
+        show-sizer
+        @on-page-size-change="pageSizeChange"
+      />
+    </div>
+
+    <!--    查看-->
+    <detail ref="detailContract"></detail>
+
+    <!--付款登记-->
+    <paymentRegistration ref="paymentRegistration"></paymentRegistration>
+
+    <!--    合同签订-->
+    <contractSign ref="contractSign" @signSuccess="getContracts"></contractSign>
+
+    <!--    查看付款计划-->
+    <contractPaymentRegistration
+      ref="contractPaymentRegistration"
+    ></contractPaymentRegistration>
+  </div>
+</template>
+
+<script>
+import {
+  getContract,
+  addContrant,
+  delContract,
+  editorContract,
+} from "@/api/contract/contract";
+import { getparameter } from "@/api/system/dictionary";
+import { listdeptNoAuth } from "@/api/system/department";
+import { getBudget } from "@/api/budget/budget";
+import { getOatoken } from "@/api/oatoken";
+import { parseTime, deepCopy } from "@/utils";
+import { Message } from "element-ui";
+import { getInfo } from "@/api/user.js";
+
+import detail from "./components/detailContract";
+import paymentRegistration from "./components/paymentRegistration";
+import contractSign from "@/views/contract/components/contractSign";
+import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration";
+import pieChart from '@/views/dashboard/components/PieChart.vue'
+export default {
+  components: {
+    pieChart,
+    detail,
+    paymentRegistration,
+    contractSign,
+    contractPaymentRegistration,
+  },
+  data() {
+    var planPass = (rule, value, callback) => {
+      if (this.form.isBudget) {
+        if (this.form.plan.length === 0) {
+          return callback(new Error("必选"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    return {
+      pageTitle: "合同列表",
+      type: 0, //pageType 合同列表_0 和 履约保函收取登记_1 公用
+      userList: ["liuxiangyu", "zhushulan", "admin", "jiangjiao"],
+      window: {
+        width: 0,
+        height: 0,
+        top: 0,
+        left: 0,
+      },
+      hasEdit: false,
+      isShowPlanForSearch: false,
+      options: [
+        {
+          value: "",
+          label: "全部",
+        },
+        {
+          value: 1,
+          label: "待申请",
+        },
+        {
+          value: 2,
+          label: "流转中",
+        },
+        {
+          value: 3,
+          label: "已办结",
+        },
+      ],
+
+      //搜索
+      select: {
+        keyword: "",
+        showDatePicker: "",
+        pageIndex: 1,
+        startDate: "",
+        endDate: "",
+        type: "",
+        department_id: "",
+        purchaseModality: "",
+        purchaseMethods: "",
+        status: "",
+        year: "",
+        plan_id: "",
+        plan_name: "请选择预算计划",
+        start_plan_price: null,
+        end_plan_price: null,
+        assurance_status: 0,
+        start_assurance_money: null,
+        end_assurance_money: null,
+        showDatePickerBao: "",
+        start_assurance_expire: "",
+        end_assurance_expire: "",
+      },
+      selectCopy: {
+        keyword: "",
+        showDatePicker: "",
+        pageIndex: 1,
+        startDate: "",
+        endDate: "",
+        type: "",
+        department_id: "",
+        purchaseModality: "",
+        purchaseMethods: "",
+        status: "",
+        year: "",
+        plan_id: "",
+        plan_name: "请选择预算计划",
+        start_plan_price: null,
+        end_plan_price: null,
+        assurance_status: 0,
+        start_assurance_money: null,
+        end_assurance_money: null,
+        showDatePickerBao: "",
+        start_assurance_expire: "",
+        end_assurance_expire: "",
+      },
+      types: [
+        {
+          label: "服务",
+          value: 1,
+        },
+        {
+          label: "货物",
+          value: 2,
+        },
+        {
+          label: "工程",
+          value: 3,
+        },
+      ],
+      purchaseType: [], //购买形式
+      purchaseWay: [], //购买方式
+      moneyWay: [], //资金渠道
+      departments: [], //部门科室
+      list: [], //数据
+      total: 0,
+      //表格
+      table: [
+        {
+          label: "项目名称",
+          width: 340,
+          prop: "name",
+          fixed: "left",
+          align: "left",
+        },
+        {
+          label: "采购形式",
+          width: 120,
+          prop: "purchase_type.value",
+        },
+        {
+          label: "项目类型",
+          width: 120,
+          prop: "type",
+          formatter: (cell, data, value) => {
+            switch (value) {
+              case 1:
+                return "服务";
+                break;
+              case 2:
+                return "货物";
+                break;
+              case 3:
+                return "工程";
+                break;
+              default:
+                return "未知";
+            }
+          },
+        },
+        {
+          label: "采购流程",
+          multiHd: [
+            {
+              label: "请示流程",
+              width: 140,
+              prop: "req_status",
+              formatter: (cell, data, value) => {
+                if (cell.is_plan === 1) {
+                  return "无";
+                }
+                switch (value) {
+                  case 1:
+                    return "待申请";
+                    break;
+                  case 2:
+                    return "流转中";
+                    break;
+                  case 3:
+                    return "已办结";
+                    break;
+                  default:
+                    return "异常";
+                    break;
+                }
+              },
+            },
+            {
+              label: "采购业务审批流程",
+              width: 158,
+              prop: "purchase_status",
+              formatter: (cell, data, value) => {
+                switch (value) {
+                  case 1:
+                    return "待申请";
+                    break;
+                  case 2:
+                    return "流转中";
+                    break;
+                  case 3:
+                    return "已办结";
+                    break;
+                  default:
+                    return "异常";
+                    break;
+                }
+              },
+            },
+            {
+              label: "招标审核流程",
+              width: 145,
+              prop: "invite_status",
+              formatter: (cell, data, value) => {
+                if (cell.purchase_way?.remark === "false") {
+                  return "无";
+                }
+                switch (value) {
+                  case 1:
+                    return "待申请";
+                    break;
+                  case 2:
+                    return "流转中";
+                    break;
+                  case 3:
+                    return "已办结";
+                    break;
+                  default:
+                    return "异常";
+                    break;
+                }
+              },
+            },
+            {
+              label: "合同会签流程",
+              width: 145,
+              prop: "join_status",
+              formatter: (cell, data, value) => {
+                switch (value) {
+                  case 1:
+                    return "待申请";
+                    break;
+                  case 2:
+                    return "流转中";
+                    break;
+                  case 3:
+                    return "已办结";
+                    break;
+                  default:
+                    return "异常";
+                    break;
+                }
+              },
+            },
+          ],
+        },
+        {
+          label: "采购方式",
+          width: 120,
+          prop: "purchase_way.value",
+        },
+        {
+          label: "资金来源",
+          width: 120,
+          customFn: (row) => {
+            {
+              return row.money_way_detail.map((item) => {
+                return <div> {item.value} </div>;
+              });
+            }
+          },
+        },
+        {
+          label: "预算计划",
+          width: 320,
+          align: "left",
+          customFn: (row) => {
+            {
+              return row.plans.map((item) => {
+                return <div> {item.name} </div>;
+              });
+            }
+          },
+        },
+        {
+          label: "已申请金额(元)",
+          prop: "apply_money_total",
+          width: 140,
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+          },
+        },
+        {
+          label: "已付金额(元)",
+          prop: "fund_log_total",
+          width: 140,
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+          },
+        },
+        {
+          label: "支付占比",
+          width: 140,
+          customFn: (row) => {
+            let per =
+              ((row.fund_log_total / row.money || 0) * 100)?.toFixed(2) || 0;
+            return (
+              <div
+                style={{
+                  color: per > 110 ? "red" : "green",
+                }}
+              >
+                {" "}
+                {per} %
+              </div>
+            );
+          },
+        },
+        {
+          label: "合同预算价(元)",
+          width: 140,
+          prop: "plan_price",
+          align: "right",
+          formatter: (v1, v2, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+          },
+        },
+        {
+          label: "合同签订价(元)",
+          width: 140,
+          prop: "money",
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+          },
+        },
+        {
+          label: "合同状态",
+          width: 120,
+          prop: "status",
+          formatter: (cell, data, value) => {
+            switch (value) {
+              case 1:
+                return "待签订";
+                break;
+              case 2:
+                return "已签订";
+                break;
+              default:
+                return "未知";
+            }
+          },
+        },
+        {
+          label: "执行进度",
+          width: 120,
+          customFn: (row) => {
+            let rptChartData = {
+              xArr: ["预算合计金额", "预算已执行金额"],
+              radiusArr: "50%",
+              yArr: [
+                {
+                  value: row.money,
+                  name: "合同金额",
+                  label: {
+                    show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+                  },
+                  emphasis: {
+                    label: {
+                      show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+                    },
+                  },
+                },
+                { value: row.plan_price, name: "计划金额" },
+              ]
+            }
+            return (
+              <el-popover placement="left" width="250" trigger="click">
+                <div style="width: 100%;">
+                  <pieChart chart-data={rptChartData} width="200px"></pieChart>
+                </div>
+
+
+                <a style="color: #2e5384;text-decoration: underline;" slot="reference">查看</a>
+              </el-popover>
+            );
+          },
+        },
+        {
+          label: "结算状态",
+          width: 120,
+          prop: "is_end",
+          formatter: (cell, data, value) => {
+            return value === 0 ? "未结清" : "已结清";
+          },
+        },
+        {
+          label: "付款计划",
+          prop: "sign_plan_count",
+          width: 120,
+          formatter: (cell, data, value) => {
+            if (value == 0) return "暂无";
+            return value + "期";
+          },
+        },
+        {
+          label: "业务科室",
+          width: 140,
+          prop: "department.name",
+        },
+        {
+          label: "经办人",
+          width: 140,
+          prop: "admin.name",
+        },
+        {
+          label: "供应商/服务商",
+          width: 220,
+          prop: "supply",
+          align: "left",
+        },
+        {
+          label: "合同服务日期",
+          width: 200,
+          customFn: (row) => {
+            if (row.start_date && row.end_date) {
+              return (
+                <div>
+                  <span>
+                    {row.start_date} ~ {row.end_date}
+                  </span>
+                </div>
+              );
+            } else {
+              return <span></span>;
+            }
+          },
+        },
+        {
+          label: "签订日期",
+          width: 160,
+          prop: "date",
+          formatter: (cell, data, value) => {
+            if (value) return parseTime(new Date(value), "{y}-{m}-{d}");
+          },
+        },
+        {
+          label: "创建日期",
+          width: 160,
+          prop: "created_at",
+          formatter: (cell, data, value) => {
+            return parseTime(new Date(value), "{y}-{m}-{d}");
+          },
+        },
+      ],
+      //履约单表格
+      table1: [
+        {
+          label: "项目名称",
+          width: 340,
+          prop: "name",
+          fixed: "left",
+          align: "left",
+        },
+        {
+          label: "项目类型",
+          width: 120,
+          prop: "type",
+          formatter: (cell, data, value) => {
+            switch (value) {
+              case 1:
+                return "服务";
+                break;
+              case 2:
+                return "货物";
+                break;
+              case 3:
+                return "工程";
+                break;
+              default:
+                return "未知";
+            }
+          },
+        },
+        {
+          prop: "assurance_expire",
+          label: "保函有效期",
+          width: 180,
+        },
+        {
+          prop: "assurance_money",
+          label: "保函金额(元)",
+          width: 180,
+        },
+        {
+          prop: "supply",
+          label: "承包商/供应商",
+          width: 200,
+          align: "left",
+        },
+        {
+          label: "业务科室",
+          width: 140,
+          prop: "department.name",
+        },
+        {
+          label: "经办人",
+          width: 140,
+          prop: "admin.name",
+        },
+      ],
+      //总计
+      tableTotal: {
+        fundLogTotal: 0,
+        moneyTotal: 0,
+        planPriceTotal: 0,
+      },
+
+      planTypes: [],
+      planTableSearch: [
+        {
+          label: "分类",
+          prop: "type",
+          formatter: (cell, data, value) => {
+            let res = this.moneyWay.filter((item) => {
+              return item.id === value;
+            });
+            return res[0]?.value || "未知";
+          },
+        },
+        {
+          label: "年份",
+          prop: "year",
+          align: "center",
+        },
+        {
+          label: "名称",
+          prop: "name",
+          align: "left",
+        },
+        {
+          label: "计划金额",
+          prop: "money",
+          align: "right",
+        },
+      ],
+      planTable: [
+        {
+          width: 36,
+          sortable: false,
+          type: "selection",
+          fixed: "left",
+        },
+        {
+          label: "分类",
+          prop: "type",
+          formatter: (cell, data, value) => {
+            let res = this.moneyWay.filter((item) => {
+              return item.id === value;
+            });
+            return res[0]?.value || "未知";
+          },
+          width: 100,
+          fixed: "left",
+        },
+
+        {
+          label: "科室",
+          prop: "plan_department.name",
+          width: 100,
+          align: "center",
+        },
+        {
+          label: "年份",
+          prop: "year",
+          width: 80,
+          align: "center",
+        },
+        {
+          label: "名称",
+          prop: "name",
+          width: 320,
+          align: "left",
+        },
+        {
+          label: "计划金额",
+          prop: "money",
+          align: "right",
+          width: 120,
+        },
+      ],
+
+      //新增
+      isShowAdd: false,
+      form: {
+        name: "",
+        type: "",
+        methods: "",
+        modality: "",
+        price: "",
+        fundingChannels: [],
+        isBudget: true,
+        plan: [],
+      },
+      plan: [],
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "必填",
+          },
+        ],
+        type: [
+          {
+            required: true,
+            message: "必选",
+          },
+        ],
+        methods: [
+          {
+            required: true,
+            message: "必选",
+          },
+        ],
+        modality: [
+          {
+            required: true,
+            message: "必选",
+          },
+        ],
+        price: [
+          {
+            required: true,
+            message: "必填",
+          },
+          {
+            pattern: /^\d+(\.\d+)?$/,
+            message: "必须为数字",
+          },
+        ],
+        fundingChannels: [
+          {
+            required: true,
+            message: "必填",
+          },
+        ],
+        plan: [
+          {
+            validator: planPass,
+            trigger: "change",
+          },
+        ],
+      },
+      isShowPlan: false, //新增中预算计划
+      plans: [], //预算数据
+      planSearch: {
+        name: "",
+        plan_department_id: "",
+      },
+      planTotal: 0,
+      plansPageIndex: 1,
+
+      isShowEditor: false,
+    };
+  },
+  created() {
+    let type = parseInt(this.$route.path.split("_")[1]);
+    this.type = type;
+    this.pageTitle = type == 1 ? "履约保函收取登记" : "合同列表";
+    if (type == 1) {
+      this.select.is_assurance = 1;
+    }
+  },
+  methods: {
+    reset() {
+      this.select = deepCopy(this.selectCopy);
+    },
+    searchContracts() {
+      this.select.pageIndex = 1;
+      this.getContracts();
+    },
+    clearSelectForSearch() {
+      this.select.plan_id = "";
+      this.select.plan_name = "请选择预算计划";
+    },
+    async getPlanTypes() {
+      const res = await getparameter({
+        number: "money_way",
+      });
+      this.planTypes = res.detail;
+      console.log(this.planTypes);
+    },
+
+    //预算计划金额输入
+    planInput(e, row) {
+      if (!/^[0-9]+.?[0-9]*$/.test(e) && e) {
+        Message({
+          type: "warning",
+          message: "金额格式错误",
+        });
+        row.useMoney = 0;
+        return;
+      }
+      if (e <= Number(row.money) - Number(row.use_money_total)) {
+        row.useMoney = e;
+        this.plan.forEach((item) => {
+          if (item.value.plan_id == row.id) {
+            item.value.use_money = e;
+          }
+        });
+        return;
+      }
+      Message({
+        type: "warning",
+        message: "使用金额大于剩余预算",
+      });
+      row.useMoney = 0;
+    },
+    //合计
+    summary(param) {
+      this.$nextTick(() => {
+        this.$refs["xyTable"].$children[0].doLayout();
+      });
+      const { columns, data } = param;
+      const sums = [];
+      columns.map((column, index) => {
+        if (index === 0) {
+          sums[index] = "总计";
+          return;
+        }
+        if (column.property === "fund_log_total") {
+          sums[index] = this.tableTotal.fundLogTotal;
+          return;
+        }
+        if (column.property === "plan_price") {
+          sums[index] = this.tableTotal.planPriceTotal;
+          return;
+        }
+        if (column.property === "money") {
+          sums[index] = this.tableTotal.moneyTotal;
+          return;
+        }
+
+        // const values = data.map(item => Number(item[column.property]));
+        // if (!values.every(value => isNaN(value)) && (column.property === 'money' || column.property === 'plan_price'|| column.property === 'fund_log_total')) {
+        //
+        //   sums[index] = sums[index].toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+        // } else {
+        //   sums[index] = '';
+        // }
+      });
+
+      return sums;
+    },
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "req_status") {
+        if (row.is_plan === 1) {
+          return {
+            color: "rgb(140,140,140)",
+          };
+        }
+        switch (row.req_status) {
+          case 1:
+            return {
+              color: "rgb(96,109,241)",
+            };
+            break;
+          case 2:
+            return {
+              color: "rgb(219,122,122)",
+            };
+            break;
+          case 3:
+            return {
+              color: "rgb(147,201,134)",
+            };
+            break;
+          default:
+            return {
+              color: "rgb(220,185,126)",
+            };
+        }
+      }
+      if (column.property === "purchase_status") {
+        switch (row.purchase_status) {
+          case 1:
+            return {
+              color: "rgb(96,109,241)",
+            };
+            break;
+          case 2:
+            return {
+              color: "rgb(219,122,122)",
+            };
+            break;
+          case 3:
+            return {
+              color: "rgb(147,201,134)",
+            };
+            break;
+          default:
+            return {
+              color: "rgb(220,185,126)",
+            };
+        }
+      }
+      if (column.property === "invite_status") {
+        if (row.purchase_way?.remark === "false") {
+          return {
+            color: "rgb(140,140,140)",
+          };
+        }
+        switch (row.invite_status) {
+          case 1:
+            return {
+              color: "rgb(96,109,241)",
+            };
+            break;
+          case 2:
+            return {
+              color: "rgb(219,122,122)",
+            };
+            break;
+          case 3:
+            return {
+              color: "rgb(147,201,134)",
+            };
+            break;
+          default:
+            return {
+              color: "rgb(220,185,126)",
+            };
+        }
+      }
+      if (column.property === "join_status") {
+        switch (row.join_status) {
+          case 1:
+            return {
+              color: "rgb(96,109,241)",
+            };
+            break;
+          case 2:
+            return {
+              color: "rgb(219,122,122)",
+            };
+            break;
+          case 3:
+            return {
+              color: "rgb(147,201,134)",
+            };
+            break;
+          default:
+            return {
+              color: "rgb(220,185,126)",
+            };
+        }
+      }
+    },
+    confirmPlanForSearch() {
+      this.isShowPlanForSearch = false;
+      this.getContracts();
+    },
+
+    //点击付款计划查看
+    showPaymentPlan(row, column, cell) {
+      if (column.property === "sign_plan_count") {
+        this.$refs["contractPaymentRegistration"].getSignPlan(row.id);
+        row.status === 2
+          ? (this.$refs["contractPaymentRegistration"].isSign = true)
+          : (this.$refs["contractPaymentRegistration"].isSign = false);
+        this.$refs["contractPaymentRegistration"].isShow = true;
+      }
+      if (column.property === "fund_log_total") {
+        this.$router.push(
+          `/contract/paymentRegistrationList?contractId=${row.id}`
+        );
+      }
+    },
+    //招标文件审查
+    async bidding(row) {
+      let baseInfo = {
+        项目名称: row?.name,
+        "项目预算（元）": row?.plan_price,
+      };
+      let res = await getOatoken();
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/27?oatoken=${
+        res.oatoken
+      }&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`;
+      let bidding = window.open(
+        url,
+        "bidding",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
+    },
+
+    //采购流程
+    async buyProcess(row) {
+      let baseInfo = {
+        项目名称: row?.name,
+        采购形式: row?.purchase_type?.value,
+        采购方式: row?.purchase_way?.value,
+        项目类型: this.types.filter((item) => {
+          return item.value === row.type;
+        })[0]?.label,
+        资金渠道: row?.money_way?.value,
+        "项目预算（元）": row?.plan_price,
+      };
+      let res = await getOatoken();
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/2?oatoken=${
+        res.oatoken
+      }&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`;
+      let buyProcess = window.open(
+        url,
+        "buyProcess",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
+    },
+    //会签流程
+    async signProcess(row) {
+      let baseInfo = {
+        合同名称: row?.name,
+        执行部门: row?.carry_department,
+        "合同金额（元）": row?.money,
+        //"承包商\\供应商":row.supply
+      };
+      let res = await getOatoken();
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/3?oatoken=${
+        res.oatoken
+      }&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`;
+      let signProcess = window.open(
+        url,
+        "signProcess",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
+    },
+    //请示流程
+    async askProcess(row) {
+      let res = await getOatoken();
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/17?oatoken=${res.oatoken}&out_contract_id=${row.id}`;
+      let askProcess = window.open(
+        url,
+        "askProcess",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
+    },
+
+    //防抖
+    debounce(fn, delay = 500) {
+      let timer = null;
+      return function _debounce() {
+        if (timer) clearTimeout(timer);
+        timer = setTimeout(() => {
+          fn();
+        }, delay);
+      };
+    },
+
+    //翻页
+    pageChange(e) {
+      this.select.pageIndex = e;
+      this.getContracts();
+    },
+    planPageChange(e) {
+      this.plansPageIndex = e;
+      this.getBudgets();
+    },
+    //日期选择
+    datePick(e) {
+      this.select.start_created_at = e[0];
+      this.select.end_created_at = e[1];
+    },
+
+    //日期选择
+    datePickBao(e) {
+      this.select.start_assurance_expire = e[0];
+      this.select.end_assurance_expire = e[1];
+    },
+    //获取预算计划
+    async getBudgets() {
+      let res = await getBudget({
+        name: this.planSearch.name,
+        page_size: 10,
+        page: this.plansPageIndex,
+        plan_department_id: this.planSearch.plan_department_id,
+      });
+      this.plans = res.list.data;
+      this.planTotal = res.list.total;
+    },
+    //获取资金渠道
+    async getMoneyWay() {
+      this.moneyWay = (
+        await getparameter({
+          number: "money_way",
+        })
+      ).detail;
+    },
+    //获取购买方式
+    async getPurchaseWay() {
+      this.purchaseWay = (
+        await getparameter({
+          number: "purchase_way",
+        })
+      ).detail;
+    },
+    //获取科室
+    async getDepartment() {
+      this.departments = await listdeptNoAuth();
+    },
+    //获取购买形式列表
+    async getPurchaseType() {
+      this.purchaseType = (
+        await getparameter({
+          number: "purchase_type",
+        })
+      ).detail;
+    },
+    pageSizeChange(e) {
+      this.select.pageSize = e;
+      this.select.pageIndex = 1;
+      this.getContracts();
+    },
+    //获取合同列表
+    async getContracts() {
+      const res = await getContract({
+        page_size: this.select.pageSize,
+        page: this.select.pageIndex,
+        ...this.select,
+      });
+
+      this.list = res.list.data;
+      this.total = res.list.total;
+      this.tableTotal.fundLogTotal = res.fund_log_total;
+      this.tableTotal.moneyTotal = Number(res.money_total)
+        .toFixed(2)
+        .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+      this.tableTotal.planPriceTotal = Number(res.plan_price_total)
+        .toFixed(2)
+        .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+    },
+
+    //新建合同
+    //显示
+    async showPlan() {
+      this.isShowPlan = true;
+      await this.getBudgets();
+      this.toggleSelection(
+        this.form.plan.map((item) => {
+          return item.value.plan_id;
+        })
+      );
+    },
+    async showPlanForSearch() {
+      this.isShowPlanForSearch = true;
+      await this.getBudgets();
+    },
+    //选择计划 搜索
+    selectPlanForSearch(sel) {
+      console.log(sel);
+      if (sel) {
+        this.select.plan_id = sel.id;
+        this.select.plan_name = sel.name;
+      } else {
+        this.select.plan_id = "";
+        this.select.plan_name = "";
+      }
+    },
+    //选择计划
+    selectPlan(sel, row) {
+      console.log(sel);
+      if (sel) {
+        this.plan = sel.map((item) => {
+          return {
+            label: item.name,
+            value: {
+              plan_id: item.id,
+              use_money: item.useMoney,
+              new_money: item.money,
+            },
+          };
+        });
+      } else {
+        this.plan = [];
+      }
+    },
+    //确认计划选择
+    planSelect() {
+      if (this.plan.length === 0) {
+        Message({
+          type: "warning",
+          message: "选择计划不能为空",
+        });
+        return;
+      }
+      for (let item of this.plan) {
+        console.log(item);
+        if (!item.value.use_money) {
+          Message({
+            type: "warning",
+            message: "金额不能为空",
+          });
+          return;
+        }
+      }
+      this.form.plan = this.plan;
+      this.isShowPlan = false;
+    },
+
+    //确认计划选择搜索
+    planSelectForSearch() {
+      if (this.select.plan_id == "") {
+        Message({
+          type: "warning",
+          message: "选择计划不能为空",
+        });
+        return;
+      }
+      this.isShowPlanForSearch = false;
+    },
+    //默认选择计划
+    toggleSelection(plans) {
+      if (plans) {
+        this.plans
+          .filter((plan) => {
+            if (plans.includes(plan.id)) {
+              plan.useMoney =
+                this.form.plan[plans.indexOf(plan.id)].value.use_money;
+              return true;
+            }
+          })
+          .map((row) => {
+            this.$refs.planTable.toggleRowSelection(row);
+          });
+      } else {
+        this.$refs.planTable.clearSelection();
+      }
+    },
+    delPlan(val) {
+      this.form.plan.map((item, index) => {
+        if (item.value.plan_id === val.value.plan_id) {
+          this.form.plan.splice(index, 1);
+        }
+      });
+    },
+    //提交新建
+    submit() {
+      addContrant({
+        type: this.form.type,
+        is_plan: this.form.isBudget ? 1 : 0,
+        purchase_type_id: this.form.methods,
+        purchase_way_id: this.form.modality,
+        money_way_id: `${this.form.fundingChannels.toString()}`,
+        plan_price: this.form.price,
+        name: this.form.name,
+        contract_plan_links: this.form.plan.map((item) => {
+          return item.value;
+        }),
+      }).then((res) => {
+        this.isShowAdd = false;
+        Message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.$refs["addContract"].reset();
+        this.$refs["planTable"].clearSelection();
+        this.getContracts();
+      });
+    },
+
+    //删除合同
+    deleteContract(id) {
+      delContract({
+        id,
+      }).then((res) => {
+        Message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.getContracts();
+      });
+    },
+    switchAssurance(id, status) {
+      let message =
+        status == 1 ? "确认履约保函状态已收取?" : "确认履约保函状态未收取?";
+      this.$confirm(message, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          editorContract({
+            id: id,
+            assurance_status: status,
+          }).then((res) => {
+            Message({
+              type: "success",
+              message: "操作成功",
+            });
+            this.getContracts();
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+  },
+  mounted() {
+    this.window.width = screen.availWidth * 0.95;
+    this.window.height = screen.availHeight * 0.95;
+    this.window.top = (window.screen.height - 30 - this.window.height) / 2;
+    this.window.left = (window.screen.width - 10 - this.window.width) / 2;
+    let that = this;
+    getInfo()
+      .then((response) => {
+        console.log(response);
+        this.user = response;
+
+        if (that.userList.indexOf(response.username) != -1) {
+          that.hasEdit = true;
+        }
+      })
+      .catch((error) => {});
+    this.getPurchaseType();
+    this.getContracts();
+    this.getDepartment();
+    this.getPurchaseWay();
+    this.getMoneyWay();
+    //页面激活后刷新合同列表
+  },
+  destroyed() {
+    window.onfocus = null;
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.selects {
+  display: flex;
+  flex-wrap: wrap;
+
+  & > div {
+    margin-bottom: 6px;
+  }
+}
+
+.selectTop {
+  margin-top: 10px;
+}
+
+.contract-add-plan {
+  min-height: 30px;
+  border: 1px solid #dcdee2;
+  border-radius: 4px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+
+  padding: 0 8px;
+
+  &-no-plan {
+    height: 30px;
+    line-height: 30px;
+    color: #cdd0d5;
+  }
+}
+
+.slot-btns {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: center;
+  justify-content: flex-start;
+
+  &-item {
+    margin: 0 6px 4px 0;
+  }
+}
+
+.xy-table-item-label {
+  width: 140px;
+}
+
+.xy-table-item-price {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    right: 0;
+    top: 0;
+    content: "（元）";
+  }
+}
+
+.select-content {
+  display: flex;
+  flex-wrap: wrap;
+
+  & > div {
+    flex-basis: 45%;
+
+    margin: 5px;
+
+    & > span:nth-child(1) {
+      display: inline-block;
+      width: 140px;
+    }
+  }
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 1cf8f59..9d96833 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,588 +1,696 @@
-<template>
-  <div class="app-container">
-    <div style="display: flex;justify-content: space-between;align-items: center;">
-      <span>当前登录人：{{user.name}}
-      </span>
-
-      <el-button type="primary">统计设置</el-button>
-    </div>
-
-<el-row :gutter="20">
-  <el-col :span="16">
-  <el-card class="box-card" style="margin: 20px 0;">
-      <div slot="header" class="clearfix">
-        <span>预算总体进展情况</span>
-        <DatePicker :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;float: right;"
-          type="year" @on-change="changeYear"></DatePicker>
-      </div>
-      <router-link :to="`/statisticalReport/budgetProgress`">
-        <div class="progress-card">
-          <div class="progress-card-item">
-            <div class="progress-card-item__num">
-              {{moneyFormat(statistic.progress ? statistic.progress.money_total_1 : 0)}}</div>
-            <div class="progress-card-item__label">年初预算合计金额</div>
-          </div>
-          <div class="progress-card-item">
-            <div class="progress-card-item__num">
-              {{moneyFormat(statistic.progress ? statistic.progress.money_total_2 : 0)}}</div>
-            <div class="progress-card-item__label">调整后预算合计金额</div>
-          </div>
-          <div class="progress-card-item">
-            <div class="progress-card-item__num">
-              {{moneyFormat(statistic.progress? statistic.progress.use_money_total : 0)}}</div>
-            <div class="progress-card-item__label">已支付金额</div>
-          </div>
-          <div class="progress-card-item">
-            <div class="progress-card-item__num">
-              {{toper(statistic.progress ? statistic.progress.money_total_1 : 0,statistic.progress ? statistic.progress.money_total_2 : 0,statistic.progress? statistic.progress.use_money_total : 0)}}%
-            </div>
-            <div class="progress-card-item__label">进展率</div>
-          </div>
-        </div>
-      </router-link>
-    </el-card>
-
-    <div ref="lxHeader">
-      <LxHeader icon="iconfont/icon--kucunguanli" text="待办事项" :custom="true" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-        <div slot="content" />
-        <slot>
-          <div></div>
-        </slot>
-      </LxHeader>
-    </div>
-    <div class="table-tree">
-      <el-table :data="list" border class="v-table" style="width: 100%;margin-bottom: 20px;">
-        <el-table-column type="index" label="序号" align="center" />
-        <el-table-column prop="type" width="100" label="类型" align="center" :formatter="typeFormatter" />
-        <el-table-column prop="content" label="内容" align="left" />
-        <el-table-column prop="created_at" width="200" label="下发时间" align="center" :formatter="timeFormatter" />
-        <el-table-column width="100" label="状态" align="center" prop="read_count">
-          <template slot-scope="{row, $index}">
-            <el-link v-if="row.read_count" type="success" :underline="false">已读</el-link>
-            <Button v-else type="error" size="small" style="margin-left: 10px;" ghost
-              @click="readIt(row, $index)">未读</Button>
-          </template>
-        </el-table-column>
-        <el-table-column width="90" header-align="center" label="操作" align="center">
-          <template slot-scope="{row, $index}">
-            <Button type="primary" size="small" style="margin-left: 10px;" ghost @click="toContract(row)">查看</Button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div style="display: flex;justify-content: flex-end;">
-        <Page :total="total" show-elevator @on-change="pageChange" />
-      </div>
-    </div>
-
-   </el-col>
-  <el-col :span="8">
-    <el-card class="box-card" style="margin: 20px 0;">
-
-    <div class="text item">
-                  <pie-chart :chartData="rptChartData"></pie-chart>
+<template>
+  <div class="app-container">
+    <div
+      style="display: flex; justify-content: space-between; align-items: center"
+    >
+      <span>当前登录人：{{ user.name }} </span>
+
+      <el-button type="primary">统计设置</el-button>
+    </div>
+
+    <el-row :gutter="20">
+      <el-col :span="16">
+        <el-card class="box-card" style="margin: 20px 0">
+          <div slot="header" class="clearfix">
+            <span>预算总体进展情况</span>
+            <DatePicker
+              :value="select.year"
+              placeholder="选择所属年份"
+              placement="bottom"
+              style="width: 130px; float: right"
+              type="year"
+              @on-change="changeYear"
+            ></DatePicker>
+          </div>
+          <router-link :to="`/statisticalReport/budgetProgress`">
+            <div class="progress-card">
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_1 : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">年初预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress ? statistic.progress.money_total_2 : 0
+                    )
+                  }}
                 </div>
+                <div class="progress-card-item__label">调整后预算合计金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    moneyFormat(
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}
+                </div>
+                <div class="progress-card-item__label">已支付金额</div>
+              </div>
+              <div class="progress-card-item">
+                <div class="progress-card-item__num">
+                  {{
+                    toper(
+                      statistic.progress ? statistic.progress.money_total_1 : 0,
+                      statistic.progress ? statistic.progress.money_total_2 : 0,
+                      statistic.progress
+                        ? statistic.progress.use_money_total
+                        : 0
+                    )
+                  }}%
+                </div>
+                <div class="progress-card-item__label">进展率</div>
+              </div>
+            </div>
+          </router-link>
+        </el-card>
+
+        <div ref="lxHeader">
+          <LxHeader
+            icon="iconfont/icon--kucunguanli"
+            text="待办事项"
+            :custom="true"
+            style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+          >
+            <div slot="content" />
+            <slot>
+              <div></div>
+            </slot>
+          </LxHeader>
+        </div>
+        <div class="table-tree">
+          <el-table
+            :data="list"
+            border
+            class="v-table"
+            style="width: 100%; margin-bottom: 20px"
+          >
+            <el-table-column type="index" label="序号" align="center" />
+            <el-table-column
+              prop="type"
+              width="100"
+              label="类型"
+              align="center"
+              :formatter="typeFormatter"
+            />
+            <el-table-column prop="content" label="内容" align="left" />
+            <el-table-column
+              prop="created_at"
+              width="200"
+              label="下发时间"
+              align="center"
+              :formatter="timeFormatter"
+            />
+            <el-table-column
+              width="100"
+              label="状态"
+              align="center"
+              prop="read_count"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-link v-if="row.read_count" type="success" :underline="false"
+                  >已读</el-link
+                >
+                <Button
+                  v-else
+                  type="error"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="readIt(row, $index)"
+                  >未读</Button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              width="90"
+              header-align="center"
+              label="操作"
+              align="center"
+            >
+              <template slot-scope="{ row, $index }">
+                <Button
+                  type="primary"
+                  size="small"
+                  style="margin-left: 10px"
+                  ghost
+                  @click="toContract(row)"
+                  >查看</Button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div style="display: flex; justify-content: flex-end">
+            <Page :total="total" show-elevator @on-change="pageChange" />
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <el-card class="box-card" style="margin: 20px 0">
+          <div class="text item">
+            <pie-chart :chartData="rptChartData"></pie-chart>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <div class="demo-split">
+      <Split v-model="split" style="height: 440px">
+        <template #left>
+          <div class="demo-split-pane" style="padding-right: 5px">
+            <div ref="lxHeader" v-if="statistic.departmentList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="科室进展情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.departmentList"
+                      :table-item="departmentTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+        <template #right>
+          <div class="demo-split-pane" style="padding-left: 10px">
+            <div ref="lxHeader" v-if="statistic.typeList">
+              <LxHeader
+                icon="iconfont/icon--kucunguanli"
+                text="预算类型进展情况"
+                :custom="true"
+                style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+              >
+                <div slot="content" />
+                <slot>
+                  <div style="width: 100%">
+                    <xy-table
+                      :height="380"
+                      :list="statistic.typeList"
+                      :table-item="typeTable"
+                    >
+                      <template v-slot:btns>
+                        <el-table-column
+                          :width="80"
+                          fixed="right"
+                          label="操作"
+                          header-align="center"
+                          align="center"
+                        >
+                          <template slot-scope="scope">
+                            <router-link
+                              :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`"
+                              >查看
+                            </router-link>
+                          </template>
+                        </el-table-column>
+                      </template>
+                    </xy-table>
+                  </div>
+                </slot>
+              </LxHeader>
+            </div>
+          </div>
+        </template>
+      </Split>
+    </div>
+
+    <detailContract ref="detailContract"></detailContract>
+  </div>
+</template>
+
+<script>
+import detailContract from "@/views/contract/components/detailContract";
+import LxHeader from "@/components/LxHeader/index.vue";
+import Pagination from "@/components/Pagination";
+import PieChart from "./components/PieChart.vue";
+import { adminDepartmentList } from "../../api/system/department.js";
+import { adminUserList, getInfo } from "../../api/user.js";
+import { getNotice, readNotice, statistic } from "@/api/dashboard/notice";
+import { parseTime, moneyFormatter } from "@/utils/index";
+import { Message } from "element-ui";
+export default {
+  name: "Manage",
+  components: {
+    LxHeader,
+    Pagination,
+    detailContract,
+    PieChart,
+  },
+  data() {
+    return {
+      value2: 12,
+      split: 0.5,
+      rptChartData: [],
+      select: {
+        year: "",
+      },
+      statistic: "",
+      department_id: [],
+      userIds: [],
+      list: [],
+      total: 0,
+      pageIndex: 1,
+      // listQuery: {
+      //   page: 1,
+      //   page_size: 10,
+      //   show_self: 1,
+      // },
+      form: {
+        id: undefined,
+      },
+      dialogFormVisible: false,
+      departmentTree: [],
+      userList: [],
+      formLabelWidth: "200px",
+      user: {},
+
+      departmentProgress: [],
+      departmentTable: [
+        {
+          label: "科室",
+          minWidth: 180,
+          prop: "plan_department.name",
+          sortable: false,
+          align: "left",
+          fixed: "left",
+        },
+        {
+          label: "进展情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row?.money_total_2;
+            let m1 = row?.money_total_1;
+            let m3 = row?.use_money_total;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 120,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+      ],
+      typeTable: [
+        {
+          label: "预算类别",
+          width: 100,
+          prop: "type_text",
+          sortable: false,
+          fixed: "left",
+        },
+        {
+          label: "进展情况",
+          sortable: false,
+          minWidth: 220,
+          align: "left",
+          fixed: "right",
+          customFn: (row) => {
+            let m2 = row.money_total_2;
+            let m1 = row.money_total_1;
+            let m3 = row.use_money_total;
+            let per = 0;
+
+            if (m2 != 0) {
+              per = ((m3 / m2) * 100).toFixed(2);
+            } else if (m1 != 0) {
+              per = ((m3 / m1) * 100).toFixed(2);
+            }
+            return (
+              <div>
+                <el-progress percentage={Number(per)}> </el-progress>{" "}
+              </div>
+            );
+          },
+        },
+        {
+          label: "年初预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_1",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "调整后预算合计金额(元)",
+          width: 260,
+          align: "right",
+          sortable: false,
+          prop: "money_total_2",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "已使用(元)",
+          width: 140,
+          align: "right",
+          sortable: false,
+          prop: "use_money_total",
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+      ],
+    };
+  },
+  created() {
+    this.select.year = this.$moment().format("YYYY");
+    this.getNotices();
 
-                </el-card>
-                </el-col>
-</el-row>
-
-
-    <div class="demo-split">
-      <Split v-model="split" style="height: 440px;">
-        <template #left>
-          <div class="demo-split-pane" style="padding-right: 5px;">
-            <div ref="lxHeader" v-if="statistic.departmentList">
-              <LxHeader icon="iconfont/icon--kucunguanli" text="科室进展情况" :custom="true" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-                <div slot="content" />
-                <slot>
-                  <div style="width: 100%">
-                    <xy-table :height="380" :list="statistic.departmentList" :table-item="departmentTable">
-                      <template v-slot:btns>
-                        <el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
-                          <template slot-scope="scope">
-                            <router-link
-                              :to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`">查看
-                            </router-link>
-                          </template>
-                        </el-table-column>
-                      </template>
-                    </xy-table>
-                  </div>
-                </slot>
-              </LxHeader>
-            </div>
-          </div>
-        </template>
-        <template #right>
-          <div class="demo-split-pane" style="padding-left: 10px;">
-            <div ref="lxHeader" v-if="statistic.typeList">
-              <LxHeader icon="iconfont/icon--kucunguanli" text="预算类型进展情况" :custom="true" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-                <div slot="content" />
-                <slot>
-                  <div style="width: 100%">
-                    <xy-table :height="380" :list="statistic.typeList" :table-item="typeTable">
-                      <template v-slot:btns>
-                        <el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
-                          <template slot-scope="scope">
-                            <router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看
-                            </router-link>
-                          </template>
-                        </el-table-column>
-                      </template>
-                    </xy-table>
-                  </div>
-                </slot>
-              </LxHeader>
-            </div>
-          </div>
-        </template>
-      </Split>
-
-
-    </div>
-
-    <detailContract ref="detailContract"></detailContract>
-  </div>
-</template>
-
-<script>
-  import detailContract from "@/views/contract/components/detailContract"
-  import LxHeader from '@/components/LxHeader/index.vue'
-  import Pagination from '@/components/Pagination'
-  import PieChart from "./components/PieChart.vue"
-  import {
-    adminDepartmentList
-  } from '../../api/system/department.js'
-  import {
-    adminUserList,
-    getInfo
-  } from '../../api/user.js'
-  import {
-    getNotice,
-    readNotice,
-    statistic
-  } from "@/api/dashboard/notice"
-  import {
-    parseTime,
-    moneyFormatter
-  } from "@/utils/index"
-  import {
-    Message
-  } from "element-ui";
-  export default {
-    name: 'Manage',
-    components: {
-      LxHeader,
-      Pagination,
-      detailContract,
-      PieChart
-    },
-    data() {
-      return {
-        value2: 12,
-        split: 0.5,
-        rptChartData: [],
-        select: {
-          year: ''
-        },
-        statistic: '',
-        department_id: [],
-        userIds: [],
-        list: [],
-        total: 0,
-        pageIndex: 1,
-        // listQuery: {
-        //   page: 1,
-        //   page_size: 10,
-        //   show_self: 1,
-        // },
-        form: {
-          id: undefined,
-        },
-        dialogFormVisible: false,
-        departmentTree: [],
-        userList: [],
-        formLabelWidth: '200px',
-        user: {},
-
-        departmentProgress: [],
-        departmentTable: [{
-            label: '科室',
-            minWidth: 180,
-            prop: 'plan_department.name',
-            sortable: false,
-            align:"left",
-            fixed: "left"
-          },
-          {
-            label: '进展情况',
-            sortable: false,
-            minWidth: 220,
-            align: 'left',
-            fixed: "right",
-            customFn: (row) => {
-              let m2 = row?.money_total_2;
-              let m1 = row?.money_total_1;
-              let m3 = row?.use_money_total;
-              let per = 0;
-
-              if (m2 != 0) {
-                per = ((m3 / m2) * 100).toFixed(2);
-              } else if (m1 != 0) {
-                per = ((m3 / m1) * 100).toFixed(2);
-              }
-              return ( < div >
-                <el-progress percentage = {
-                  Number(per)
-                }> </el-progress> </div >
-              )
-            }
-          },
-          {
-            label: '年初预算合计金额(元)',
-            width: 260,
-            align: 'right',
-            sortable: false,
-            prop: 'money_total_1',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
-          {
-            label: '调整后预算合计金额(元)',
-            width: 260,
-            align: 'right',
-            sortable: false,
-            prop: 'money_total_2',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
-          {
-            label: '已使用(元)',
-            width: 120,
-            align: 'right',
-            sortable: false,
-            prop: 'use_money_total',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          }
-        ],
-        typeTable: [{
-            label: '预算类别',
-            width: 100,
-            prop: 'type_text',
-            sortable: false,
-            fixed: "left",
-          },
-          {
-            label: '进展情况',
-            sortable: false,
-            minWidth: 220,
-            align: 'left',
-            fixed: "right",
-            customFn: (row) => {
-              let m2 = row.money_total_2;
-              let m1 = row.money_total_1;
-              let m3 = row.use_money_total;
-              let per = 0;
-
-              if (m2 != 0) {
-                per = ((m3 / m2) * 100).toFixed(2);
-              } else if (m1 != 0) {
-                per = ((m3 / m1) * 100).toFixed(2);
-              }
-              return ( < div >
-                <el-progress percentage = {
-                  Number(per)
-                }> </el-progress> </div >
-              )
-            }
-          },
-          {
-            label: '年初预算合计金额(元)',
-            width: 260,
-            align: 'right',
-            sortable: false,
-            prop: 'money_total_1',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
-          {
-            label: '调整后预算合计金额(元)',
-            width: 260,
-            align: 'right',
-            sortable: false,
-            prop: 'money_total_2',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
-          {
-            label: '已使用(元)',
-            width: 140,
-            align: 'right',
-            sortable: false,
-            prop: 'use_money_total',
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
-          },
-        ]
-      }
-    },
-    created() {
-      this.select.year = this.$moment().format('YYYY');
-      this.getNotices();
-
-      this.getStatistic();
-
-      getInfo().then(response => {
-        console.log(response)
-        this.user = response
-      }).catch(error => {})
-    },
-    methods: {
-      changeYear(e) {
-        this.select.year = e;
-        this.getStatistic()
-
-      },
-      async getStatistic() {
-        const res = await statistic(this.select)
-        console.log(res)
-        this.statistic = res;
-
-        this.rptChartData = {
-          xArr: ["预算合计金额","预算已执行金额"],
-          radiusArr: '50%',
-          yArr: [{ value: res.progress.money_total_1, name: '预算合计金额',
-          label:{
-            show:false//这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+    this.getStatistic();
+
+    getInfo()
+      .then((response) => {
+        console.log(response);
+        this.user = response;
+      })
+      .catch((error) => {});
+  },
+  methods: {
+    changeYear(e) {
+      this.select.year = e;
+      this.getStatistic();
+    },
+    async getStatistic() {
+      const res = await statistic(this.select);
+      console.log(res);
+      this.statistic = res;
+
+      this.rptChartData = {
+        xArr: ["预算合计金额", "预算已执行金额"],
+        radiusArr: "50%",
+        yArr: [
+          {
+            value: res.progress.money_total_1,
+            name: "预算合计金额",
+            label: {
+              show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+            },
+            emphasis: {
+              label: {
+                show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
+              },
+            },
           },
-          emphasis:{
-                        label:{
-                            show:false//这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
-                        }
-                    } },
-          { value: res.progress.use_money_total, name: '预算已执行金额' }]
+          { value: res.progress.use_money_total, name: "预算已执行金额" },
+        ],
+      };
+    },
+
+    toContract(row) {
+      this.$refs["detailContract"].getDetail(row.contract_id);
+      this.$refs["detailContract"].isShowDetail = true;
+    },
+
+    pageChange(e) {
+      this.pageIndex = e;
+      this.getNotices();
+    },
+
+    timeFormatter(cell, data, value) {
+      return parseTime(new Date(value));
+    },
+    typeFormatter(cell, data, value) {
+      return value === 1 ? "合同流程" : "付款计划";
+    },
+    toper(m1, m2, m3) {
+      if (m2 != 0) {
+        return ((m3 / m2) * 100).toFixed(2);
+      } else if (m1 != 0) {
+        return ((m3 / m1) * 100).toFixed(2);
+      } else return 0;
+    },
+    async getNotices() {
+      const res = await getNotice({
+        page_size: 10,
+        page: this.pageIndex,
+      });
+      this.list = res.data;
+      this.total = res.total;
+    },
+
+    filterChildren(data) {
+      data.forEach((i) => {
+        if (i.children && i.children.length > 0) {
+          this.filterChildren(i.children);
+        } else {
+          delete i.children;
         }
-
-      },
-
-      toContract(row) {
-        this.$refs['detailContract'].getDetail(row.contract_id)
-        this.$refs['detailContract'].isShowDetail = true
-      },
-
-      pageChange(e) {
-        this.pageIndex = e
-        this.getNotices()
-      },
-
-      timeFormatter(cell, data, value) {
-        return parseTime(new Date(value))
-      },
-      typeFormatter(cell, data, value) {
-        return value === 1 ? '合同流程' : '付款计划'
-      },
-      toper(m1, m2, m3) {
-        if (m2 != 0) {
-          return ((m3 / m2) * 100).toFixed(2);
-        } else if (m1 != 0) {
-          return ((m3 / m1) * 100).toFixed(2);
-        } else
-          return 0
-      },
-      async getNotices() {
-        const res = await getNotice({
-          page_size: 10,
-          page: this.pageIndex
-        })
-        this.list = res.data
-        this.total = res.total
-      },
-
-
-      filterChildren(data) {
-        data.forEach(i => {
-          if (i.children && i.children.length > 0) {
-            this.filterChildren(i.children)
-          } else {
-            delete i.children
-          }
-        })
-      },
-      getList() {
-        index(this.listQuery).then(response => {
-          this.list = response.data
-          this.total = response.total
-        }).catch(error => {})
-      },
-      handleFilter() {
-        this.listQuery.page = 1
-        this.getList()
-      },
-      readIt(row) {
-        readNotice({
-          id: row.id
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: '已读'
-          })
-          this.getNotices()
-        })
-        // show({id: row.id}).then(r => { this.form = r }).catch(error => {})
-        // this.list[index].is_read = 1
-      },
-      save() {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            const tempData = Object.assign({}, this.form)
-            tempData.admin_id_list = tempData.ids.map(i => {
-              return {
-                admin_id: i
-              }
-            })
-            if (tempData.id) {
-              save(tempData).then(r => {
-                this.saved()
-              }).catch(error => {})
-            } else {
-              store(tempData).then(r => {
-                this.saved()
-              }).catch(error => {})
-            }
-          }
-        })
-      },
-      saved() {
-        this.handleFilter()
-        this.dialogFormVisible = false
-        this.$message.success('保存成功')
-      },
-      handleDelete(row, index) {
-        this.$confirm('确定要删除吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          destroy({
-            id: row.id
-          }).then(response => {
-            this.$message.success('删除成功')
-            this.getList()
-          }).catch(error => {})
-        }).catch(() => {});
-      },
-    },
-    computed: {
-      moneyFormat() {
-        return function(price) {
-          return moneyFormatter(price)
-        }
-      }
-    }
-  }
-</script>
-<style scoped lang="scss">
-  ::v-deep .el-dialog__body {
-    padding: 8px 20px;
-  }
-
-  ::v-deep .el-col-5 {
-    width: 20%;
-  }
-
-  ::v-deep .el-card__body {
-    padding: 4px 10px !important;
-  }
-
-  .progress-card {
-    display: flex;
-
-    &-item {
-      text-align: center;
-      flex: 1;
-
-      &__label {
-        font-size: 14px;
-      }
-
-      &__num {
-        font-size: 20px;
-        font-weight: 600;
-
-        padding: 6px 0;
-      }
-    }
-  }
-</style>
-<style lang="scss" scoped>
-  .ivu-btn {
-    margin-right: 10px;
-  }
-
-  .table-tree {
-    margin-top: 10px;
-  }
-
-  .v-text {
-    padding: 8px 0;
-    border-bottom: 1px solid #eee;
-    margin-bottom: 20px;
-
-    .title {
-      color: #338de3;
-    }
-  }
-
-  .dataGroup {
-    padding: 10px 0;
-  }
-
-  .grid-content {
-    border-radius: 5px;
-    text-align: center;
-    background: #ffffff;
-    padding: 15px 0;
-
-    p {
-      line-height: 1.8;
-    }
-
-    p:first-child {
-      font-weight: 700;
-      font-size: 16px;
-    }
-  }
-
-  .bg-org {
-    border: 2px solid #EF6C24;
-    color: #EF6C24;
-  }
-
-  .bg-blue {
-    border: 2px solid #0800FF;
-    color: #0800FF;
-  }
-
-  .bg-green {
-    border: 2px solid #0F9700;
-    color: #0F9700;
-  }
-
-  .bg-black {
-    border: 2px solid #333;
-    color: #333;
-  }
-
-  .bg-pink {
-    border: 2px solid #FF0000;
-    color: #FF0000;
-  }
+      });
+    },
+    getList() {
+      index(this.listQuery)
+        .then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        })
+        .catch((error) => {});
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    readIt(row) {
+      readNotice({
+        id: row.id,
+      }).then((res) => {
+        Message({
+          type: "success",
+          message: "已读",
+        });
+        this.getNotices();
+      });
+      // show({id: row.id}).then(r => { this.form = r }).catch(error => {})
+      // this.list[index].is_read = 1
+    },
+    save() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          const tempData = Object.assign({}, this.form);
+          tempData.admin_id_list = tempData.ids.map((i) => {
+            return {
+              admin_id: i,
+            };
+          });
+          if (tempData.id) {
+            save(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          } else {
+            store(tempData)
+              .then((r) => {
+                this.saved();
+              })
+              .catch((error) => {});
+          }
+        }
+      });
+    },
+    saved() {
+      this.handleFilter();
+      this.dialogFormVisible = false;
+      this.$message.success("保存成功");
+    },
+    handleDelete(row, index) {
+      this.$confirm("确定要删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          destroy({
+            id: row.id,
+          })
+            .then((response) => {
+              this.$message.success("删除成功");
+              this.getList();
+            })
+            .catch((error) => {});
+        })
+        .catch(() => {});
+    },
+  },
+  computed: {
+    moneyFormat() {
+      return function (price) {
+        return moneyFormatter(price);
+      };
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+::v-deep .el-dialog__body {
+  padding: 8px 20px;
+}
+
+::v-deep .el-col-5 {
+  width: 20%;
+}
+
+::v-deep .el-card__body {
+  padding: 4px 10px !important;
+}
+
+.progress-card {
+  display: flex;
+
+  &-item {
+    text-align: center;
+    flex: 1;
+
+    &__label {
+      font-size: 14px;
+    }
+
+    &__num {
+      font-size: 20px;
+      font-weight: 600;
+
+      padding: 6px 0;
+    }
+  }
+}
+</style>
+<style lang="scss" scoped>
+.ivu-btn {
+  margin-right: 10px;
+}
+
+.table-tree {
+  margin-top: 10px;
+}
+
+.v-text {
+  padding: 8px 0;
+  border-bottom: 1px solid #eee;
+  margin-bottom: 20px;
+
+  .title {
+    color: #338de3;
+  }
+}
+
+.dataGroup {
+  padding: 10px 0;
+}
+
+.grid-content {
+  border-radius: 5px;
+  text-align: center;
+  background: #ffffff;
+  padding: 15px 0;
+
+  p {
+    line-height: 1.8;
+  }
+
+  p:first-child {
+    font-weight: 700;
+    font-size: 16px;
+  }
+}
+
+.bg-org {
+  border: 2px solid #ef6c24;
+  color: #ef6c24;
+}
+
+.bg-blue {
+  border: 2px solid #0800ff;
+  color: #0800ff;
+}
+
+.bg-green {
+  border: 2px solid #0f9700;
+  color: #0f9700;
+}
+
+.bg-black {
+  border: 2px solid #333;
+  color: #333;
+}
+
+.bg-pink {
+  border: 2px solid #ff0000;
+  color: #ff0000;
+}
 </style>
diff --git a/src/views/finance/evaluateConfirm.vue b/src/views/finance/evaluateConfirm.vue
index 7879333..6338d39 100644
--- a/src/views/finance/evaluateConfirm.vue
+++ b/src/views/finance/evaluateConfirm.vue
@@ -46,6 +46,7 @@
               @click="
                 () => {
                   $refs['addPlanEvaluate'].type = 1;
+                  $refs['addPlanEvaluate'].setPlan(scope.row);
                   $refs['addPlanEvaluate'].setPlanId(scope.row.id);
                   $refs['addPlanEvaluate'].show();
                 }
@@ -60,6 +61,7 @@
               @click="
                 () => {
                   $refs['addPlanEvaluate'].type = 2;
+                  $refs['addPlanEvaluate'].setPlan(scope.row);
                   $refs['addPlanEvaluate'].setPlanId(scope.row.id);
                   $refs['addPlanEvaluate'].show();
                 }
@@ -67,47 +69,6 @@
             >
               年末目标
             </Button>
-            <el-popover placement="left" width="200" trigger="click">
-              <div style="margin-bottom: 15px;">确认年中自评确认?</div>
-              <div style="margin-top:15px; display: flex;justify-content: flex-end;">
-                <Button @click="" type="primary" ghost size="small">确认</Button>
-              </div>
-              <Button
-                slot="reference"
-                size="small"
-                type="primary"
-                class="slot-btns-item"
-                style="margin-right: 5px;"
-                @click="
-                () => {
-
-                }
-              "
-              >
-                年中确认
-              </Button>
-            </el-popover>
-
-            <el-popover placement="left" width="200" trigger="click">
-              <div style="margin-bottom: 15px;">确认年末自评确认?</div>
-              <div style="margin-top:15px; display: flex;justify-content: flex-end;">
-                <Button @click="" type="primary" ghost size="small">确认</Button>
-              </div>
-              <Button
-                style="margin-right: 5px;"
-                slot="reference"
-                size="small"
-                type="primary"
-                class="slot-btns-item"
-                @click="
-                () => {
-
-                }
-              "
-              >
-                年末确认
-              </Button>
-            </el-popover>
           </template>
         </el-table-column>
       </template>
@@ -128,7 +89,7 @@
             }" />
     </div>
 
-    <addEvaluate ref="addEvaluate" @refresh="getList"></addEvaluate>
+
     <addPlanEvaluate ref="addPlanEvaluate"></addPlanEvaluate>
   </div>
 </template>
@@ -138,12 +99,11 @@ import { getBudget, editorBudget } from "@/api/budget/budget";
 import { index, destroy } from "@/api/achievements/evaluate";
 import { deepCopy, moneyFormatter, parseTime } from '@/utils'
 import { getparameter } from "@/api/system/dictionary";
-import addEvaluate from '@/views/achievements/components/addEvaluate.vue'
 import addPlanEvaluate from '@/views/achievements/components/addPlanEvaluate.vue'
 
 export default {
   components: {
-    addPlanEvaluate, addEvaluate
+    addPlanEvaluate
   },
   data() {
     return {
@@ -175,16 +135,26 @@ export default {
         },
         {
           label: '年中自评',
-          prop: 'year_midst',
+          prop: 'year_midst_status',
           formatter: (cell, data, value) => {
-            return value ? "" : "待完成"
+            let map = new Map([
+              [0,'待完成'],
+              [1,'已完成'],
+              [2,'已确认']
+            ])
+            return map.get(value)
           }
         },
         {
           label: '年末自评',
-          prop: 'year_end',
+          prop: 'year_end_status',
           formatter: (cell, data, value) => {
-            return value ? "" : "待完成"
+            let map = new Map([
+              [0,'待完成'],
+              [1,'已完成'],
+              [2,'已确认']
+            ])
+            return map.get(value)
           }
         },
         {
@@ -246,11 +216,12 @@ export default {
     async getList() {
       const res = await getBudget(this.select);
       this.list = res.list.data;
+      this.total = res.list.total
     },
 
     edit(row, key) {
       let rowCopy = deepCopy(row)
-      row[key] = 2
+      rowCopy[key] = 2
       editorBudget(rowCopy).then(res => {
         this.$message({
           type: 'success',
diff --git a/src/views/inOut/expenseAccount.vue b/src/views/inOut/expenseAccount.vue
index ed9d5c0..beec901 100644
--- a/src/views/inOut/expenseAccount.vue
+++ b/src/views/inOut/expenseAccount.vue
@@ -235,7 +235,7 @@ export default {
         page: 1,
         page_size: 10,
         start_created_at: "",
-        end_created_at: "",
+        end_created_at: undefined,
         start_plan_price: "",
         end_plan_price: "",
         department_id: "",
@@ -277,21 +277,39 @@ export default {
         },
         {
           prop: "money",
-          label: "报销金额（元）",
+          label: this.$route.path.split("_")[1] == 2 ? "报销金额（元）" : "支出金额（元）",
           width: 140,
           align: "right",
         },
         {
           prop: "use_money_total",
-          label: "实际报销金额（元）",
+          label: this.$route.path.split("_")[1] == 2 ? "实际报销金额（元）" : "实际支出金额（元）",
           width: 140,
           align: "right",
+          customFn:row => {
+            let total = 0
+            row.plans?.forEach(i => {
+              total += Number(i.money) || 0
+            })
+            return (
+              <span>{ total }</span>
+            )
+          }
         },
         {
           prop: "has_money_total",
           label: "已付金额",
           width: 140,
           align: "right",
+          customFn:row => {
+            let total = 0
+            row.plans?.forEach(i => {
+              total += Number(i.end_money) || 0
+            })
+            return (
+              <span>{ total }</span>
+            )
+          }
         },
         {
           prop: "department.name",