flat: 修改些条件

src/api/tenant/talents.js

@@ -112,3 +112,12 @@ export const getDeptMyTree = (params) => {
     params
   })
 }
+
+export const getDeptAllTree = (params) => {
+  return request({
+    url: '/api/jobslink-api/system/dept/all-tree',
+    method: 'get',
+    params
+  })
+}
+

src/views/manage/cuser/serve/Dialog/addLog.vue

@@ -13,7 +13,9 @@
                   :show-file-list="false"
                   :http-request="allUpload"
                   :multiple="false"
-                ><el-button size="small" type="primary">点击上传</el-button></el-upload>
+                >
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
               </div>
               <avue-input disabled v-model="policyFileUrl" placeholder="点击上传文件"></avue-input>
             </div>
@@ -84,6 +86,8 @@
             "span": 24,
             labelWidth: 100,
             "prop": "createTime",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
             "rules": [
               {
                 "required": true,
@@ -199,8 +203,7 @@
       if (this.form.note.length > 64 * 512) {
         this.$message.error('文章内容不能超过64KB！');
         done()
-          }
+      } else {
-          else{
         if (this.type == 'add') {
           addNews(
             this.form.articleTitle,
@@ -215,8 +218,7 @@
             this.$message.success('添加成功');
             this.$router.go(-1);
           })
-          }
+        } else if (this.type == 'edit') {
-          else if (this.type == 'edit') {
           editNews(
             this.id,
             this.form.articleTitle,
@@ -276,6 +278,7 @@
 .ql-editor {
   height: 400px;
 }
+
 .policyFileUrlWrapper {
   position: relative;
 }
@@ -287,4 +290,3 @@
 
 }
 </style>
-  

src/views/manage/cuser/serve/index.vue

@@ -867,9 +867,9 @@ export default {
         column: [{
           label: '服务时间',
           prop: 'createTime',
-          type: 'datetime',
+          type: 'date',
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd",
         }, {
           label: '服务发起人',
           prop: 'fromName'

src/views/manage/cuser/talents/Dialog/transferGroups.vue

@@ -51,6 +51,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             slot: true,

src/views/manage/cuser/talents/index.vue

@@ -140,7 +140,7 @@ import {
   detail,
   getDept,
   removeDept,
-  upload, getDeptMyTree,
+  upload, getDeptMyTree, getDeptAllTree,
 } from "@/api/tenant/talents";
 import {getWorkTypes, getLabelList} from "@/api/tenant/common";
 import {mapGetters} from "vuex";
@@ -196,6 +196,7 @@ export default {
       obj: {},
       depTree: [],
       excelForm: {isCovered: 1},
+      AllTree: [],
     };
   },
   components: {addGroups, transferGroups, Resume, ied, TextTooltip},
@@ -271,6 +272,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             span: 24,
@@ -489,6 +491,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             slot: true,
@@ -594,11 +597,10 @@ export default {
       let params = {
         tenantId: '000000'
       }
-      let resData = await getDeptMyTree(params)
+      // let resData = await getDeptMyTree(params)
+      let resData = await getDeptAllTree(params)
       if (resData.data.code === 200) {
         this.depTree = resData.data.data
-        console.log(this.depTree)
-
       }
     },
     getWorkTypes() {

src/views/tenant/main/serve/Dialog/addLog.vue

@@ -13,7 +13,9 @@
                   :show-file-list="false"
                   :http-request="allUpload"
                   :multiple="false"
-                ><el-button size="small" type="primary">点击上传</el-button></el-upload>
+                >
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
               </div>
               <avue-input disabled v-model="policyFileUrl" placeholder="点击上传文件"></avue-input>
             </div>
@@ -84,6 +86,8 @@
             "span": 24,
             labelWidth: 100,
             "prop": "createTime",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
             "rules": [
               {
                 "required": true,
@@ -199,8 +203,7 @@
       if (this.form.note.length > 64 * 512) {
         this.$message.error('文章内容不能超过64KB！');
         done()
-          }
+      } else {
-          else{
         if (this.type == 'add') {
           addNews(
             this.form.articleTitle,
@@ -215,8 +218,7 @@
             this.$message.success('添加成功');
             this.$router.go(-1);
           })
-          }
+        } else if (this.type == 'edit') {
-          else if (this.type == 'edit') {
           editNews(
             this.id,
             this.form.articleTitle,
@@ -276,6 +278,7 @@
 .ql-editor {
   height: 400px;
 }
+
 .policyFileUrlWrapper {
   position: relative;
 }
@@ -287,4 +290,3 @@
 
 }
 </style>
-  

src/views/tenant/main/serve/index.vue

@@ -870,9 +870,9 @@ export default {
         column: [{
           label: '服务时间',
           prop: 'createTime',
-          type: 'datetime',
+          type: 'date',
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd",
         }, {
           label: '服务发起人',
           prop: 'fromName'

src/views/tenant/main/talents/certain/Dialog/transferGroups.vue

@@ -51,6 +51,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             slot: true,

src/views/tenant/main/talents/certain/index.vue

@@ -271,6 +271,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             span: 24,

src/views/tenant/main/talents/latent/Dialog/transferGroups.vue

@@ -51,6 +51,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             slot: true,

src/views/tenant/main/talents/latent/index.vue

@@ -273,6 +273,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             span: 24,
@@ -496,6 +497,7 @@ export default {
             dicData: this.depTree,
             props: {
               label: "title",
+              value: 'value'
             },
             checkStrictly: true,
             slot: true,

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -137,6 +137,7 @@ import {
   wageOptionsWithNoMonth,
   educationState,
 } from "@/common/dic";
+import {dateFormat} from "@/util/date";
 
 const validateTel = (rule, value, callback) => {
   if (isvalidatemobile(value)[0]) {
@@ -354,8 +355,9 @@ export default {
                 valueFormat: "yyyy-MM-dd 00:00:00",
                 pickerOptions: {
                   disabledDate(time) {
+                    const oneDay = 1000 * 60 * 60 * 24
                     return !(
-                      time.getTime() > Date.now() &&
+                      time.getTime() + oneDay > Date.now() &&
                       (!self.endTime ||
                         (time.getTime() < self.endTime &&
                           time.getTime() > self.endTime - 2678400000)) &&

src/views/tenant/works/Dialog/CopyMission.vue

@@ -474,8 +474,9 @@ export default {
                 valueFormat: "yyyy-MM-dd 00:00:00",
                 pickerOptions: {
                   disabledDate(time) {
+                    const oneDay = 1000 * 60 * 60 * 24
                     return !(
-                      time.getTime() > Date.now() &&
+                      time.getTime() + oneDay > Date.now() &&
                       (!self.endTime ||
                         (time.getTime() < self.endTime &&
                           time.getTime() > self.endTime - 2678400000)) &&