heyang

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

@@ -230,7 +230,8 @@
           queryParams: {
             pageNum: 1,
             pageSize:20,
-            searchValue:'',
+            searchValue:null,
+            userType:null,
             subjectId:this.subjectData.id,
             beginTime:null,
             endTime:null,
@@ -495,9 +496,13 @@
           this.$set(this,'queryParams',{
             pageNum: 1,
             pageSize:20,
-            deptId:"",
-            name: '',
+            subjectId:this.subjectData.id,
+            searchValue: null,
+            userType:null,
+            beginTime:null,
+            endTime:null,
           });
+          this.dateRange=[];
           this.handleQuery();
         },
         handleClick(index,row,doType){

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

@@ -135,7 +135,7 @@
           <p @click="delSign(item)"><i class="el-icon-delete"></i>删除</p>
         </div>
       </div>
-      <p class="add-for-p" @click="addData('addSign')"><i class="el-icon-plus"></i>添加信息牌</p>
+      <p class="add-for-p" @click="addData('addSign')" v-if="listXxp.length<1"><i class="el-icon-plus"></i>添加信息牌</p>
     </div>
     <el-dialog :title="title" :visible.sync="addType" v-if="addType" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">

src/views/safetyInfo/safetyInfoCategory/infoConfig.vue

@@ -80,9 +80,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
+        remark:'sort'
       },
       //列表数据
-      tableData:[{status:3}],
+      tableData:[],
       total:0,
 
     }

src/views/safetyInfo/safetyInfoCategory/safetyInfoCategory.vue

@@ -137,12 +137,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        searchValue:'',
-        startTime:'',
-        endTime:'',
+        searchValue:null,
+        beginTime:null,
+        endTime:null,
+        remark:'time',
       },
       total:0,
-      tableData:[{}],
+      tableData:[],
       dateRange:[],
       pageData2:{},
       // 表单参数
@@ -214,9 +215,9 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.searchValue = "";
+        this.queryParams.searchValue = null;
         this.dateRange=[];
-        this.queryParams.startTime=null;
+        this.queryParams.beginTime=null;
         this.queryParams.endTime=null
         this.handleQuery();
       },
@@ -247,10 +248,10 @@ export default {
       getList(){
         let _this=this;
         if(this.dateRange&&this.dateRange.length>0) {
-          this.queryParams.startTime=this.dateRange[0]
+          this.queryParams.beginTime=this.dateRange[0]
           this.queryParams.endTime=this.dateRange[1]
         } else {
-          this.queryParams.startTime=null;
+          this.queryParams.beginTime=null;
           this.queryParams.endTime=null
         }
         infoCategoryList(_this.queryParams).then( response => {

src/views/safetyInfo/safetyInfoConfig/safetyInfoConfig.vue

@@ -298,6 +298,8 @@ export default {
         let obj={
           pageNum: 1,
           pageSize:100,
+          isShow:1,
+          remark:'sort',
         }
         infoCategoryList(obj).then( response => {
           let res=response.rows;