Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/api/laboratoryManagement/index.js

@@ -287,7 +287,7 @@ export function laboratorySubRelInfoList(data) {
   })
 }
 
-//实验室新增
+//实验室-新增
 export function laboratorySubRelInfoAdd(data) {
   return request({
     url: '/laboratory/subRelInfo/add',
@@ -295,7 +295,15 @@ export function laboratorySubRelInfoAdd(data) {
     data: data
   })
 }
-//实验室详情
+//实验室-编辑
+export function laboratorySubRelInfoUpdate(data) {
+  return request({
+    url: '/laboratory/subRelInfo/update',
+    method: 'post',
+    data: data
+  })
+}
+//实验室-详情
 export function laboratorySubRelInfoGetDetailInfo(query) {
   return request({
     url: '/laboratory/subRelInfo/getDetailInfo',
@@ -303,6 +311,14 @@ export function laboratorySubRelInfoGetDetailInfo(query) {
     params: query
   })
 }
+//实验室-删除
+export function laboratorySubRelInfoGetDetailDelete(data) {
+  return request({
+    url: '/laboratory/subRelInfo/delete',
+    method: 'post',
+    data: data
+  })
+}
 
 
 /******************* 安全信息类目 *********************/

src/views/laboratoryManagement/subject/addSubject.vue

@@ -112,7 +112,7 @@
         <!--管控一体机-->
         <div class="bottom-form-box-one" v-if="checkButtonType == 1">
           <div class="left-form-box">
-            <el-form-item label="实验室负责人" prop="adminId" class="form-item">
+            <el-form-item label="实验室负责人" prop="adminId" class="form-item" label-width="180px">
               <el-select
                 style="width:500px;"
                 v-model="form.adminId"
@@ -131,7 +131,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="安全警示标识" prop="safeSigns" class="form-item">
+            <el-form-item label="安全警示标识" prop="safeSigns" class="form-item" label-width="180px">
               <el-select v-model="form.safeSigns" multiple  placeholder="请选择安全警示标识" style="width:500px;">
                 <el-option
                   v-for="dict in safetyWarning"
@@ -141,7 +141,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="风控防控措施" prop="riskMeasure" class="form-item">
+            <el-form-item label="风控防控措施" prop="riskMeasure" class="form-item" label-width="180px">
               <el-select v-model="form.riskMeasure" multiple  placeholder="请选择风险防控措施" style="width:500px;">
                 <el-option
                   v-for="dict in riskMeasure"
@@ -153,7 +153,7 @@
             </el-form-item>
           </div>
           <div class="right-form-box">
-            <el-form-item label="安全责任人" prop="safeUserId" class="form-item">
+            <el-form-item label="安全责任人" prop="safeUserId" class="form-item" label-width="180px">
               <el-select
                 style="width:500px;"
                 v-model="form.safeUserId"
@@ -174,7 +174,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="主要危险类别" prop="hazardCategory" class="form-item">
+            <el-form-item label="主要危险类别" prop="hazardCategory" class="form-item" label-width="180px">
               <el-select v-model="form.hazardCategory" multiple  placeholder="请选择主要危险类别" style="width:500px;">
                 <el-option
                   v-for="dict in hazardCategory"
@@ -184,8 +184,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="灭火要点" prop="outfire" class="form-item">
-              <el-select v-model="form.outfire" multiple  placeholder="请选择灭火要点" style="width:500px;">
+            <el-form-item label="灭火要点" prop="outFire" class="form-item" label-width="180px">
+              <el-select v-model="form.outFire" multiple  placeholder="请选择灭火要点" style="width:500px;">
                 <el-option
                   v-for="dict in extinguishingKeyPoints"
                   :key="dict.itemId"
@@ -272,13 +272,12 @@
 
 <script>
     import { onUselistLayoutByFloorId,onUselistLayoutByFloorIdTwo } from "@/apiDemo/laboratory/layout";
-    import { addSubject, getClassifyBySubId, updateSubject } from '@/apiDemo/laboratory/subject'
     import { labMoldQueryOption } from "@/apiDemo/laboratory/subjectClass";
     //v3
     import { getDeptDropList,systemBuildingGetOptList,laboratoryClassMoldGetList,
       laboratoryClassLevelGetList,laboratoryClassTypeGetList,systemRoomInfoGetList,
       systemUserSelectUser} from "@/api/commonality/permission";
-    import { laboratoryInfoBrandGetClassifyBySubId,laboratorySubRelInfoAdd,laboratorySubRelInfoGetDetailInfo } from "@/api/laboratoryManagement/index";
+    import { laboratoryInfoBrandGetClassifyBySubId,laboratorySubRelInfoAdd,laboratorySubRelInfoUpdate,laboratorySubRelInfoGetDetailInfo } from "@/api/laboratoryManagement/index";
     export default {
       name: "addSubject",
       props:{
@@ -358,6 +357,7 @@
         if(!this.subjectData.subId){
           this.laboratoryInfoBrandGetClassifyBySubId();
         }else{
+          this.$set(this.form,'infoId',this.subjectData.infoId)
           this.$set(this.form,'subId',this.subjectData.subId)
           this.$set(this.form,'subName',this.subjectData.subName)
           this.$set(this.form,'moldId',this.subjectData.moldId)
@@ -390,8 +390,8 @@
             this.$set(this.form,'hazardCategory',this.subjectData.hazardCategory.split(','))
           }
           //灭火要点
-          if(this.subjectData.outfire){
-            this.$set(this.form,'outfire',this.subjectData.outfire.split(','))
+          if(this.subjectData.outFire){
+            this.$set(this.form,'outFire',this.subjectData.outFire.split(','))
           }
           //实验室负责人
           if(this.subjectData.adminId){
@@ -422,14 +422,14 @@
             this.$set(this.form, 'safeUserId', safeUserIdList);
           }
           //安全信息牌
-          if(this.subjectData.classifyList){
+          if(this.subjectData.labInfoBrandModels){
             //循环取安全信息牌信息
-            let list=this.subjectData.classifyList
+            let list=this.subjectData.labInfoBrandModels
             for(let i=0;i<list.length;i++){
               let list2=[];
-              if(list[i].privateList.length>0){
-                for(let b=0;b<list[i].privateList.length;b++){
-                  list2.push(list[i].privateList[b].id)
+              if(list[i].publicList.length>0){
+                for(let b=0;b<list[i].publicList.length;b++){
+                  list2.push(list[i].publicList[b].detailId)
                 }
                 list[i].privateList=list2
               }
@@ -541,8 +541,8 @@
                 if(self.form.hazardCategory) {
                   self.form.hazardCategory = self.form.hazardCategory.join() ;
                 }
-                if(self.form.outfire) {
-                  self.form.outfire = self.form.outfire.join() ;
+                if(self.form.outFire) {
+                  self.form.outFire = self.form.outFire.join() ;
                 }
                 if(self.form.riskMeasure) {
                   self.form.riskMeasure = self.form.riskMeasure.join() ;
@@ -560,14 +560,14 @@
                   let list2=[];
                   if(self.safetyInfoList[i].privateList && self.safetyInfoList[i].privateList.length>0){
                     for(let b=0;b<self.safetyInfoList[i].privateList.length;b++){
-                      list2.push({id:self.safetyInfoList[i].privateList[b]})
+                      list2.push({detailId:self.safetyInfoList[i].privateList[b]})
                     }
-                    list.push({id:self.safetyInfoList[i].id,privateDetailList:list2})
+                    list.push({brandId:self.safetyInfoList[i].brandId,labInfoBrandDetailModelList:list2})
                   }
                 }
-                self.form.classifyList=list
-                if(self.form.id){
-                  self.updateSubject();
+                self.form.labInfoBrandModels=list
+                if(self.form.infoId){
+                  self.laboratorySubRelInfoUpdate();
                 }else{
                   self.laboratorySubRelInfoAdd();
                 }
@@ -584,9 +584,9 @@
           });
         },
         //修改实验室
-        updateSubject(){
+        laboratorySubRelInfoUpdate(){
           this.form.details = escape(this.form.details);
-          updateSubject(this.form).then(response => {
+          laboratorySubRelInfoUpdate(this.form).then(response => {
             this.msgSuccess("修改成功");
             this.$parent.clickPage(1);
           });
@@ -734,7 +734,6 @@
     }
     .bottom-form-box-one{
       display: flex;
-      padding-left:20px;
       .left-form-box{
         width:650px;
       }

src/views/laboratoryManagement/subject/index.vue

@@ -420,7 +420,7 @@ import store from '@/store'
 
 /********************** V3 **********************/
 import { getDeptDropList,laboratoryClassTypeGetList,laboratoryClassLevelGetList } from "@/api/commonality/permission";
-import { laboratorySubRelInfoList,laboratorySubRelInfoGetDetailInfo } from "@/api/laboratoryManagement/index";
+import { laboratorySubRelInfoList,laboratorySubRelInfoGetDetailInfo,laboratorySubRelInfoGetDetailDelete } from "@/api/laboratoryManagement/index";
 
 export default {
   filters:{
@@ -1065,13 +1065,10 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
           }).then(function() {
-            let obj = {
-              id:row.id,
-            };
-            // laboratorySubRelInfoDelete(obj).then(response => {
-            //   this.msgSuccess(response.message);
-            //   self.getList();
-            // });
+            laboratorySubRelInfoGetDetailDelete({infoId:row.infoId}).then(response => {
+              self.msgSuccess(response.message);
+              self.getList();
+            });
           }).then(() => {}).catch(() => { });
           break;
         default: