dev01 1 year ago
parent
commit
b41733d3da

+ 1 - 1
src/views/login.vue

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

+ 8 - 2
src/views/project/list/index.vue

@@ -352,7 +352,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"
@@ -573,7 +573,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" }],
       },
     };
   },
@@ -773,6 +776,9 @@ export default {
       this.$refs["form"].validate((valid) => {
         this.form.startTime = this.dateRange1[0];
         this.form.endTime = this.dateRange1[1];
+
+        console.log("-----");
+        return;
         if (valid) {
           if (this.form.id != undefined) {
             updateProject(this.form).then((response) => {

+ 9 - 1
src/views/record/list/index.vue

@@ -2,7 +2,7 @@
   <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;">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -605,3 +605,11 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+.head-container {
+  word-wrap: break-word;
+  overflow: hidden;
+  word-break: break-all;
+}
+</style>

+ 1 - 0
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;
       });

+ 17 - 3
src/views/system/user/index.vue

@@ -2,7 +2,7 @@
   <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;">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -297,7 +297,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 +343,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 +1101,11 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+.head-container {
+  word-wrap: break-word;
+  overflow: hidden;
+  word-break: break-all;
+}
+</style>