Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/views/system/stationItem/index.vue
This commit is contained in:
曹辉
commit
69cc27c4a5
@ -12,10 +12,9 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -104,6 +103,7 @@
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
@ -426,7 +426,7 @@
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick">
|
||||
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick" v-loading="loading2">
|
||||
<el-table-column label="请选择" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -489,7 +489,7 @@ import {
|
||||
goodsInfoList,
|
||||
goodsCategory,
|
||||
editGoodsWhetherShelf,
|
||||
stationList
|
||||
stationList,
|
||||
} from "@/api/system/OperateGoodsInfo";
|
||||
import editor from "@/components/Editor";
|
||||
import stationAcatar from "../stationAvatar/index.vue";
|
||||
@ -507,6 +507,7 @@ export default {
|
||||
datas: null,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
loading2:true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
@ -525,6 +526,7 @@ export default {
|
||||
nurseStationlist: [],
|
||||
// 查询商品分类列表
|
||||
goodsCategorylist: [],
|
||||
handstationlist: [], //页面搜索list
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@ -616,6 +618,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.infos();
|
||||
// this.getList2();
|
||||
},
|
||||
methods: {
|
||||
@ -799,7 +802,6 @@ export default {
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
@ -807,8 +809,7 @@ export default {
|
||||
goodsName: null,
|
||||
goodsCategoryName: null,
|
||||
goodsPurpose: null,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
this.handleQuery();
|
||||
},
|
||||
@ -841,11 +842,11 @@ export default {
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const id = row.goodsInfoId || this.ids;
|
||||
this.StationName = row.nurseStationName;
|
||||
if(this.StationName == null){
|
||||
this.StationName = "请选择所属护理站";
|
||||
}
|
||||
console.log(this.StationName)
|
||||
this.StationName = row.nurseStationName;
|
||||
if (this.StationName == null) {
|
||||
this.StationName = "请选择所属护理站";
|
||||
}
|
||||
console.log(this.StationName);
|
||||
getGoodsInfo(id).then((response) => {
|
||||
this.form = response.data[0];
|
||||
this.imgone = this.form.goodsPictureUrl;
|
||||
@ -869,7 +870,17 @@ export default {
|
||||
if (this.form.goodsInfoId != null) {
|
||||
this.form.id = this.form.goodsInfoId;
|
||||
updateGoodsInfo(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.goodsPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
@ -896,6 +907,13 @@ export default {
|
||||
})
|
||||
.then(() => {
|
||||
delGoodsInfo(row.goodsInfoId).then((res) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
obj.pictureUrlList.push(row.goodsPictureUrl);
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.$message.success("删除成功");
|
||||
this.getList();
|
||||
});
|
||||
@ -932,27 +950,33 @@ export default {
|
||||
console.log(this.form);
|
||||
this.goodsCategorylist = res.rows;
|
||||
});
|
||||
this.loading2 = true
|
||||
stationList(this.getListByUserquery).then((res) => {
|
||||
this.nurseStationlist = res.rows;
|
||||
this.total2 = res.total;
|
||||
console.log(res)
|
||||
console.log(res);
|
||||
// if (res.rows[0].isAdmin == "1") {
|
||||
// this.nurseStationlist = res.rows;
|
||||
// this.total2 = res.total;
|
||||
// } else {
|
||||
// this.total2 = res.total;
|
||||
// this.nurseStationlist = res.rows;
|
||||
// this.queryParams.nurseStationId = res.rows[0].id;
|
||||
// this.form.nurseStationId = res.rows[0].id;
|
||||
// this.handleQuery();
|
||||
// }
|
||||
this.loading2 = false
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total2 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total2) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
stationList(this.getListByUserquery).then((res) => {
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
};
|
||||
stationList(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -16,11 +16,10 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
@keyup.enter.native="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -32,11 +31,10 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
@keyup.enter.native="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -217,22 +215,6 @@
|
||||
"
|
||||
>{{ item.nurseStationName }}</el-button
|
||||
>
|
||||
<!-- <el-select
|
||||
v-model="item.nurseStationId"
|
||||
clearable
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
style="width: 250px"
|
||||
@click="nurseinfo"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select> -->
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="科室名称"
|
||||
@ -303,7 +285,6 @@
|
||||
style="width: 250px"
|
||||
disabled
|
||||
/>
|
||||
|
||||
</el-form-item>
|
||||
<el-form-item label="科室名称" prop="departmentName">
|
||||
<el-input
|
||||
@ -386,7 +367,11 @@
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick">
|
||||
<el-table
|
||||
:data="nurseStationlist"
|
||||
@cell-dblclick="nurseclick"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column label="请选择" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -462,6 +447,7 @@ export default {
|
||||
};
|
||||
return {
|
||||
nurseStationlist: [],
|
||||
handstationlist: [],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
@ -580,6 +566,7 @@ export default {
|
||||
this.getList();
|
||||
// this.listinfo();
|
||||
this.info();
|
||||
this.infos();
|
||||
},
|
||||
methods: {
|
||||
// add点击护理站名称
|
||||
@ -626,24 +613,6 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total2 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total2) {
|
||||
} else {
|
||||
if (this.nurseStationqueryParams.pageNum >= a) {
|
||||
} else {
|
||||
this.nurseStationqueryParams.pageNum++;
|
||||
console.log(this.nurseStationqueryParams.pageNum);
|
||||
getListByUser(this.nurseStationqueryParams).then((res) => {
|
||||
console.log(res);
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
/** 查询护理站部门信息列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
@ -721,10 +690,12 @@ export default {
|
||||
}
|
||||
},
|
||||
addhd() {
|
||||
this.loading = true;
|
||||
getListByUser(this.nurseStationqueryParams).then((res) => {
|
||||
this.total2 = res.total;
|
||||
this.nurseStationlist = res.rows;
|
||||
});
|
||||
this.loading = false;
|
||||
},
|
||||
addresetQuery() {
|
||||
this.nurseStationqueryParams = {
|
||||
@ -805,6 +776,16 @@ export default {
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res);
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download(
|
||||
|
||||
@ -212,7 +212,7 @@ import {
|
||||
listGoodsCategory,
|
||||
getGoodsCategory,
|
||||
delGoodsCategory,
|
||||
updatePicture ,
|
||||
updatePicture,
|
||||
addGoodsCategory,
|
||||
updateGoodsCategory,
|
||||
} from "@/api/system/goodsCategory";
|
||||
@ -223,7 +223,7 @@ export default {
|
||||
components: { stationAcatar },
|
||||
data() {
|
||||
return {
|
||||
imgone:"",
|
||||
imgone: "",
|
||||
baseurl: "",
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
@ -293,7 +293,7 @@ export default {
|
||||
cancel() {
|
||||
console.log(this.form);
|
||||
var obj = { pictureUrlList: [] };
|
||||
if(this.imgone !=this.form.goodsCategoryPicture ){
|
||||
if (this.imgone != this.form.goodsCategoryPicture) {
|
||||
obj.pictureUrlList.push(this.form.goodsCategoryPicture);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
@ -362,6 +362,15 @@ export default {
|
||||
if (valid) {
|
||||
if (this.form.id != null) {
|
||||
updateGoodsCategory(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.goodsCategoryPicture) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -385,6 +394,13 @@ export default {
|
||||
return delGoodsCategory(ids);
|
||||
})
|
||||
.then(() => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
obj.pictureUrlList.push(row.goodsCategoryPicture);
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -223,7 +223,7 @@
|
||||
<el-form-item label="护理站名称" prop="nurseStationName">
|
||||
<el-input
|
||||
v-model="form.nurseStationName"
|
||||
placeholder="请输入商品名称"
|
||||
placeholder="请输入护理站名称"
|
||||
max="40"
|
||||
style="width: 210px"
|
||||
disabled
|
||||
@ -507,6 +507,7 @@ export default {
|
||||
goodsInfoList: [],
|
||||
// 护理站列表
|
||||
nurseStationlist: [],
|
||||
handstationlist: [], //页面搜索list
|
||||
// 查询商品分类列表
|
||||
goodsCategorylist: [],
|
||||
// 弹出层标题
|
||||
@ -604,6 +605,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.infos();
|
||||
// this.getList2();
|
||||
},
|
||||
methods: {
|
||||
@ -788,20 +790,19 @@ export default {
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
if (this.nurseStationlist[0].isAdmin == '1') {
|
||||
if (this.nurseStationlist[0].isAdmin == "1") {
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams = {
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
}
|
||||
pageSize: 10,
|
||||
};
|
||||
} else {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.queryParams.pageSize = 10
|
||||
this.queryParams.goodsName = null
|
||||
this.queryParams.goodsCategoryName = null
|
||||
this.queryParams.goodsPurpose = null
|
||||
this.queryParams.whetherShelf = null
|
||||
|
||||
this.queryParams.pageSize = 10;
|
||||
this.queryParams.goodsName = null;
|
||||
this.queryParams.goodsCategoryName = null;
|
||||
this.queryParams.goodsPurpose = null;
|
||||
this.queryParams.whetherShelf = null;
|
||||
}
|
||||
this.handleQuery();
|
||||
},
|
||||
@ -814,8 +815,8 @@ export default {
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.form.nurseStationName = this.nurseStationlist[0].nurseStationName
|
||||
this.reset();
|
||||
this.form.nurseStationName = this.nurseStationlist[0].nurseStationName;
|
||||
this.form.nurseStationId = this.nurseStationlist[0].id;
|
||||
this.title = "商品基本信息";
|
||||
this.StationName = "请选择所属护理站";
|
||||
@ -832,13 +833,13 @@ export default {
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
console.log(row)
|
||||
console.log(row);
|
||||
// this.reset();
|
||||
const id = row.goodsInfoId || this.ids;
|
||||
getGoodsInfo(id).then((response) => {
|
||||
console.log(response)
|
||||
console.log(response);
|
||||
this.form = response.data[0];
|
||||
this.form.nurseStationName = row.nurseStationName
|
||||
this.form.nurseStationName = row.nurseStationName;
|
||||
this.imgone = this.form.goodsPictureUrl;
|
||||
if (response.data[0].goodAttributeDetailsLists) {
|
||||
this.goodDetailsLists = response.data[0].goodAttributeDetailsLists;
|
||||
@ -860,6 +861,15 @@ export default {
|
||||
if (this.form.goodsInfoId != null) {
|
||||
this.form.id = this.form.goodsInfoId;
|
||||
updateGoodsInfo(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.goodsPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -887,13 +897,19 @@ export default {
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
obj.pictureUrlList.push(row.goodsPictureUrl);
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
|
||||
delGoodsInfo(row.goodsInfoId).then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
this.getList();
|
||||
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
|
||||
});
|
||||
})
|
||||
.catch(() => { });
|
||||
.catch(() => {});
|
||||
},
|
||||
// handleDelete(row) {
|
||||
// const ids = row.id || this.ids;
|
||||
@ -945,13 +961,13 @@ export default {
|
||||
//权限列表
|
||||
info() {
|
||||
goodsCategory().then((res) => {
|
||||
console.log(res)
|
||||
console.log(res);
|
||||
|
||||
console.log(this.form);
|
||||
this.goodsCategorylist = res.rows;
|
||||
});
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
console.log(res)
|
||||
console.log(res);
|
||||
if (res.rows[0].isAdmin == "1") {
|
||||
this.nurseStationlist = res.rows;
|
||||
// console.log(this.queryParams)
|
||||
@ -964,21 +980,15 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total2 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total2) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize:9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -12,10 +12,9 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -672,6 +671,7 @@ export default {
|
||||
total: 0,
|
||||
// 商品订单表格数据
|
||||
goodsOrderList: [],
|
||||
handstationlist: [], //页面搜索list
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@ -712,6 +712,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.infos();
|
||||
},
|
||||
methods: {
|
||||
// 退款类型
|
||||
@ -1022,23 +1023,18 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total2 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total2) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize:9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -12,10 +12,9 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -584,6 +583,7 @@ export default {
|
||||
total: 0,
|
||||
// 护理类型信息表格数据
|
||||
OrderDetailsList: [],
|
||||
handstationlist: [], //页面搜索list
|
||||
dispatchlist: [],
|
||||
nurseName: "请选择护理员",
|
||||
nursePersonid: "",
|
||||
@ -627,6 +627,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.infos();
|
||||
},
|
||||
methods: {
|
||||
//取消预约确定按钮
|
||||
@ -802,21 +803,15 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total) {
|
||||
} else {
|
||||
if (this.queryParams.pageNum >= a) {
|
||||
} else {
|
||||
this.queryParams.pageNum++;
|
||||
getListByUser(this.queryParams).then((res) => {
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize:9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
resetQuery2() {
|
||||
this.resetForm("queryForm");
|
||||
|
||||
@ -16,11 +16,10 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
@keyup.enter.native="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -33,10 +32,9 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -361,24 +359,6 @@
|
||||
style="width: 200px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
circle
|
||||
plain
|
||||
icon="el-icon-circle-plus-outline"
|
||||
@click="adddisease"
|
||||
v-if="index == 0"
|
||||
></el-button>
|
||||
|
||||
<el-button
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
circle
|
||||
plain
|
||||
@click="deldisease(index)"
|
||||
v-if="index != 0"
|
||||
></el-button> -->
|
||||
</div>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@ -436,7 +416,11 @@
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick">
|
||||
<el-table
|
||||
:data="nurseStationlist"
|
||||
@cell-dblclick="nurseclick"
|
||||
v-loading="loading"
|
||||
>
|
||||
<el-table-column label="请选择" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -1033,6 +1017,7 @@ export default {
|
||||
// 所属科室
|
||||
StationDepartmentLists: [],
|
||||
nurseStationlist: [],
|
||||
handstationlist: [], //页面搜索list
|
||||
stationid: "",
|
||||
stationid2: "",
|
||||
departid: "",
|
||||
@ -1155,6 +1140,7 @@ export default {
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.infos();
|
||||
this.getList();
|
||||
this.info();
|
||||
},
|
||||
@ -1167,24 +1153,21 @@ export default {
|
||||
this.departid = item.departmentCode;
|
||||
this.innerVisible2 = true;
|
||||
this.index = index;
|
||||
|
||||
} else {
|
||||
// this.innerVisible2 = false;
|
||||
this.$message.error('请先选择所属护理站');
|
||||
this.$message.error("请先选择所属护理站");
|
||||
}
|
||||
|
||||
},
|
||||
// // 修改所属科室按钮
|
||||
departclick2() {
|
||||
console.log(this.form.nurseStationId)
|
||||
console.log(this.form.nurseStationId);
|
||||
if (this.form.nurseStationId != null) {
|
||||
this.getList3();
|
||||
this.departid2 = this.form.departmentCode;
|
||||
this.innerVisiblexg2 = true;
|
||||
|
||||
} else {
|
||||
// this.innerVisible2 = false;
|
||||
this.$message.error('请先选择所属护理站');
|
||||
this.$message.error("请先选择所属护理站");
|
||||
}
|
||||
},
|
||||
//修改护理站按钮
|
||||
@ -1211,33 +1194,7 @@ export default {
|
||||
this.innerVisiblexg = false;
|
||||
this.form.nursename = row.nurseStationName;
|
||||
},
|
||||
//删除deldisease
|
||||
// deldisease(index) {
|
||||
// this.form.nurseStationPersonList.splice(index, 1);
|
||||
// console.log(this.form.nurseStationPersonList);
|
||||
// },
|
||||
|
||||
// adddisease() {
|
||||
// this.form.nurseStationId = null
|
||||
// var obj = {
|
||||
// nursePersonCode: "",
|
||||
// nursePersonCode: "",
|
||||
// nursePersonName: "",
|
||||
// nursePersonType: "",
|
||||
// phone: "",
|
||||
// address: "",
|
||||
// sex: "",
|
||||
// nurseStationId: "",
|
||||
// departmentName: "请选择所属科室",
|
||||
// // departname: "",
|
||||
// nurseStationName: "请选择所属护理站",
|
||||
// };
|
||||
// if (this.form.nurseStationPersonList.length == 5) {
|
||||
// this.$message.error("最多只能5条");
|
||||
// } else {
|
||||
// this.form.nurseStationPersonList.push(obj);
|
||||
// }
|
||||
// },
|
||||
|
||||
// 护理站名称
|
||||
nurseclick(row) {
|
||||
console.log(row);
|
||||
@ -1289,14 +1246,7 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// getList2() {
|
||||
// this.loading = true;
|
||||
// getListByUser(this.StationqueryParams).then((res) => {
|
||||
// this.nursetotal = res.total;
|
||||
// this.nurseStationlist = res.rows;
|
||||
// this.loading = false;
|
||||
// });
|
||||
// },
|
||||
|
||||
getList3() {
|
||||
this.loading = true;
|
||||
StationDepartmentList(this.queryParams3).then((res) => {
|
||||
@ -1304,7 +1254,6 @@ export default {
|
||||
this.departtotal = res.total;
|
||||
this.loading = false;
|
||||
});
|
||||
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
@ -1438,7 +1387,7 @@ export default {
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.queryParams3.nurseStationId=null
|
||||
this.queryParams3.nurseStationId = null;
|
||||
this.reset();
|
||||
this.open2 = true;
|
||||
this.title = "添加护理站人员信息";
|
||||
@ -1453,7 +1402,7 @@ export default {
|
||||
this.departmentName = response.data.departmentName;
|
||||
this.nurseStationName = response.data.nurseStationName;
|
||||
this.form = response.data;
|
||||
this.queryParams3.nurseStationId=response.data.nurseStationId
|
||||
this.queryParams3.nurseStationId = response.data.nurseStationId;
|
||||
this.open = true;
|
||||
this.title = "修改护理站人员信息";
|
||||
if (this.departmentName == null && this.departmentName == undefined) {
|
||||
@ -1498,7 +1447,7 @@ export default {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => { });
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 导入按钮操作 */
|
||||
handleImport() {
|
||||
@ -1526,8 +1475,8 @@ export default {
|
||||
this.$refs.upload.clearFiles();
|
||||
this.$alert(
|
||||
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
|
||||
response.msg +
|
||||
"</div>",
|
||||
response.msg +
|
||||
"</div>",
|
||||
"导入结果",
|
||||
{ dangerouslyUseHTMLString: true }
|
||||
);
|
||||
@ -1550,6 +1499,7 @@ export default {
|
||||
},
|
||||
//权限列表
|
||||
info() {
|
||||
this.loading = true;
|
||||
getListByUser(this.nurseStationqueryParams).then((res) => {
|
||||
console.log(res);
|
||||
if (res.rows[0].isAdmin == "1") {
|
||||
@ -1561,27 +1511,19 @@ export default {
|
||||
this.nurseStationlist = res.rows;
|
||||
this.queryParams.nurseStationId = res.rows[0].id;
|
||||
this.queryParams3.nurseStationId = res.rows[0].id;
|
||||
this.handleQuery();
|
||||
}
|
||||
});
|
||||
this.loading = false;
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.nursetotal / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.nursetotal) {
|
||||
} else {
|
||||
if (this.nurseStationqueryParams.pageNum >= a) {
|
||||
} else {
|
||||
this.nurseStationqueryParams.pageNum++;
|
||||
console.log(this.nurseStationqueryParams.pageNum);
|
||||
getListByUser(this.nurseStationqueryParams).then((res) => {
|
||||
console.log(res);
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize: 999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res);
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -13,35 +13,20 @@
|
||||
prop="nurseStationName"
|
||||
v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.id"
|
||||
<el-input
|
||||
v-model="queryParams.nurseStationName"
|
||||
placeholder="请输入护理站"
|
||||
clearable
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属护理站" prop="nurseStationName" v-else>
|
||||
<el-select
|
||||
v-model="queryParams.id"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="queryParams.nurseStationName"
|
||||
placeholder="请输入护理站"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="护理站编号" prop="nurseStationCode">
|
||||
<el-input
|
||||
@ -127,13 +112,7 @@
|
||||
prop="nurseStationName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column label="护理站类型" align="center" prop="nurseTypeName">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="text" @click="looktype(scope.row)"
|
||||
>查看</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
|
||||
<el-table-column label="所属区域" align="center" prop="area">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
@ -190,32 +169,6 @@
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="liststationinfo"
|
||||
/>
|
||||
<!-- 查看护理类型 -->
|
||||
<el-dialog
|
||||
title="护理类型"
|
||||
:visible.sync="typeopen"
|
||||
width="700px"
|
||||
append-to-body
|
||||
>
|
||||
<el-table v-loading="loading" :data="typelooks">
|
||||
<el-table-column
|
||||
label="护理类型名称"
|
||||
align="center"
|
||||
prop="nurseTypeName"
|
||||
/>
|
||||
<el-table-column
|
||||
label="护理类型编号"
|
||||
align="center"
|
||||
prop="nurseTypeCode"
|
||||
/>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" plain @click="typeopen = false" size="small"
|
||||
>关闭窗口</el-button
|
||||
>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 新增护理站信息对话框 -->
|
||||
<el-dialog
|
||||
:title="title"
|
||||
@ -537,6 +490,7 @@ export default {
|
||||
imageUrl2: "",
|
||||
imgtwo: "",
|
||||
imgone: "",
|
||||
handstationlist: [], //页面搜索list
|
||||
// 用户导入参数
|
||||
upload: {
|
||||
// 是否显示弹出层（用户导入）
|
||||
@ -685,15 +639,15 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getaddress();
|
||||
this.info();
|
||||
this.infos();
|
||||
},
|
||||
methods: {
|
||||
imgUrl(imgUrl) {
|
||||
console.log(imgUrl);
|
||||
this.form.stationPictureUrl = imgUrl;
|
||||
},
|
||||
imgUrl2(imgUrl) {
|
||||
console.log(imgUrl);
|
||||
this.form.stationIntroducePcitureUrl = imgUrl;
|
||||
},
|
||||
delnurseStationLabelList(index, item) {
|
||||
@ -728,16 +682,7 @@ export default {
|
||||
}
|
||||
console.log(this.looknurseStationLabel);
|
||||
},
|
||||
//查看类型
|
||||
looktype(item) {
|
||||
// console.log(item);
|
||||
this.typelooks = [];
|
||||
getInfoLists(item.nurseStationType).then((res) => {
|
||||
console.log(res);
|
||||
this.typelooks = res.data;
|
||||
this.typeopen = true;
|
||||
});
|
||||
},
|
||||
|
||||
//点击街道
|
||||
clickstreet(item) {
|
||||
this.form.areaCode = item.areaCode;
|
||||
@ -771,14 +716,13 @@ export default {
|
||||
});
|
||||
},
|
||||
/** 查询护理站信息列表 */
|
||||
getList() {
|
||||
this.liststationinfo();
|
||||
getaddress() {
|
||||
getFirstLevelInfo().then((res) => {
|
||||
this.provincelist = res.data;
|
||||
});
|
||||
getInfoList().then((res) => {
|
||||
this.nurseStationTypelist = res.data;
|
||||
});
|
||||
},
|
||||
getList() {
|
||||
this.liststationinfo();
|
||||
this.loading = true;
|
||||
},
|
||||
// 取消按钮
|
||||
@ -817,12 +761,13 @@ export default {
|
||||
stationIntroducePcitureUrl: null,
|
||||
sort: null,
|
||||
nurseStationLabelList: [],
|
||||
streetCode:null,
|
||||
streetCode: null,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
liststationinfo() {
|
||||
this.loading = true;
|
||||
listStation(this.queryParams).then((response) => {
|
||||
this.stationList = response.rows;
|
||||
this.total = response.total;
|
||||
@ -898,7 +843,7 @@ export default {
|
||||
this.looknurseStationLabel = response.data.nurseStationLabel;
|
||||
this.open = true;
|
||||
this.loading = false;
|
||||
console.log(this.form)
|
||||
console.log(this.form);
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
@ -912,6 +857,16 @@ export default {
|
||||
this.form.nurseStationType = this.nurseStationType2.join(",");
|
||||
if (this.form.id != null) {
|
||||
updateStation(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.stationIntroducePcitureUrl) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
if (this.imgtwo != this.form.stationPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgtwo);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {});
|
||||
}
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -939,6 +894,12 @@ export default {
|
||||
return delStation(ids);
|
||||
})
|
||||
.then(() => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
obj.pictureUrlList.push(row.stationIntroducePcitureUrl);
|
||||
obj.pictureUrlList.push(row.stationPictureUrl);
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {});
|
||||
}
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
@ -1003,23 +964,15 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
//滑动下拉框
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total2 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total2) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
console.log(this.getListByUserquery.pageNum);
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
console.log(res);
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize:9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -17,10 +17,9 @@
|
||||
v-model="queryParams.nurseStationId"
|
||||
clearable
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -33,10 +32,9 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -513,7 +511,6 @@
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
|
||||
<el-form-item label="护理站编码" prop="nurseStationCode">
|
||||
<el-input
|
||||
style="width: 180px"
|
||||
@ -523,7 +520,7 @@
|
||||
@keyup.enter.native="handleQuery2"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="护理站名称" prop="nurseStationName">
|
||||
<el-form-item label="护理站名称" prop="nurseStationName">
|
||||
<el-input
|
||||
style="width: 180px"
|
||||
v-model="getListByUserquery.nurseStationName"
|
||||
@ -583,7 +580,6 @@
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
|
||||
<el-table-column label="联系电话" align="center" prop="phone" />
|
||||
<el-table-column
|
||||
label="护理站地址"
|
||||
@ -591,7 +587,6 @@
|
||||
prop="address"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
@ -677,6 +672,7 @@ export default {
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
handstationlist: [],
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
@ -815,6 +811,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.infos();
|
||||
// this.listinfo();
|
||||
},
|
||||
methods: {
|
||||
@ -950,6 +947,7 @@ export default {
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
listStationConsumableinfo() {
|
||||
this.loading=true;
|
||||
listStationConsumable(this.queryParams).then((response) => {
|
||||
this.stationConsumableList = response.rows;
|
||||
this.total = response.total;
|
||||
@ -1099,23 +1097,15 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
loadMore() {
|
||||
console.log(1);
|
||||
var a = Math.ceil(this.total3 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total3) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
console.log(res);
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res);
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
v-model="queryParams.nurseStationId"
|
||||
clearable
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -39,10 +39,10 @@
|
||||
<el-select
|
||||
v-model="queryParams.nurseStationId"
|
||||
placeholder="请选择护理站"
|
||||
v-loadmore="loadMore"
|
||||
|
||||
>
|
||||
<el-option
|
||||
v-for="item in nurseStationlist"
|
||||
v-for="item in handstationlist"
|
||||
:key="item.id"
|
||||
:label="item.nurseStationName"
|
||||
:value="item.id"
|
||||
@ -231,7 +231,6 @@
|
||||
label-width="130px"
|
||||
:inline="true"
|
||||
>
|
||||
<!-- prop="nurseStationItem.nurseStationId" -->
|
||||
<el-form-item label="所属护理站" required>
|
||||
<template>
|
||||
<el-button
|
||||
@ -491,7 +490,7 @@
|
||||
:data="nurseStationlist"
|
||||
@cell-dblclick="choicestationid"
|
||||
>
|
||||
<el-table-column label="请选择" width="70" align="center">
|
||||
<el-table-column label="请选择" width="70" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -715,6 +714,7 @@ export default {
|
||||
return {
|
||||
imageUrl: "",
|
||||
imgone: "",
|
||||
handstationlist:[],
|
||||
// 用户导入参数
|
||||
upload: {
|
||||
// 是否显示弹出层（用户导入）
|
||||
@ -740,7 +740,7 @@ export default {
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
// 总条数
|
||||
total: 0,
|
||||
total2: 0,
|
||||
total3: 0,
|
||||
@ -762,7 +762,6 @@ export default {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -831,8 +830,8 @@ export default {
|
||||
this.getList();
|
||||
this.info();
|
||||
this.getInfoListinfo();
|
||||
// this.stationlist();
|
||||
// this.listStationConsumableinfo();
|
||||
this.infos();
|
||||
|
||||
},
|
||||
methods: {
|
||||
imgUrl(imgUrl) {
|
||||
@ -939,10 +938,12 @@ export default {
|
||||
},
|
||||
//下拉框
|
||||
stationlist() {
|
||||
this.loading=true;
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
this.total4 = res.total;
|
||||
this.nurseStationlist = res.rows;
|
||||
});
|
||||
this.loading=false;
|
||||
},
|
||||
//护理类型
|
||||
getInfoListinfo() {
|
||||
@ -1164,10 +1165,16 @@ export default {
|
||||
console.log(valid);
|
||||
if (valid) {
|
||||
if (this.form.nurseStationItem.id != null) {
|
||||
this.form.nurseStationItemPrices.forEach((e) => {
|
||||
e.nurseStationItemId = this.form.nurseStationItem.id;
|
||||
});
|
||||
updateNurseItem(this.form).then((response) => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
if (this.imgone != this.form.nurseStationItem.itemPictureUrl) {
|
||||
obj.pictureUrlList.push(this.imgone);
|
||||
}
|
||||
if (obj.pictureUrlList.length > 0) {
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
}
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -1183,6 +1190,16 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
infos() {
|
||||
var queryFor = {
|
||||
pageNum: 1,
|
||||
pageSize:9999,
|
||||
};
|
||||
getListByUser(queryFor).then((res) => {
|
||||
console.log(res)
|
||||
this.handstationlist = res.rows;
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
@ -1192,10 +1209,15 @@ export default {
|
||||
return delNurseItem(ids);
|
||||
})
|
||||
.then(() => {
|
||||
var obj = { pictureUrlList: [] };
|
||||
obj.pictureUrlList.push(row.nurseStationItem.itemPictureUrl);
|
||||
updatePicture(obj).then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导入按钮操作 */
|
||||
handleExport() {
|
||||
@ -1219,21 +1241,7 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
loadMore() {
|
||||
var a = Math.ceil(this.total4 / 10);
|
||||
if (this.nurseStationlist.length + 1 >= this.total4s) {
|
||||
} else {
|
||||
if (this.getListByUserquery.pageNum >= a) {
|
||||
} else {
|
||||
this.getListByUserquery.pageNum++;
|
||||
getListByUser(this.getListByUserquery).then((res) => {
|
||||
res.rows.forEach((e) => {
|
||||
this.nurseStationlist.push(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user