diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index 538de19..0760fdb 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -40,7 +40,7 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
-
+
+
+
导入
+
取 消
+
+
@@ -436,8 +457,8 @@
>
-
-
+
+
+
+
+ {{
+ scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
+ }}
+ {{
+ scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
+ }}
+
+
-
+
@@ -492,24 +535,32 @@
:visible.sync="innerVisiblexg"
width="1000px"
append-to-body
- :before-close="addcancel"
>
+
@@ -528,16 +580,16 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery4"
+ @click="handleQuery2"
>搜索
- 重置
-
-
+
+
-
+
+
+ {{
+ scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
+ }}
+ {{
+ scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
+ }}
+
-
+
+
+
+
@@ -585,7 +664,6 @@
:visible.sync="innerVisible2"
width="1000px"
append-to-body
- :before-close="departcancel"
>
@@ -606,6 +685,7 @@
v-model="queryParams3.departmentName"
placeholder="请输入科室名称"
clearable
+ @keyup.enter.native="handleQuery"
/>
@@ -625,7 +705,7 @@
:data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick"
>
-
+
@@ -658,18 +740,24 @@
-
+
@@ -678,7 +766,6 @@
:visible.sync="innerVisiblexg2"
width="1000px"
append-to-body
- :before-close="departcancel"
>
+
@@ -699,6 +795,7 @@
v-model="queryParams3.departmentName"
placeholder="请输入科室名称"
clearable
+ @keyup.enter.native="handleQuery"
/>
@@ -718,7 +815,7 @@
:data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick2"
>
-
+
@@ -751,20 +850,27 @@
-
+
+
@@ -775,15 +881,17 @@
style="margin-left: -20px"
>
{{ nurseStationName }}
+
-
+
{
+ this.StationDepartmentLists = res.rows;
+ this.total3 = res.total;
+ this.loading = false;
+ });
+ // console.log(item);
this.departid2 = this.form.departmentCode;
this.innerVisiblexg2 = true;
// this.index = index;
},
- //修改护理站按钮
- departclickxg() {
- this.getList2();
- this.stationid2 = this.form.nurseStationId;
- this.innerVisiblexg = true;
- this.index = index;
- },
// 新增护理站按钮
clickinnerVisible(item, index) {
- this.getList2();
+ // console.log(item);
this.stationid = item.nurseStationId;
this.innerVisible = true;
this.index = index;
},
- // 修改护理站
- nurseclick2(row) {
- console.log(row);
- this.nurseStationName = row.nurseStationName;
- this.stationid2 = row.id;
- this.form.nurseStationId = row.id;
- this.innerVisiblexg = false;
- this.form.nursename = row.nurseStationName;
+ // 修改护理站按钮
+ clickinnerVisible2() {
+ stationList(this.queryParams2).then((res) => {
+ this.stationLists = res.rows;
+ this.total2 = res.total;
+ this.loading = false;
+ });
+ // console.log(item);
+ this.stationid2 = this.form.nurseStationId;
+ this.innerVisiblexg = true;
+ // this.index = index;
+ },
+ //xialakuang
+ // loadMore() {
+ // console.log("1");
+ // var a = Math.ceil(this.total4 / 10);
+ // console.log(this.nurseStationlist.length);
+ // if (this.nurseStationlist.length + 1 >= this.total4) {
+ // } else {
+ // if (this.nurseStationqueryParams.pageNum >= a) {
+ // } else {
+ // this.nurseStationqueryParams.pageNum++;
+ // stationList(this.nurseStationqueryParams).then((res) => {
+ // console.log(res);
+ // res.rows.forEach((e) => {
+ // this.nurseStationlist.push(e);
+ // });
+ // });
+ // }
+ // }
+ // },
+ nurselist() {
+ stationList(this.nurseStationqueryParams).then((res) => {
+ console.log(res);
+ this.nurseStationlist = res.rows;
+ this.total4 = res.total;
+ console.log(this.nurseStationlist);
+ });
},
//删除deldisease
deldisease(index) {
@@ -1192,6 +1335,8 @@ export default {
},
adddisease() {
+ // this.nurseStationName = "请选择护理站名称";
+ // this.departmentName=""
var obj = {
nursePersonCode: "",
nursePersonCode: "",
@@ -1201,6 +1346,7 @@ export default {
address: "",
sex: "",
nurseStationId: "",
+
departmentName: "请选择所属科室",
// departname: "",
nurseStationName: "请选择护理站名称",
@@ -1224,7 +1370,16 @@ export default {
row.nurseStationName;
this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
},
-
+ // 修改护理站
+ nurseclick2(row) {
+ console.log(row);
+ this.nurseStationName = row.nurseStationName;
+ this.stationid2 = row.id;
+ this.form.nurseStationId = row.id;
+ console.log(this.form);
+ this.innerVisiblexg = false;
+ this.form.nursename = row.nurseStationName;
+ },
// 所属科室
StationDepartmentclick(row) {
console.log(row);
@@ -1261,18 +1416,16 @@ export default {
});
},
getList2() {
+ // 护理站名称
this.loading = true;
- getListByUser(this.StationqueryParams).then((res) => {
- this.nursetotal = res.total;
- this.nurseStationlist = res.rows;
+ stationList(this.queryParams2).then((res) => {
+ this.stationLists = res.rows;
+ this.total2 = res.total;
this.loading = false;
});
- },
- getList3() {
- this.loading = true;
StationDepartmentList(this.queryParams3).then((res) => {
this.StationDepartmentLists = res.rows;
- this.departtotal = res.total;
+ this.total3 = res.total;
this.loading = false;
});
},
@@ -1280,7 +1433,7 @@ export default {
cancel() {
this.open = false;
this.open2 = false;
- this.nurseStationName = "请选择所属护理站";
+ this.nurseStationName = "请选择护理站名称";
this.departmentName = "请选择所属科室";
// this.upload.open=false;
this.reset();
@@ -1301,7 +1454,7 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
- nurseStationName: "请选择所属护理站",
+ nurseStationName: "请选择护理站名称",
departmentName: "请选择所属科室",
nurseStationPersonList: [
{
@@ -1311,7 +1464,7 @@ export default {
nursePersonCode: "",
nursePersonName: "",
nursePersonType: "",
- nurseStationName: "请选择所属护理站",
+ nurseStationName: "请选择护理站名称",
phone: "",
address: "",
sex: "",
@@ -1321,52 +1474,54 @@ export default {
};
this.resetForm("form");
},
+
/** 搜索按钮操作 */
handleQuery2() {
- this.StationqueryParams.pageNum = 1;
- this.getList2();
+ this.queryParams.pageNum = 1;
+ stationList(this.queryParams2).then((res) => {
+ this.stationLists = res.rows;
+ this.total2 = res.total;
+ this.loading = false;
+ });
+ this.innerVisible = true;
},
- // 修改护理站弹框的搜索
- handleQuery4() {
- this.StationqueryParams.pageNum = 1;
- this.getList2();
- },
- //修改所属科室
+
handleQuery3() {
- this.queryParams3.pageNum = 1;
- this.getList3();
- },
- handleQuery() {
+ console.log(this.queryParams3);
+ StationDepartmentList(this.queryParams3).then((response) => {
+ this.StationDepartmentLists = response.rows;
+ this.total3 = response.total;
+ this.loading = false;
+ });
this.queryParams.pageNum = 1;
this.getList();
},
+ handleQuery() {
+ // stationList(this.nurseStationqueryParams).then((res) => {
+ // console.log(res);
+ // this.nurseStationlist = res.rows;
+ // this.total4 = res.total;
+ // console.log(this.nurseStationlist);
+ // });
+ this.queryParams.pageNum = 1;
+ this.getList();
+ // this.nurselist()
+ // this.stationList();
+ // this.nurseStationlist()
+ },
/** 重置按钮操作 */
- addcancel() {
- this.innerVisible = false;
- this.innerVisiblexg = false;
- this.resetQuery2();
- },
- departcancel() {
- this.innerVisible2 = false;
- this.innerVisiblexg2 = false;
- this.resetQuery3();
- },
resetQuery2() {
- this.resetForm("queryForm");
- this.StationqueryParams = {
+ this.queryParams2 = {
pageNum: 1,
pageSize: 10,
-
+ nurseStationName: null,
+ id: null,
+ nurseStationId: null,
};
- this.handleQuery2();
- },
- resetQuery4() {
- this.resetForm("queryForm");
- this.StationqueryParams = {
- pageNum: 1,
- pageSize: 10,
- };
- this.handleQuery4();
+ stationList(this.queryParams2).then((res) => {
+ this.stationLists = res.rows;
+ this.total2 = res.total;
+ });
},
resetQuery3() {
this.queryParams3 = {
@@ -1378,8 +1533,13 @@ export default {
departmentName: null,
nurseStationId: null,
};
- this.handleQuery3();
+ StationDepartmentList(this.queryParams3).then((response) => {
+ this.StationDepartmentLists = response.rows;
+ this.total3 = response.total;
+ this.loading = false;
+ });
},
+
resetQuery() {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
@@ -1395,6 +1555,7 @@ export default {
phone: null,
address: null,
};
+
this.handleQuery();
} else {
console.log(1);
@@ -1417,14 +1578,16 @@ export default {
this.reset();
this.open2 = true;
this.title = "添加护理站人员信息";
- this.title2 = "请选择所属护理站";
+ this.title2 = "请选择护理站";
this.title3 = "请选择科室";
},
/** 修改按钮操作 */
handleUpdate(row) {
+ // this.reset();
const id = row.id || this.ids;
getPerson(id).then((response) => {
console.log(response);
+ // this.departmentName="请选择科室"
this.departmentName = response.data.departmentName;
this.nurseStationName = response.data.nurseStationName;
this.form = response.data;
@@ -1441,6 +1604,9 @@ export default {
submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => {
+ // this.form.nursename = null;
+ // this.form.nurseStationId = null;
+
if (valid) {
if (this.form.id != null) {
updatePerson(this.form).then((response) => {
@@ -1453,7 +1619,7 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open2 = false;
this.getList();
- this.nurseStationName = "请选择所属护理站";
+ this.nurseStationName = "请选择护理站名称";
this.departmentName = "请选择所属科室";
});
}
@@ -1529,9 +1695,9 @@ export default {
if (res.rows[0].isAdmin == "1") {
console.log(true);
this.nurseStationlist = res.rows;
- this.nursetotal = res.total;
+ this.total5 = res.total;
} else {
- this.nursetotal = res.total;
+ this.total5 = res.total;
this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.handleQuery();
@@ -1540,8 +1706,8 @@ export default {
},
//滑动下拉框
loadMore() {
- var a = Math.ceil(this.nursetotal / 10);
- if (this.nurseStationlist.length + 1 >= this.nursetotal) {
+ var a = Math.ceil(this.total5 / 10);
+ if (this.nurseStationlist.length + 1 >= this.total5) {
} else {
if (this.nurseStationqueryParams.pageNum >= a) {
} else {
@@ -1556,6 +1722,24 @@ export default {
}
}
},
+ // loadMore() {
+ // console.log("1");
+ // var a = Math.ceil(this.total4 / 10);
+ // console.log(this.nurseStationlist.length);
+ // if (this.nurseStationlist.length + 1 >= this.total4) {
+ // } else {
+ // if (this.nurseStationqueryParams.pageNum >= a) {
+ // } else {
+ // this.nurseStationqueryParams.pageNum++;
+ // stationList(this.nurseStationqueryParams).then((res) => {
+ // console.log(res);
+ // res.rows.forEach((e) => {
+ // this.nurseStationlist.push(e);
+ // });
+ // });
+ // }
+ // }
+ // },
},
};