出入登记新增备注

src/views/menu/visitRecord/add.vue

@@ -56,14 +56,22 @@
               :maxlength="200"
               placeholder="请输入人员姓名"
               label="陪同人员"></van-field>
-            <!-- <div class="upload-box" >
-              <span class="required">联网核查结果</span>
+            
+            <date-cell required title="进入时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
+<!--            <date-cell title="离开时间" :max-date="maxData" v-model="formData.departureTime" date-type="datetime" />-->
+            <div class="upload-box" >
+              <span>核查图片</span>
               <van-cell>
                 <uploader :maxCount="2" v-model="formData.checkImage"/>
               </van-cell>
-            </div> -->
-            <date-cell required title="进入时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
-<!--            <date-cell title="离开时间" :max-date="maxData" v-model="formData.departureTime" date-type="datetime" />-->
+            </div>
+            <van-field
+              v-model="formData.remark"
+              rows="1"
+              autosize
+              :maxlength="200"
+              placeholder="请输入备注信息"
+              label="备注"></van-field>
           </div>
           <div class="big-btn-box" >
             <van-button  type="info" size="large" @click="onSubmit">确认保存</van-button>

src/views/menu/visitRecord/detail.vue

@@ -85,8 +85,35 @@
             </div>
             <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="进入时间" @change="arrivalTimeChangedHandler" :max-date="maxDate" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
             <date-cell v-if="canRecord() && !selectedUser.departureTime" required title="离开时间" :max-date.sync="maxDate" :updateMaxDateNow="true" :min-date='departureTimeMinDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
-          </div>
 
+            <div class="upload-box" v-if="selectedUser.checkImage && selectedUser.checkImage.length > 0">
+              <span>核查结果</span>
+              <van-cell >
+                <div
+                  class="nfc-img van-hairline--surround"
+                  v-for="(v, i) in selectedUser.checkImage"
+                  :key="v"
+                  @click="preView(selectedUser.checkImage)">
+                  <img :src="imgUrl(v)" alt="" />
+                </div>
+              </van-cell>
+            </div>
+            <div class="upload-box" v-if="canRecord() && !selectedUser.departureTime && !selectedUser.checkImage">
+              <span >核查结果</span>
+              <van-cell>
+                <uploader :maxCount="2" v-model="formData.checkImage"/>
+              </van-cell>
+            </div>
+            <van-cell v-if="selectedUser.departureTime && selectedUser.remark" title="备注" :value="selectedUser.remark"></van-cell>
+            <van-field v-if="canRecord() && !selectedUser.departureTime"
+              v-model="formData.remark"
+              rows="1"
+              autosize
+              :maxlength="200"
+              placeholder="请输入备注信息"
+              label="备注"></van-field>
+
+            </div>
           <van-action-sheet v-model="showSign" title="安全员签名" class="sheet">
             <writingPad ref="esign" :old-signature-seal="oldSignatureSeal" @resultImg="resultImg" @cancelSign="cancelSign"></writingPad>
           </van-action-sheet>
@@ -138,6 +165,7 @@ export default {
         departureTime:null,
         checkImage:null,
         accompanyingPerson:null,
+        remark:null,
       },
       dicts:['out_in_approve_status','out_in_type','letter_id_type'],
       oldSignatureSeal:"",
@@ -194,6 +222,7 @@ export default {
     {
         let data = {
           id:this.selectedUser.id,
+          remark:this.formData.remark,
           // accompanyingPerson:this.selectedUser.accompanyingPerson?this.selectedUser.accompanyingPerson:accompanyingPerson,
           // arrivalTime: this.selectedUser.arrivalTime ? this.selectedUser.arrivalTime:arrivalTime,
           // departureTime,
@@ -290,6 +319,7 @@ export default {
         this.selectedUser.checkImage = checkImage;
         this.selectedUser.imgFile = imgFile;
         this.selectedUser.letterFile = letterFile;
+        this.formData.remark=this.selectedUser.remark;
         //设置最小时间
         let minDate = this.selectedUser.arrivalTime;