Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-30 c181527b88758cec56479f2076f06c8df9dd45c6

 src/views/systemManage/userManage/index.vue

@@ -425,6 +425,19 @@
                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="是否安全员:" prop="issecurityofficer">
                            <el-select v-model.trim="dataForm.issecurityofficer"  auto-complete="on" style="width:100%;">
                                <el-option
                                    v-for="item in isSecurityOfficerList"
                                    :key="item.id"
                                    :value="item.id"
                                    :label="item.name"
                                >
                                </el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="状态:" prop="status">
                            <el-select v-model.trim="dataForm.status"  auto-complete="on" style="width:100%;">
                                <el-option
@@ -437,13 +450,14 @@
                            </el-select>
                        </el-form-item>
                    </el-col>

                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="定位卡编号:" prop="empNo">
                            <el-input v-model.trim="dataForm.empNo"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="定位卡MAC地址:" prop="deviceNo">
                            <el-input v-model.trim="dataForm.deviceNo"></el-input>
@@ -656,6 +670,7 @@
                listLoading: true,
                isMain:false,
                iscompanyList:[{id:1,name:'否'},{id:0,name:'是'}],
                isSecurityOfficerList:[{id:1,name:'是'},{id:0,name:'否'}],
                queryForm: {
                    realname:'',
                    username: '',
@@ -692,6 +707,7 @@
                    lastmodifieddate:'',
                    empNo:'',
                    deviceNo:'',
                    issecurityofficer:'',
                },
                cardDataForm:{
                    username:'',
@@ -902,6 +918,7 @@
                    createddate:'',
                    lastmodifiedby:'',
                    lastmodifieddate:'',
                    issecurityofficer:'',
                }
            },
            getDepartmentData(){