部门必填

src/views/assessingTarget/search.vue

@@ -2,7 +2,7 @@
   <div class="search">
     <el-form :inline="true" :model="searchParams" size="mini">
       <template v-if="type == 1 || type == 2">
-        <el-form-item label="一级指标：">
+        <el-form-item label="一级指标:">
           <el-select
             filterable
             clearable
@@ -17,7 +17,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二级指标：">
+        <el-form-item label="二级指标:">
           <el-select filterable clearable v-model="searchParams.quota2">
             <el-option
               v-for="(item, index) of quota2"
@@ -29,7 +29,7 @@
         </el-form-item>
       </template>
       <template v-if="type == 3">
-        <el-form-item label="考核指标：">
+        <el-form-item label="考核指标:">
           <el-select filterable clearable v-model="searchParams.quota">
             <el-option
               v-for="(item, index) of quota"
@@ -40,7 +40,7 @@
           </el-select>
         </el-form-item>
       </template>
-      <el-form-item label="考核内容：">
+      <el-form-item label="考核内容:">
         <el-input
           placeholder="请输入考核内容"
           clearable
@@ -48,14 +48,14 @@
         ></el-input>
       </el-form-item>
       <template v-if="type == 3">
-        <el-form-item label="牵头单位：">
+        <el-form-item label="牵头单位:">
           <el-input
             placeholder="请输入"
             v-model="searchParams.leaderUnit"
           ></el-input>
         </el-form-item>
       </template>
-      <el-form-item label="牵头部门：">
+      <el-form-item label="牵头部门:">
         <treeselect
           v-model="searchParams.leaderDept"
           :options="formatDep"

src/views/summary/basicTarget.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="basic-target ele-body">
     <el-card>
-      <search></search>
+      <search @search:task="updateParams($event)"></search>
       <el-table
         highlight-current-row
         :data="dataList"
@@ -44,7 +44,7 @@
           label="预计得分"
           min-width="60"
           align="center"
-          prop="expectedPoints"
+          prop="expectedScore"
         ></el-table-column>
         <el-table-column
           label="区牵头单位"

src/views/summary/constraint.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="constraint ele-body">
     <el-card>
-      <search :type="3" /></search>
+      <search :type="3" @search:task="updateParams($event)" /></search>
       <el-table
         highlight-current-row
         :data="dataList"

src/views/summary/reward.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="reward ele-body">
     <el-card>
-      <search></search>
+      <search :type="2" @search:task="updateParams($event)"></search>
       <el-table
         highlight-current-row
         :data="dataList"

src/views/system/user/index.vue

@@ -111,7 +111,7 @@
               </el-select>
             </el-form-item>
              <el-form-item label="部门:" prop="deptId">
-              <el-select filterable clearable v-model="editForm.deptId" size="small" placeholder="-请选择部门-">
+              <el-select multiple clearable v-model="editForm.deptId" size="small" placeholder="-请选择部门-">
                 <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -170,6 +170,9 @@ export default {
         gender: [
           {required: true, message: '请选择性别', trigger: 'blur'}
         ],
+        deptId: [
+          {required: true, message: '请选择部门', trigger: 'blur'}
+        ],
         roleIds: [
           {required: true, message: '请选择角色', trigger: 'blur'}
         ],