From a57321a2f060180fe6a07dfdd78fbd9b0da9d70a Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 6 May 2024 17:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../achievements/components/addPlanEvaluate.vue | 17 +++++++++++++++--
 src/views/achievements/components/addPoint.vue  |  2 +-
 .../components/detailAchievements.vue           |  2 +-
 src/views/achievements/endExamine.vue           |  3 ++-
 src/views/achievements/evaluate.vue             |  1 +
 src/views/achievements/middleExamine.vue        |  3 ++-
 src/views/budget/components/addPoint.vue        |  6 +++---
 src/views/contract/contractList.vue             |  2 +-
 8 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/views/achievements/components/addPlanEvaluate.vue b/src/views/achievements/components/addPlanEvaluate.vue
index 2ac5255..a6d9ab4 100644
--- a/src/views/achievements/components/addPlanEvaluate.vue
+++ b/src/views/achievements/components/addPlanEvaluate.vue
@@ -84,6 +84,18 @@ export default {
                   props={{ model: row._form }}
                   label-width="120px"
                 >
+                  <el-form-item label="评价要点及评分规则">
+                    <el-input
+                      type="textarea"
+                      autosize={{
+                        minRows: 3,
+                      }}
+                      v-model={row._form.evaluation_main}
+                      size="small"
+                      placeholder="请输入评价要点及评分规则"
+                    ></el-input>
+                  </el-form-item>
+
                   <el-form-item label="实际完成值" required={true}>
                     <el-input
                       type="textarea"
@@ -224,8 +236,8 @@ export default {
           minWidth: 200,
         },
         {
-          label: "评价方式",
-          prop: "target.evaluation_way",
+          label: "建议上传佐证材料",
+          prop: "evaluation_way",
           minWidth: 260,
           align: "left"
         },
@@ -332,6 +344,7 @@ export default {
           return {
             _form: {
               id: "",
+              evaluation_main: "",
               socre: "",
               result: "",
               remark: "",
diff --git a/src/views/achievements/components/addPoint.vue b/src/views/achievements/components/addPoint.vue
index 227aaa9..aedc4c1 100644
--- a/src/views/achievements/components/addPoint.vue
+++ b/src/views/achievements/components/addPoint.vue
@@ -151,7 +151,7 @@
       <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>
diff --git a/src/views/achievements/components/detailAchievements.vue b/src/views/achievements/components/detailAchievements.vue
index 025e98f..ebc966a 100644
--- a/src/views/achievements/components/detailAchievements.vue
+++ b/src/views/achievements/components/detailAchievements.vue
@@ -64,7 +64,7 @@
             <td>{{ item.target ? item.target.name : '' }}</td>
             <td>{{ targetValue(item) }}</td>
             <td>{{ item.score }}</td>
-            <td style="max-width: 300px;">{{ item.target ? item.target.evaluation_way : '' }}</td>
+            <td style="max-width: 300px;">{{ (item.plan_evaluates && item.plan_evaluates.find(j => j.plan_target_id === item.id)) ? item.plan_evaluates.find(j => j.plan_target_id === item.id).evaluation_main : '' }}</td>
             <td>{{ actResultFormat(item) }}</td>
             <td>{{ (item.plan_evaluates && item.plan_evaluates.find(j => j.plan_target_id === item.id)) ? item.plan_evaluates.find(j => j.plan_target_id === item.id).socre : '' }}</td>
           </tr>
diff --git a/src/views/achievements/endExamine.vue b/src/views/achievements/endExamine.vue
index 587e1f8..33338e7 100644
--- a/src/views/achievements/endExamine.vue
+++ b/src/views/achievements/endExamine.vue
@@ -106,7 +106,8 @@ export default {
   data() {
     return {
       select: {
-        top_pid: 1,
+        has_plan_target: 1,
+        pid: 0,
         page: 1,
         page_size: 10,
         name: "",
diff --git a/src/views/achievements/evaluate.vue b/src/views/achievements/evaluate.vue
index 0204aeb..84282fe 100644
--- a/src/views/achievements/evaluate.vue
+++ b/src/views/achievements/evaluate.vue
@@ -178,6 +178,7 @@ export default {
         page: 1,
         page_size: 10,
         pid: 0,
+        has_plan_target: 1,
       },
       total: 0,
       table: [
diff --git a/src/views/achievements/middleExamine.vue b/src/views/achievements/middleExamine.vue
index 836afa1..917fe69 100644
--- a/src/views/achievements/middleExamine.vue
+++ b/src/views/achievements/middleExamine.vue
@@ -105,7 +105,8 @@ export default {
   data() {
     return {
       select: {
-        top_pid: 1,
+        has_plan_target: 1,
+        pid: 0,
         page: 1,
         page_size: 10,
         name: "",
diff --git a/src/views/budget/components/addPoint.vue b/src/views/budget/components/addPoint.vue
index 8b45a89..1667a8f 100644
--- a/src/views/budget/components/addPoint.vue
+++ b/src/views/budget/components/addPoint.vue
@@ -14,7 +14,7 @@
         }"
         @click="isShowModal = true"
       >
-        目标选择</Button
+          指标选择</Button
       >
       <Button
         shape="circle"
@@ -24,7 +24,7 @@
         }"
         @click="$refs['addPoint'].setType('add'),$refs['addPoint'].show()"
       >
-        目标新增</Button
+        指标新增</Button
       >
       <xy-table :list="list" :table-item="table">
         <template v-slot:btns> </template>
@@ -128,7 +128,7 @@ export default {
           }
         },
         {
-          label: "评价方式",
+          label: "建议上传佐证材料",
           width: 220,
           prop: "evaluation_way",
           customFn: row => {
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 0ff8278..fa8296a 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2821,7 +2821,7 @@ export default {
   },
   created() {
     this.getBudgets();
-    this.select.keyword = this.$route.query.keyword || "";
+    this.selecit.keyword = this.$route.query.keyword || "";
     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;