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

Merge remote-tracking branch 'origin/jihan_0203_运营管理端功能开发' into jihan_0203_运营管理端功能开发

Browse Source 
# Conflicts:
#	src/views/system/stationItem/stationItemjs.js
This commit is contained in:
曹辉 2023-02-22 12:11:13 +08:00
commit e4c0835817
5 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/system/InformationCategory/index.vue
View File

@ -201,7 +201,7 @@
:prop="`informationCategoryList.${index}.sort`" :prop="`informationCategoryList.${index}.sort`"
> >
<el-input <el-input
v-model="item.sort" v-model.number="item.sort"
maxlength="5" maxlength="5"
style="width: 200px" style="width: 200px"
placeholder="请输入资讯分类排序" placeholder="请输入资讯分类排序"
@ -263,7 +263,7 @@
<el-form-item label="资讯分类排序" prop="sort"> <el-form-item label="资讯分类排序" prop="sort">
<el-input <el-input
v-model="form.sort" v-model.number="form.sort"
placeholder="请输入分类排序" placeholder="请输入分类排序"
style="width: 250px" style="width: 250px"
maxlength="5" maxlength="5"
@ -515,9 +515,6 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
if(this.form.informationCategoryList[0].sort){
this.form.informationCategoryList[0].sort=parseInt( this.form.informationCategoryList[0].sort)
}
addInformationCategory(this.form).then((response) => { addInformationCategory(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");

14
src/views/system/classifyItem/index.vue
View File

@ -156,7 +156,7 @@
> >
<el-input <el-input
style="width: 200px" style="width: 200px"
v-model="item.classifySort" v-model.number="item.classifySort"
placeholder="请输入分类排序" placeholder="请输入分类排序"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5" maxlength="5"
@ -223,7 +223,7 @@
</el-form-item> </el-form-item>
<el-form-item label="分类排序" prop="classifySort"> <el-form-item label="分类排序" prop="classifySort">
<el-input <el-input
v-model="form.classifySort" v-model.number="form.classifySort"
placeholder="请输入分类排序" placeholder="请输入分类排序"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5" maxlength="5"
@ -356,7 +356,7 @@ export default {
var obj = { var obj = {
classifyName: "", classifyName: "",
classifyPictureUrl: "", classifyPictureUrl: "",
classifySort: "", classifySort: null,
idd: this.idd idd: this.idd
}; };
if (this.form.nurseClassifyInfoList.length == 5) { if (this.form.nurseClassifyInfoList.length == 5) {
@ -454,7 +454,7 @@ export default {
{ {
classifyName: "", classifyName: "",
classifyPictureUrl: "", classifyPictureUrl: "",
classifySort: "", classifySort: null,
idd: this.idd idd: this.idd
} }
] ]
@ -491,11 +491,7 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
if (this.form.nurseClassifyInfoList[0].classifySort) {
this.form.nurseClassifyInfoList[0].classifySort = parseInt(
this.form.nurseClassifyInfoList[0].classifySort
);
}
addInfo(this.form).then(response => { addInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;

10
src/views/system/stationClassify/index.vue
View File

@ -173,7 +173,7 @@
> >
<el-input <el-input
style="width: 200px" style="width: 200px"
v-model="item.classifySort" v-model.number="item.classifySort"
placeholder="请输入分类排序" placeholder="请输入分类排序"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
maxLength="5" maxLength="5"
@ -244,7 +244,7 @@
</el-form-item> </el-form-item>
<el-form-item label="分类排序" prop="classifySort"> <el-form-item label="分类排序" prop="classifySort">
<el-input <el-input
v-model="form.classifySort" v-model.number="form.classifySort"
placeholder="请输入分类排序" placeholder="请输入分类排序"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
maxLength="5" maxLength="5"
@ -507,9 +507,9 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
if(this.form.nurseClassifyInfoList[0].classifySort){ // if(this.form.nurseClassifyInfoList[0].classifySort){
this.form.nurseClassifyInfoList[0].classifySort=parseInt(this.form.nurseClassifyInfoList[0].classifySort) // this.form.nurseClassifyInfoList[0].classifySort=parseInt(this.form.nurseClassifyInfoList[0].classifySort)
} // }
addStationClassify(this.form).then((response) => { addStationClassify(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");

2
src/views/system/stationItem/index.vue
View File

@ -272,7 +272,7 @@
<el-form-item label="排序" prop="nurseStationItem.sort"> <el-form-item label="排序" prop="nurseStationItem.sort">
<el-input <el-input
placeholder="请输入排序" placeholder="请输入排序"
v-model="form.nurseStationItem.sort" v-model.number="form.nurseStationItem.sort"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5" maxlength="5"
/> />

1
src/views/system/stationItem/stationItemjs.js
View File

@ -540,7 +540,6 @@ export default {
}); });
this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId; this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
if (this.form.nurseStationItem.appointmentLimitCount == "") { if (this.form.nurseStationItem.appointmentLimitCount == "") {
console.log(1)
this.form.nurseStationItem.appointmentLimitCount = null this.form.nurseStationItem.appointmentLimitCount = null
} }
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {