zc

src/views/emergencyManagement/plan/associatedPage.vue

@@ -65,7 +65,11 @@
     </div>
     <div class="page-content-box">
       <el-table class="table-box" v-loading="loading" border :data="tableData">
-        <el-table-column label="实验室" align="left" prop="subName" width="300" show-overflow-tooltip/>
+        <el-table-column label="实验室" align="left" prop="subName" width="300" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{scope.row.subName}}{{scope.row.roomNum?'('+scope.row.roomNum+')':''}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="安全分类" align="left" prop="typeName" width="140"/>
         <el-table-column label="安全分级" align="left" prop="levelName" width="140"/>
         <el-table-column label="危险源" align="left" prop="labSensorHazardRelationsList" show-overflow-tooltip>

src/views/integratedManagement/messageNotice/notice/addPage.vue

@@ -65,10 +65,10 @@
           <el-select
             style="width:500px;"
             v-model="addForm.subIds"
+            :multiple="true"
             filterable
             remote
             reserve-keyword
-            @change="subChange"
             placeholder="请搜索选择实验室"
             :remote-method="subSelectList">
             <el-option
@@ -102,7 +102,8 @@
   import { systemNoticeGetSendType,systemNoticeAdd,systemNotifyAdd,
     systemNoticeDetail,systemNoticeUpdate,
     systemNoticeSendUserIds } from "@/api/systemManagement/index";
-  import { systemNoticeGetNoticeType,systemUserSelect,systemDeptOrganizeStructure } from "@/api/commonality/permission";
+  import { systemNoticeGetNoticeType,systemUserSelect,
+    systemDeptOrganizeStructure,laboratorySubRelInfoGetRelListByPower } from "@/api/commonality/permission";
   import { systemSubjectGetList } from '@/api/commonality/noPermission'
   export default {
     name: 'addPage',
@@ -240,9 +241,19 @@
               obj.noticeType = this.addForm.noticeType;
               obj.sendType = this.addForm.sendType;
               obj.userIds = this.addForm.sendType == 5 ? this.addForm.userIds : [];
-              obj.deptIds = this.addForm.sendType == 6 ? this.addForm.deptIds : [];
-              obj.subIds = this.addForm.sendType == 7 ? this.addForm.subIds : [];
+              obj.subIds = this.addForm.sendType == 7 ? this.addForm.subIds+'' : '';
               obj.sendState = this.addForm.sendState;
+              if(this.addForm.sendType == 6){
+                let list = this.$refs['cascader'].getCheckedNodes()
+                let valueList = [];
+                list.forEach((item)=>{
+                  valueList.push(item.value)
+                })
+                obj.deptIds = valueList+'';
+              }else {
+                obj.deptIds = '';
+              }
+              console.log('obj',obj)
             }else{
               obj.notifyType = this.addForm.noticeType
               obj.company = this.addForm.company;

src/views/systemManagement/systemUser/index.vue

@@ -416,7 +416,7 @@ export default {
         password: [
           { required: true, message: "用户密码不能为空",trigger :"blur"},
           { required: true, message: "用户密码不能为空", validator: this.spaceJudgment,trigger :"blur"},
-          { required: true, validator: equalToPassword,trigger :"blur"},
+          // { required: true, validator: equalToPassword,trigger :"blur"},
           { required: true, message: "不能输入如:123,abc,111,aaa等形式的连续型字符", validator: LxStr,trigger :"blur"},
           {
             pattern: /^(?=(?:.*[A-Z]){1})(?=(?:.*[a-z]){1})(?=(?:.*[0-9]){1})(?=(?:.*[!@#*?&]){1})(?!(.)\1)(.{10,16})$/,