From 73a719a945073fa601ac051603433c49f515d31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 22 Feb 2023 11:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/classifyItem/index.vue    | 14 ++++++--------
 src/views/system/poser/index.vue           |  6 ++----
 src/views/system/station/index.vue         | 18 ++++++++++--------
 src/views/system/stationClassify/index.vue | 10 ++++------
 src/views/system/stationItem/index.vue     | 14 +++++---------
 5 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue
index 40e93a5..2e6bb41 100644
--- a/src/views/system/classifyItem/index.vue
+++ b/src/views/system/classifyItem/index.vue
@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item label="分类排序" prop="classifySort">
         <el-input
-          v-model="queryParams.classifySort"
+          v-model.number="queryParams.classifySort"
           placeholder="请输入分类排序"
           clearable
           @keyup.enter.native="handleQuery"
@@ -188,7 +188,7 @@
           >
             <el-input
               style="width: 200px"
-              v-model="item.classifySort"
+              v-model.number="item.classifySort"
               placeholder="请输入分类排序"
               oninput="value=value.replace(/[^\d]/g,'')"
               maxLength="10"
@@ -259,7 +259,7 @@
         </el-form-item>
         <el-form-item label="分类排序" prop="classifySort">
           <el-input
-            v-model="form.classifySort"
+            v-model.number="form.classifySort"
             placeholder="请输入分类排序"
             oninput="value=value.replace(/[^\d]/g,'')"
             maxLength="10"
@@ -389,7 +389,7 @@ export default {
       var obj = {
         classifyName: "",
         classifyPictureUrl: "",
-        classifySort: "",
+        classifySort: null,
         idd: this.idd,
       };
       if (this.form.nurseClassifyInfoList.length == 5) {
@@ -487,7 +487,7 @@ export default {
           {
             classifyName: "",
             classifyPictureUrl: "",
-            classifySort: "",
+            classifySort: null,
             idd: this.idd,
           },
         ],
@@ -523,9 +523,7 @@ export default {
               this.getList();
             });
           } else {
-            if(this.form.nurseClassifyInfoList[0].classifySort){
-              this.form.nurseClassifyInfoList[0].classifySort = parseInt(this.form.nurseClassifyInfoList[0].classifySort);
-            }
+        
             addInfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue
index a50d25e..563e1c7 100644
--- a/src/views/system/poser/index.vue
+++ b/src/views/system/poser/index.vue
@@ -199,7 +199,7 @@
         </el-form-item>
         <el-form-item label="海报显示顺序" prop="poserSort">
           <el-input
-            v-model="form.poserSort"
+            v-model.number="form.poserSort"
             placeholder="请输入海报显示顺序"
             oninput="value=value.replace(/[^\d]/g,'')"
             maxlength="5"
@@ -948,9 +948,7 @@ export default {
               this.getList();
             });
           } else {
-            if (this.form.poserSort) {
-              this.form.poserSort = parseInt(this.form.poserSort);
-            }
+         
             addPoser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index 72b9fc0..fac1a7f 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -265,7 +265,7 @@
             maxlength="11"
           />
         </el-form-item>
-        <el-form-item label="护理机构分类" required>
+        <el-form-item label="护理机构分类" >
           <template>
             <el-button
               @click="clickinnerVisible()"
@@ -317,7 +317,7 @@
         <el-form-item label="排序" prop="sort">
           <el-input
             placeholder="请输入排序"
-            v-model="form.sort"
+            v-model.number="form.sort"
             oninput="value=value.replace(/[^\d]/g,'')"
             maxLength="5"
           />
@@ -440,7 +440,7 @@
             <el-table-column label="排序" width="200" align="center">
               <template slot-scope="scope">
                 <el-input
-                  v-model="scope.row.labelSort"
+                  v-model.number="scope.row.labelSort"
                   oninput="value=value.replace(/[^\d]/g,'')"
                   maxLength="5"
                 ></el-input>
@@ -693,7 +693,7 @@ export default {
           //所属标签
           looknurseStationLabel: [{
               labelDescription: "",
-              sort: "",
+              sort: null,
               idd: 1,
           },],
           // 护理站信息表格数据
@@ -811,7 +811,7 @@ export default {
           if (this.looknurseStationLabel.length === 1) {
               this.looknurseStationLabel = [{
                   labelDescription: "",
-                  sort: "",
+                  sort: null,
                   idd: 1,
               },];
           } else {
@@ -827,7 +827,7 @@ export default {
               this.idd++;
               var obj = {
                   labelDescription: "",
-                  sort: "",
+                  sort: null,
                   idd: this.idd,
               };
               this.looknurseStationLabel.push(obj);
@@ -969,6 +969,8 @@ export default {
               this.form.classifyNameList = "";
               this.form.nurseStationClassifyIds.forEach(f => {
                   let classify = this.classifylist.find(d => d.id == f)
+                  if (!classify)
+                        return;
                   this.form.classifyNameList += classify.classifyName + ","
               })
               this.form.classifyNameList = this.form.classifyNameList.substring(0, this.form.classifyNameList.length - 1)
@@ -1038,7 +1040,7 @@ export default {
           this.open = true;
           this.looknurseStationLabel = [{
               labelDescription: "",
-              sort: "",
+              sort: null,
               idd: 1,
           },];
           this.title = "添加护理站信息";
@@ -1188,4 +1190,4 @@ export default {
       },
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/stationClassify/index.vue b/src/views/system/stationClassify/index.vue
index 7a5bf27..cbb9835 100644
--- a/src/views/system/stationClassify/index.vue
+++ b/src/views/system/stationClassify/index.vue
@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item label="分类排序" prop="classifySort">
         <el-input
-          v-model="queryParams.classifySort"
+          v-model.number="queryParams.classifySort"
           placeholder="请输入分类排序"
           clearable
           @keyup.enter.native="handleQuery"
@@ -181,7 +181,7 @@
           >
             <el-input
               style="width: 200px"
-              v-model="item.classifySort"
+              v-model.number="item.classifySort"
               placeholder="请输入分类排序"
               oninput="value=value.replace(/[^\d]/g,'')"
               maxLength="10"
@@ -252,7 +252,7 @@
         </el-form-item>
         <el-form-item label="分类排序" prop="classifySort">
           <el-input
-            v-model="form.classifySort"
+            v-model.number="form.classifySort"
             placeholder="请输入分类排序"
             oninput="value=value.replace(/[^\d]/g,'')"
             maxLength="10"
@@ -511,9 +511,7 @@ export default {
               this.getList();
             });
           } else {
-            if(this.form.nurseClassifyInfoList[0].classifySort){
-              this.form.nurseClassifyInfoList[0].classifySort=parseInt(this.form.nurseClassifyInfoList[0].classifySort)
-            }
+          
             addStationClassify(this.form).then((response) => {
              
               this.$modal.msgSuccess("新增成功");
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index f7ac9c7..8873ac7 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -229,11 +229,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="预约人数上限" prop="nurseStationItem.appointmentLimitCount">
           <el-input
             placeholder="请输入预约人数上限"
-            v-model="form.nurseStationItem.appointmentLimitCount"
+            v-model.number="form.nurseStationItem.appointmentLimitCount"
             oninput="value=value.replace(/[^\d]/g,'')"
             maxlength="8"
           />
@@ -255,7 +254,7 @@
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             placeholder="请输入排序"
-            v-model="form.nurseStationItem.sort"
+            v-model.number="form.nurseStationItem.sort"
             maxlength="10"
             oninput="value=value.replace(/[^\d]/g,'')"
           />
@@ -700,7 +699,8 @@ export default {
           nurseItemContent: "",
           advanceAppointDuration: "",
           itemPictureUrl: "",
-          sort: "",
+          sort: null,
+          appointmentLimitCount:null,
           nurseStationName: "请选择所属护理站",
           classifyName: "请选择护理项目分类",
           nurseClassifyId: ""
@@ -1100,11 +1100,7 @@ export default {
       this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if( this.form.nurseStationItem.appointmentLimitCount ==""){
-                        this.form.nurseStationItem.appointmentLimitCount=null
-                      }else{
-                        this.form.nurseStationItem.appointmentLimitCount=parseInt(this.form.nurseStationItem.appointmentLimitCount)
-                      }
+  
           if (this.form.nurseStationItem.id != null) {
             this.form.nurseStationItemPrices.forEach(e => {
               e.nurseStationItemId = this.form.nurseStationItem.id;