zouling 2 anni fa
parent
commit
bdc81298f6

+ 1 - 1
src/views/bdc/marriageNew/index.vue

@@ -680,7 +680,7 @@ export default {
 		getList() {
 			this.loading = true;
 			listInfo(this.queryParams).then(response => {
-				this.infoList = response.rows;
+				this.infoList = response.data;
         this.nbdgywkajs = true
 				this.total = response.total;
 				this.loading = false;

+ 13 - 3
src/views/system/residentss/index.vue

@@ -454,7 +454,7 @@
             </el-col> -->
             <el-col :span="12">
               <el-form-item label="全员核酸" prop="isNucleicAcidFive">
-              	<el-select v-model="form.isNucleicAcidFive" placeholder="是否参加5天一次全员核酸" clearable style="width: 100%;">
+              	<el-select :disabled="isNucleicflag" v-model="form.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>
@@ -1012,7 +1012,9 @@ export default {
       comind:false,
       nmkl:false,
       user:{},
-      qyhs:[]
+      qyhs:[],
+      isNucleicflag:false,//全员核酸禁用
+
 		};
 	},
 	created() {
@@ -2052,7 +2054,8 @@ export default {
 			this.naiseurya = '';
 			this.hsuej = '';
 			// this.form.city = this.selected[1];
-			// this.form.region = this.selected[2];
+			// this.form.region = this.selected[2];
+      this.isNucleicflag=false;
 			this.title = '添加信息';
 			this.jdourdjoaj = true;
       this.senlsduea = false
@@ -2084,6 +2087,7 @@ export default {
 		/** 修改按钮操作 */
 		handleUpdate(row) {
       this.opens = true;
+      this.isNucleicflag=false;
       this.form = {}
   if(this.typeOptionsname.length == 0){
     this.getDicts('renyuanfenlei').then(response => {
@@ -2172,6 +2176,12 @@ export default {
         this.nhdyesku = true
         this.nhtrew = true
         this.nhyeswdga.nhus = []
+        // 全员核酸3  禁止修改
+        if(response.data.isNucleicAcidFive !==null&&response.data.isNucleicAcidFive=='3'){
+          this.isNucleicflag=true
+        }else{
+          this.isNucleicflag=false;
+        }
         if(this.form.houseType == '是'){
           //是户主
           this.shifouh = true

+ 1 - 1
src/views/system/user/profiles/index.vue

@@ -39,7 +39,7 @@
       <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户名称" align="center" prop="nikeName" :show-overflow-tooltip="true" />
       <el-table-column label="部门名称" align="center" prop="deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" /> -->
       <el-table-column label="登录类型" align="center" prop="loginType" :show-overflow-tooltip="true" />
       <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
         <template slot-scope="scope">