Merge branch 'master' of http://gitlab.posedu.cn:8099/cdd/employed
正在显示
3 个修改的文件
包含
10 行增加
和
6 行删除
| @@ -179,11 +179,11 @@ | @@ -179,11 +179,11 @@ | ||
| 179 | <p style="margin: 0;">{$vo.container_name}</p> | 179 | <p style="margin: 0;">{$vo.container_name}</p> |
| 180 | </div> | 180 | </div> |
| 181 | <div class="program"> | 181 | <div class="program"> |
| 182 | -<!-- {if $vo.review_stage == 0 && $vo.project_approval_status == 0 && $vo.qr_code}--> | ||
| 183 | -<!-- <div class="verify">--> | ||
| 184 | -<!-- <a title="教师审核二维码" href="javascript:;" id="qr_code"><img src="{$vo.qr_code}" width="75" height="75" ></a>--> | ||
| 185 | -<!-- </div>--> | ||
| 186 | -<!-- {/if}--> | 182 | + {if $vo.review_stage == 0 && $vo.project_approval_status == 0 && $vo.qr_code} |
| 183 | + <div class="verify"> | ||
| 184 | + <a title="教师审核二维码" href="javascript:;" id="qr_code"><img src="{$vo.qr_code}" width="75" height="75" ></a> | ||
| 185 | + </div> | ||
| 186 | + {/if} | ||
| 187 | <div class="pic"> | 187 | <div class="pic"> |
| 188 | <text class="iconfont" style="font-size: 1.5rem;"></text> | 188 | <text class="iconfont" style="font-size: 1.5rem;"></text> |
| 189 | <text class="center "> | 189 | <text class="center "> |
| @@ -362,6 +362,10 @@ class User extends ManystoreBase | @@ -362,6 +362,10 @@ class User extends ManystoreBase | ||
| 362 | unset($params['password'] ); | 362 | unset($params['password'] ); |
| 363 | } | 363 | } |
| 364 | unset($params['confirem_password'] ); | 364 | unset($params['confirem_password'] ); |
| 365 | + $exist = Db::name('user')->where(['student_no' => $params['student_no']])->where('id','neq',$row['id'])->find(); | ||
| 366 | + if($exist) { | ||
| 367 | + $this->error(__('该学号已被使用')); | ||
| 368 | + } | ||
| 365 | $result = false; | 369 | $result = false; |
| 366 | Db::startTrans(); | 370 | Db::startTrans(); |
| 367 | try { | 371 | try { |
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | <div class="form-group"> | 9 | <div class="form-group"> |
| 10 | <label class="control-label col-xs-12 col-sm-2">{:__('Student_no')}:</label> | 10 | <label class="control-label col-xs-12 col-sm-2">{:__('Student_no')}:</label> |
| 11 | <div class="col-xs-12 col-sm-8"> | 11 | <div class="col-xs-12 col-sm-8"> |
| 12 | - <input id="c-student_no" class="form-control" readonly name="row[student_no]" type="text" value="{$row.student_no|htmlentities}"> | 12 | + <input id="c-student_no" class="form-control" name="row[student_no]" type="text" value="{$row.student_no|htmlentities}"> |
| 13 | </div> | 13 | </div> |
| 14 | </div> | 14 | </div> |
| 15 | 15 |
-
请 注册 或 登录 后发表评论