userupdata

i18n/locale/zh-CN.js

@@ -1914,6 +1914,6 @@ export default {
     authority:'权限',
     whour:'可用工日',
     whourpd:'可用工时/天',
-    joindate:'加盟日'
+    joindate:'加入日期'
   }
 }

pages/project/groupUser/index1.vue

@@ -90,44 +90,49 @@ export default {
                     key: "userId",
                     title: this.l("userId"),
                     align: "left",
+                    width: 150,
                     slot: 'userId'
                 },
                 {
                     key: "role",
                     title: this.l("role"),
                     align: "center",
+                    width: 180,
                     slot: 'role'
                 },
                 {
                     key: "status",
                     title: this.l("status"),
                     align: "center",
+                    width: 150,
                     slot: 'status'
                 },
                 {
                     key: "joindate",
                     title: this.l("joindate"),
                     align: "center",
+                    width: 180,
                     slot: 'joindate'
                 },
                 {
                     key: "whour",
                     title: this.l("whour"),
                     align: "right",
-                    width: 200,
+                    width: 150,
                     slot: 'whour'
                 },
                 {
                     key: "whourpd",
                     title: this.l("whourpd"),
                     align: "right",
-                    width: 200,
+                    width: 150,
                     slot: 'whourpd'
                 },
                 {
                     key: "authority",
                     title: this.l("authority"),
                     align: "center",
+                    width: 200,
                     slot: 'authority'
 
                 },
@@ -135,7 +140,6 @@ export default {
                     key: "note",
                     title: this.l("note"),
                     align: "left",
-                    high: true,
                     slot: 'note'
                 },
                 {
@@ -187,6 +191,9 @@ export default {
                     if (el.authority == 1) {
                         this.authorityCount = 1
                     }
+                    if (el.joindate && el.joindate.length >= 10) {
+                        el.joindate = el.joindate.substr(0, 10)
+                    }
                 })
 
             }
@@ -266,10 +273,15 @@ export default {
                 this.$Message.error("请选择人员角色");
                 return;
             }
+            if (this.cur.joindate == null || this.cur.joindate == '') {
+                this.$Message.error("请选择人员加入日期");
+                return;
+            }
             if (this.cur.authority == null || this.cur.authority == '') {
                 this.$Message.error("请选择人员权限");
                 return;
             }
+            this.getTime(this.cur.joindate)
             if (this.cur.id && this.cur.id != '') { //人员修改
                 Api.update(this.cur).then((r) => {
                     this.disabled = false;
@@ -310,7 +322,8 @@ export default {
                 "-" +
                 this.p(d.getMonth() + 1) +
                 "-" +
-                this.p(d.getDate())
+                this.p(d.getDate()) +
+                " 00:00:01";
             return resDate;
         },
         p(s) {