1、增加 签名画板非空判断

2、签名返回 判断是否为空，空值不覆盖

src/components/alert.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2022-03-19 10:27:33
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-19 20:48:01
+ * @LastEditTime: 2022-03-20 11:43:03
  * @Description: 
 -->
 <template>
@@ -11,7 +11,9 @@
       <strong class="signHandleTitle">{{ title }}</strong>
     </div>
     <div class="signHandle_bd">
-      <canvas class="xhy-canvas" />
+      <div class="inside">
+        <canvas class="xhy-canvas" />
+      </div>
     </div>
 
     <div class="signHandle_ft">
@@ -23,6 +25,7 @@
         type="info"
         size="mini"
         @click="save()"
+        :disabled="isDis"
         >保存</van-button
       >
       <van-button
@@ -61,6 +64,9 @@ export default {
   data() {
     return {
       signaturePad: null, // 存放竖屏SignaturePad对象
+      isDis: false,
+      padBack:
+        "data:image/png;base64,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",
     };
   },
   mounted() {
@@ -77,8 +83,8 @@ export default {
         this.signaturePad.onEnd = () => {
           this.$emit("receive", this.signaturePad.toDataURL()); //通知父组件改变。
         };
-        canvas.height = document.body.clientHeight - 100;
-        canvas.width = document.body.clientWidth;
+        canvas.height = document.body.clientHeight / 3;
+        canvas.width = document.body.clientWidth - 10;
       }
     },
     againSignature() {
@@ -93,6 +99,18 @@ export default {
       this.$emit("onCancel");
     },
   },
+  computed: {},
+  watch: {
+    signaturePad: {
+      handler: function() {
+        this.isDis =
+          this.signaturePad && this.signaturePad.toDataURL() != this.padBack
+            ? false
+            : true;
+      },
+      deep: true,
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -116,21 +134,38 @@ export default {
   font-size: 18px;
 }
 .signHandle_bd {
-  height: 80vh;
+  /* height: 80vh; */
   font-size: 15px;
   line-height: 1.3;
   word-wrap: break-word;
   word-break: break-all;
-  color: #4a4a4a;
+  padding: 10px;
+  .inside {
+    display: flex;
+    position: relative;
+    width: 100%;
+    height: 100%;
+    background-color: rgb(242, 242, 242);
+
+    .icon-full {
+      position: absolute;
+      right: 0;
+      top: 0;
+      padding: 6px;
+    }
+
+    .xhy-canvas {
+    }
+  }
 }
 
 .signHandle_ft {
   width: 100%;
-  position: fixed;
+  /* position: fixed;
 
   bottom: 0;
-  left: 0;
-
+  left: 0; */
+  padding: 15px;
   display: flex;
   flex-direction: row;
   padding-bottom: 20px;
@@ -138,18 +173,21 @@ export default {
     border: 1px solid #dedede;
     z-index: 1;
     height: 40px;
+    width: 30%;
   }
   .saveCanvas {
     text-align: center;
     border: 1px solid #dedede;
     z-index: 1;
     height: 40px;
+    width: 30%;
   }
   .Cancel {
     text-align: center;
     border: 1px solid #dedede;
     z-index: 1;
     height: 40px;
+    width: 30%;
   }
 }
 </style>

src/components/leaveHospital.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 09:47:37
+ * @LastEditTime: 2022-03-20 11:49:19
  * @Description: 
 -->
 <template>
@@ -41,13 +41,14 @@
       label-width="190px"
     >
       <template #input>
+        <img class="Signimg" v-show="leaveSign" :src="leaveSign" alt="" />
         <van-button
           size="small"
           block
           type="primary"
           @click="showSignHandleVue = true"
           native-type="button"
-          >点击签字</van-button
+          >{{ leaveSign ? "重新签字" : "点击签字" }}</van-button
         >
       </template></van-field
     >
@@ -76,6 +77,7 @@
         :max-date="maxDate"
         @confirm="onleaveDate"
         @cancel="showCalendar = false"
+        v-model="leaveDate1"
       />
     </van-popup>
   </div>
@@ -100,6 +102,8 @@ export default {
       minleaveDate: new Date(2020, 0, 1),
       maxDate: new Date(),
       showSignHandleVue: false,
+
+      leaveDate1: new Date(),
     };
   },
   mounted() {
@@ -110,8 +114,10 @@ export default {
       this.leaveDate = formatDate(new Date(), "yyyy-MM-dd");
     },
     onCancel(val) {
-      console.log(val);
-      this.leaveSign = val;
+      if (val) {
+        this.leaveSign = val;
+      }
+
       this.showSignHandleVue = false;
     },
 
@@ -142,6 +148,10 @@ export default {
 
 <style lang="scss" scoped>
 .leaveHospital {
+  .Signimg {
+    width: 200px;
+    height: 50px;
+  }
   &_title {
     text-align: center;
   }

src/components/page3.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 09:34:04
+ * @LastEditTime: 2022-03-20 11:33:40
  * @Description: 
 -->
 <template>
@@ -75,13 +75,19 @@
       :rules="[{ required: true, message: '请患者签字' }]"
     >
       <template #input>
+        <img
+          class="Signimg"
+          v-show="agreementSign"
+          :src="agreementSign"
+          alt=""
+        />
         <van-button
           size="small"
           @click="showSignHandleVue = true"
           block
           type="primary"
           native-type="button"
-          >点击签字</van-button
+          >{{ agreementSign ? "重新签字" : "点击签字" }}</van-button
         >
       </template>
     </van-field>
@@ -96,7 +102,12 @@
       label="签字日期"
       placeholder="点击选择签字日期"
       @click="showCalendar = true"
-      :rules="[{ required: true, message: '请选择签字日期' }]"
+      :rules="[
+        {
+          required: true,
+          message: '请选择签字日期',
+        },
+      ]"
     />
     <van-popup v-model="showCalendar" position="bottom">
       <van-datetime-picker
@@ -106,6 +117,7 @@
         @confirm="onAgreementDate"
         @cancel="showCalendar = false"
         :formatter="formatter"
+        v-model="agreementDate1"
       />
     </van-popup>
     <jlPopup title="签名" v-if="showSignHandleVue" @onCancel="onCancel">
@@ -131,6 +143,7 @@ export default {
       bedNumber: "", //床号
       agreementSign: "", // 患者签字
       agreementDate: "", // 签字日期
+      agreementDate1: new Date(), // 签字日期弹窗默认日期
       showCalendar: false, //签字日期弹窗
       minAgreementDate: new Date(2020, 0, 1),
       maxDate: new Date(),
@@ -147,7 +160,10 @@ export default {
     },
 
     onCancel(val) {
-      this.agreementSign = val;
+      console.log(`${val}`);
+      if (val) {
+        this.agreementSign = val;
+      }
       this.showSignHandleVue = false;
     },
     onAgreementDate(date) {
@@ -177,6 +193,10 @@ export default {
 
 <style lang="scss" scoped>
 .page3 {
+  .Signimg {
+    width: 200px;
+    height: 50px;
+  }
   &_text {
     margin: 25px;
     font-size: 14px;

src/components/page4.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-19 17:15:50
+ * @LastEditTime: 2022-03-20 11:12:12
  * @Description: 
 -->
 <template>
@@ -231,7 +231,7 @@ export default {
       areaList, //地址数据选项列表
       showArea: false, //控制地址弹窗
 
-      showbirthday: false, //核酸时间弹窗
+      showbirthday: false, //出生时间弹窗
 
       minbirthday: new Date(1920, 0, 1),
       maxDate: new Date(),

src/components/page5.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 10:04:43
+ * @LastEditTime: 2022-03-20 11:15:01
  * @Description: 
 -->
 <template>
@@ -69,6 +69,7 @@
     <van-popup v-model="showUnusualDate" position="bottom">
       <van-datetime-picker
         type="date"
+        v-model="unusualDate1"
         :min-date="minUnusualDate"
         :max-date="maxDate"
         @confirm="onUnusualDate"
@@ -94,6 +95,7 @@
     <van-popup v-model="showNormalDate" position="bottom">
       <van-datetime-picker
         type="date"
+        v-model="normalDate1"
         :min-date="minNormalDate"
         :max-date="maxDate"
         @confirm="onNormalDate"
@@ -119,6 +121,7 @@
     <van-popup v-model="showInHospitalDate" position="bottom">
       <van-datetime-picker
         type="date"
+        v-model="inHospitalDate1"
         :min-date="minInHospitalDate"
         :max-date="maxDate"
         @confirm="onInHospitalDate"
@@ -240,6 +243,7 @@
     <van-popup v-model="showVaccineDate" position="bottom">
       <van-datetime-picker
         type="date"
+        v-model="vaccineDate1"
         :min-date="minVaccineDate"
         :max-date="maxDate"
         @confirm="onVaccineDate"
@@ -284,6 +288,12 @@ export default {
       minInHospitalDate: new Date(2021, 0, 1),
       minVaccineDate: new Date(2020, 0, 1),
       maxDate: new Date(),
+
+      /**时间弹窗默认时间 */
+      unusualDate1: new Date(), //核酸检测异常时间
+      normalDate1: new Date(), //未发生异常时间
+      inHospitalDate1: new Date(), //120转运时间
+      vaccineDate1: new Date(), //最后一次接种日期
     };
   },
   mounted() {

src/components/page6.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 10:17:21
+ * @LastEditTime: 2022-03-20 11:15:47
  * @Description: 
 -->
 <template>
@@ -188,6 +188,7 @@
         @confirm="onChestCT"
         @cancel="showCalendar = false"
         :formatter="formatter"
+        v-model="ChestCTDate1"
       />
     </van-popup>
   </div>
@@ -218,6 +219,8 @@ export default {
       minChestCTDate: new Date(2020, 0, 1),
       minDate: new Date(2010, 0, 1),
       maxDate: new Date(),
+
+      ChestCTDate1: new Date(),
     };
   },
   mounted() {

src/store/modules/user.js

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2022-03-17 15:06:50
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-19 22:20:18
+ * @LastEditTime: 2022-03-20 11:21:18
  * @Description: 
  */
 import http from '@/http/index'