From 6161c51d3602a6e2ab114320792912799d603bdf Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 11 May 2025 21:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addPlanEvaluate.vue            | 34 +++++++++++++++++++
 .../achievements/components/addPoint.vue      | 27 +++++++++++++++
 .../components/addSelfEvaluationForm.vue      | 21 ++++++++++++
 .../achievements/components/addTypes.vue      | 25 ++++++++++++++
 .../components/detailAchievements.vue         | 10 ++++++
 src/views/achievements/point.vue              |  6 ++++
 src/views/achievements/types.vue              |  5 +++
 vue.config.js                                 |  2 +-
 8 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/src/views/achievements/components/addPlanEvaluate.vue b/src/views/achievements/components/addPlanEvaluate.vue
index 038aa23..30d53b7 100644
--- a/src/views/achievements/components/addPlanEvaluate.vue
+++ b/src/views/achievements/components/addPlanEvaluate.vue
@@ -116,9 +116,41 @@ export default {
                       }
                     ],
                     result: [{ required: true, message: "请输入实际完成值", trigger: "blur" }],
+                    year_plan: [{ required: true, message: "请输入年初计划值", trigger: "blur" }],
+                    score_level: [{ required: true, message: "请输入分值", trigger: "blur" }],
                   }}
                   label-width="120px"
                 >
+                {
+                  this.type !== 1 ? (
+                    <el-form-item label="年初计划值" prop="year_plan" required={true}>
+                      <el-input-number
+                        precision={2}
+                        controls={false}
+                        vModel={row._form.year_plan}
+                        size="small"
+                        min={0}
+                        max={100}
+                        placeholder="请输入年初计划值"
+                      ></el-input-number>
+                    </el-form-item>
+                  ) : ""
+                }
+                {
+                  this.type !== 1 ? (
+                    <el-form-item label="分值" prop="score_level" required={true}>
+                      <el-input-number
+                        precision={2}
+                        controls={false}
+                        vModel={row._form.score_level}
+                        size="small"
+                        min={0}
+                        max={100}
+                        placeholder="请输入分值"
+                      ></el-input-number>
+                    </el-form-item>
+                  ) : ""
+                }
                   {
                     this.type !== 1 ? (
                       <el-form-item label="评价要点及评分规则" prop="evaluation_main" required={true}>
@@ -416,6 +448,8 @@ export default {
           return {
             _form: {
               id: "",
+              year_plan:'',
+              score_level:'',
               evaluation_main: "",
               socre: "",
               result: "",
diff --git a/src/views/achievements/components/addPoint.vue b/src/views/achievements/components/addPoint.vue
index aedc4c1..14622bc 100644
--- a/src/views/achievements/components/addPoint.vue
+++ b/src/views/achievements/components/addPoint.vue
@@ -67,6 +67,24 @@
           </div>
         </div>
       </template>
+      <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
+            >
+            年份 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.year"
+              type="year"
+              style="width: 300px"
+              placeholder="选择年">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -266,6 +284,7 @@ export default {
       form: {
         target_type_id: "",
         target_type2_id: "",
+        year:'',
         name: "",
         symbol_id: "",
         unit_id: "",
@@ -288,6 +307,12 @@ export default {
             message: "请填写二级指标",
           },
         ],
+        year: [
+          {
+            required: true,
+            message: "请填写年份",
+          },
+        ],
         name: [
           {
             required: true,
@@ -345,6 +370,7 @@ export default {
       this.form = {
         target_type_id: "",
         target_type2_id: "",
+        year:'',
         name: "",
         symbol_id: "",
         unit_id: "",
@@ -374,6 +400,7 @@ export default {
       this.$integrateData(this.form, res);
 
       this.target_type2s = this.target_types?.filter(i => i.id === this.form.target_type_id)[0]?.children
+      this.form.year = res.year?res.year+'':''
     },
 
     submit() {
diff --git a/src/views/achievements/components/addSelfEvaluationForm.vue b/src/views/achievements/components/addSelfEvaluationForm.vue
index d2224eb..9a5af77 100644
--- a/src/views/achievements/components/addSelfEvaluationForm.vue
+++ b/src/views/achievements/components/addSelfEvaluationForm.vue
@@ -3,6 +3,22 @@
     <el-dialog :title="(type === 1 ? '年中' : '年末') + '自评表'" :visible.sync="isShow" width="54%">
       <Tag v-if="form.year_middle_audit < 0 || form.year_end_audit < 0" color="warning">审核驳回</Tag>
       <el-form :model="form" size="small">
+        <el-form-item v-if="type === 1" :label="'年中科室支出概况'">
+          <el-input :value="form.middle_expenditure_survey"
+                    placeholder="年中科室支出概况"
+                    type="textarea"
+                    @input="e => {
+                      form.middle_expenditure_survey = e
+                    }"></el-input>
+        </el-form-item>
+        <el-form-item v-else :label="'年末科室支出概况'">
+          <el-input :value="form.end_expenditure_survey"
+                    placeholder="年末科室支出概况"
+                    type="textarea"
+                    @input="e => {
+                      form.end_expenditure_survey = e
+                    }"></el-input>
+        </el-form-item>
         <el-form-item v-if="type !== 1" :label="(type === 1 ? '年度' : '年末') + '绩效等级'">
           <el-input :value="type === 1 ? form.middle_achievement : form.end_achievement"
                     placeholder="绩效等级"
@@ -10,6 +26,9 @@
                       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.year_midst : form.year_end"
                     type="textarea"
@@ -88,6 +107,7 @@ export default {
 
     setForm () {
       this.form = this.type === 1 ? {
+        middle_expenditure_survey:"",
         middle_achievement: "",
         middle_effect: "",
         middle_question: "",
@@ -96,6 +116,7 @@ export default {
         year_midst: "",
         year_middle_audit: ""
       } : {
+        end_expenditure_survey:'',
         end_achievement: "",
         end_effect: "",
         end_question: "",
diff --git a/src/views/achievements/components/addTypes.vue b/src/views/achievements/components/addTypes.vue
index 9f7a39d..108abff 100644
--- a/src/views/achievements/components/addTypes.vue
+++ b/src/views/achievements/components/addTypes.vue
@@ -9,6 +9,24 @@
       :rules="rules"
       @submit="submit"
     >
+    <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
+          >
+          年份 ：
+        </div>
+        <div class="xy-table-item-content">
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            style="width: 300px"
+            placeholder="选择年">
+          </el-date-picker>
+        </div>
+      </div>
+    </template>
       <template v-slot:pid>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -116,6 +134,7 @@ export default {
       cascaderId_pid: 0,
 
       form: {
+        year:'',
         pid: "",
         name: "",
         remark: "",
@@ -123,6 +142,10 @@ export default {
         sort: "",
       },
       rules: {
+        year:[{
+            required: true,
+            message: "请填写年份",
+          },],
         pid: [
           {
             required: true,
@@ -147,6 +170,7 @@ export default {
     },
     init() {
       this.form = {
+        year:'',
         pid: "",
         name: "",
         remark: "",
@@ -179,6 +203,7 @@ export default {
     async getDetail() {
       const res = await show({ id: this.id });
       this.$integrateData(this.form, res);
+      this.form.year = res.year?res.year+'':''
     },
 
     submit() {
diff --git a/src/views/achievements/components/detailAchievements.vue b/src/views/achievements/components/detailAchievements.vue
index 9ca17b4..56a7645 100644
--- a/src/views/achievements/components/detailAchievements.vue
+++ b/src/views/achievements/components/detailAchievements.vue
@@ -109,6 +109,16 @@
             <td>{{ scoreTotal }}</td>
             <th colspan="2"></th>
           </tr>
+
+          <tr v-if="type == 1">
+            <th>年中科室支出概况</th>
+            <td colspan="8">{{ detail.middle_expenditure_survey}}</td>
+          </tr>
+          <tr v-if="type !== 1">
+            <th>年末科室支出概况</th>
+            <td colspan="8">{{ detail.end_expenditure_survey}}</td>
+          </tr>
+
           <tr v-if="type !== 1">
             <th>绩效等级</th>
             <td colspan="8">{{ type === 1 ? detail.middle_achievement : detail.end_achievement }}</td>
diff --git a/src/views/achievements/point.vue b/src/views/achievements/point.vue
index 9d1017b..8cd4d95 100644
--- a/src/views/achievements/point.vue
+++ b/src/views/achievements/point.vue
@@ -77,6 +77,7 @@ export default {
       pos1: 0,
       pos: 0,
       table: [
+
         {
           label: "一级指标名称",
           prop: "target_type_detail.name",
@@ -117,6 +118,11 @@ export default {
           prop: "score",
           width: 100
         },
+        {
+          label: "年份",
+          prop: "year",
+          width: 200
+        },
         {
           label: "操作",
           align: "left",
diff --git a/src/views/achievements/types.vue b/src/views/achievements/types.vue
index 038107c..1bad2a3 100644
--- a/src/views/achievements/types.vue
+++ b/src/views/achievements/types.vue
@@ -73,6 +73,11 @@ export default {
       },
       total: 0,
       table: [
+        {
+          label: "年份",
+          prop: "year",
+          width: 200
+        },
         {
           label: "名称",
           prop: "name",
diff --git a/vue.config.js b/vue.config.js
index 7a72d4c..7920f4d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath:  process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: './dist',
+  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,