|
@@ -158,6 +158,21 @@
|
|
|
<el-option :value="false" label="否"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="健康码" prop="healthyCode">
|
|
|
+ <el-select
|
|
|
+ v-model="queryModel.healthyCode"
|
|
|
+ size="mini"
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width:100px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in healthyCodeList"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<!-- <div>
|
|
|
<el-form-item v-if="position1Show" :label="position1" prop="position1">
|
|
@@ -774,6 +789,7 @@ import personRoleInfoApi from "@/api/base/personRoleInfo";
|
|
|
import companyPositionApi from "@/api/base/companyPosition";
|
|
|
import deviceInfoApi from "@/api/base/deviceInfo";
|
|
|
import personDeviceRelationApi from "@/api/base/personDeviceRelation";
|
|
|
+import dataDictionaryApi from "@/api/sys/dataDictionary";
|
|
|
import SelectTree from "@/components/SelectTree";
|
|
|
import LifeRecordList from "./lifeRecord-list";
|
|
|
|
|
@@ -806,7 +822,8 @@ export default {
|
|
|
parkId: "",
|
|
|
roleId:"",
|
|
|
enableAttendance: null,
|
|
|
- enableRegisterExamine: null
|
|
|
+ enableRegisterExamine: null,
|
|
|
+ healthyCode:"",
|
|
|
},
|
|
|
loading: false,
|
|
|
tableData: [],
|
|
@@ -870,6 +887,7 @@ export default {
|
|
|
parkList: [],
|
|
|
showRoleModal: false,
|
|
|
roleResult:[],
|
|
|
+ healthyCodeList:[],
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
@@ -919,6 +937,13 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ var formData = new FormData();
|
|
|
+ formData.append("catalogName", "健康码");
|
|
|
+ dataDictionaryApi.findByCatalogName(formData).then(response => {
|
|
|
+ var jsonData = response.data;
|
|
|
+ this.healthyCodeList = jsonData.data;
|
|
|
+ });
|
|
|
+
|
|
|
// companyInfoApi.list({ type: "3" }).then((response) => {
|
|
|
// var jsonData = response.data;
|
|
|
// this.parkList = jsonData.data;
|
|
@@ -1049,6 +1074,8 @@ export default {
|
|
|
formData.append("direction", this.direction);
|
|
|
}
|
|
|
|
|
|
+ formData.append("healthyCode", self.queryModel.healthyCode);
|
|
|
+
|
|
|
personInfoApi
|
|
|
.pageList(formData)
|
|
|
.then(function (response) {
|