dedsudiyu 11 maanden geleden
bovenliggende
commit
4bcedc17c4

+ 8 - 1
src/views/chemicalManage/components/addChemicals.vue

@@ -58,7 +58,7 @@
         </div>
         <div>
           <el-form-item label="CAS:" prop="casNum" label-width="130px">
-            <el-input v-model="dialogForm.casNum" placeholder="请输入CAS码" maxLength="20" style="width:245px;"/>
+            <el-input v-model="dialogForm.casNum" placeholder="请输入CAS码" maxLength="12" style="width:245px;"/>
           </el-form-item>
           <el-form-item label="别名:" prop="anotherName" label-width="90px">
             <el-input v-model="dialogForm.anotherName" placeholder="请输入化学品别名" maxLength="20" style="width:245px;"/>
@@ -224,6 +224,13 @@
       dialogSubmit(){
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
+            if(this.dialogForm.casNum){//
+              let regex = /^\d{1,7}-\d{2}-\d/;
+              if(!regex.test(this.dialogForm.casNum)){
+                this.msgError('请输入正确的CAS码')
+                return
+              }
+            }
             if(this.dialogForm.chemicalId){
               chemicalChemicalUpdate(this.dialogForm).then(response => {
                 this.msgSuccess(response.message)

+ 1 - 1
src/views/emergencyManagement/planExecuteRecord/planExecuteRecordDetail.vue

@@ -1,4 +1,4 @@
-<!-预案执行记录详情-->
+<!-- 预案执行记录详情 -->
 <template>
   <div class="page-container planExecuteRecordDetail">
     <div class="page-top-title-box">

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -13,7 +13,7 @@
               />
             </el-form-item>
             <el-form-item label="" prop="deptId">
-              <el-select v-model="queryParams.deptId" placeholder="请选择学院" style="width:150px;">
+              <el-select v-model="queryParams.deptId" placeholder="请选择二级单位" style="width:150px;">
                 <el-option
                   v-for="dict in deptOptions"
                   :key="dict.deptId"