From b056cc76e116aa9d7868e01a146e006522fa4e73 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 13 Apr 2023 17:32:12 +0800
Subject: [PATCH] 2023-4-13

---
 src/components/XyTable/index.vue              |    6 +-
 .../components/addPlanEvaluate.vue            |  282 ++++
 .../achievements/components/addPoint.vue      |   60 +-
 src/views/achievements/evaluate.vue           |   41 +-
 src/views/budget/budgetList.vue               | 1386 ++++++++++-------
 src/views/budget/components/addEvaluate.vue   |   69 +
 src/views/budget/components/addPoint.vue      |  128 +-
 src/views/contract/contractList.vue           |   37 +-
 8 files changed, 1339 insertions(+), 670 deletions(-)
 create mode 100644 src/views/achievements/components/addPlanEvaluate.vue
 create mode 100644 src/views/budget/components/addEvaluate.vue

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index d18dbd5..2354844 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -132,7 +132,11 @@ export default {
     },
     doLayout() {
       this.$refs['table'].doLayout();
-    }
+    },
+    toggleRowExpansion(row,expanded){
+      this.$refs['table'].toggleRowExpansion(row,expanded)
+    },
+
   },
   created() {
     this.initLoad()
diff --git a/src/views/achievements/components/addPlanEvaluate.vue b/src/views/achievements/components/addPlanEvaluate.vue
new file mode 100644
index 0000000..dcd0837
--- /dev/null
+++ b/src/views/achievements/components/addPlanEvaluate.vue
@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <el-drawer
+      size="46%"
+      :title="type === 1 ? '年中绩效指标' : '年末绩效指标'"
+      :visible.sync="isShow"
+      direction="rtl"
+    >
+      <xy-table
+        ref="table"
+        :list="list"
+        :table-item="table"
+        :default-expand-all="false"
+        @expand-change="expandChange"
+      >
+        <template v-slot:btns> </template>
+      </xy-table>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { index } from "@/api/budget/planTarget";
+import { save, show } from "@/api/achievements/evaluate"
+import { resetSelect } from "@/utils";
+import { getToken } from "@/utils/auth";
+
+export default {
+  data() {
+    return {
+      isShow: false,
+      type: 1,
+      action: process.env.VUE_APP_UPLOAD_API,
+
+      list: [],
+      table: [
+        {
+          type: "expand",
+          width: 80,
+          label: "自评展开",
+          expandFn: ({ row, $index, store }) => {
+            return (
+              <div class="expand">
+                <el-form
+                  ref={`expand-form${$index}`}
+                  props={{ model: row._form }}
+                  label-width="80px"
+                >
+                  <el-form-item label="自评值" required={true}>
+                    <el-input
+                      type="textarea"
+                      autosize={{
+                        minRows: 3,
+                      }}
+                      v-model={row._form.result}
+                      size="small"
+                      placeholder="请输入自评值"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item label="备注">
+                    <el-input
+                      type="textarea"
+                      autosize={{
+                        minRows: 3,
+                      }}
+                      v-model={row._form.remark}
+                      size="small"
+                      placeholder="请输入备注"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item label="文件">
+                    <el-upload
+                      style="width: 300px"
+                      ref={`expand-form-upload${$index}`}
+                      multiple={true}
+                      headers={{
+                        Authorization: "Bearer " + getToken(),
+                      }}
+                      before-upload={this.uploadBefore}
+                      props={{
+                        onSuccess: (response, file, fileList) => {
+                          this.successHandle(response, file, fileList, row);
+                        },
+                        onRemove: (file, fileList) => {
+                          this.removeHande(file, fileList, row);
+                        },
+                      }}
+                      accept="application/x-rar-compressed,application/zip,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf"
+                      action={this.action}
+                      file-list={row._fileList}
+                      auto-upload={false}
+                    >
+                      <el-button slot="trigger" size="small" type="primary">
+                        选取文件
+                      </el-button>
+                      <el-button
+                        style="margin-left: 10px"
+                        size="small"
+                        type="success"
+                        on={{
+                          ["click"]: (e) =>
+                            this.$refs[`expand-form-upload${$index}`].submit(),
+                        }}
+                      >
+                        开始上传
+                      </el-button>
+                      <div slot="tip" className="el-upload__tip">
+                        支持文件格式：.rar .zip .doc .docx .pdf
+                        <br />
+                        单个文件不能超过500kb
+                      </div>
+                    </el-upload>
+                  </el-form-item>
+
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      on={{
+                        ["click"]: (e) => {
+                          row._form.file_ids = row._fileList?.map(i => i.response.id)
+                          save(row._form).then(res => {
+                            this.$message({
+                              type: "success",
+                              message: "操作成功"
+                            })
+                          })
+                        },
+                      }}
+                    >
+                      立即创建
+                    </el-button>
+                    <el-button
+                      on={{
+                        ["click"]: (e) => {
+                          this.$refs["table"].toggleRowExpansion(row, false);
+                          resetSelect(row._form);
+                        },
+                      }}
+                    >
+                      取消
+                    </el-button>
+                  </el-form-item>
+                </el-form>
+              </div>
+            );
+          },
+        },
+        {
+          label: "指标名称",
+          prop: "target.name",
+          minWidth: 200,
+        },
+        {
+          label: "半年（程）指标值",
+          prop: "target.half_target",
+          width: 180,
+        },
+        {
+          label: "全年（程）指标值",
+          prop: "target.year_target",
+          width: 180,
+        },
+        {
+          label: "创建时间",
+          prop: "created_at",
+          width: 200,
+        },
+      ],
+      select: {
+        page: 1,
+        page_size: 999,
+        plan_id: "",
+      },
+    };
+  },
+  methods: {
+    show() {
+      this.isShow = true;
+    },
+    hidden() {
+      this.isShow = false;
+    },
+    getPlanId() {
+      return this.select.plan_id;
+    },
+    setPlanId(plan_id) {
+      this.select.plan_id = plan_id;
+    },
+
+    //上传
+    successHandle(response, file, fileList, row) {
+      row._fileList = fileList;
+    },
+    removeHande(file, fileList, row) {
+      row._fileList = fileList;
+    },
+    uploadBefore(file) {
+      console.log(file);
+      if (file.size / 1024 > 500) {
+        this.$message({
+          type: "warning",
+          message: "上传文件大小超过500kb！",
+        });
+        return false;
+      }
+    },
+
+    spanMethod({ row, column, rowIndex, columnIndex }) {
+      if (column.key === "target_type") {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col,
+        };
+      }
+      if (column.key === "target_type2") {
+        const _row = this.spanArr1[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col,
+        };
+      }
+    },
+
+    expandChange({ row, expanded }) {
+      console.log(row, expanded)
+      if(expanded.indexOf(row) !== -1) {
+        show({ id:2 }).then(res => {
+          this.$integrateData(row._form,res)
+          row._fileList = res.files.map(i => {
+            return {
+              name: i.name,
+              url: i.url,
+              response: {
+                id: i.id
+              }
+            }
+          })
+        })
+      }
+    },
+
+    async getList() {
+      const res = await index(this.select);
+      this.list = res.data.map((item) => {
+        return {
+          _form: {
+            id: "",
+            result: "",
+            remark: "",
+            type: this.type,
+            file_ids: [],
+            plan_id: this.getPlanId(),
+            plan_target_id: item.id,
+          },
+          _fileList: [],
+          ...item,
+        };
+      });
+
+      console.log(this.list);
+    },
+
+    submit() {},
+  },
+  computed: {},
+  watch: {
+    isShow(val) {
+      if (val) {
+        this.getList();
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/achievements/components/addPoint.vue b/src/views/achievements/components/addPoint.vue
index 176e26c..3cc3b0d 100644
--- a/src/views/achievements/components/addPoint.vue
+++ b/src/views/achievements/components/addPoint.vue
@@ -117,6 +117,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-select
+              ref="symbolSelect"
               v-model="form.symbol_id"
               clearable
               placeholder="请选择计算符号"
@@ -141,12 +142,24 @@
             半年（程）指标值 ：
           </div>
           <div class="xy-table-item-content">
-            <el-input
-              v-model="form.half_target"
-              clearable
-              placeholder="请输入半年（程）指标值"
-              style="width: 300px"
-            ></el-input>
+            <template v-if="isDingxing">
+              <el-input
+                v-model="form.half_target"
+                clearable
+                placeholder="请输入半年（程）指标值"
+                style="width: 300px"
+              ></el-input>
+            </template>
+            <template v-else>
+              <el-input-number
+                v-model="form.half_target"
+                clearable
+                placeholder="请输入半年（程）指标值"
+                style="width: 300px"
+                :controls="false"
+                :precision="2"
+              ></el-input-number>
+            </template>
           </div>
         </div>
       </template>
@@ -159,12 +172,24 @@
             全年（程）指标值 ：
           </div>
           <div class="xy-table-item-content">
-            <el-input
-              v-model="form.year_target"
-              clearable
-              placeholder="请输入全年（程）指标值"
-              style="width: 300px"
-            ></el-input>
+            <template v-if="isDingxing">
+              <el-input
+                v-model="form.year_target"
+                clearable
+                placeholder="请输入全年（程）指标值"
+                style="width: 300px"
+              ></el-input>
+            </template>
+            <template v-else>
+              <el-input-number
+                v-model="form.year_target"
+                clearable
+                placeholder="请输入全年（程）指标值"
+                style="width: 300px"
+                :controls="false"
+                :precision="2"
+              ></el-input-number>
+            </template>
           </div>
         </div>
       </template>
@@ -191,6 +216,7 @@ export default {
   },
   data() {
     return {
+      isDingxing: false,
       isShow: false,
       id: "",
       type: "",
@@ -318,7 +344,7 @@ export default {
   computed:{
     typeFormat() {
       return this.target_types.filter(item => item.id === this.form.target_type_id)[0]?.name || "";
-    }
+    },
   },
   watch: {
     isShow(val) {
@@ -334,6 +360,14 @@ export default {
         delete this.form.id;
       }
     },
+    "form.symbol_id": {
+      handler:function(val) {
+        this.$nextTick(() => {
+          this.isDingxing = this.$refs['symbolSelect']?.selectedLabel === '定形';
+        })
+      },
+      immediate: true
+    }
   },
 };
 </script>
diff --git a/src/views/achievements/evaluate.vue b/src/views/achievements/evaluate.vue
index 28ae853..cf55ab7 100644
--- a/src/views/achievements/evaluate.vue
+++ b/src/views/achievements/evaluate.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="padding: 0 20px;">
-    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="绩效指标类型">
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="绩效自评自审">
       <div slot="content"></div>
       <slot>
         <div class="selects">
@@ -22,20 +22,26 @@
 
     <xy-table :list="list" :table-item="table" @delete="destroy" @editor="edit">
       <template v-slot:btns>
-        <el-table-column label="操作" header-align="center" fixed="right" width="200">
+        <el-table-column label="操作" header-align="center" fixed="right" width="120">
           <template v-slot:default="scope">
-            <Button type="primary"
-                    size="small"
-                    style="margin-left:4px;margin-bottom: 2px;"
-                    @click="edit(scope.row,1)">年中评审</Button>
-            <Button type="error"
-                    size="small"
-                    style="margin-left:4px;margin-bottom: 2px;"
-                    @click="edit(scope.row,2)">年终评审</Button>
-            <Button type="error"
-                    size="small"
-                    style="margin-left:4px;margin-bottom: 2px;"
-                    @click="edit(scope.row,2)">查看</Button>
+            <el-dropdown
+              @command="
+                  (command) => {
+                    $refs['addPlanEvaluate'].type = command;
+                    $refs['addPlanEvaluate'].setPlanId(scope.row.id);
+                    $refs['addPlanEvaluate'].show();
+                  }
+                "
+            >
+              <Button size="small" type="primary" class="slot-btns-item">
+                绩效审核<i class="el-icon-arrow-down el-icon--right"></i>
+              </Button>
+
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="1">年中目标</el-dropdown-item>
+                <el-dropdown-item :command="2">年末目标</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
       </template>
@@ -45,6 +51,7 @@
     <!--      <Page :total="total" @on-change="" show-elevator show-sizer @on-page-size-change="" />-->
     <!--    </div>-->
     <addEvaluate ref="addEvaluate" @refresh="getList"></addEvaluate>
+    <addPlanEvaluate ref="addPlanEvaluate"></addPlanEvaluate>
   </div>
 </template>
 
@@ -52,12 +59,14 @@
 import { getBudget } from "@/api/budget/budget"
 import { index,destroy } from "@/api/achievements/evaluate"
 import { moneyFormatter, parseTime } from '@/utils'
+import { getparameter } from '@/api/system/dictionary'
 
 import addEvaluate from '@/views/achievements/components/addEvaluate.vue'
-import { getparameter } from '@/api/system/dictionary'
+import addPlanEvaluate from '@/views/achievements/components/addPlanEvaluate.vue'
 export default {
   components:{
-    addEvaluate
+    addEvaluate,
+    addPlanEvaluate
   },
   data() {
     return {
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 3f88665..6692c0e 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -1,142 +1,322 @@
 <template>
   <div style="padding: 0 20px">
-    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="预算计划">
+    <lx-header
+      icon="md-apps"
+      style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+      text="预算计划"
+    >
       <div slot="content"></div>
       <slot>
         <div>
-          <span style="padding: 0 6px;">年份</span>
+          <span style="padding: 0 6px">年份</span>
           <span>
-            <DatePicker :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;" type="year"
-              @on-change="(e)=>select.year = e"></DatePicker>
+            <DatePicker
+              :value="select.year"
+              placeholder="选择所属年份"
+              placement="bottom"
+              style="width: 130px"
+              type="year"
+              @on-change="(e) => (select.year = e)"
+            ></DatePicker>
           </span>
 
-          <span style="padding: 0 6px;">
-            预算类型
-          </span>
+          <span style="padding: 0 6px"> 预算类型 </span>
           <span>
-            <Select v-model="select.type" clearable placeholder="选择预算类型" style="width:130px;">
-              <Option v-for="item in types" :key="item.id" :value="item.id">{{ item.value }}</Option>
+            <Select
+              v-model="select.type"
+              clearable
+              placeholder="选择预算类型"
+              style="width: 130px"
+            >
+              <Option v-for="item in types" :key="item.id" :value="item.id">{{
+                item.value
+              }}</Option>
             </Select>
           </span>
 
-          <span style="padding: 0 6px;">
-            科室
-          </span>
+          <span style="padding: 0 6px"> 科室 </span>
           <span>
-            <el-select placeholder="科室选择" clearable size="small" v-model="select.department" style="width: 160px;">
-              <el-option v-for="item in departments" :label="item.name" :value="item.id" :key="item.id">
+            <el-select
+              placeholder="科室选择"
+              clearable
+              size="small"
+              v-model="select.department"
+              style="width: 160px"
+            >
+              <el-option
+                v-for="item in departments"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
               </el-option>
             </el-select>
           </span>
-          <el-switch v-model="isTree" @change="changeTree" active-text="树形结构" style="margin-left: 4px;">
+          <el-switch
+            v-model="isTree"
+            @change="changeTree"
+            active-text="树形结构"
+            style="margin-left: 4px"
+          >
           </el-switch>
-          <Button style="margin-left: 10px" type="primary" @click="showAdd('')">新增</Button>
-          <Button style="margin-left: 10px" type="primary" @click="getBudgets">查询</Button>
-          <Button style="margin-left: 10px" type="primary"
-            @click="()=>select={page:1,year:'', type:'', department:''}">重置
+          <Button style="margin-left: 10px" type="primary" @click="showAdd('')"
+            >新增</Button
+          >
+          <Button style="margin-left: 10px" type="primary" @click="getBudgets"
+            >查询</Button
+          >
+          <Button
+            style="margin-left: 10px"
+            type="primary"
+            @click="
+              () => (select = { page: 1, year: '', type: '', department: '' })
+            "
+            >重置
           </Button>
         </div>
       </slot>
     </lx-header>
 
     <div v-if="isTree">
-      <el-table ref="treeTable" :height="tableHeight" class="v-table" :summary-method="summary" show-summary
-        :data="treeData" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-        <el-table-column type="index" align="center" fixed="left"></el-table-column>
-        <el-table-column v-for="(item,index) of table" :prop="item.prop" :label="item.label" :width="item.width"
-          :min-width="item.minWidth" :fixed="item.fixed" :align="item.align">
+      <el-table
+        ref="treeTable"
+        :height="tableHeight"
+        class="v-table"
+        :summary-method="summary"
+        show-summary
+        :data="treeData"
+        style="width: 100%; margin-bottom: 20px"
+        row-key="id"
+        border
+        default-expand-all
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+        <el-table-column
+          type="index"
+          align="center"
+          fixed="left"
+        ></el-table-column>
+        <el-table-column
+          v-for="(item, index) of table"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :min-width="item.minWidth"
+          :fixed="item.fixed"
+          :align="item.align"
+        >
           <template slot-scope="scope">
             <span v-if="item.formatter">
-              {{item.formatter(scope.row,scope.row,scope.row[item.prop])}}
+              {{ item.formatter(scope.row, scope.row, scope.row[item.prop]) }}
             </span>
             <span v-else>
-              {{(item.prop.indexOf(".")>-1?scope.row[item.prop.split(".")[0]][item.prop.split(".")[1]]:scope.row[item.prop])}}
+              {{
+                item.prop.indexOf(".") > -1
+                  ? scope.row[item.prop.split(".")[0]][item.prop.split(".")[1]]
+                  : scope.row[item.prop]
+              }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" header-align="center" label="操作" width="200">
+        <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="showEditor(scope.row)">
+              <Button
+                class="slot-btns-item"
+                size="small"
+                type="primary"
+                @click="showEditor(scope.row)"
+              >
                 编辑
               </Button>
-              <Button @click="showAdd(scope.row)" v-if="scope.row.pid==0"
-                class="slot-btns-item" size="small" type="info">
+              <Button
+                @click="showAdd(scope.row)"
+                v-if="scope.row.pid == 0"
+                class="slot-btns-item"
+                size="small"
+                type="info"
+              >
                 下级
               </Button>
-              <Poptip :transfer="true" confirm placement="bottom" title="确认要删除吗"
-                @on-ok="()=>deleteTable(scope.row)">
-                <i-button class="slot-btns-item" size="small" type="error">删除
+              <Poptip
+                :transfer="true"
+                confirm
+                placement="bottom"
+                title="确认要删除吗"
+                @on-ok="() => deleteTable(scope.row)"
+              >
+                <i-button class="slot-btns-item" size="small" type="error"
+                  >删除
                 </i-button>
               </Poptip>
-              <Button class="slot-btns-item" size="small" type="primary" @click="$refs['addPoint'].setPlanId(scope.row.id),$refs['addPoint'].show()">绩效指标</Button>
+              <Button
+                class="slot-btns-item"
+                size="small"
+                type="primary"
+                @click="
+                  $refs['addPoint'].setPlanId(scope.row.id),
+                    $refs['addPoint'].show()
+                "
+                >绩效指标</Button
+              >
+              <el-dropdown
+                @command="
+                  (command) => {
+                    $refs['addEvaluate'].type = command;
+                    $refs['addEvaluate'].setId(scope.row.id);
+                    $refs['addEvaluate'].show();
+                  }
+                "
+              >
+                <Button size="small" type="primary" class="slot-btns-item">
+                  绩效目标<i class="el-icon-arrow-down el-icon--right"></i>
+                </Button>
+
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="1">年中目标</el-dropdown-item>
+                  <el-dropdown-item :command="2">年末目标</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </div>
           </template>
         </el-table-column>
       </el-table>
-
     </div>
     <div v-if="!isTree">
-      <xy-table ref="xyTable" :objectSpanMethod="objectSpanMethod" :list="list" :show-summary="true" :summary-method="summary" :table-item="table"
-        @delete="deleteTable" @editor="showEditor">
+      <xy-table
+        ref="xyTable"
+        :objectSpanMethod="objectSpanMethod"
+        :list="list"
+        :show-summary="true"
+        :summary-method="summary"
+        :table-item="table"
+        @delete="deleteTable"
+        @editor="showEditor"
+      >
         <template v-slot:btns>
-          <el-table-column fixed="right" header-align="center" label="操作" width="200">
+          <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="showEditor(scope.row)">
+                <Button
+                  class="slot-btns-item"
+                  size="small"
+                  type="primary"
+                  @click="showEditor(scope.row)"
+                >
                   编辑
                 </Button>
-                <Button @click="showAdd(scope.row)" v-if="scope.row.pid==0"
-                  class="slot-btns-item" size="small" type="info">
+                <Button
+                  @click="showAdd(scope.row)"
+                  v-if="scope.row.pid == 0"
+                  class="slot-btns-item"
+                  size="small"
+                  type="info"
+                >
                   下级
                 </Button>
-                <Poptip :transfer="true" confirm placement="bottom" title="确认要删除吗"
-                  @on-ok="()=>deleteTable(scope.row)">
-                  <i-button class="slot-btns-item" size="small" type="error">删除</i-button>
+                <Poptip
+                  :transfer="true"
+                  confirm
+                  placement="bottom"
+                  title="确认要删除吗"
+                  @on-ok="() => deleteTable(scope.row)"
+                >
+                  <i-button class="slot-btns-item" size="small" type="error"
+                    >删除</i-button
+                  >
                 </Poptip>
-                <Button class="slot-btns-item" size="small" type="primary" @click="$refs['addPoint'].setPlanId(scope.row.id),$refs['addPoint'].show()">绩效目标</Button>
+                <Button
+                  class="slot-btns-item"
+                  size="small"
+                  type="primary"
+                  @click="
+                    $refs['addPoint'].setPlanId(scope.row.id),
+                      $refs['addPoint'].show()
+                  "
+                  >绩效目标</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 style="display: flex; justify-content: flex-end">
+        <Page
+          :total="total"
+          show-elevator
+          @on-change="pageChange"
+          show-sizer
+          @on-page-size-change="pageSizeChange"
+        />
       </div>
     </div>
     <!--    新增-->
-    <xy-dialog ref="addBudget" :form="form" :is-show.sync="isShowAdd" :rules="rules" title="新增计划" type="form"
-      @submit="submit">
+    <xy-dialog
+      ref="addBudget"
+      :form="form"
+      :is-show.sync="isShowAdd"
+      :rules="rules"
+      title="新增计划"
+      type="form"
+      @submit="submit"
+    >
       <template v-slot:pid v-if="form.pid_info">
         <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            隶属
-          </div>
+          <div class="xy-table-item-label">隶属</div>
           <div class="xy-table-item-content">
-            <div style="width: 300px;">{{form.pid_info?form.pid_info.name:'无'}}</div>
+            <div style="width: 300px">
+              {{ form.pid_info ? form.pid_info.name : "无" }}
+            </div>
           </div>
         </div>
       </template>
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目名称
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >项目名称
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.name" clearable placeholder="请填写项目名称" style="width: 300px;" />
+            <el-input
+              v-model="form.name"
+              clearable
+              placeholder="请填写项目名称"
+              style="width: 300px"
+            />
           </div>
         </div>
       </template>
       <template v-slot:type>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>预算类型
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >预算类型
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.type" clearable placeholder="请选择预算类型" style="width: 300px;">
-              <el-option v-for="item in types" :label="item.value" :value="item.id"></el-option>
+            <el-select
+              v-model="form.type"
+              clearable
+              placeholder="请选择预算类型"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in types"
+                :label="item.value"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </div>
         </div>
@@ -144,37 +324,65 @@
       <template v-slot:year>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目所属年份
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >项目所属年份
           </div>
           <div class="xy-table-item-content">
-            <el-datePicker v-model="form.year" clearable placeholder="请选择所属年份" placement="bottom" style="width: 300px;"
-              type="year" value-format="yyyy"></el-datePicker>
+            <el-datePicker
+              v-model="form.year"
+              clearable
+              placeholder="请选择所属年份"
+              placement="bottom"
+              style="width: 300px"
+              type="year"
+              value-format="yyyy"
+            ></el-datePicker>
           </div>
         </div>
       </template>
       <template v-slot:department>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>科室
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >科室
           </div>
           <div class="xy-table-item-content">
-            <el-select placeholder="科室选择" clearable size="small" v-model="form.department" style="width: 300px;">
-              <el-option v-for="item in departments" :label="item.name" :value="item.id" :key="item.id">
+            <el-select
+              placeholder="科室选择"
+              clearable
+              size="small"
+              v-model="form.department"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in departments"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
               </el-option>
             </el-select>
           </div>
         </div>
       </template>
 
-
       <template v-slot:plan_department_links>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>可用科室
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >可用科室
           </div>
           <div class="xy-table-item-content">
             <el-checkbox-group v-model="form.plan_department_link_id">
-              <el-checkbox v-for="dept in departments" :label="dept.id" :key="dept.id">{{dept.name}}</el-checkbox>
+              <el-checkbox
+                v-for="dept in departments"
+                :label="dept.id"
+                :key="dept.id"
+                >{{ dept.name }}</el-checkbox
+              >
             </el-checkbox-group>
           </div>
         </div>
@@ -182,56 +390,101 @@
       <template v-slot:content>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >内容
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.content" clearable placeholder="请填写内容" style="width: 300px;" type="textarea" />
+            <el-input
+              v-model="form.content"
+              clearable
+              placeholder="请填写内容"
+              style="width: 300px"
+              type="textarea"
+            />
           </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>金额
+            <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" clearable placeholder="请填写金额" style="width: 300px;"
-              @blur="moneyFormat('money')" @focus="moneyRecover('money')" />
+            <el-input
+              v-model="form.money"
+              clearable
+              placeholder="请填写金额"
+              style="width: 300px"
+              @blur="moneyFormat('money')"
+              @focus="moneyRecover('money')"
+            />
           </div>
         </div>
       </template>
       <template v-slot:remark>
         <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            备注
-          </div>
+          <div class="xy-table-item-label">备注</div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.remark" clearable placeholder="请填写备注" style="width: 300px;" type="textarea" />
+            <el-input
+              v-model="form.remark"
+              clearable
+              placeholder="请填写备注"
+              style="width: 300px"
+              type="textarea"
+            />
           </div>
         </div>
       </template>
     </xy-dialog>
 
     <!--    编辑-->
-    <xy-dialog ref="editorDialog" :form="editorForm" :is-show.sync="isShowEditor" :rules="rules" title="编辑" type="form">
+    <xy-dialog
+      ref="editorDialog"
+      :form="editorForm"
+      :is-show.sync="isShowEditor"
+      :rules="rules"
+      title="编辑"
+      type="form"
+    >
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目名称
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >项目名称
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="editorForm.name" clearable placeholder="请填写项目名称" style="width: 300px;" />
+            <el-input
+              v-model="editorForm.name"
+              clearable
+              placeholder="请填写项目名称"
+              style="width: 300px"
+            />
           </div>
         </div>
       </template>
       <template v-slot:type>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>预算类型
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >预算类型
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="editorForm.type" clearable placeholder="请选择预算类型" style="width: 300px;">
-              <el-option v-for="item in types" :label="item.value" :value="item.id"></el-option>
+            <el-select
+              v-model="editorForm.type"
+              clearable
+              placeholder="请选择预算类型"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in types"
+                :label="item.value"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </div>
         </div>
@@ -239,23 +492,40 @@
       <template v-slot:year>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目所属年份
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >项目所属年份
           </div>
           <div class="xy-table-item-content">
-            <el-datePicker v-model="editorForm.year" clearable placeholder="请选择所属年份" placement="bottom"
-              style="width: 300px;" type="year" value-format="yyyy"></el-datePicker>
+            <el-datePicker
+              v-model="editorForm.year"
+              clearable
+              placeholder="请选择所属年份"
+              placement="bottom"
+              style="width: 300px"
+              type="year"
+              value-format="yyyy"
+            ></el-datePicker>
           </div>
         </div>
       </template>
       <template v-slot:department>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>科室
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >科室
           </div>
           <div class="xy-table-item-content">
-            <el-cascader :options="departments" :props="{ checkStrictly: true, label: 'name', value: 'id' }"
-              :value="editorForm.department" clearable size="small" style="width: 300px;"
-              @change="e => editorForm.department = e[e.length-1] || ''" />
+            <el-cascader
+              :options="departments"
+              :props="{ checkStrictly: true, label: 'name', value: 'id' }"
+              :value="editorForm.department"
+              clearable
+              size="small"
+              style="width: 300px"
+              @change="(e) => (editorForm.department = e[e.length - 1] || '')"
+            />
           </div>
         </div>
       </template>
@@ -263,11 +533,18 @@
       <template v-slot:plan_department_links>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>可用科室
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >可用科室
           </div>
           <div class="xy-table-item-content">
             <el-checkbox-group v-model="editorForm.plan_department_link_id">
-              <el-checkbox v-for="dept in departments" :label="dept.id" :key="dept.id">{{dept.name}}</el-checkbox>
+              <el-checkbox
+                v-for="dept in departments"
+                :label="dept.id"
+                :key="dept.id"
+                >{{ dept.name }}</el-checkbox
+              >
             </el-checkbox-group>
           </div>
         </div>
@@ -276,44 +553,72 @@
       <template v-slot:content>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+              >*</span
+            >内容
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="editorForm.content" autosize clearable placeholder="请填写内容" style="width: 300px;"
-              type="textarea" />
+            <el-input
+              v-model="editorForm.content"
+              autosize
+              clearable
+              placeholder="请填写内容"
+              style="width: 300px"
+              type="textarea"
+            />
           </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>年初预算金额
+            <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="editorForm.money" clearable placeholder="请填写年初预算金额" style="width: 300px;"
-              @blur="moneyFormatEditor('money')" @focus="moneyRecoverEditor('money')" />
+            <el-input
+              v-model="editorForm.money"
+              clearable
+              placeholder="请填写年初预算金额"
+              style="width: 300px"
+              @blur="moneyFormatEditor('money')"
+              @focus="moneyRecoverEditor('money')"
+            />
           </div>
         </div>
       </template>
       <template v-slot:update_money>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>调整后预算金额
+            <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="editorForm.update_money" clearable placeholder="请填写调整后预算金额" style="width: 300px;"
-              @blur="moneyFormatEditor('update_money')" @focus="moneyRecoverEditor('update_money')" />
+            <el-input
+              v-model="editorForm.update_money"
+              clearable
+              placeholder="请填写调整后预算金额"
+              style="width: 300px"
+              @blur="moneyFormatEditor('update_money')"
+              @focus="moneyRecoverEditor('update_money')"
+            />
           </div>
         </div>
       </template>
       <template v-slot:remark>
         <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            备注
-          </div>
+          <div class="xy-table-item-label">备注</div>
           <div class="xy-table-item-content">
-            <el-input v-model="editorForm.remark" autosize clearable placeholder="请填写备注" style="width: 300px;"
-              type="textarea" />
+            <el-input
+              v-model="editorForm.remark"
+              autosize
+              clearable
+              placeholder="请填写备注"
+              style="width: 300px"
+              type="textarea"
+            />
           </div>
         </div>
       </template>
@@ -323,409 +628,399 @@
     </xy-dialog>
 
     <addPoint ref="addPoint"></addPoint>
+    <addEvaluate ref="addEvaluate"></addEvaluate>
   </div>
 </template>
 
 <script>
-  import {
-    addBudget,
-    getBudget,
-    delBudget,
-    editorBudget,
-    detailBudget
-  } from "@/api/budget/budget"
-  import {
-    listdeptNoAuth
-  } from "@/api/system/department"
-  import {
-    Message
-  } from "element-ui";
-  import {
-    parseTime,
-    moneyFormatter,
-    moneyRecovery
-  } from "@/utils"
-  import {
-    getparameter
-  } from "@/api/system/dictionary"
-  import {
-    mergeTableRow
-  } from "@/utils/mergeTableRow"
+import {
+  addBudget,
+  getBudget,
+  delBudget,
+  editorBudget,
+  detailBudget,
+} from "@/api/budget/budget";
+import { listdeptNoAuth } from "@/api/system/department";
+import { Message } from "element-ui";
+import { parseTime, moneyFormatter, moneyRecovery } from "@/utils";
+import { getparameter } from "@/api/system/dictionary";
+import { mergeTableRow } from "@/utils/mergeTableRow";
 
-  import addPoint from "./components/addPoint.vue"
-  export default {
-    components: {
-      addPoint
-    },
-    data() {
-      return {
-        tableHeight: 0,
-        isShowAdd: false,
-        types: [],
-        treeData: [],
-        isTree: true,
-        form: {
-          pid: "0",
-          name: "",
-          type: "",
-          year: "",
-          department: "",
-          money: "",
-          content: "",
-          remark: "",
-          plan_department_link_id: [],
-          plan_department_links: [],
-          update_money: "",
-          pid_info: null
-        },
-        rules: {
-          name: [{
-            required: true,
-            message: "必填项"
-          }],
-          type: [{
-            required: true,
-            message: "必选项"
-          }],
-          year: [{
-            required: true,
-            message: "必选项"
-          }],
-          department: [{
-            required: true,
-            message: "必选项"
-          }],
-          money: [{
-              required: true,
-              message: "必填项"
-            },
-            {
-              pattern: /^\d{1,3}(,\d{3})*(\.\d+)/,
-              message: '必须为数字',
-              trigger: 'change'
-            }
-          ],
-          content: [{
-            required: true,
-            message: "必填项"
-          }]
-        },
-        list: [],
-        totalMoney: 0,
-        total: 0,
-        pageIndex: 1,
-        pageSize: 10,
-        table: [],
-        tableItem: [{
-            label: "项目名称",
-            prop: 'name',
-            width: 200,
-            align: 'left',
-            sortable: false,
-            fixed: 'left'
-          },
+import addPoint from "./components/addPoint.vue";
+import addEvaluate from "./components/addEvaluate.vue";
+export default {
+  components: {
+    addPoint,
+    addEvaluate,
+  },
+  data() {
+    return {
+      tableHeight: 0,
+      isShowAdd: false,
+      types: [],
+      treeData: [],
+      isTree: true,
+      form: {
+        pid: "0",
+        name: "",
+        type: "",
+        year: "",
+        department: "",
+        money: "",
+        content: "",
+        remark: "",
+        plan_department_link_id: [],
+        plan_department_links: [],
+        update_money: "",
+        pid_info: null,
+      },
+      rules: {
+        name: [
           {
-            label: "预算类型",
-            prop: 'type',
-            width: 115,
-            formatter: (cell, data, value) => {
-              let res = this.types.filter(item => {
-                return item.id === value
-              })
-              return res[0]?.value || '未知'
-            }
+            required: true,
+            message: "必填项",
           },
+        ],
+        type: [
           {
-            label: "所属年份",
-            prop: 'year',
-            width: 105
+            required: true,
+            message: "必选项",
           },
+        ],
+        year: [
           {
-            label: "相关科室",
-            prop: 'plan_department.name',
-            width: 110
+            required: true,
+            message: "必选项",
           },
+        ],
+        department: [
           {
-            label: '年初预算金额（元）',
-            prop: 'money',
-            align: 'right',
-            width: 180,
-            formatter: (cell, data, value) => {
-              if (value == 0) return '--'
-              else
-                return moneyFormatter(value)
-            }
+            required: true,
+            message: "必选项",
           },
+        ],
+        money: [
           {
-            label: '调整后预算金额（元）',
-            prop: 'update_money',
-            align: 'right',
-            width: 200,
-            formatter: (cell, data, value) => {
-              return moneyFormatter(value)
-            }
+            required: true,
+            message: "必填项",
           },
           {
-            label: "创建信息",
-            prop: 'created_at',
-            width: 160,
-            formatter: (cell, data, value) => {
-              return parseTime(new Date(value), '{y}-{m}-{d}')
-            }
+            pattern: /^\d{1,3}(,\d{3})*(\.\d+)/,
+            message: "必须为数字",
+            trigger: "change",
           },
+        ],
+        content: [
           {
-            label: "描述",
-            minWidth: 300,
-            prop: 'content',
-            align: 'left',
-            sortable: false
+            required: true,
+            message: "必填项",
           },
         ],
-        select: {
-          page: 1,
-          year: "",
-          type: "",
-          department: ""
+      },
+      list: [],
+      totalMoney: 0,
+      total: 0,
+      pageIndex: 1,
+      pageSize: 10,
+      table: [],
+      tableItem: [
+        {
+          label: "项目名称",
+          prop: "name",
+          width: 200,
+          align: "left",
+          sortable: false,
+          fixed: "left",
         },
-        departments: [], //部门类型
-
-        //编辑信息
-        isShowEditor: false,
-        editorForm: {
-          plan_department_link_id: []
-        }
+        {
+          label: "预算类型",
+          prop: "type",
+          width: 115,
+          formatter: (cell, data, value) => {
+            let res = this.types.filter((item) => {
+              return item.id === value;
+            });
+            return res[0]?.value || "未知";
+          },
+        },
+        {
+          label: "所属年份",
+          prop: "year",
+          width: 105,
+        },
+        {
+          label: "相关科室",
+          prop: "plan_department.name",
+          width: 110,
+        },
+        {
+          label: "年初预算金额（元）",
+          prop: "money",
+          align: "right",
+          width: 180,
+          formatter: (cell, data, value) => {
+            if (value == 0) return "--";
+            else return moneyFormatter(value);
+          },
+        },
+        {
+          label: "调整后预算金额（元）",
+          prop: "update_money",
+          align: "right",
+          width: 200,
+          formatter: (cell, data, value) => {
+            return moneyFormatter(value);
+          },
+        },
+        {
+          label: "创建信息",
+          prop: "created_at",
+          width: 160,
+          formatter: (cell, data, value) => {
+            return parseTime(new Date(value), "{y}-{m}-{d}");
+          },
+        },
+        {
+          label: "描述",
+          minWidth: 300,
+          prop: "content",
+          align: "left",
+          sortable: false,
+        },
+      ],
+      select: {
+        page: 1,
+        year: "",
+        type: "",
+        department: "",
+      },
+      departments: [], //部门类型
 
+      //编辑信息
+      isShowEditor: false,
+      editorForm: {
+        plan_department_link_id: [],
+      },
+    };
+  },
+  methods: {
+    //合并行
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      const span = column["property"] + "-span";
+      if (row[span]) {
+        return row[span];
       }
     },
-    methods: { //合并行
-      objectSpanMethod({
-        row,
-        column,
-        rowIndex,
-        columnIndex
-      }) {
-        const span = column['property'] + '-span'
-        if (row[span]) {
-          return row[span]
-        }
-      },
-      changeTree() {
-
-        if (!this.isTree) {
-          this.table = [{
+    changeTree() {
+      if (!this.isTree) {
+        this.table = [
+          {
             label: "隶属项目",
-            prop: 'pid_info_name',
+            prop: "pid_info_name",
             width: 200,
-            align: 'left',
+            align: "left",
             sortable: false,
-            fixed: 'left'
-          }].concat(this.tableItem);
-        } else {
-          this.table = this.tableItem;
-        }
-        this.getBudgets();
-      },
-      initLoad() {
-        var that = this;
-        var clientHeight = document.documentElement.clientHeight
-        var lxHeader_height = 96.5; //查询 头部
-        var paginationHeight = 37; //分页的高度
-        var topHeight = 50; //页面 头部
-        let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
-      },
-      showAdd(row) {
-        this.form.pid = '0';
-        this.form.pid_info = null;
-        this.isShowAdd = true
-        this.getDepartment()
-        if (row != '') {
-          this.form.pid = row.id;
-          this.form.pid_info = row;
-        }
-      },
-      changeDepartments(v) {
-        console.log(v)
-      },
-      async getTypes() {
-        const res = await getparameter({
-          number: 'money_way'
-        })
-        this.types = res.detail
-      },
+            fixed: "left",
+          },
+        ].concat(this.tableItem);
+      } else {
+        this.table = this.tableItem;
+      }
+      this.getBudgets();
+    },
+    initLoad() {
+      var that = this;
+      var clientHeight = document.documentElement.clientHeight;
+      var lxHeader_height = 96.5; //查询 头部
+      var paginationHeight = 37; //分页的高度
+      var topHeight = 50; //页面 头部
+      let tableHeight =
+        clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
+      that.tableHeight = tableHeight;
+    },
+    showAdd(row) {
+      this.form.pid = "0";
+      this.form.pid_info = null;
+      this.isShowAdd = true;
+      this.getDepartment();
+      if (row != "") {
+        this.form.pid = row.id;
+        this.form.pid_info = row;
+      }
+    },
+    changeDepartments(v) {
+      console.log(v);
+    },
+    async getTypes() {
+      const res = await getparameter({
+        number: "money_way",
+      });
+      this.types = res.detail;
+    },
 
-      moneyRecoverEditor(key) {
-        if (!/^\d{1,3}(,\d{3})*(\.\d+)/.test(this.editorForm[key])) {
-          return
-        }
-        this.editorForm[key] = moneyRecovery(this.editorForm[key])
-      },
-      moneyFormatEditor(key) {
-        if (!/^\d+(\.\d+)?$/.test(this.editorForm[key])) {
-          return
-        }
-        this.editorForm[key] = moneyFormatter(this.editorForm[key])
-      },
-      moneyRecover(key) {
-        if (!/^\d{1,3}(,\d{3})*(\.\d+)/.test(this.form[key])) {
-          return
+    moneyRecoverEditor(key) {
+      if (!/^\d{1,3}(,\d{3})*(\.\d+)/.test(this.editorForm[key])) {
+        return;
+      }
+      this.editorForm[key] = moneyRecovery(this.editorForm[key]);
+    },
+    moneyFormatEditor(key) {
+      if (!/^\d+(\.\d+)?$/.test(this.editorForm[key])) {
+        return;
+      }
+      this.editorForm[key] = moneyFormatter(this.editorForm[key]);
+    },
+    moneyRecover(key) {
+      if (!/^\d{1,3}(,\d{3})*(\.\d+)/.test(this.form[key])) {
+        return;
+      }
+      this.form[key] = moneyRecovery(this.form[key]);
+    },
+    moneyFormat(key) {
+      if (!/^\d+(\.\d+)?$/.test(this.form[key])) {
+        return;
+      }
+      this.form[key] = moneyFormatter(this.form[key]);
+    },
+    //合计
+    summary(param) {
+      this.$nextTick(() => {
+        if (!this.isTree) this.$refs["xyTable"].$children[0].doLayout();
+        else this.$refs["treeTable"].doLayout();
+      });
+      const { columns, data } = param;
+      const sums = [];
+      columns.map((column, index) => {
+        if (index === 0) {
+          sums[index] = "总计";
+          return;
         }
-        this.form[key] = moneyRecovery(this.form[key])
-      },
-      moneyFormat(key) {
-        if (!/^\d+(\.\d+)?$/.test(this.form[key])) {
-          return
+        if (column.property === "money") {
+          sums[index] = moneyFormatter(this.totalMoney);
+          return;
         }
-        this.form[key] = moneyFormatter(this.form[key])
-      },
-      //合计
-      summary(param) {
-        this.$nextTick(() => {
-          if (!this.isTree)
-            this.$refs['xyTable'].$children[0].doLayout();
-          else
-
-            this.$refs['treeTable'].doLayout();
-        })
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.map((column, index) => {
-          if (index === 0) {
-            sums[index] = '总计'
-            return
-          }
-          if (column.property === 'money') {
-            sums[index] = moneyFormatter(this.totalMoney)
-            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
-      },
+        // 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;
+    },
 
-      //翻页
-      pageChange(e) {
-        this.pageIndex = e
-        this.getBudgets()
-      },
-      pageSizeChange(e) {
-        this.pageSize = e
-        this.pageIndex = 1
-        this.getBudgets()
-      },
-      //获取科室
-      getDepartment() {
-        listdeptNoAuth().then(res => {
-          this.departments = res
-        })
-      },
-      //查询计划列表
-      getBudgets() {
-        getBudget({
-          page_size: this.pageSize,
-          page: this.pageIndex,
-          year: this.select.year,
-          type: this.select.type,
-          plan_department_id: this.select.department,
-          is_tree: this.isTree ? 1 : "",
-          top_pid: !this.isTree ? 1 : "",
-        }).then(res => {
-          if (this.isTree)
-            this.treeData = res.list;
-          else {
-            for (var m of res.list.data) {
-              m.pid_info_name = m.pid_info?.name
-            }
-            this.list =
-              mergeTableRow({
-                data: res.list.data,
-                mergeColNames: ["pid_info_name"], // 需要合并的列，默认合并列相同的数据
-                firstMergeColNames: ["pid_info_name"], // 受影响的列，只合并以firstMerge为首的同类型数据
-                firstMerge: 'pid_info_name' // 以哪列为基础进行合并，一般为第一列
-              })
-            this.total = res.list.total
+    //翻页
+    pageChange(e) {
+      this.pageIndex = e;
+      this.getBudgets();
+    },
+    pageSizeChange(e) {
+      this.pageSize = e;
+      this.pageIndex = 1;
+      this.getBudgets();
+    },
+    //获取科室
+    getDepartment() {
+      listdeptNoAuth().then((res) => {
+        this.departments = res;
+      });
+    },
+    //查询计划列表
+    getBudgets() {
+      getBudget({
+        page_size: this.pageSize,
+        page: this.pageIndex,
+        year: this.select.year,
+        type: this.select.type,
+        plan_department_id: this.select.department,
+        is_tree: this.isTree ? 1 : "",
+        top_pid: !this.isTree ? 1 : "",
+      }).then((res) => {
+        if (this.isTree) this.treeData = res.list;
+        else {
+          for (var m of res.list.data) {
+            m.pid_info_name = m.pid_info?.name;
           }
-          this.totalMoney = res.total_money
-        })
-      },
-      //新增提交
-      submit() {
-        let plan_department_links = [];
-        if (this.form.plan_department_link_id.length == 0) {
-          Message({
-            message: '请选择可用部门',
-            type: 'error'
-          })
-          return false;
+          this.list = mergeTableRow({
+            data: res.list.data,
+            mergeColNames: ["pid_info_name"], // 需要合并的列，默认合并列相同的数据
+            firstMergeColNames: ["pid_info_name"], // 受影响的列，只合并以firstMerge为首的同类型数据
+            firstMerge: "pid_info_name", // 以哪列为基础进行合并，一般为第一列
+          });
+          this.total = res.list.total;
         }
+        this.totalMoney = res.total_money;
+      });
+    },
+    //新增提交
+    submit() {
+      let plan_department_links = [];
+      if (this.form.plan_department_link_id.length == 0) {
+        Message({
+          message: "请选择可用部门",
+          type: "error",
+        });
+        return false;
+      }
 
-        this.form.plan_department_link_id.map(item => {
-          plan_department_links.push({
-            department_id: item
-          })
-
-        })
-
-        addBudget({
-          name: this.form.name,
-          type: this.form.type,
-          year: this.form.year,
-          content: this.form.content,
-          money: moneyRecovery(this.form.money),
-          plan_department_id: this.form.department,
-          plan_department_links: plan_department_links,
-          remark: this.form.remark,
-          pid: this.form.pid,
-        }).then(res => {
-          Message({
-            message: '操作成功',
-            type: 'success'
-          })
-          this.isShowAdd = false
-          this.$refs["addBudget"].reset()
-          this.getBudgets()
-        })
-      },
-      //删除
-      deleteTable(e) {
-        delBudget({
-          id: e.id
-        }).then(res => {
-          Message({
-            message: '操作成功',
-            type: 'success'
-          })
-          this.getBudgets()
-        })
-      },
+      this.form.plan_department_link_id.map((item) => {
+        plan_department_links.push({
+          department_id: item,
+        });
+      });
 
-      //修改
-      editorTable() {
-        this.$refs['editorDialog'].$refs['elForm'].validate().then(res => {
+      addBudget({
+        name: this.form.name,
+        type: this.form.type,
+        year: this.form.year,
+        content: this.form.content,
+        money: moneyRecovery(this.form.money),
+        plan_department_id: this.form.department,
+        plan_department_links: plan_department_links,
+        remark: this.form.remark,
+        pid: this.form.pid,
+      }).then((res) => {
+        Message({
+          message: "操作成功",
+          type: "success",
+        });
+        this.isShowAdd = false;
+        this.$refs["addBudget"].reset();
+        this.getBudgets();
+      });
+    },
+    //删除
+    deleteTable(e) {
+      delBudget({
+        id: e.id,
+      }).then((res) => {
+        Message({
+          message: "操作成功",
+          type: "success",
+        });
+        this.getBudgets();
+      });
+    },
 
+    //修改
+    editorTable() {
+      this.$refs["editorDialog"].$refs["elForm"]
+        .validate()
+        .then((res) => {
           if (this.editorForm.plan_department_link_id.length == 0) {
             Message({
-              message: '请选择可用部门',
-              type: 'error'
-            })
+              message: "请选择可用部门",
+              type: "error",
+            });
             return false;
           }
           let plan_department_links = [];
-          this.editorForm.plan_department_link_id.map(item => {
+          this.editorForm.plan_department_link_id.map((item) => {
             plan_department_links.push({
-              department_id: item
-            })
-
-          })
+              department_id: item,
+            });
+          });
           editorBudget({
             id: this.editorForm.id,
             name: this.editorForm.name,
@@ -736,97 +1031,98 @@
             update_money: moneyRecovery(this.editorForm.update_money),
             remark: this.editorForm.remark,
             plan_department_id: this.editorForm.department,
-            plan_department_links: plan_department_links
-          }).then(res => {
-            this.isShowEditor = false
+            plan_department_links: plan_department_links,
+          }).then((res) => {
+            this.isShowEditor = false;
             Message({
-              message: '操作成功',
-              type: 'success'
-            })
-            this.getBudgets()
-          })
-        }).catch(err => {
-          this.$message({
-            message: '请填写完整信息',
-            type: 'error'
-          })
-        })
-      },
-      showEditor(row) {
-        this.getDepartment()
-        detailBudget({
-          id: row.id
-        }).then(res => {
-          this.editorForm = {
-            id: res.id,
-            name: res.name,
-            type: res.type,
-            department: res.plan_department_id,
-            money: moneyFormatter(res.money),
-            update_money: moneyFormatter(res.update_money),
-            year: res.year,
-            content: res.content,
-            remark: res.remark,
-            plan_department_links: res.plan_department_links,
-            pid:res.pid
-          }
-          let ids = [];
-          res.plan_department_links.map(item => {
-            ids.push(item.department_id);
-          })
-          //this.editorForm.plan_department_link_id = ids;
-          this.$set(this.editorForm, "plan_department_link_id", ids);
-
-          this.isShowEditor = true
-          console.log(this.editorForm)
+              message: "操作成功",
+              type: "success",
+            });
+            this.getBudgets();
+          });
         })
-      },
+        .catch((err) => {
+          this.$message({
+            message: "请填写完整信息",
+            type: "error",
+          });
+        });
     },
-    created() {
-      this.table = this.tableItem;
-      this.initLoad();
+    showEditor(row) {
+      this.getDepartment();
+      detailBudget({
+        id: row.id,
+      }).then((res) => {
+        this.editorForm = {
+          id: res.id,
+          name: res.name,
+          type: res.type,
+          department: res.plan_department_id,
+          money: moneyFormatter(res.money),
+          update_money: moneyFormatter(res.update_money),
+          year: res.year,
+          content: res.content,
+          remark: res.remark,
+          plan_department_links: res.plan_department_links,
+          pid: res.pid,
+        };
+        let ids = [];
+        res.plan_department_links.map((item) => {
+          ids.push(item.department_id);
+        });
+        //this.editorForm.plan_department_link_id = ids;
+        this.$set(this.editorForm, "plan_department_link_id", ids);
 
-      this.select.year = this.$moment().format('YYYY');
+        this.isShowEditor = true;
+        console.log(this.editorForm);
+      });
     },
-    mounted() {
-      this.getTypes()
-      this.getDepartment()
-      this.getBudgets()
-    }
-  }
+  },
+  created() {
+    this.table = this.tableItem;
+    this.initLoad();
+
+    this.select.year = this.$moment().format("YYYY");
+  },
+  mounted() {
+    this.getTypes();
+    this.getDepartment();
+    this.getBudgets();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .xy-table-item-label {
-    width: 160px;
-  }
+.xy-table-item-label {
+  width: 160px;
+}
 
-  .xy-table-item-price {
-    position: relative;
+.xy-table-item-price {
+  position: relative;
 
-    &::after {
-      z-index: 1;
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（元）'
-    }
+  &::after {
+    z-index: 1;
+    position: absolute;
+    right: 0;
+    top: 0;
+    content: "（元）";
+  }
 
-    ::v-deep .el-input__clear {
-      position: relative;
-      right: 30px;
-      z-index: 2;
-    }
+  ::v-deep .el-input__clear {
+    position: relative;
+    right: 30px;
+    z-index: 2;
   }
+}
 
-  .slot-btns {
-    display: flex;
-    flex-wrap: wrap;
-    align-content: center;
-    justify-content: flex-start;
+.slot-btns {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: center;
+  justify-content: flex-start;
 
-    &-item {
-      margin: 0 6px 4px 0;
-    }
+  &-item {
+    margin: 0 6px 4px 0;
   }
+}
 </style>
diff --git a/src/views/budget/components/addEvaluate.vue b/src/views/budget/components/addEvaluate.vue
new file mode 100644
index 0000000..968abb1
--- /dev/null
+++ b/src/views/budget/components/addEvaluate.vue
@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <el-dialog :title="type === 1 ? '年中绩效目标' : '年末绩效目标'" :visible.sync="isShow" width="54%">
+      <el-input :value="type === 1 ? form.year_midst : form.year_end"
+                type="textarea"
+                :autosize="{ minRows:6 }"
+                :placeholder="type === 1 ? '请填写年中绩效目标' : '请填写年末绩效目标'"
+                @input="input"></el-input>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="hidden">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { editorBudget,detailBudget } from "@/api/budget/budget";
+export default {
+  data() {
+    return {
+      id: "",
+      isShow: false,
+      type: 1,//1年中 2年末
+      form: {
+      }
+    }
+  },
+  methods: {
+    show() {
+      this.isShow = true
+    },
+    hidden() {
+      this.isShow = false
+    },
+    setId(id) {
+      this.id = id;
+    },
+
+    input(e) {
+      this.type === 1 ? this.form.year_midst = e : this.form.year_end = e
+    },
+
+    submit() {
+      editorBudget(this.form).then(res => {
+        this.$message({
+          type: 'success',
+          message: "保存成功"
+        })
+        this.hidden();
+      })
+    }
+  },
+  computed: {},
+  watch: {
+    isShow(val) {
+      if(val) {
+        detailBudget({id: this.id}).then(res => this.form = res )
+      }else{
+        this.form = {}
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/budget/components/addPoint.vue b/src/views/budget/components/addPoint.vue
index 38d9c55..de0265c 100644
--- a/src/views/budget/components/addPoint.vue
+++ b/src/views/budget/components/addPoint.vue
@@ -45,23 +45,14 @@
         <el-button type="primary" @click="submit">确 定</el-button>
       </span>
     </el-dialog>
-
-    <el-dialog :title="evaluateForm.type === 1 ? '年中绩效目标' : '年末绩效目标'" :visible.sync="isShowEvaluate" width="54%">
-      <el-input v-model="evaluateForm.result" type="textarea" :autosize="{minRows:6}" placeholder="请填写目标"></el-input>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="isShowModal = false">取 消</el-button>
-        <el-button type="primary" @click="submitEvaluate">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { index, save, destroy } from "@/api/budget/planTarget";
 import { index as pointIndex } from "@/api/achievements/points";
-import { save as evaluateSave } from "@/api/achievements/evaluate"
-import { resetSelect } from "@/utils"
+import { resetSelect } from "@/utils";
+
 export default {
   data() {
     return {
@@ -95,67 +86,42 @@ export default {
           minWidth: 200,
           customFn: (row) => {
             return (
-              <div style={
-                {
-                  'display':'flex',
-                  'align-items':'center',
-                  'flex-wrap':'wrap',
-                  'justify-content':'flex-start'
-                }
-              }>
-                <el-dropdown on={{
-                  ['command']:command => {
-                    this.evaluateForm.plan_target_id = row.id
-                    this.evaluateForm.type = command
-                    this.isShowEvaluate = true
-                  }
-                }}>
-                  <el-button size="mini" type="primary">
-                    绩效目标<i class="el-icon-arrow-down el-icon--right"></i>
+              <el-popover
+                style="margin-left: .4em;"
+                placement="top"
+                width="160"
+                trigger="click"
+              >
+                <p>确定删除吗？</p>
+                <div style="text-align: right; margin: 0">
+                  <el-button size="mini" type="text">
+                    取消
                   </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command={1}>年中目标</el-dropdown-item>
-                    <el-dropdown-item command={2}>年末目标</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-
-                <el-popover
-                  style="margin-left: .4em;"
-                  placement="top"
-                  width="160"
-                  trigger="click"
-                >
-                  <p>确定删除吗？</p>
-                  <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="text">
-                      取消
-                    </el-button>
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      on={{
-                        ["click"]: (e) => {
-                          destroy({
-                            id: row.id,
-                          }).then((res) => {
-                            this.$message({
-                              type: "success",
-                              message: "删除成功",
-                            });
-                            this.getList();
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    on={{
+                      ["click"]: (e) => {
+                        destroy({
+                          id: row.id,
+                        }).then((res) => {
+                          this.$message({
+                            type: "success",
+                            message: "删除成功",
                           });
-                        },
-                      }}
-                    >
-                      确定
-                    </el-button>
-                  </div>
-
-                  <el-button slot="reference" size="mini" type="danger">
-                    删除
+                          this.getList();
+                        });
+                      },
+                    }}
+                  >
+                    确定
                   </el-button>
-                </el-popover>
-              </div>
+                </div>
+
+                <el-button slot="reference" size="mini" type="danger">
+                  删除
+                </el-button>
+              </el-popover>
             );
           },
         },
@@ -239,13 +205,7 @@ export default {
       ],
       selections: [], //已选择的全部计划
 
-      isShowEvaluate: false,
-      evaluateForm: {
-        result: "",
-        type: 1,
-        file_ids: [],
-        plan_target_id: ""
-      }
+
     };
   },
   methods: {
@@ -291,15 +251,15 @@ export default {
     },
 
     async getList() {
-      this.pos = this.pos1 = 0;
-      this.spanArr = [];
-      this.spanArr1 = [];
       const res = await index(this.select);
       this.list = res.data;
     },
 
     async getPoints() {
       this.loading = true;
+      this.pos = this.pos1 = 0;
+      this.spanArr = [];
+      this.spanArr1 = [];
       try {
         const res = await pointIndex(this.pointSelect);
         let selectedIds = Array.from(new Set(this.list.map((item) => item.target_id)));
@@ -362,15 +322,7 @@ export default {
         this.isShowModal = false;
       });
     },
-    submitEvaluate() {
-      evaluateSave(this.evaluateForm).then(res => {
-        this.$message({
-          type: 'success',
-          message: "保存成功"
-        })
-        this.isShowEvaluate = false;
-      })
-    }
+
   },
   computed: {},
   watch: {
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index f3ee6fb..bb85e5a 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -263,8 +263,10 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*是否为简易流程</span>
           </div>
           <div class="xy-table-item-content">
-            <el-switch v-model="form.is_simple" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
-            <span>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</span>
+            <div style="display:flex;width: 300px;align-items: center;">
+              <el-switch v-model="form.is_simple" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
+              <div style="flex: 1;text-align: right;">（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div>
+            </div>
           </div>
 
         </div>
@@ -368,6 +370,28 @@
           </div>
         </div>
       </template>
+      <template v-slot:is_framework>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否框架协议
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.is_framework" active-text="是" inactive-text="否" :active-value="1"
+                       :inactive-value="0"/>
+          </div>
+        </div>
+      </template>
+      <template v-slot:use_framework_buy>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否使用框架协议内的采购
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.use_framework_buy" active-text="是" inactive-text="否" :active-value="1"
+                       :inactive-value="0"/>
+          </div>
+        </div>
+      </template>
       <template v-slot:plan>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -1086,6 +1110,9 @@ export default {
         isBudget: true,
         plan: [],
         is_substitute: 0,
+        is_framework: 0,
+        use_framework_buy: 0,
+
       },
       plan: [],
       rules: {
@@ -1737,8 +1764,6 @@ export default {
     let iframe = document.createElement('iframe');
     iframe.src = `${process.env.VUE_APP_OUT_OLD}/login/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`
     iframe.style.display = 'none'
-    console.log(111,`${process.env.VUE_APP_OUT_OLD}/login/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`
-    )
     document.body.appendChild(iframe);
   },
   destroyed() {
@@ -1805,7 +1830,5 @@ export default {
     content: '（元）'
   }
 }
-.xy-table-item-label{
-  width: 200px;
-}
+
 </style>