xinyilu/NurseStationOperateUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
闫晓茹 2022-11-11 17:49:00 +08:00
commit 53ae1c7dc4
2 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/system/OperateGoodsInfo/index.vue
View File

@ -728,9 +728,9 @@ export default {
this.innerVisible = true;
},
nurseclick(row) {
console.log(this.form);
// console.log(this.form);
console.log(row);
this.form.nurseStationId = row.id;
this.nurseStationId = row.id;
this.StationName = row.nurseStationName;
this.innerVisible = false;
},
@ -839,6 +839,7 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.nurseStationId = row.id;
this.reset();
const id = row.goodsInfoId || this.ids;
this.StationName = row.nurseStationName;

74
src/views/system/person/index.vue
View File

@ -396,7 +396,7 @@
>
<el-form
ref="queryForm"
:model="StationqueryParams"
:model="nurseStationqueryParams"
:rules="rules"
label-width="80px"
:inline="true"
@ -407,7 +407,7 @@
label-width="120"
>
<el-input
v-model="StationqueryParams.nurseStationCode"
v-model="nurseStationqueryParams.nurseStationCode"
placeholder="请输入护理站编码"
clearable
/>
@ -418,7 +418,7 @@
label-width="120"
>
<el-input
v-model="StationqueryParams.nurseStationName"
v-model="nurseStationqueryParams.nurseStationName"
placeholder="请输入护理站名称"
clearable
/>
@ -481,9 +481,9 @@
<pagination
v-show="nursetotal > 0"
:total="nursetotal"
:page.sync="StationqueryParams.pageNum"
:limit.sync="StationqueryParams.pageSize"
@pagination="getList2"
:page.sync="nurseStationqueryParams.pageNum"
:limit.sync="nurseStationqueryParams.pageSize"
@pagination="info"
/>
</el-dialog>
<!-- 修改护理站名称弹框 -->
@ -496,7 +496,7 @@
>
<el-form
ref="queryForm"
:model="StationqueryParams"
:model="nurseStationqueryParams"
:rules="rules"
label-width="80px"
:inline="true"
@ -507,7 +507,7 @@
label-width="120"
>
<el-input
v-model="StationqueryParams.nurseStationCode"
v-model="nurseStationqueryParams.nurseStationCode"
placeholder="请输入护理站编码"
clearable
/>
@ -518,7 +518,7 @@
label-width="120"
>
<el-input
v-model="StationqueryParams.nurseStationName"
v-model="nurseStationqueryParams.nurseStationName"
placeholder="请输入护理站名称"
clearable
/>
@ -574,9 +574,9 @@
<pagination
v-show="nursetotal > 0"
:total="nursetotal"
:page.sync="StationqueryParams.pageNum"
:limit.sync="StationqueryParams.pageSize"
@pagination="getList2"
:page.sync="nurseStationqueryParams.pageNum"
:limit.sync="nurseStationqueryParams.pageSize"
@pagination="info"
/>
</el-dialog>
<!-- 所属科室弹框 -->
@ -641,6 +641,12 @@
@click="StationDepartmentclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="nurseStationName"
label="护理站名称"
align="center"
>
</el-table-column>
<el-table-column
property="departmentCode"
@ -1149,11 +1155,20 @@ export default {
methods: {
// // 新增所属科室按钮
departclick(item, index) {
this.form.nurseStationId
if(this.form.nurseStationId == null){
this.innerVisible2 = false;
this.$message.error('请先选择所属护理站');
}else{
this.getList3();
console.log(item);
this.departid = item.departmentCode;
this.innerVisible2 = true;
this.index = index;
}
},
// // 修改所属科室按钮
departclick2() {
@ -1164,14 +1179,14 @@ export default {
},
//修改护理站按钮
departclickxg() {
this.getList2();
this.info();
this.stationid2 = this.form.nurseStationId;
this.innerVisiblexg = true;
this.index = index;
},
// 新增护理站按钮
clickinnerVisible(item, index) {
this.getList2();
this.info();
this.stationid = item.nurseStationId;
this.innerVisible = true;
this.index = index;
@ -1217,6 +1232,7 @@ export default {
this.nursename = row.nurseStationName;
this.stationid = row.id;
this.form.nurseStationId = row.id;
console.log(this.form.nurseStationId);
console.log(this.form);
this.innerVisible = false;
this.form.nursename = row.nurseStationName;
@ -1260,14 +1276,14 @@ 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;
});
},
// 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) => {
@ -1323,13 +1339,13 @@ export default {
},
/** 搜索按钮操作 */
handleQuery2() {
this.StationqueryParams.pageNum = 1;
this.getList2();
this.nurseStationqueryParams.pageNum = 1;
this.info();
},
// 修改护理站弹框的搜索
handleQuery4() {
this.StationqueryParams.pageNum = 1;
this.getList2();
this.nurseStationqueryParams.pageNum = 1;
this.info();
},
//修改所属科室
handleQuery3() {
@ -1353,16 +1369,15 @@ export default {
},
resetQuery2() {
this.resetForm("queryForm");
this.StationqueryParams = {
this.nurseStationqueryParams = {
pageNum: 1,
pageSize: 10,
};
this.handleQuery2();
},
resetQuery4() {
this.resetForm("queryForm");
this.StationqueryParams = {
this.nurseStationqueryParams = {
pageNum: 1,
pageSize: 10,
};
@ -1534,6 +1549,7 @@ export default {
this.nursetotal = res.total;
this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.queryParams3.nurseStationId = res.rows[0].id;
this.handleQuery();
}
});