zc 合并3.3.1修改内容与BUG

src/api/laboratory/subject.js

@@ -59,6 +59,15 @@ export function updateSubject(data) {
     data: data
   })
 }
+// 实验室-修改排序
+export function laboratorySubjectEditSort(data) {
+  return request({
+    url: '/laboratory/subject/editSort',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询实验室-安全信息牌
 export function getClassifyBySubId(data) {
   return request({
@@ -67,7 +76,6 @@ export function getClassifyBySubId(data) {
     data: data
   })
 }
-
 // 修改实验室(包含新危险源)
 export function updateSubjectEditJoinHazard(data) {
   return request({

src/api/medicUniversity-3_1/index.js

@@ -141,11 +141,11 @@ export function hxpCabinetList(query) {
 }
 
 //获取机柜列表(无权限)
-export function getNoauthList(query) {
+export function getNoauthList(data) {
   return request({
-    url: '/chemical/hxpCabinet/getNoauthList',
-    method: 'get',
-    params: query
+    url: '/chemical/hxpCabinet/getCabinetList',
+    method: 'post',
+    data: data
   })
 }
 

src/views/comprehensive/laboratoryManagement/building/buildingManagement.vue

@@ -191,19 +191,19 @@
           <el-input v-model="dialogForm.nameThree" maxlength="10" placeholder="请输入楼层名称" />
         </el-form-item>
         <el-form-item label="房间类型：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间类型" />
         </el-form-item>
         <el-form-item label="房间号：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间号" />
         </el-form-item>
         <el-form-item label="房间名称：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间名称" />
         </el-form-item>
         <el-form-item label="房间选择：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间选择" />
         </el-form-item>
         <el-form-item label="房间位置：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间位置" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

@@ -293,6 +293,9 @@
           this.$set(this.form,'details',this.subjectData.details)
           this.$refs.UEditor.text=unescape(this.subjectData.details)
           this.$set(this.form,'moldId',this.subjectData.moldId)
+          this.$set(this.form,'room',this.subjectData.room)
+          this.$set(this.form,'details',this.subjectData.details)
+          this.$refs.UEditor.text=unescape(this.subjectData.details)
           if(this.subjectData.adminId){
             this.$set(this.form,'adminId',this.subjectData.adminId)
             this.userSelectList(this.subjectData.adminName);

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -330,7 +330,7 @@ import {
   updateSubject,
   mangerVoice,
   startUrl,
-  queryHardByTypeList, subjectTriggerModes,
+  queryHardByTypeList, getHaikangUserList, subjectTriggerModes, subjectEditSort, laboratorySubjectEditSort
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
 import { filterDept } from "@/api/medicUniversity-3_1/index";
@@ -976,7 +976,7 @@ export default {
             id:row.id,
             diyOrder:row.diyOrder,
           };
-          updateSubject(obj).then(response => {
+          laboratorySubjectEditSort(obj).then(response => {
             self.msgSuccess("修改成功");
             self.getList();
           });

src/views/comprehensive/system/notice/index.vue

@@ -66,7 +66,7 @@
 
     <el-table v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
       <!--<el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="序号" align="left" prop="noticeId" width="100" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column
         label="公告标题"
         align="left"

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/InventoryDetails/index.vue

@@ -201,12 +201,12 @@
     methods: {
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -236,12 +236,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -244,12 +244,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

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

@@ -85,7 +85,7 @@
       </div>
     </div>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="620px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能终端编号：" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -110,7 +110,7 @@
                   <p @click="addList(index,bigIndex)">+添加</p>
                 </div>
                 <div class="for-min-box" v-for="(minItem,minIndex) in bigItem.list">
-                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmount">
+                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmountLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -124,7 +124,7 @@
                       <p class="num-title-span">{{listPropsData.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
-                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
+                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tareLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -237,9 +237,54 @@
         console.log('rule',rule)
         const list = rule.field.split('.');
         let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
         let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].list[index2].tare);
         if(value>max){
-            callback(new Error("超出该机柜可存放量"));
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingCapacityLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].tare);
+        if(value>max){
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingTare = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingTareLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
         }else{
           callback();
         }
@@ -287,11 +332,22 @@
           chemicalAmount:[
             { required: true, message: '请输入容器容量', trigger: 'blur' },
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
-            { required: true, message: "超出该机柜可存放量", validator: computingCapacity, trigger: "blur" },
+            { required: true, validator: computingCapacity, trigger: "blur" },
+          ],
+          chemicalAmountLock:[
+            { required: true, message: '请输入容器容量', trigger: 'blur' },
+            { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingCapacityLock, trigger: "blur" },
           ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
-            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTare, trigger: "blur" },
+          ],
+          tareLock:[
+            { required: true, message: '请输入容器自重', trigger: 'blur' },
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTareLock, trigger: "blur" },
           ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },

src/views/medicUniversity-3_1/chemicalManagement/usageRecord/index.vue

@@ -256,12 +256,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/securityCheck/checkRecord/reformCheck.vue

@@ -58,7 +58,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" border :data="checkRecordList" border>
-        <el-table-column label="项目序号" align="left" prop="jcxSstkNum" width="100" show-overflow-tooltip/>
+        <el-table-column label="序号" type="index" align="center" width="50"/>
+        <!--<el-table-column label="项目序号" align="left" prop="jcxSstkNum" width="100" show-overflow-tooltip/>-->
         <el-table-column label="隐患描述" align="left" prop="yhMs" show-overflow-tooltip/>
         <el-table-column label="整改类型" align="left" prop="zgType" width="110" show-overflow-tooltip>
           <template slot-scope="scope">{{scope.row.zgType==0?'一般整改':(scope.row.zgType==1?'重大整改':'')}}</template>

src/views/securityCheck/checkRecord/verifyCheck.vue

@@ -56,7 +56,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" border :data="checkRecordList" border>
-        <el-table-column label="项目序号" align="left" prop="jcxNum" width="180"/>
+        <el-table-column label="序号" type="index" align="center" width="50"/>
+        <!--<el-table-column label="项目序号" align="left" prop="jcxNum" width="180"/>-->
         <el-table-column label="隐患描述" align="left" prop="yhMs" width="290" :show-overflow-tooltip="true"/>
         <el-table-column label="整改类型" align="left" prop="zgType" width="150">
           <template slot-scope="scope">{{scope.row.zgType==0?'一般整改':(scope.row.zgType==1?'重大整改':'')}}</template>

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -109,7 +109,7 @@
                   <p @click="addList(index,bigIndex)">+添加</p>
                 </div>
                 <div class="for-min-box" v-for="(minItem,minIndex) in bigItem.list">
-                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmount">
+                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmountLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -123,7 +123,7 @@
                       <p class="num-title-span">{{selectioned.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
-                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
+                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tareLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -247,6 +247,22 @@
           callback();
         }
       };
+      const computingCapacityLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].tare);
+        if(value>max){
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
       const computingTare = (rule, value, callback) => {
         console.log('rule',rule)
         const list = rule.field.split('.');
@@ -259,6 +275,19 @@
           callback();
         }
       };
+      const computingTareLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
 
       return {
         //限制时间范围
@@ -303,11 +332,21 @@
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
             { required: true, validator: computingCapacity, trigger: "blur" },
           ],
+          chemicalAmountLock:[
+            { required: true, message: '请输入容器容量', trigger: 'blur' },
+            { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingCapacityLock, trigger: "blur" },
+          ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
             { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
             { required: true, validator: computingTare, trigger: "blur" },
           ],
+          tareLock:[
+            { required: true, message: '请输入容器自重', trigger: 'blur' },
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTareLock, trigger: "blur" },
+          ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },
             { required: true, message: "请输入存放数量", validator: this.spaceJudgment, trigger: "blur" }

src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -230,12 +230,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/studentViews/chemicalManagement/studentUsageRecord/index.vue

@@ -234,12 +234,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -238,12 +238,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/system/ceditScoreSite/index.vue

@@ -71,7 +71,7 @@
 
     <el-table v-loading="loading" border :data="ceditScoreSiteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column label="合格分" align="center" prop="passScore" />
       <el-table-column label="是否需要获得安全准入证书,0:是,1:否" align="center" prop="getCondition" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/system/violationScoreSite/index.vue

@@ -95,7 +95,7 @@
 
     <el-table v-loading="loading" border :data="violationScoreSiteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column label="穿戴未通过扣分" align="center" prop="wear" />
       <el-table-column label="未做离开考勤" align="center" prop="leave" />
       <el-table-column label="未考勤签到进入实验室" align="center" prop="laboratory" />