Merge remote-tracking branch 'origin/master'

src/layout/components/Sidebar/Logo.vue

@@ -98,7 +98,7 @@ export default {
   line-height: 50px;
   background: #2b2f3a;
   // text-align: center;
-  padding-left:20px;
+  padding-left: 10%;
   overflow: hidden;
 
   & .sidebar-logo-link {
@@ -127,6 +127,8 @@ export default {
   }
 
   &.collapse {
+    text-align: center;
+    padding-left: 0;
     .sidebar-logo {
       margin-right: 0px;
     }

src/views/login.vue

@@ -89,7 +89,7 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaEnabled: true,
+      captchaEnabled: false,
       // 注册开关
       register: false,
       redirect: undefined

src/views/project/list/index.vue

@@ -2,19 +2,37 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <!-- <el-col :span="4" :xs="24">
+      <el-col
+        :span="2"
+        :xs="24"
+        style="padding-left: 0; padding-right: 0; overflow-x: auto"
+      >
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
-        <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-            @node-click="handleNodeClick" />
+        <div class="head-container" style="display: flex">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
         </div>
-      </el-col> -->
+      </el-col>
       <!--用户数据-->
-      <el-col :span="24" :xs="24">
+      <el-col :span="22" :xs="24">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -215,7 +233,7 @@
           <el-table-column
             label="累积工时"
             align="center"
-            width="80"
+            width="50"
             key="duration"
             prop="duration"
             v-if="columns[7].visible"
@@ -231,12 +249,15 @@
           <el-table-column
             label="起止时间"
             align="center"
+            width="168"
             key="startTime"
             prop="startTime"
             v-if="columns[9].visible"
           >
             <template slot-scope="scope">
-              <div>{{ scope.row.startTime + " 至 " + scope.row.endTime }}</div>
+              <div style="font-size: 12px;">
+                {{ scope.row.startTime + " 至 " + scope.row.endTime }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column
@@ -352,7 +373,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="superiorName1">
+            <el-form-item label="负责人" prop="aid">
               <el-autocomplete
                 v-model="superiorName1"
                 style="width: 250px"
@@ -473,7 +494,7 @@ import {
   listStaff,
   deleteStaff,
 } from "@/api/system/project";
-import { selectName } from "@/api/system/user";
+import { selectName, deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -573,7 +594,10 @@ export default {
       rules: {
         projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
         name: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
-        aid: [{ required: true, message: "负责人不能为空", trigger: "blur" }],
+        aid: [{ required: true, message: "负责人不能为空", trigger: ["blur", "change"] }],
+        crossYear: [{ required: true, message: "请选择是否跨年", trigger: "blur" }],
+        createYear: [{ required: true, message: "创建年份不能为空", trigger: "blur" }],
+        projectYear: [{ required: true, message: "项目年份不能为空", trigger: "blur" }],
       },
     };
   },
@@ -585,7 +609,7 @@ export default {
   },
   created() {
     this.getList();
-    // this.getDeptTree();
+    this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });

src/views/record/list/index.vue

@@ -2,7 +2,11 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="2" :xs="24">
+      <el-col
+        :span="2"
+        :xs="24"
+        style="padding-left: 0; padding-right: 0; overflow-x: auto"
+      >
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -13,7 +17,7 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container" style="display: flex">
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
@@ -229,9 +233,12 @@
             key="projectStatus"
             prop="projectStatus"
             v-if="columns[9].visible"
-            >
+          >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.syx_record_stage" :value="scope.row.projectStatus"/>
+              <dict-tag
+                :options="dict.type.syx_record_stage"
+                :value="scope.row.projectStatus"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -605,3 +612,11 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+// .head-container {
+//   word-wrap: break-word;
+//   overflow: hidden;
+//   word-break: break-all;
+// }
+</style>

src/views/system/dept/index.vue

@@ -385,6 +385,7 @@ export default {
       listDept().then((response) => {
         this.deptOptions = this.handleTree(response.data, "deptId");
         this.form.parentId = response.data[0].deptId;
+        this.form.orderNum = 1;
         // deptId == 100为创建公司
         this.isERP = response.data[0].deptId == 100;
       });

src/views/system/user/index.vue

@@ -2,7 +2,11 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="2" :xs="24">
+      <el-col
+        :span="2"
+        :xs="24"
+        style="padding-left: 0; padding-right: 0; overflow-x: auto"
+      >
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -13,7 +17,7 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container" style="display: flex">
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
@@ -297,7 +301,10 @@
             width="60"
           >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_user_fulljob" :value="scope.row.fullJob"/>
+              <dict-tag
+                :options="dict.type.sys_user_fulljob"
+                :value="scope.row.fullJob"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -340,7 +347,10 @@
             width="60"
           >
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+              <dict-tag
+                :options="dict.type.sys_normal_disable"
+                :value="scope.row.status"
+              />
             </template>
             <!-- <template slot-scope="scope">
               <el-switch
@@ -1095,3 +1105,11 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+// .head-container {
+//   word-wrap: break-word;
+//   overflow: hidden;
+//   word-break: break-all;
+// }
+</style>