Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/case/index.vue

src/components/case/index.vue

@@ -289,7 +289,6 @@ export default {
           sessionStorage.setItem('classId', classId)
           this.assessmentId = assessmentId
           this.classId = classId
-          console.log()
       }
       let tokens = sessionStorage.getItem('token')
       // if(this.getQueryVariable('projectId')) {
@@ -517,19 +516,6 @@ export default {
                 message: "已取消提交"
               });
         });
-      // this.$confirm("此操作将视为结束考试, 是否继续?", "提示", {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //   type: "warning",
-      //   center: true
-      // }).then(() => {
-      //   this.sureSubmit(true)
-      // }).catch(() => {
-      //   this.$message({
-      //     type: "info",
-      //     message: "已取消提交"
-      //   });
-      // });
     },
       sureSubmit(judge){
         this.actEndTime = new Date().getTime();

src/pages/manage/list/dayEnd/tellerCertificate.vue

@@ -58,7 +58,7 @@
                             width="180"
                             >
                             <template slot-scope="scope">
-                                <el-input type='number' min="0" v-model.number="scope.row.cashBoxNum" class='numrule'></el-input>
+                                <el-input type='text' @input="val => inputListen(val, scope.row)" min="0" :value="scope.row.cashBoxNum" class='numrule'></el-input>
                         </template>
                         </el-table-column>
                     </el-table>
@@ -98,7 +98,9 @@ export default {
         
     },
     methods: {
-
+        inputListen(val, row) {
+            row.cashBoxNum = Number(val.replace(/\D+/, ''))
+        }
     }
 };
 </script>

src/pages/manage/list/servicesAccount/passwordChange.vue

@@ -13,7 +13,7 @@
                 <el-form ref="form" :model="form" label-width="120px">
                     <el-col :span="10" :offset="1">
                         <el-form-item label="证件类型">
-                            <el-select v-model="form.t" placeholder="请选择">
+                            <el-select v-model="form.identitCard">
                                 <el-option label="身份证" value="身份证"> </el-option>
                             </el-select>
                         </el-form-item>
@@ -66,7 +66,8 @@ export default{
                 t3: '',
                 t4: '',
                 t5: '',
-                t6: ''
+                t6: '',
+                identitCard: '身份证'
             }
         }
     },