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

src/api/laboratory/subject.js

@@ -59,7 +59,14 @@ export function updateSubject(data) {
     data: data
   })
 }
-
+// 实验室-修改排序
+export function laboratorySubjectEditSort(data) {
+  return request({
+    url: '/laboratory/subject/editSort',
+    method: 'post',
+    data: data
+  })
+}
 // 修改实验室(包含新危险源)
 export function updateSubjectEditJoinHazard(data) {
   return request({

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

@@ -303,6 +303,9 @@
           this.$set(this.form,'floorId',this.subjectData.floorId)
           // this.$set(this.form,'layoutId',this.subjectData.layoutId)
           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

@@ -293,7 +293,7 @@ import {
   updateSubject,
   mangerVoice,
   startUrl,
-  queryHardByTypeList, getHaikangUserList, 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";
@@ -937,7 +937,7 @@ export default {
             id:row.id,
             diyOrder:row.diyOrder,
           };
-          updateSubject(obj).then(response => {
+          laboratorySubjectEditSort(obj).then(response => {
             self.msgSuccess("修改成功");
             self.getList();
           });

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;"/>