+
@@ -18,11 +18,11 @@ export default {
},
async created() {
- this.setProjectId(this.$route.query.pid);
const userId = this.$route.query.uid;
const params = { userId };
await this.getUserId(params);
await this.getAllMembers({ projectId: this.$route.query.pid });
+ this.setProjectId(this.$route.query.pid);
},
methods: {
@@ -40,11 +40,4 @@ body,
min-height: 100%;
width: 100%;
}
-
-#app {
- /* background: transparent; */
-}
-body {
- /* background: #f5f5f5 !important; */
-}
diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index 3074f39..e2c78f3 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -483,7 +483,7 @@ h2{
}
.second-base-bg{
- background: #AACD06
+ background: #52c41a
}
// 文字颜色
@@ -491,6 +491,14 @@ h2{
color: #fff
}
+.red--text{
+ color: #f00
+}
+
+.green--text{
+ color: #52c41a
+}
+
.title-color{
color: rgba(0,0,0,.85)
}
@@ -511,3 +519,7 @@ h2{
.line-height-36{
line-height: 36px
}
+
+.line-through{
+ text-decoration: line-through
+}
diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index cbd2952..fbe53fb 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -1,5 +1,5 @@
-
+
考勤管理
导出
@@ -23,7 +23,6 @@ export default {
+
+
diff --git a/src/components/TimePicker/TimePicker.vue b/src/components/TimePicker/TimePicker.vue
index 02018cb..e6a825e 100644
--- a/src/components/TimePicker/TimePicker.vue
+++ b/src/components/TimePicker/TimePicker.vue
@@ -5,6 +5,7 @@
:disabled-date="disabledStartDate"
show-time
allow-clear
+ locale="zh-cn"
:format="monthFormat"
placeholder="起始时间"
class="box box1"
@@ -13,7 +14,6 @@
axios.post(`${defaultwbs}/clock/punch`, para
// 查询所有成员
export const queryChecker = params => axios.post(`${defaultwbs}/deliver/queryChecker`, params);
+
+// 查询所有成员
+export const clockAudit = params => axios.post(`${defaultwbs}/clock/audit`, params);
diff --git a/src/main.js b/src/main.js
index 8b1b41d..337baa8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,6 +9,9 @@ import './plugins/ant-design-vue.js';
import 'common/portrait.styl';
import './assets/icon/iconfont.css';
import moment from 'moment'; //导入文件
+import 'moment/locale/zh-cn';
+
+moment.locale('zh-cn');
Vue.prototype.$moment = moment; //赋值使用
diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js
index 2b88e52..e62b9ec 100644
--- a/src/plugins/ant-design-vue.js
+++ b/src/plugins/ant-design-vue.js
@@ -43,6 +43,7 @@ import {
Card,
Skeleton,
Drawer,
+ TimePicker,
} from 'ant-design-vue';
import { ConfigProvider } from 'ant-design-vue';
Vue.component(ConfigProvider.name, ConfigProvider);
@@ -80,6 +81,7 @@ Vue.use(Divider);
Vue.use(Card);
Vue.use(Skeleton);
Vue.use(Drawer);
+Vue.use(TimePicker);
Vue.prototype.$message = message;
Vue.prototype.$notification = notification;