提交‘

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"
@@ -179,8 +179,8 @@ export default {
  .vue-treeselect,
 /deep/ .vue-treeselect__control,
 /deep/ .vue-treeselect__value-container {
-  height: 20px;
-  line-height: 32px;
+  height: 28px !important;
+  line-height: 28px;
   box-sizing: border-box;
 }
 </style>

src/views/system/user/index.vue

@@ -170,6 +170,9 @@ export default {
         gender: [
           {required: true, message: '请选择性别', trigger: 'blur'}
         ],
+        deptId: [
+          {required: true, message: '请选择部门', trigger: 'blur'}
+        ],
         roleIds: [
           {required: true, message: '请选择角色', trigger: 'blur'}
         ],
@@ -195,8 +198,9 @@ export default {
   methods: {
     /* 显示编辑 */
     edit(row) {
+      console.log(row);
       this.editForm = Object.assign({}, row, {
-        roleIds: row.roles.map(d => d.id)
+        roleIds: row.roles.map(d => d.id),
       });
       this.showEdit = true;
     },