Merge branch 'master' of http://192.168.101.10:13000/tjf/shujuju-web

src/api/system/residentss.js

@@ -176,8 +176,8 @@ export function updateInfo(data) {
 export function updateInfohsxx(query) {
   return request({
     url: '/boman-web-core/core/jzdz/isFive',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 

src/views/system/residentss/index.vue

@@ -708,7 +708,7 @@
                 </el-col> -->
                 <el-col :span="24">
                   <el-form-item label="全员核酸" prop="isNucleicAcidFive">
-                  	<el-select :disabled="isNucleicflag" v-model="formhs.isNucleicAcidFive" placeholder="是否参加5天一次全员核酸" clearable style="width: 100%;">
+                  	<el-select  v-model="formhs.isNucleicAcidFive" placeholder="是否参加5天一次全员核酸" clearable style="width: 100%;">
                   		<el-option v-for="dict in qyhs" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                   	</el-select>
                   </el-form-item>
@@ -752,7 +752,8 @@ export default {
 			loading: true,
       dch:false,
 			// 选中数组
-			ids: [],
+			ids: [],
+      cards:[],
 			// 非单个禁用
 			single: true,
 			// 非多个禁用
@@ -1976,7 +1977,8 @@ export default {
 		},
 		// 多选框选中数据
 		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.id);
+			this.ids = selection.map(item => item.id);
+      this.cards=selection.map(item => item.idCard);
 			this.single = selection.length !== 1;
 			this.multiple = !selection.length;
 		},
@@ -3400,9 +3402,9 @@ let reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|
         this.$refs['formhs'].validate(valid => {
           let nhuesf = {}
           nhuesf.isNucleicAcidFive = this.formhs.isNucleicAcidFive
-          nhuesf.idCardList = this.ids.join(',')
+          nhuesf.idCardList = this.cards
           updateInfohsxx(nhuesf).then(response => {
-            console.log(response)
+            // console.log(response)
             if(response.code == 200){
                this.msgSuccess('操作成功');
                this.qyhss = false;