Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -27,8 +27,8 @@
         </el-table-column>
         <el-table-column label="授权状态" align="left" prop="isretry">
           <template slot-scope="scope">
-            <span v-if="scope.row.impowerStatus">成功</span>
-            <span v-if="!scope.row.impowerStatus">失败</span>
+            <span v-if="scope.row.state">成功</span>
+            <span v-if="!scope.row.state">失败</span>
           </template>
         </el-table-column>
         <el-table-column label="类别" align="left" prop="userType"></el-table-column>

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -95,7 +95,7 @@
     data() {
       return {
         //操作方式
-        optionsList:[{id:1,name:"入库"},{id:2,name:"出库"},{id:3,name:"领用"},{id:4,name:"归还"},{id:5,name:"系统"}],
+        optionsList:[{id:1,name:"入库"},{id:2,name:"出库"},{id:3,name:"领用"},{id:4,name:"归还"},{id:0,name:"系统"}],
         // 搜索数据
         queryParamsData:{
           pageNum:1,

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/addPage.vue

@@ -36,16 +36,16 @@
         // 表单校验
         rules: {
           name:[
-            {required: true, message: '请输入危险品名称', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgment, trigger: "blur" }
+            {required: true, message: '请输入化学品名称', trigger: 'blur'},
+            { required: true, message: "请输入化学品名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
           code:[
-            {required: true, message: '请输入编号', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgment, trigger: "blur" }
+            {required: true, message: '请输入化学品编号', trigger: 'blur'},
+            { required: true, message: "请输入化学品编号", validator: this.spaceJudgment, trigger: "blur" }
           ],
           content:[
-            {required: true, message: '请输入详情', trigger: 'blur'},
-            { required: true, message: "请输入危险品名称", validator: this.spaceJudgmentHTML, trigger: "blur" }
+            {required: true, message: '请输入化学品详情', trigger: 'blur'},
+            { required: true, message: "请输入化学品详情", validator: this.spaceJudgmentHTML, trigger: "blur" }
           ],
         },
       };

src/views/securityCheck/release/listPage.vue

@@ -66,8 +66,8 @@
           <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" border :data="checkRecordList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
+      <el-table v-loading="loading" border :data="checkRecordList">
+<!--        <el-table-column type="selection" width="55" align="center"/>-->
         <!--<el-table-column type="selection" width="55" align="center" />-->
         <!--<el-table-column label="创建人id" align="center" prop="id" />-->
         <el-table-column label="整改状态" align="left" prop="zgStatus" width="120">