Merge branch '3.3.2-dzxxp' into 3.3.4-kdyh

src/api/laboratory/onDutyConfiguration.js

@@ -42,11 +42,11 @@ export function treeDeptSubSel(query) {
   })
 }
 //获取实验室可选值班人员列表
-export function getUserDutyList(data) {
+export function getUserDutyList(query) {
   return request({
     url: '/system/user/getUserDutyList',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 

src/views/comprehensive/personnel/onDutyConfiguration/index.vue

@@ -330,8 +330,8 @@
         }
         this.loading = true;
         let obj = JSON.parse(JSON.stringify(this.queryParams))
-        obj.subjectIds = self.getSubList;
-        obj.dateList = self.checkList.sort(self.compare('time', 'inverted'));
+        obj.subjectIds = self.getSubList+''
+        obj.dateList = self.checkList.sort(self.compare('time', 'inverted'))+'';
         getUserDutyList(obj).then( response => {
           //处理用户数据
           for(let i=0;i<self.userCheckList.length;i++){