考核任务，评分任务页面修改

ruoyi-ui/src/views/kaohe/vote/index.vue

@@ -10,19 +10,13 @@
         />
       </el-form-item>
       <el-form-item label="开始时间" prop="sTime">
-        <el-date-picker clearable
+        <el-date-picker clearable v-model="queryParams.sTime" type="datetime"
-          v-model="queryParams.sTime"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始时间">
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" prop="eTime">
-        <el-date-picker clearable
+        <el-date-picker clearable v-model="queryParams.eTime" type="datetime"
-          v-model="queryParams.eTime"
+                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束时间">
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -32,27 +26,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['kaohe:vote:add']"
-        >新增</el-button>
-      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['kaohe:vote:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -78,141 +51,166 @@
     </el-row>
 
     <el-table v-loading="loading" :data="voteList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column label="主键" align="center" prop="id" width="55" />
+      <el-table-column label="主键" align="center" prop="id" width="55" fixed/>
-      <el-table-column label="考核任务名称" align="center" prop="pingceName" min-width="140" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核任务名称" align="center" prop="pingceName" min-width="200" :show-overflow-tooltip="true" fixed/>
-      <el-table-column label="考核项名称" align="center" prop="khitemName" min-width="140" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核项名称" align="center" prop="khitemName" min-width="200" :show-overflow-tooltip="true"/>
-      <el-table-column label="考核类型" align="center" prop="khitemName" min-width="100">
+      <el-table-column label="考核项类型" align="center" prop="khitemTypeid" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.type===1">选项评分</span>
+          <span v-if="scope.row.khitemTypeid===1">选项评分</span>
-          <span v-if="scope.row.type===2">占比评分</span>
+          <span v-if="scope.row.khitemTypeid===2">占比评分</span>
-          <span v-if="scope.row.type===5">单独评分</span>
+          <span v-if="scope.row.khitemTypeid===5">单独评分</span>
         </template>
       </el-table-column>
-      <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="140" :show-overflow-tooltip="true">
+      <el-table-column label="评分主题" align="center" prop="voteTitle" min-width="200" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-link type="primary" @click="goVoteEmp(scope.row)">{{ scope.row.voteTitle }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="评分选项" align="center" prop="options" min-width="120" :show-overflow-tooltip="true">
+      <el-table-column label="评分选项" align="center" prop="options" min-width="200" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <div v-if="scope.row.options.length>0">
+          <div v-if="scope.$index=== xzhIndex && scope.row.khitemTypeid===1">
-            <div v-for="item in scope.row.options" :key="item.value">{{ item.label }}</div>
+            <el-select :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                       v-model="scope.row.voteItems" multiple placeholder="请选择评分选项">
+              <el-option
+                v-for="item in vote_options"
+                :key="item.id"
+                :label="item.vitemName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div v-else>
+            <div v-if=" scope.row.voteItems">
+              <div>{{ scope.row.voteItemsName }}</div>
+            </div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="最大值" align="center" prop="maxNum" min-width="60" :show-overflow-tooltip="true"/>
+      <el-table-column label="最大值" align="center" prop="maxNum" min-width="220" :show-overflow-tooltip="true">
-      <el-table-column label="评分占比" align="center" prop="percentage" min-width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="开始时间" align="center" prop="sTime" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sTime, '{y}-{m}-{d}') }}</span>
+          <div v-if="scope.$index===xzhIndex && scope.row.khitemTypeid!==1">
+            <el-input-number :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                             v-model="scope.row.maxNum" :min="0" style="width: 150px;"></el-input-number>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.maxNum }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="eTime" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column label="评分占比" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.eTime, '{y}-{m}-{d}') }}</span>
+          <div v-if="scope.$index===xzhIndex && scope.row.khitemTypeid!==5">
+            <el-input-number :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                             v-model="scope.row.percentage" :precision="2" :step="0.01" :max="1" style="width: 150px;"></el-input-number>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.percentage }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="state" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column label="状态" align="center" prop="vote"  min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
         </template>
       </el-table-column>
-      <el-table-column label="评分详情描述" align="center" prop="vDescription" min-width="140" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
-      <el-table-column label="备注" align="center" prop="remark" min-width="140" :show-overflow-tooltip="true"/>
+        <template slot-scope="scope">
+          <div v-if="scope.$index===xzhIndex">
+            <el-date-picker clearable style="width: 100%;" v-model="scope.row.sTime"
+                            :disabled="!(new Date(scope.row.sTime) > (new Date()))"
+                            type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择开始时间">
+            </el-date-picker>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.sTime }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="vote"  min-width="220" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-if="scope.$index===xzhIndex">
+            <el-date-picker :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                            clearable style="width: 100%;"   v-model="scope.row.eTime"
+                            type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择结束时间">
+            </el-date-picker>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.eTime }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="评分详情描述" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-if="scope.$index===xzhIndex">
+            <el-input :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                      v-model="scope.row.vDescription" type="textarea" placeholder="请输入评分详情描述"/>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.vDescription }}</span>
+          </div>
+
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="vote" min-width="220" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-if="scope.$index===xzhIndex">
+            <el-input :disabled="!(new Date(scope.row.eTime) > (new Date()))"
+                      v-model="scope.row.remark" type="textarea" placeholder="请输入备注"/>
+          </div>
+          <div v-else>
+            <span>{{ scope.row.remark }}</span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
         <template slot-scope="scope">
-          <el-button
+          <div>
-            size="mini"
+            <el-button v-if="!(scope.$index=== xzhIndex)"
-            type="text"
+                       size="mini"
-            icon="el-icon-edit"
+                       type="text"
-            @click="handleUpdate(scope.row)"
+                       icon="el-icon-s-tools"
-            v-hasPermi="['kaohe:vote:edit']"
+                       v-hasPermi="['kaohe:vote:edit']"
-          >修改</el-button>
+                       @click="handleUpdate(scope.$index)"
-<!--          <el-button
+            >修改</el-button>
-            size="mini"
+            <el-button v-if="scope.$index=== xzhIndex"
-            type="text"
+                       size="mini"
-            icon="el-icon-delete"
+                       type="text"
-            @click="handleDelete(scope.row)"
+                       v-hasPermi="['kaohe:vote:edit']"
-            v-hasPermi="['kaohe:vote:remove']"
+                       @click="voteSubmit(scope.row)"
-          >删除</el-button>-->
+            >确认</el-button>
-          <el-button
+            <el-button v-if="scope.$index=== xzhIndex"
-            v-if="scope.row.state !== '0'"
+                       size="mini"
-            size="mini"
+                       type="text"
-            type="text"
+                       v-hasPermi="['kaohe:vote:edit']"
-            icon="el-icon-thumb"
+                       @click="cancelVote"
-            @click="goVotepage(scope.row)"
+            >取消</el-button>
-          >去评分</el-button>
+            <el-button
+              v-if="(new Date(scope.row.sTime) < (new Date())) && (new Date(scope.row.eTime) > (new Date()))"
+              size="mini"
+              type="text"
+              icon="el-icon-thumb"
+              @click="goVotepage(scope.row)"
+            >去评分</el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>
 
-<!--    <pagination
+    <pagination
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    />-->
+    />
 
-    <!-- 添加或修改投票评测对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="评分主题" prop="voteTitle">
-          <el-input v-model="form.voteTitle" placeholder="请输入评分主题" :disabled="form.state!=='0'"/>
-        </el-form-item>
-        <el-form-item label="评分选项" prop="options" v-if="form.type===1">
-          <el-tag v-for="item in form.options" :key="item.value" type="info" style="margin: 0 5px;">{{ item.label }}</el-tag>
-        </el-form-item>
-        <el-form-item label="最大值" prop="maxNum" v-if="form.type!==1">
-          <el-input-number v-model="form.maxNum" controls-position="right" :min="0" :disabled="form.state!=='0'"></el-input-number>
-        </el-form-item>
-        <el-form-item label="评分占比" prop="percentage" v-if="form.type===2||form.type===1">
-          <el-input-number v-model="form.percentage" controls-position="right" :precision="2" :step="0.01" :max="1" :disabled="form.state!=='0'"></el-input-number>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="sTime">
-          <el-date-picker clearable style="width: 100%;" :disabled="form.state!=='0'"
-                          v-model="form.sTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="eTime">
-          <el-date-picker clearable style="width: 100%;" :disabled="form.state!=='0'"
-                          v-model="form.eTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="状态" prop="state">
-          <el-select v-model="form.state" placeholder="请选择评测状态" clearable style="width: 100%" :disabled="form.state!=='0'">
-            <el-option
-              v-for="dict in dict.type.kh_state"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="详情描述" prop="vDescription">
-          <el-input v-model="form.vDescription" type="textarea" placeholder="请输入内容" :disabled="form.state!=='0'"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listVote, getVote, delVote, addVote, updateVote } from "@/api/kaohe/vote"
+import { listVote_items } from "@/api/kaohe/vote_items"
 
 export default {
   name: "Vote",
@@ -233,13 +231,9 @@ export default {
       total: 0,
       // 投票评测表格数据
       voteList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
+        pageNum: 2,
         pageSize: 10,
         voteTitle: null,
         vDescription: null,
@@ -247,418 +241,41 @@ export default {
         eTime: null,
         maxNum: null,
       },
-      // 表单参数
+      // 选中行Index
-      form: {},
+      xzhIndex: null,
-      // 表单校验
+      // 评分选项类型数据
-      rules: {
+      vote_options: []
-        voteTitle: [
-          { required: true, message: "评分主题不能为空", trigger: "blur" }
-        ],
-      }
     }
   },
   created() {
-    this.getList()
+    this.getVoteItemsList();
   },
   methods: {
     /** 查询投票评测列表 */
     getList() {
       this.loading = true
       listVote(this.queryParams).then(response => {
-        // this.voteList = response.rows
+        let pcSetUpList = [];
-        this.voteList = [{
+        response.rows.forEach(item=>{
-          id:1,
+          if(item.voteItems){
-          index: 0,
+            item.voteItems = item.voteItems.split(',');
-          index1: 0,
+            let VoteItemsName = []
-          type: 2,
+            item.voteItems.forEach(e => {
-          pingceName: '党建与行政目标任务',
+              this.vote_options.forEach(e1 => {
-          khitemName: '政治建设',
+                if(e === e1.id){
-          voteTitle: '政治建设评分',
+                  VoteItemsName.push(e1.vitemName)
-          options: [],
+                }
-          maxNum: 100,
+              })
-          percentage: 0.2, //评分占比
+            })
-          state: '2', //状态
+            item['voteItemsName'] = VoteItemsName.join(',');
-          sTime: '2025-06-15', //开始时间
+          }
-          eTime: '2025-06-20', //结束时间
+          pcSetUpList.push(item);
-          vDescription: '政治建设评分详情描述', //评分详情描述
+        })
-          remark: '政治建设备注', //备注
+        this.voteList = pcSetUpList;
-        },
+        this.total = response.total;
-        {
+        this.loading = false;
-          id:2,
-          index: 0,
-          index1: 1,
-          type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '宣传与思想政治工作',
-          voteTitle: '宣传与思想政治工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '宣传与思想政治工作评分详情描述', //评分详情描述
-          remark: '宣传与思想政治工作备注', //备注
-        },{
-          id:3,
-          index: 0,
-          index1: 2,
-          type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '作风纪律',
-          voteTitle: '作风纪律评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '作风纪律评分详情描述', //评分详情描述
-          remark: '作风纪律备注', //备注
-        },
-          {
-          id: 4,
-          index: 0,
-          index1: 3,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '安全稳定',
-          voteTitle: '安全稳定评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '安全稳定评分详情描述', //评分详情描述
-          remark: '安全稳定备注', //备注
-        },{
-          id: 5,
-          index: 0,
-          index1: 4,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '师资队伍与师德师风',
-          voteTitle: '师资队伍与师德师风评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '师资队伍与师德师风评分详情描述', //评分详情描述
-          remark: '师资队伍与师德师风备注', //备注
-        },
-          {
-          id: 6,
-          index: 0,
-          index1: 5,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '财务工作',
-          voteTitle: '财务工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '财务工作评分详情描述', //评分详情描述
-          remark: '财务工作备注', //备注
-        },{
-          id: 7,
-          index: 0,
-          index1: 6,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '依法治校与综合治理',
-          voteTitle: '依法治校与综合治理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.05, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '依法治校与综合治理评分详情描述', //评分详情描述
-          remark: '依法治校与综合治理备注', //备注
-        },
-          {
-          id: 8,
-          index: 0,
-          index1: 7,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '国有资产管理',
-          voteTitle: '国有资产管理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.02, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '国有资产管理评分详情描述', //评分详情描述
-          remark: '国有资产管理备注', //备注
-        },{
-          id: 9,
-          index: 0,
-          index1: 8,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '实验室管理',
-          voteTitle: '实验室管理评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.03, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '实验室管理评分详情描述', //评分详情描述
-          remark: '实验室管理备注', //备注
-        },
-          {
-          id: 10,
-          index: 0,
-          index1: 9,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '招生就业与创新创业工作',
-          voteTitle: '招生就业与创新创业工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '招生就业与创新创业工作评分详情描述', //评分详情描述
-          remark: '招生就业与创新创业工作备注', //备注
-        },{
-          id: 11,
-          index: 0,
-          index1: 10,
-            type: 2,
-          pingceName: '党建与行政目标任务',
-          khitemName: '对外交流与合作',
-          voteTitle: '对外交流与合作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '对外交流与合作评分详情描述', //评分详情描述
-          remark: '对外交流与合作备注', //备注
-        },
-          {
-          id: 12,
-          index: 1,
-          index1: 0,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '教学工作',
-          voteTitle: '教学工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.2, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '教学工作评分详情描述', //评分详情描述
-          remark: '教学工作备注', //备注
-        },{
-          id: 13,
-          index: 1,
-          index1: 1,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '科研工作',
-          voteTitle: '科研工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '科研工作评分详情描述', //评分详情描述
-          remark: '科研工作备注', //备注
-        },
-          {
-          id: 14,
-          index: 1,
-          index1: 2,
-            type: 2,
-          pingceName: '事业发展',
-          khitemName: '学生工作',
-          voteTitle: '学生工作评分',
-          options: [],
-          maxNum: 100,
-          percentage: 0.1, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '学生工作评分详情描述', //评分详情描述
-          remark: '学生工作备注', //备注
-        },{
-          id:15,
-          index: 2,
-          index1: 0,
-            type: 1,
-          pingceName: '民主测评',
-          khitemName: '师院领导班子',
-          voteTitle: '师院领导班子评分',
-          options: [
-            {
-              value: 1,
-              label: '优秀'
-            },
-            {
-              value: 2,
-              label: '合格'
-            },
-            {
-              value: 3,
-              label: '基本合格'
-            },
-            {
-              value: 4,
-              label: '不合格'
-            }
-          ],
-          maxNum: null,
-          percentage: 0.2, //评分占比
-          state: '2', //状态
-          sTime: '2025-06-15', //开始时间
-          eTime: '2025-06-20', //结束时间
-          vDescription: '师院领导班子评分详情描述', //评分详情描述
-          remark: '师院领导班子备注', //备注
-        },
-          {
-            id: 16,
-            index: 2,
-            index1: 1,
-            type: 1,
-            pingceName: '民主测评',
-            khitemName: '师院处级领导干部',
-            voteTitle: '师院处级领导干部评分',
-            options: [
-              {
-                value: 1,
-                label: '优秀'
-              },
-              {
-                value: 2,
-                label: '合格'
-              },
-              {
-                value: 3,
-                label: '基本合格'
-              },
-              {
-                value: 4,
-                label: '不合格'
-              }
-            ],
-            maxNum: null,
-            percentage: 0.2, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '师院处级领导干部评分详情描述', //评分详情描述
-            remark: '师院处级领导干部备注', //备注
-          },
-          {
-            id: 17,
-            index: 2,
-            index1: 2,
-            type: 1,
-            pingceName: '民主测评',
-            khitemName: '服务对象代表',
-            voteTitle: '服务对象代表评分',
-            options: [
-              {
-                value: 1,
-                label: '优秀'
-              },
-              {
-                value: 2,
-                label: '合格'
-              },
-              {
-                value: 3,
-                label: '基本合格'
-              },
-              {
-                value: 4,
-                label: '不合格'
-              }
-            ],
-            maxNum: null,
-            percentage: 0.2, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '服务对象代表评分详情描述', //评分详情描述
-            remark: '服务对象代表备注', //备注
-          },
-          {
-            id: 18,
-            index: 3,
-            index1: 0,
-            type: 5,
-            pingceName: '特色创新',
-            khitemName: '分数（满分10分）',
-            voteTitle: '特色创新分数（满分10分）评分',
-            options: [],
-            maxNum: 10,
-            percentage: null, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '特色创新分数（满分10分）评分详情描述', //评分详情描述
-            remark: '特色创新分数（满分10分）备注', //备注
-          },
-          {
-            id: 19,
-            index: 4,
-            index1: 0,
-            type: 5,
-            pingceName: '综合评价',
-            khitemName: '分数（加减分项，值域可以为负）',
-            voteTitle: '综合评价分数（加减分项，值域可以为负）',
-            options: [],
-            maxNum: 10,
-            percentage: null, //评分占比
-            state: '2', //状态
-            sTime: '2025-06-15', //开始时间
-            eTime: '2025-06-20', //结束时间
-            vDescription: '综合评价分数（加减分项，值域可以为负）评分详情描述', //评分详情描述
-            remark: '综合评价分数（加减分项，值域可以为负）备注', //备注
-          }];
-        this.total = 3
-        this.loading = false
       })
     },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        voteTitle: null,
-        vDescription: null,
-        sTime: null,
-        eTime: null,
-        maxNum: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      }
-      this.resetForm("form")
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -675,54 +292,118 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加投票评测"
-    },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(index) {
-      this.reset()
+      this.xzhIndex = index;
-      this.form = row;
+      this.getList();
-      this.open = true
+    },
-      this.title = "修改投票评测"
+    cancelVote(){
-      /*const id = row.id || this.ids
+      this.xzhIndex = null;
-      getVote(id).then(response => {
+      this.getList();
-        this.form = response.data
-        this.open = true
-        this.title = "修改投票评测"
-      })*/
     },
     /** 提交按钮 */
-    submitForm() {
+    voteSubmit(row) {
-      this.$refs["form"].validate(valid => {
+      let flag = true;
-        /*if (valid) {
+      let Vote = {...row}
-          if (this.form.id != null) {
+      if(!Vote.voteTitle){
-            updateVote(this.form).then(response => {
+        flag = false;
-              this.$modal.msgSuccess("修改成功")
+        this.$alert(`评分主题不能为空！`, `提示`, {
-              this.open = false
+          type: 'Danger'
-              this.getList()
+        })
-            })
+      }
-          } else {
+      if(!Vote.state){
-            addVote(this.form).then(response => {
+        flag = false;
-              this.$modal.msgSuccess("新增成功")
+        this.$alert(`状态不能为空！`, `提示`, {
-              this.open = false
+          type: 'Danger'
-              this.getList()
+        })
-            })
+      }
-          }
+      if(!Vote.sTime){
-        }*/
+        flag = false;
-      })
+        this.$alert(`开始时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.eTime){
+        flag = false;
+        this.$alert(`结束时间不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.id && !(new Date(Vote.sTime) > (new Date()))){
+        flag = false;
+        this.$alert(`开始时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date()))){
+        flag = false;
+        this.$alert(`结束时间需大于当前时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!(new Date(Vote.eTime) > (new Date(Vote.sTime)))){
+        flag = false;
+        this.$alert(`结束时间需大于开始时间！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid===1 && (!Vote.voteItems)){
+        flag = false;
+        this.$alert(`评分选项不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid!==1 && (!Vote.maxNum)){
+        flag = false;
+        this.$alert(`最大值不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(row.khitemTypeid!==5 && (!Vote.percentage)){
+        flag = false;
+        this.$alert(`评分占比不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.voteTitle){
+        flag = false;
+        this.$alert(`评分主题不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if(!Vote.vDescription){
+        flag = false;
+        this.$alert(`评分详情描述不能为空！`, `提示`, {
+          type: 'Danger'
+        })
+      }
+      if (Vote.id != null && flag ) {
+        if(Vote.voteItems){
+          Vote.voteItems = Vote.voteItems.join(',')
+        }
+        updateVote(Vote).then(response => {
+          this.$modal.msgSuccess("修改成功")
+          this.cancelVote()
+        })
+      } else if(Vote.id === null && flag){
+        if(Vote.voteItems){
+          Vote.voteItems = Vote.voteItems.join(',')
+        }
+        addVote(Vote).then(response => {
+          this.$modal.msgSuccess("新增成功")
+          this.cancelVote()
+        })
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      /*const ids = row.id || this.ids
+      const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除投票评测编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除评分任务编号为"' + ids + '"的数据项？').then(function() {
         return delVote(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})*/
+      }).catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -731,11 +412,23 @@ export default {
       }, `vote_${new Date().getTime()}.xlsx`)*/
     },
     goVotepage(row){
-      this.$router.push({ path: '/votepage', query: { index: row.index, index1: row.index1 }});
+      this.$router.push({ path: '/votepage', query: { id: row.id }});
     },
     goVoteEmp(row){
       this.$router.push({ path: '/toupiao/vote_emp', query: { id: row.id }});
-    }
+    },
+    getVoteItemsList() {
+      listVote_items({
+        pageSize: 1000000,
+        pageNum: 1
+      }).then(response => {
+        this.vote_options = response.rows;
+        this.vote_options.forEach(e1 => {
+          e1.id = String(e1.id)
+        });
+        this.getList();
+      })
+    },
   }
 }
 </script>