Эх сурвалжийг харах

调整出入事由 文字限制长度

zhulu 5 өдөр өмнө
parent
commit
074ef4c21b

+ 1 - 1
src/components/waterCom.vue

@@ -43,7 +43,7 @@ export default {
       ctx.rotate(-0.4) //设置文字旋转角度
       ctx.fillText(`${userName||''}${orgName||''}${this.date}`, -30, 120) //设置显示文字内容
       const img = canvas.toDataURL('image/png') //参数默认为 image/png,可以是其他image/jpeg等,该方法返回值是一个url,是base64组成的图片的源数据、可以直接赋值给图片的src属性
-      const style = `background-image:url(${img});width:100%;z-index:111;display:${type==1? 'block':'none'};` //定义样式
+      const style = `background-image:url(${img});width:100%;z-index:9999;display:${type==1? 'block':'none'};` //定义样式
       water.setAttribute('style', style) //给要添加水印的元素设置样式
     }
   }

+ 1 - 1
src/views/menu/introduceLetter/letter/add.vue

@@ -63,7 +63,7 @@
               v-model="formData.reasons"
               placeholder="请输入"
               show-word-limit
-              :maxlength="100"/>
+              :maxlength="28"/>
               <van-cell  
               v-if="letterType=='3'"
               is-row

+ 2 - 2
src/views/menu/introduceLetter/letter/index.vue

@@ -83,7 +83,7 @@
           </div>
 
           <div class="entries">
-            <div class="entry" v-for="(e, idx) in item.recentOutInRequestRecords" :key="idx">
+            <div class="entry" v-for="(e, idx) in item.recentOutInRequestRecords" :key="idx" @click.stop="handleOutInRequestRecordClick(e)">
               <div class="entry-left">
                 <div class="entry-title">出入名单:{{ e.userNames }}</div>
                 <div class="entry-sub">核对人:{{ e.createBy }}</div>
@@ -94,7 +94,7 @@
                 <!-- <div class="entry-time" v-if="e.approveTime">审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</div> -->
                                 
               </div>
-              <div class="entry-right" @click.stop="handleOutInRequestRecordClick(e)">
+              <div class="entry-right">
                 <van-tag size="large" v-if="e.status===0" type="warning" plain>待审批</van-tag>
                 <van-tag size="large" v-else-if="e.status===1" type="primary" plain>待登记</van-tag>
                 <van-tag size="large" v-else-if="e.status===2" type="success" plain>已完成</van-tag>

+ 8 - 6
src/views/menu/introduceLetter/outIn/fillOutInInfo.vue

@@ -143,7 +143,7 @@
               autosize
               required
               show-word-limit
-              :maxlength="100"
+              :maxlength="28"
               :rules="[{ required: true, message: '出入事由不能为空' }]"
               placeholder="请输入出入事由"
               label="出入事由"></van-field>
@@ -155,7 +155,8 @@
           </div>
           <van-field label=" " 
               v-model="outInRequestInfo.remark"
-              rows="1"
+              rows="2"
+              type="textarea"
               autosize
               :maxlength="150"
               placeholder="请输入备注信息"></van-field>
@@ -193,7 +194,7 @@
     <van-dialog
         v-model="showBatchSetTimeDialog"
         class="add-picker"
-        title="选择历史人员"
+        title="批量录入出入信息"
         @cancel="closeBatchSetTime()"
         @confirm="confirmBatchSetTime()"
         show-cancel-button>
@@ -203,12 +204,13 @@
           <van-form validate-first >
             <van-field                
                 v-model="batchSetFormData.companyName"
-                rows="1"
+                rows="2"
+                type="textarea"
                 autosize
-                :maxlength="20"
+                :maxlength="28"
                 label="申请单位"
                 :rules="[{ pattern:/^(.+)$/, message: '请输入' }]"
-                placeholder="请输入"/>
+                placeholder="请输入申请单位"/>
             <date-cell  title="进入时间" @change="batchSetTimeArrivalTimeChangedHandler" :max-date="maxDate" :min-date='minDate' :is-row="true"  v-model="batchSetFormData.arrivalTime" date-type="datetime" labeldateType="dateminute" />
             <date-cell  title="离开时间" :max-date.sync="maxDate" :updateMaxDateNow="true" :min-date='batchSetFormData.departureTimeMinDate' :is-row="true"  v-model="batchSetFormData.departureTime" date-type="datetime" labeldateType="dateminute"/>           
           </van-form>