Merge branch 'master' of http://git.qiniu1314.com/cmy/jztStore

src/pages/check/classes/index.vue

@@ -12,7 +12,7 @@
 					{{ showDate(row.checkin_time)}}
 				</template>
 				<template slot-scope="{ row, index }" slot="checkin_type">
-					{{ row.type == 1?'上班打卡': '下班打卡'}}
+					{{ row.checkin_type == 1?'上班打卡': '下班打卡'}}
 				</template>
 				<template slot-scope="{ row, index }" slot="sch_checkin_time">
 					{{ showDate(row.sch_checkin_time)}}

src/pages/check/components/addStaff.vue

@@ -29,7 +29,7 @@
 							</Col>
 							<Col span="24">
 							<FormItem label="手机号：" prop="mobile" label-for="mobile">
-								<Input v-model="formItem.mobile" placeholder="请输入手机号" />
+								<Input v-model="formItem.mobile" placeholder="请输入手机号" :disabled="formItem.id"/>
 							</FormItem>
 							</Col>
 							<Col span="24">