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

2024-06-13 17:34:51 +08:00 · 2024-06-13 17:34:51 +08:00 · 6f8b41e941
commit 6f8b41e941
parent 7ef1fdc8f8 ad6f635ada
3 changed files with 760 additions and 812 deletions
--- a/src/views/system/bank/index.vue
+++ b/src/views/system/bank/index.vue
@ -297,7 +297,11 @@ export default {
        }
      });
    },
-    cancels() { },
+    cancels() { 
+      this.opens=false
+      this.reset();
+
+    },
    // change(e) {
    //   console.log(e, "78");
    //   // console.log(this.$refs.cascader)
--- a/src/views/system/components/wangEditor.vue
+++ b/src/views/system/components/wangEditor.vue
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@ -38,7 +38,7 @@
                  <el-option label="术前" value="PREOPERATIVE" />
                  <el-option label="术后" value="POSTOPERATIVE" /> -->
                </el-select>
-                <el-input v-model="item.routeNodeDay" style="width: 70px" type="number"></el-input>
+                <el-input v-model="item.routeNodeDay" style="width: 70px" type="number" :min="0"></el-input>
                <span>天</span>
              </div>
              <div>