Commit c747000a authored by 赵啸非's avatar 赵啸非

添加窗口人员查询

parent 82e6c8ee
...@@ -16,7 +16,6 @@ export default { ...@@ -16,7 +16,6 @@ export default {
}, },
]; ];
} }
console.log(data);
return data; return data;
}, },
// 渲染后置处理 // 渲染后置处理
...@@ -26,7 +25,6 @@ export default { ...@@ -26,7 +25,6 @@ export default {
data.attachmentPathList && data.attachmentPathList.length > 0 data.attachmentPathList && data.attachmentPathList.length > 0
? (data.attachmentPath = data.attachmentPathList[0].url) ? (data.attachmentPath = data.attachmentPathList[0].url)
: (data.attachmentPath = ""); : (data.attachmentPath = "");
console.log(data);
return data; return data;
}, },
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <Field <!-- <Field
label="部门" label="部门"
prop="deptId" prop="deptId"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
v-model="form.number" v-model="form.number"
placeholder="请输入工号" placeholder="请输入工号"
/> --> /> -->
<!-- <Field <!-- <Field
label="负责窗口数量" label="负责窗口数量"
prop="windowCount" prop="windowCount"
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<el-button type="primary" @click="onSubmitSearch">查询</el-button> <el-button type="primary" @click="onSubmitSearch">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<el-table <el-table
...@@ -137,8 +137,8 @@ export default { ...@@ -137,8 +137,8 @@ export default {
mixins: [form], mixins: [form],
components: {}, components: {},
created() { created() {
this.changePath("window/owner"); // this.changePath("window/owner");
this.getUser() // this.getUser()
}, },
data() { data() {
return { return {
...@@ -167,7 +167,7 @@ export default { ...@@ -167,7 +167,7 @@ export default {
] ]
}, },
userList:{}, userList:{},
}; };
}, },
......
...@@ -82,7 +82,7 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win ...@@ -82,7 +82,7 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
siteHallPdu.setSiteId(1L); siteHallPdu.setSiteId(1L);
Rest<RespData<List<SiteHallPdu>>> rest = siteHallFeign.list(siteHallPdu); Rest<RespData<List<SiteHallPdu>>> rest = siteHallFeign.list(siteHallPdu);
if (YesNoEnum.YES.getValue() == rest.getCode()) { if (YesNoEnum.YES.getValue() == rest.getCode()) {
Map<Long, String> hallMap = rest.getData().getData().stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getHallName(), (o, n) -> n)); Map<String, String> hallMap = rest.getData().getData().stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getHallName(), (o, n) -> n));
this.addDict(model, "hallId", hallMap); this.addDict(model, "hallId", hallMap);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment