diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index f83fe1a..7b7d66a 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -1,6 +1,7 @@
 <script>
 export default {
   props:{
+    zIndex: Number,
     type:{
       type:String,
       default:"normal"
@@ -126,6 +127,7 @@ export default {
     const {okText,okClick,footerRender,width,type,$scopedSlots,rules,form,showChange,isShow,title} = this
     return (
       <Modal
+        zIndex={this.zIndex}
         ok-text={okText}
         class-name={'vertical-center-modal'}
         width={width}
diff --git a/src/views/achievements/components/addPlanEvaluate.vue b/src/views/achievements/components/addPlanEvaluate.vue
index 62d6c33..d4c892f 100644
--- a/src/views/achievements/components/addPlanEvaluate.vue
+++ b/src/views/achievements/components/addPlanEvaluate.vue
@@ -89,7 +89,18 @@ export default {
                     ></el-input>
                   </el-form-item>
 
-                  <el-form-item label="备注">
+                  <el-form-item label="得分" required={true}>
+                    <el-input-number
+                      type="textarea"
+                      precision={2}
+                      controls={false}
+                      vModel={row._form.result}
+                      size="small"
+                      placeholder="请输入自评值"
+                    ></el-input-number>
+                  </el-form-item>
+
+                  <el-form-item label="备注及未完成指标原因分析">
                     <el-input
                       type="textarea"
                       autosize={{
@@ -97,7 +108,7 @@ export default {
                       }}
                       v-model={row._form.remark}
                       size="small"
-                      placeholder="请输入备注"
+                      placeholder="请输入备注及未完成指标原因分析"
                     ></el-input>
                   </el-form-item>
 
diff --git a/src/views/achievements/components/addPoint.vue b/src/views/achievements/components/addPoint.vue
index 3cc3b0d..89e9f9c 100644
--- a/src/views/achievements/components/addPoint.vue
+++ b/src/views/achievements/components/addPoint.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <xy-dialog
+      :z-index="zIndex"
       ref="dialog"
       :is-show.sync="isShow"
       type="form"
@@ -133,6 +134,39 @@
           </div>
         </div>
       </template>
+      <template #is_fixed>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否固定指标项目 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch style="width: 300px" v-model="form.is_fixed" :active-value="1" :inactive-value="0"></el-switch>
+          </div>
+        </div>
+      </template>
+      <template #evaluation_way>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            评价方式 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input style="width: 300px" v-model="form.evaluation_way" type="textarea" :autosize="{ minRows: 2 }"></el-input>
+          </div>
+        </div>
+      </template>
+      <template #score>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red; font-weight: 600; padding-right: 4px"
+            >*</span
+            >
+            分值 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :precision="2" style="width: 300px" v-model="form.score" :controls="false"></el-input-number>
+          </div>
+        </div>
+      </template>
       <template v-slot:half_target>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -199,6 +233,7 @@
 
 <script>
 import { show, save } from "@/api/achievements/points";
+import { PopupManager } from "element-ui/src/utils/popup"
 export default {
   props: {
     target_types: {
@@ -216,6 +251,7 @@ export default {
   },
   data() {
     return {
+      zIndex: PopupManager.nextZIndex(),
       isDingxing: false,
       isShow: false,
       id: "",
@@ -227,6 +263,9 @@ export default {
         target_type2_id: "",
         name: "",
         unit_id: "",
+        is_fixed: 1,
+        evaluation_way: "",
+        score: 0.00,
         symbol_id: "",
         half_target: "",
         year_target: "",
@@ -274,6 +313,12 @@ export default {
             message: "请填写全年（程）指标值",
           },
         ],
+        score: [
+          {
+            required: true,
+            message: "请填写分值",
+          },
+        ]
       },
     };
   },
@@ -290,6 +335,9 @@ export default {
         target_type2_id: "",
         name: "",
         unit_id: "",
+        is_fixed: 1,
+        evaluation_way: "",
+        score: 0.00,
         symbol_id: "",
         half_target: "",
         year_target: "",
@@ -349,6 +397,7 @@ export default {
   watch: {
     isShow(val) {
       if (val) {
+        this.zIndex = PopupManager.nextZIndex()
         if (this.type === "editor") {
           this.getDetail();
         }
diff --git a/src/views/achievements/components/addSelfEvaluationForm.vue b/src/views/achievements/components/addSelfEvaluationForm.vue
new file mode 100644
index 0000000..06ca13d
--- /dev/null
+++ b/src/views/achievements/components/addSelfEvaluationForm.vue
@@ -0,0 +1,122 @@
+<template>
+  <div>
+    <el-dialog :title="(type === 1 ? '年中' : '年末') + '自评表'" :visible.sync="isShow" width="54%">
+      <el-form :model="form" size="small">
+        <el-form-item :label="(type === 1 ? '年中' : '年末') + '绩效等级'">
+          <el-input :value="type === 1 ? form.middle_achievement : form.end_achievement"
+                    @input="e => {
+                      type === 1 ? form.middle_achievement = e : form.end_achievement = e
+                    }"></el-input>
+        </el-form-item>
+        <el-form-item :label="(type === 1 ? '年中' : '年末') + '成效'">
+          <el-input :value="type === 1 ? form.middle_effect : form.end_effect"
+                    type="textarea"
+                    :autosize="{ minRows: 2 }"
+                    @input="e => {
+                      type === 1 ? form.middle_effect = e : form.end_effect = e
+                    }"></el-input>
+        </el-form-item>
+        <el-form-item :label="(type === 1 ? '年中' : '年末') + '问题'">
+          <el-input :value="type === 1 ? form.middle_question : form.end_question"
+                    type="textarea"
+                    :autosize="{ minRows: 2 }"
+                    @input="e => {
+                      type === 1 ? form.middle_question = e : form.end_question = e
+                    }"></el-input>
+        </el-form-item>
+        <el-form-item :label="(type === 1 ? '年中' : '年末') + '整改措施'">
+          <el-input :value="type === 1 ? form.middle_measure : form.end_measure"
+                    type="textarea"
+                    :autosize="{ minRows: 2 }"
+                    @input="e => {
+                      type === 1 ? form.middle_measure = e : form.end_measure = e
+                    }"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <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 {
+      type: 1,//1middle 2end
+      id: "",//planId
+      isShow: false,
+      form: {
+
+      }
+    }
+  },
+  methods: {
+    setForm () {
+      this.form = this.type === 1 ? {
+        middle_achievement: "",
+        middle_effect: "",
+        middle_question: "",
+        middle_measure: ""
+      } : {
+        end_achievement: "",
+        end_effect: "",
+        end_question: "",
+        end_measure: ""
+      }
+    },
+    show() {
+      this.isShow = true
+    },
+    hidden() {
+      this.isShow = false
+    },
+    setId(id) {
+      this.id = id;
+    },
+    setType (type) {
+      if ([1,2].indexOf(type) !== -1) {
+        this.type = type
+      }
+    },
+
+    submit() {
+      this.form.id = this.id
+      editorBudget({
+        ...this.form,
+        id: this.id
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: "保存成功"
+        })
+        this.hidden();
+      })
+    }
+  },
+  computed: {},
+  watch: {
+    isShow(val) {
+      if(val) {
+        this.setForm()
+      }else{
+        this.form = {}
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  letter-spacing: 4px;
+
+  padding: 10px 6px;
+}
+</style>
diff --git a/src/views/achievements/evaluate.vue b/src/views/achievements/evaluate.vue
index feeafd5..51d7a91 100644
--- a/src/views/achievements/evaluate.vue
+++ b/src/views/achievements/evaluate.vue
@@ -36,37 +36,76 @@
           label="操作"
           header-align="center"
           fixed="right"
-          width="170"
+          width="210"
         >
           <template v-slot:default="scope">
-            <Button
-              size="small"
-              type="primary"
-              class="slot-btns-item"
-              @click="
-                () => {
-                  $refs['addPlanEvaluate'].type = 1;
-                  $refs['addPlanEvaluate'].setPlanId(scope.row.id);
-                  $refs['addPlanEvaluate'].show();
-                }
-              "
-            >
-              年中目标
-            </Button>
-            <Button
-              size="small"
-              type="primary"
-              class="slot-btns-item"
-              @click="
-                () => {
-                  $refs['addPlanEvaluate'].type = 2;
-                  $refs['addPlanEvaluate'].setPlanId(scope.row.id);
-                  $refs['addPlanEvaluate'].show();
-                }
-              "
-            >
-              年末目标
-            </Button>
+            <el-dropdown @command="command => {
+              if (command === 'yearMiddle') {
+                $refs['addPlanEvaluate'].type = 1;
+                $refs['addPlanEvaluate'].setPlanId(scope.row.id);
+                $refs['addPlanEvaluate'].show();
+              } else {
+                $refs['addPlanEvaluate'].type = 2;
+                $refs['addPlanEvaluate'].setPlanId(scope.row.id);
+                $refs['addPlanEvaluate'].show();
+              }
+            }">
+              <Button size="small" type="primary">
+                绩效目标<i class="el-icon-arrow-down el-icon--right"></i>
+              </Button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="yearMiddle">年中</el-dropdown-item>
+                <el-dropdown-item command="yearEnd">年末</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+            <el-dropdown @command="command => {
+              if (command === 'yearMiddle') {
+                $refs['addSelfEvaluationForm'].setId(scope.row.id);
+                $refs['addSelfEvaluationForm'].setType(1);
+                $refs['addSelfEvaluationForm'].show();
+              } else {
+                $refs['addSelfEvaluationForm'].setId(scope.row.id);
+                $refs['addSelfEvaluationForm'].setType(2);
+                $refs['addSelfEvaluationForm'].show();
+              }
+            }">
+              <Button style="margin-left: 4px;" size="small" type="primary">
+                自评表<i class="el-icon-arrow-down el-icon--right"></i>
+              </Button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="yearMiddle">年中</el-dropdown-item>
+                <el-dropdown-item command="yearEnd">年末</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+<!--            <Button-->
+<!--              size="small"-->
+<!--              type="primary"-->
+<!--              class="slot-btns-item"-->
+<!--              @click="-->
+<!--                () => {-->
+<!--                  $refs['addPlanEvaluate'].type = 1;-->
+<!--                  $refs['addPlanEvaluate'].setPlanId(scope.row.id);-->
+<!--                  $refs['addPlanEvaluate'].show();-->
+<!--                }-->
+<!--              "-->
+<!--            >-->
+<!--              年中目标-->
+<!--            </Button>-->
+<!--            <Button-->
+<!--              size="small"-->
+<!--              type="primary"-->
+<!--              class="slot-btns-item"-->
+<!--              @click="-->
+<!--                () => {-->
+<!--                  $refs['addPlanEvaluate'].type = 2;-->
+<!--                  $refs['addPlanEvaluate'].setPlanId(scope.row.id);-->
+<!--                  $refs['addPlanEvaluate'].show();-->
+<!--                }-->
+<!--              "-->
+<!--            >-->
+<!--              年末目标-->
+<!--            </Button>-->
           </template>
         </el-table-column>
       </template>
@@ -88,6 +127,7 @@
     </div>
     <addEvaluate ref="addEvaluate" @refresh="getList"></addEvaluate>
     <addPlanEvaluate ref="addPlanEvaluate"></addPlanEvaluate>
+    <addSelfEvaluationForm ref="addSelfEvaluationForm"></addSelfEvaluationForm>
   </div>
 </template>
 
@@ -99,10 +139,12 @@ import { getparameter } from "@/api/system/dictionary";
 
 import addEvaluate from "@/views/achievements/components/addEvaluate.vue";
 import addPlanEvaluate from "@/views/achievements/components/addPlanEvaluate.vue";
+import addSelfEvaluationForm from '@/views/achievements/components/addSelfEvaluationForm.vue'
 export default {
   components: {
     addEvaluate,
     addPlanEvaluate,
+    addSelfEvaluationForm
   },
   data() {
     return {
@@ -111,6 +153,7 @@ export default {
         keyword: "",
         page: 1,
         page_size: 10,
+        top_pid: 0,
       },
       total: 0,
       table: [
@@ -185,6 +228,7 @@ export default {
     async getList() {
       const res = await getBudget(this.select);
       this.list = res.list.data;
+      this.total = res.list.total;
     },
 
     edit(row, type) {
diff --git a/src/views/achievements/point.vue b/src/views/achievements/point.vue
index e371c5d..46b1d5c 100644
--- a/src/views/achievements/point.vue
+++ b/src/views/achievements/point.vue
@@ -110,6 +110,11 @@ export default {
           label: "单位",
           prop: "unit_detail.value",
           width: 120
+        },
+        {
+          label: "分值",
+          prop: "score",
+          width: 100
         }
       ],
       list: [],
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 36a3662..977a39f 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -127,10 +127,11 @@
           fixed="right"
           header-align="center"
           label="操作"
-          width="200"
+          width="220"
         >
           <template slot-scope="scope">
             <div class="slot-btns">
+              <Tag color="blue" v-if="scope.row.pid === 0">分值：{{ pScore(scope.row) }}</Tag>
               <Button
                 class="slot-btns-item"
                 size="small"
@@ -164,6 +165,7 @@
                 size="small"
                 type="primary"
                 @click="
+                $refs['addPoint'].setPlanPid(scope.row.pid),
                   $refs['addPoint'].setPlanId(scope.row.id),
                     $refs['addPoint'].show()
                 "
@@ -208,6 +210,7 @@
           >
             <template slot-scope="scope">
               <div class="slot-btns">
+                <Tag color="blue" v-if="scope.row.pid === 0">分值：{{ pScore(scope.row) }}</Tag>
                 <Button
                   class="slot-btns-item"
                   size="small"
@@ -241,6 +244,7 @@
                   size="small"
                   type="primary"
                   @click="
+                   $refs['addPoint'].setPlanPid(scope.row.pid),
                     $refs['addPoint'].setPlanId(scope.row.id),
                       $refs['addPoint'].show()
                   "
@@ -318,7 +322,7 @@
               clearable
               size="small"
               style="width: 300px"
-              @change="(e) => (form.type = e[e.length - 1] || '')"
+              @change="cascaderPick"
             />
 <!--            <el-select-->
 <!--              v-model="form.type"-->
@@ -499,7 +503,7 @@
               clearable
               size="small"
               style="width: 300px"
-              @change="(e) => (editorForm.type = e[e.length - 1] || '')"
+              @change="(e) => (editorForm.type = e[e.length - 1] || '',editorForm.type_pid = e[e.length - 2] || '')"
             />
 <!--            <el-select-->
 <!--              v-model="editorForm.type"-->
@@ -847,6 +851,10 @@ export default {
     };
   },
   methods: {
+    cascaderPick (e) {
+      this.form.type_pid = e[e.length - 2] || ''
+      this.form.type = e[e.length - 1] || ''
+    },
     //合并行
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       const span = column["property"] + "-span";
@@ -1142,6 +1150,13 @@ export default {
       });
     },
   },
+  computed: {
+    pScore () {
+      return function(row) {
+        return row?.plan_targets?.reduce((pre, cur) => (pre + parseFloat(cur.score||0)),0) || 0
+      }
+    }
+  },
   created() {
     this.table = this.tableItem;
     this.initLoad();
diff --git a/src/views/budget/components/addPoint.vue b/src/views/budget/components/addPoint.vue
index 784bd43..9e07f82 100644
--- a/src/views/budget/components/addPoint.vue
+++ b/src/views/budget/components/addPoint.vue
@@ -16,13 +16,25 @@
       >
         目标选择</Button
       >
+      <Button
+        shape="circle"
+        type="primary"
+        :style="{
+          margin: '0 0 10px 20px',
+        }"
+        @click="$refs['addPoint'].show()"
+      >
+        目标新增</Button
+      >
       <xy-table :list="list" :table-item="table">
         <template v-slot:btns> </template>
       </xy-table>
     </el-drawer>
 
     <el-dialog title="绩效指标列表" :visible.sync="isShowModal" width="54%">
+      <Input v-model="pointSelect.name" search enter-button placeholder="三级指标搜索" @on-search="getPoints"/>
       <Table
+        style="margin-top: 10px;"
         :data="points"
         :columns="pointTable"
         :loading="loading"
@@ -51,6 +63,8 @@
         <el-button type="primary" @click="submit">确 定</el-button>
       </span>
     </el-dialog>
+
+    <addPoint ref="addPoint"></addPoint>
   </div>
 </template>
 
@@ -58,14 +72,64 @@
 import { index, save, destroy } from "@/api/budget/planTarget";
 import { index as pointIndex } from "@/api/achievements/points";
 import { resetSelect } from "@/utils";
-
+import addPoint from "@/views/achievements/components/addPoint.vue"
 export default {
+  components: {
+    addPoint
+  },
   data() {
     return {
+      planPid: 0,
       isShow: false,
 
       list: [],
       table: [
+        {
+          label: "分值填写",
+          width: 200,
+          customFn: row => {
+            return (
+              <div style="display: flex;">
+                <el-input-number precision={2}
+                                 min={0}
+                                 max={100}
+                                 disabled={this.planPid === 0}
+                                 vModel={row.score}
+                                 size="small"
+                                 controls={false}
+                                 placeholder="分值"></el-input-number>
+                <el-button style="border-top-left-radius: 0;border-bottom-left-radius: 0;transform: translateX(-4px);"
+                           size="small"
+                           disabled={this.planPid === 0}
+                           type="primary"
+                           icon="el-icon-edit"
+                           on={{
+                             click: _ => {
+                               this.$confirm('确认保存分数？','提示',{
+                                 closeOnClickModal: false
+                               }).then(_ => {
+                                 let totalScore = this.list.reduce((pre,cur)=>(pre + parseFloat(cur.score||0)),0)
+                                 if (totalScore > 100) {
+                                   this.$message({
+                                     type: "warning",
+                                     message: "分值超过100"
+                                   })
+                                 } else {
+                                   save(row).then(_ => {
+                                     this.$message({
+                                       type: 'success',
+                                       message: '保存成功'
+                                     })
+                                     this.getList()
+                                   })
+                                 }
+                               })
+                             }
+                           }}>保存</el-button>
+              </div>
+            )
+          }
+        },
         {
           label: "指标名称",
           prop: "target.name",
@@ -143,6 +207,7 @@ export default {
       pointSelect: {
         page: 1,
         page_size: 10,
+        name: ""
       },
       points: [],
       pointTotal: 0,
@@ -220,6 +285,9 @@ export default {
     hidden() {
       this.isShow = false;
     },
+    setPlanPid (pid) {
+      this.planPid = pid;
+    },
     getPlanId() {
       return this.select.plan_id;
     },
@@ -323,6 +391,7 @@ export default {
           save({
             target_id,
             plan_id: this.getPlanId(),
+            score: this.points.find(j => j.id === target_id)?.score
           })
         );
       });
@@ -354,4 +423,5 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+</style>
diff --git a/src/views/contract/components/addContractLedger.vue b/src/views/contract/components/addContractLedger.vue
index 7bace17..1cc6852 100644
--- a/src/views/contract/components/addContractLedger.vue
+++ b/src/views/contract/components/addContractLedger.vue
@@ -88,61 +88,6 @@
           </div>
         </div>
       </template>
-      <!--
-      <template v-slot:guarantee_money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>质保金
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input-number :precision="2" :controls="false" placeholder="请填写质保金" v-model="form.guarantee_money"
-                             style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:start_date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同服务时间
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker style="width: 300px;" value-format="yyyy-MM-dd" v-model="time" type="daterange"
-                            range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-                            @change="e => {
-                              (e[0] && e[1]) ?
-                                (form.start_date = e[0],
-                                form.end_date = e[1])
-                                : (form.start_date = '',form.end_date = '')
-
-                            }">
-            </el-date-picker>
-          </div>
-        </div>
-      </template>
-      <template v-slot:guarantee_year>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>质保期
-          </div>
-          <div class="xy-table-item-content xy-table-item-year">
-            <el-input-number :controls="false" placeholder="请填写质保期" v-model="form.guarantee_year"
-                             style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-
-            <span style="color: red;">*</span>
-            签订日期
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker style="width: 300px;" value-format="yyyy-MM-dd" v-model="form.date" type="date">
-            </el-date-picker>
-          </div>
-        </div>
-      </template>-->
       <template v-slot:is_framework>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -230,15 +175,12 @@ export default {
         name: "",
         contract_type: 1,
         number: "",
-        supply: "",
-        money: "",
         start_date: "",
         end_date: "",
         guarantee_money: "",
         guarantee_year: "",
         date: this.$moment().format('YYYY-MM-DD'),
         is_contract: 1,
-        is_framework: "",
         purchase_status: 3,
         //join_status: 3,
         invite_status: 3,
@@ -295,12 +237,22 @@ export default {
       this.isShow = false;
     },
     init() {
-      for (let key in this.form) {
-        if (this.form[key] instanceof Array) {
-          this.form[key] = [];
-        } else {
-          this.form[key] = "";
-        }
+      this.form = {
+        name: "",
+        contract_type: 1,
+        number: "",
+        start_date: "",
+        end_date: "",
+        guarantee_money: "",
+        guarantee_year: "",
+        date: this.$moment().format('YYYY-MM-DD'),
+        is_contract: 1,
+        purchase_status: 3,
+        //join_status: 3,
+        invite_status: 3,
+        files: [],
+        outcome_type: 1,
+        is_substitute: 1
       }
       this.$refs["dialog"].clearValidate();
     },
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index bd3d03b..002a518 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -149,18 +149,10 @@
         </div>
       </template>
       <template v-slot:extraFormBottom>
-        <div class="base-info add-plan" style="margin-top: 20px;margin-bottom: 20px">
-          <div class="base-info-title">合同关联方</div>
-          <Button type="primary" style="margin-left: 50px;" @click="form.contract_links.push({contract_id:contract.id,type_id:'',name:'',remark:''})">新增</Button>
-        </div>
-        <xy-table :height="160" :list="form.contract_links instanceof Array ? form.contract_links : []" :table-item="linkTable">
-          <template v-slot:btns></template>
-        </xy-table>
-
         <div class="base-info add-plan" style="margin-top: 20px;margin-bottom: 20px">
           <div class="base-info-title">付款计划</div>
           <Button type="primary" style="margin-left: 50px;" @click="isShowAddPlan = true">新增计划</Button>
-          <p style="font-weight: 600;zoom: .9;color: red;">如需分期付款，请分条填报付款计划</p>
+          <p style="font-weight: 600;zoom: .9;color: red;margin-left: 10px;">如需分期付款，请分条填报付款计划</p>
         </div>
 
         <xy-table :list="signList" :table-item="signTable" :show-index="false" :height="160"
@@ -168,6 +160,14 @@
           @editor="(row)=>{$refs['detailContractSign'].planId = row.id;$refs['detailContractSign'].isShow = true}">
 
         </xy-table>
+
+        <div class="base-info add-plan" style="margin-top: 20px;margin-bottom: 20px">
+          <div class="base-info-title">合同关联方</div>
+          <Button type="primary" style="margin-left: 50px;" @click="form.contract_links.push({contract_id:contract.id,type_id:'',name:'',remark:''})">新增</Button>
+        </div>
+        <xy-table :height="160" :list="form.contract_links instanceof Array ? form.contract_links : []" :table-item="linkTable">
+          <template v-slot:btns></template>
+        </xy-table>
       </template>
     </xy-dialog>
 
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index e5a14cb..b115acc 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -37,7 +37,7 @@
       <template v-slot:is_simple>
         <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">
             <div style="display:flex;width: 300px;align-items: center;">
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index 21250bb..4693829 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -75,7 +75,6 @@
             <el-select placeholder="选择款项类型或直接填写其他类型"
                        v-model="paymentRegistrationForm.type"
                        style="width: 200px;"
-                       disabled
                        filterable
                        allow-create
                        clearable>
@@ -164,7 +163,7 @@ export default {
           }
         }
       ],
-      paymentType:["进度款","结算款","质保金"],
+      paymentType:["首付款","进度款","结算款","质保金"],
       isShow:false,
       registrationId:"",
       paymentRegistrationForm:{
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 3419698..02407da 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -313,7 +313,7 @@ export default {
           },
         },
       ],
-      paymentType: ["进度款", "结算款", "质保金"],
+      paymentType: ["首付款","进度款", "结算款", "质保金"],
       isShowPaymentRegistration: false,
       paymentRegistrationForm: {
         applyMoney: "",
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index e53f0e9..fe98fa1 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -73,6 +73,7 @@
           row-key="id"
           border
           default-expand-all
+          @select="planPick"
           :tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }"
         >
           <template v-slot:btns>
@@ -1164,7 +1165,7 @@ export default {
           align: "left",
         },
         {
-          label: "预存金额",
+          label: "框架合同总额",
           prop: "plan_price",
           width: 120,
           align: "right"
@@ -1194,6 +1195,14 @@ export default {
     };
   },
   methods: {
+    planPick (selection, row) {
+      if (row.year != new Date().getFullYear()) {
+        this.$confirm("您选择了非本年预算，是否继续？").catch(_ => {
+          this.$refs['editorPlanTable'].toggleRowSelection(row)
+        })
+      }
+    },
+
     setType(type) {
       if (["add", "edit"].find((i) => i === type)) {
         this.type = type;
@@ -1372,7 +1381,7 @@ export default {
         })?.label,
         yusuan: row?.plan_price?.toString(),
         zijinlaiyuan: row.money_way_detail?.value,
-        zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"；"),"")
+        zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
       };
       let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/8&auth_token=${this.$store.getters.oa_token}&out_caigou_id=${
         row.id
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index f4144b9..0ff8278 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2268,7 +2268,7 @@ export default {
 
           }
         }, ""),
-        zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"；"),"")
+        zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
       };
       console.log(baseInfo.zijinlaiyuanjuti)
       // let res = await getOatoken()
@@ -2745,7 +2745,7 @@ export default {
           flowStatus["shenpi"].setExecutable(true)
         }
       }
-      if (item.is_contract && item.purchase_way?.value !== "网上商城" && !/contractLedger/g.test(this.$route.path)) {
+      if (item.is_contract && item.purchase_way?.value !== "网上商城" && !item.is_substitute) {
         flowStatus["qianding"].setStatus(item.status)
         if (item.join_status === 3 && item.status === 1) {
           flowStatus["qianding"].setExecutable(true)
@@ -2754,9 +2754,9 @@ export default {
       if (item.is_end === 0) {
         flowStatus["zhifu"].setStatus(1)
         //最后一笔没付完
-        if ((item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
+        if ((!item.is_contract && !item.is_substitute && item.purchase_status === 3) || (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
           item.status === 2 ||
-          (!item.is_contract && item.is_simple)) {
+          (!item.is_contract && item.is_simple) || (item.is_contract && item.is_substitute && item.join_status === 3)) {
           //网上商场的话采购完成 合同签订完成 不为合同并且为简易
           flowStatus["zhifu"].setExecutable(true)
         }
@@ -2810,7 +2810,6 @@ export default {
       })
       .catch((error) => {});
     this.getPurchaseType();
-    this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0
     this.getDepartment();
     this.getPurchaseWay();
     this.getMoneyWay();
@@ -2823,13 +2822,11 @@ export default {
   created() {
     this.getBudgets();
     this.select.keyword = this.$route.query.keyword || "";
-    //this.select.is_contract = /All|all/g.test(this.$route.path) ? "" : 0;
+    this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0;
     if (/contractLedger/g.test(this.$route.path)) {
       this.select.is_contract = 1;
       this.select.purchase_status = 3;
-    }
-    if (/mycontract/g.test(this.$route.path)) {
-      this.select.is_contract = 1;
+      this.select.invite_status = 3;
     }
     if (/contractAll/g.test(this.$route.path)) {
       this.select.is_simple = "";
@@ -2845,6 +2842,7 @@ export default {
 .selects {
   display: flex;
   flex-wrap: wrap;
+  align-items: center;
 
   & > div {
     margin-bottom: 6px;
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 02179f3..69a52f0 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -572,7 +572,7 @@ export default {
       });
       let curAct = res?.map(i => {
         const { use_money_total,money_total_2 } = i
-        return money_total_2 ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
+        return Number(money_total_2) ? (Math.round((Number(use_money_total||0) / Number(money_total_2||0)) * 10000) / 100) : 0;
       });
       let nextPlan = res?.map(i => {
         const { use_money_total_next,paid_plan_total_next,money_total_2 } = i
@@ -944,6 +944,13 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
 .show-static-btn {
   cursor: pointer;
   font-size: 15px;
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 6f7075a..1505330 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -98,8 +98,7 @@
           </div>
           <div class="xy-table-item-content">
             <!--            <el-input readonly clearable placeholder="选择款项类型或直接填写其他类型" v-model="paymentRegistrationForm.type" style="width: 300px;"/>-->
-            <el-select placeholder="选择款项类型或直接填写其他类型" v-model="paymentRegistrationForm.type" style="width: 300px;"
-              disabled filterable allow-create clearable>
+            <el-select placeholder="选择款项类型或直接填写其他类型" v-model="paymentRegistrationForm.type" style="width: 300px;" filterable allow-create clearable>
               <el-option v-for="item in paymentType" :key="item" :label="item" :value="item">
               </el-option>
             </el-select>
@@ -291,7 +290,7 @@ import { listdeptNoAuth } from '@/api/system/department'
             }
           }
         ],
-        paymentType: ["进度款", "结算款", "质保金"],
+        paymentType: ["首付款","进度款", "结算款", "质保金"],
         isShow: false,
         registrationId: "",
         paymentRegistrationForm: {