zc

src/api/integratedManagement/index.js

@@ -829,3 +829,11 @@ export function laboratorySubPassOutCheckedSubList(data) {
     data: data
   })
 }
+//获取安全类目最大排序
+export function laboratoryBoardGetBrandInOrder(query) {
+  return request({
+    url: '/laboratory/board/getBrandInOrder',
+    method: 'get',
+    params: query
+  })
+}

src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue

@@ -145,7 +145,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate } from '@/api/integratedManagement/index'
+import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate,laboratoryBoardGetBrandInOrder } from '@/api/integratedManagement/index'
 import infoConfig from "./infoConfig.vue"
 export default {
   name: "Approval",
@@ -207,6 +207,20 @@ export default {
 
   },
   methods: {
+      //获取安全类目最大排序
+      laboratoryBoardGetBrandInOrder(){
+        laboratoryBoardGetBrandInOrder({}).then(response => {
+          this.title='新增安全信息类目';
+          this.$set(this,'form',{
+            brandName:'',
+            brandType:'',
+            isSpecial:'',
+            showColour:'',
+            orderNum:response.data,
+          });
+          this.open = true;
+        })
+      },
       //保存当前序号
       liveSort(row) {
         let obj = {
@@ -252,14 +266,7 @@ export default {
       handleClick(index,row,doType){
         let _this=this;
         if(doType=='add'){//添加
-          this.title='新增安全信息类目';
-          this.$set(this,'form',{
-            brandName:'',
-            brandType:'',
-            isSpecial:'',
-            showColour:'',
-          });
-          this.open = true;
+          this.laboratoryBoardGetBrandInOrder();
         }else if(doType=='edit'){//编辑
           this.title='编辑安全信息类目';
           this.$set(this,'form',{

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

@@ -176,7 +176,9 @@
                     <p>安全责任人：<span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{item.safeUserName}}｜{{item.safeUserPhone}}{{index==0?' 、':''}}</span></p>
                   </div>
                   <div class="subject-dialog-info-right-box">
-                    <img :src="dialogData.qrCodeUrl">
+                    <vue-qr style="display: block;height:110px;width:110px;"
+                      :text="identification+'?'+dialogData.qrCodeUrl" :size="300">
+                    </vue-qr>
                   </div>
                 </div>
               </div>
@@ -237,6 +239,7 @@
 
 <script>
   /********************** V3 **********************/
+  import vueQr from 'vue-qr'
   import html2canvas from 'html2canvas'
   import importComponent from "@/components/importComponent/importComponent.vue";
   import batchQrCodeDialog from "@/components/batchQrCodeDialog/batchQrCodeDialog.vue";
@@ -262,6 +265,7 @@
   export default {
     name: 'subject',
     components: {
+      vueQr,
       importComponent,
       addSubject,
       admissionConfiguration,