Merge remote-tracking branch 'origin/master'

jiangping

2024-06-07 73af3ed9fbcc616cdecc739fc4307163c19c5764

 h5/n_pages/visitorApplication/visitorApplication.vue

@@ -8,27 +8,33 @@
               <text>*</text>
            </view>
            <view class="list_item_content" @click="show1 = true">
               <text :style="{color: form1.receptMemberName ? '#000000' : ''}">{{form1.receptMemberName ? form1.receptMemberName : '请选择'}}</text>
          <text :style="{ color: form1.receptMemberName ? '#000000' : '' }">{{
            form1.receptMemberName ? form1.receptMemberName : "请选择"
          }}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
         <view class="list_item">
            <view class="list_item_label">
               <text>入厂时间</text>
          <text>入园时间</text>
               <text>*</text>
            </view>
            <view class="list_item_content" @click="show4 = true">
               <text :style="{color: form1.starttime ? '#000000' : ''}">{{form1.starttime ? form1.starttime : '请选择'}}</text>
          <text :style="{ color: form1.starttime ? '#000000' : '' }">{{
            form1.starttime ? form1.starttime : "请选择"
          }}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
         <view class="list_item">
            <view class="list_item_label">
               <text>离厂时间</text>
          <text>离园时间</text>
               <text>*</text>
            </view>
            <view class="list_item_content" @click="show5 = true">
               <text :style="{color: form1.endtime ? '#000000' : ''}">{{form1.endtime ? form1.endtime : '请选择'}}</text>
          <text :style="{ color: form1.endtime ? '#000000' : '' }">{{
            form1.endtime ? form1.endtime : "请选择"
          }}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
@@ -38,7 +44,9 @@
               <text>*</text>
            </view>
            <view class="list_item_content">
               <text :style="{color: form1.doorSelectName ? '#000000' : ''}">{{form1.doorSelectName ? form1.doorSelectName : '请选择'}}</text>
          <text :style="{ color: form1.doorSelectName ? '#000000' : '' }">{{
            form1.doorSelectName ? form1.doorSelectName : "请选择"
          }}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
@@ -48,7 +56,12 @@
               <text></text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入来访事由" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入来访事由"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
      </view>
@@ -60,7 +73,12 @@
               <text>*</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入访客的真实姓名" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入访客的真实姓名"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
         <view class="list_item">
@@ -69,7 +87,12 @@
               <text>*</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入访客的手机号" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入访客的手机号"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
         <view class="list_item">
@@ -78,7 +101,9 @@
               <text>*</text>
            </view>
            <view class="list_item_content" @click="show4 = true">
               <text :style="{color: form1.starttime ? '#000000' : ''}">{{form1.starttime ? form1.starttime : '请选择'}}</text>
          <text :style="{ color: form1.starttime ? '#000000' : '' }">{{
            form1.starttime ? form1.starttime : "请选择"
          }}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
@@ -88,7 +113,12 @@
               <text>*</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入访客的证件号码" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入访客的证件号码"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
         <view class="list_item">
@@ -96,7 +126,12 @@
               <text>公司名称</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入访客的公司名称" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入访客的公司名称"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
         <view class="list_item">
@@ -104,10 +139,15 @@
               <text>随行车辆</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入车牌号" placeholder-style="color: #999999;" />
          <input
            type="text"
            v-model="form1.reason"
            placeholder="请输入车牌号"
            placeholder-style="color: #999999;"
          />
            </view>
         </view>
         <view class="cell" style="padding: 24rpx 0;">
      <view class="cell" style="padding: 24rpx 0">
            <view class="title1">
               <text class="title1_a">人脸照片<b>*</b></text>
               <text class="title1_b">1、请提供五官清晰，人脸居中的正面人脸免</text>
@@ -122,7 +162,7 @@
               </view> -->
            </view>
         </view>
         <view class="cell" style="padding: 24rpx 0;">
      <view class="cell" style="padding: 24rpx 0">
            <view class="title">健康证<b>*</b></view>
            <view class="content">
               <view class="content_uplaod" @click="upload('imgurl')">
@@ -137,9 +177,18 @@
      <view class="cate">
         <view class="cate_head">随访人员信息</view>
         <view class="cate_list">
            <view class="cate_list_item" v-for="(item,index) in personnel" :key="index">
        <view
          class="cate_list_item"
          v-for="(item, index) in personnel"
          :key="index"
        >
               <text>{{item.name}}</text>
               <u-icon name="close" color="#999999" size="20" @click="deleUser(index)"></u-icon>
          <u-icon
            name="close"
            color="#999999"
            size="20"
            @click="deleUser(index)"
          ></u-icon>
            </view>
         </view>
         <view class="cate_add" @click="show3 = true">+添加随访人员</view>
@@ -148,7 +197,7 @@
      <view class="footer">
         <view class="footer_btn" @click="submit">提交</view>
      </view>
      <!-- 入场时间 -->
    <!-- 入园时间 -->
      <u-datetime-picker
         :show="show4"
         :minDate="new Date().getTime()"
@@ -156,7 +205,7 @@
         @cancel="show4 = false"
         @confirm="setinDate"
      ></u-datetime-picker>
      <!-- 离场时间 -->
    <!-- 离园时间 -->
      <u-datetime-picker
         :show="show5"
         :minDate="new Date().getTime()"
@@ -165,16 +214,34 @@
         @confirm="setoutDate"
      ></u-datetime-picker>
      <!-- 门禁 -->
      <u-popup :show="show" :round="10" :safeAreaInsetBottom="true" :closeable="true" mode="bottom" @close="show = false">
    <u-popup
      :show="show"
      :round="10"
      :safeAreaInsetBottom="true"
      :closeable="true"
      mode="bottom"
      @close="show = false"
    >
         <view class="menjin">
            <view class="respondent-title">
               选择门禁
            </view>
        <view class="respondent-title"> 选择门禁 </view>
            <scroll-view scroll-y class="list">
               <view class="list_item" v-for="(item, index) in columns" :key="index" @click="seleMJ(index)">
          <view
            class="list_item"
            v-for="(item, index) in columns"
            :key="index"
            @click="seleMJ(index)"
          >
                  <text>{{item.name}}</text>
                  <image src="@/static/video@2x.png" mode="widthFix" v-show="!item.active"></image>
                  <image src="@/static/video_sel@2x.png" mode="widthFix" v-show="item.active"></image>
            <image
              src="@/static/video@2x.png"
              mode="widthFix"
              v-show="!item.active"
            ></image>
            <image
              src="@/static/video_sel@2x.png"
              mode="widthFix"
              v-show="item.active"
            ></image>
               </view>
            </scroll-view>
            <view class="menjin_footer">
@@ -184,11 +251,16 @@
         </view>
      </u-popup>
      <!-- 选择随行人员 -->
      <u-popup :show="show1" :round="10" :safeAreaInsetBottom="true" :closeable="true" mode="bottom" @close="show1 = false">
    <u-popup
      :show="show1"
      :round="10"
      :safeAreaInsetBottom="true"
      :closeable="true"
      mode="bottom"
      @close="show1 = false"
    >
         <view class="popup-content">
            <view class="respondent-title">
               选择
            </view>
        <view class="respondent-title"> 选择 </view>
            <view class="search-box">
               <view class="search-box-top">
                  <view class="search-box-top-ipt">
@@ -224,7 +296,14 @@
         </view>
      </u-popup>
      <!-- 添加随行人员 -->
      <u-popup :show="show3" :round="10" :safeAreaInsetBottom="true" :closeable="true" mode="bottom" @close="show3 = false">
    <u-popup
      :show="show3"
      :round="10"
      :safeAreaInsetBottom="true"
      :closeable="true"
      mode="bottom"
      @close="show3 = false"
    >
         <view class="adduser">
            <view class="adduser_head">随行人员</view>
            <view class="adduser_list">
@@ -234,7 +313,12 @@
                     <text>*</text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <input type="text" v-model="withUserList.name" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入真实姓名" />
              <input
                type="text"
                v-model="withUserList.name"
                placeholder-style="color: #999999;font-size: 28rpx;"
                placeholder="请输入真实姓名"
              />
                  </view>
               </view>
               <view class="adduser_list_item">
@@ -243,7 +327,13 @@
                     <text>*</text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <input type="number" v-model="withUserList.phone" maxlength="11" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入手机号" />
              <input
                type="number"
                v-model="withUserList.phone"
                maxlength="11"
                placeholder-style="color: #999999;font-size: 28rpx;"
                placeholder="请输入手机号"
              />
                  </view>
               </view>
               <view class="adduser_list_item">
@@ -252,7 +342,14 @@
                     <text>*</text>
                  </view>
                  <view class="adduser_list_item_ipt" @click="show6 = true">
                     <text :style="{color: withUserList.idcardTypeName ? '#000000' : ''}">{{withUserList.idcardTypeName ? withUserList.idcardTypeName : '请选择'}}</text>
              <text
                :style="{ color: withUserList.idcardTypeName ? '#000000' : '' }"
                >{{
                  withUserList.idcardTypeName
                    ? withUserList.idcardTypeName
                    : "请选择"
                }}</text
              >
                     <u-icon name="arrow-right" color="#CCCCCC" size="16"></u-icon>
                  </view>
               </view>
@@ -262,7 +359,12 @@
                     <text>*</text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <input type="text" v-model="withUserList.idcardNo" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入证件号码" />
              <input
                type="text"
                v-model="withUserList.idcardNo"
                placeholder-style="color: #999999;font-size: 28rpx;"
                placeholder="请输入证件号码"
              />
                  </view>
               </view>
               <view class="adduser_list_item">
@@ -271,7 +373,12 @@
                     <text></text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <input type="text" v-model="withUserList.companyName" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入公司名称" />
              <input
                type="text"
                v-model="withUserList.companyName"
                placeholder-style="color: #999999;font-size: 28rpx;"
                placeholder="请输入公司名称"
              />
                  </view>
               </view>
               <view class="adduser_list_item">
@@ -280,7 +387,12 @@
                     <text></text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <input type="text" v-model="withUserList.carNos" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入车牌号" />
              <input
                type="text"
                v-model="withUserList.carNos"
                placeholder-style="color: #999999;font-size: 28rpx;"
                placeholder="请输入车牌号"
              />
                  </view>
               </view>
               <view class="adduser_list_item">
@@ -290,10 +402,22 @@
                     <text class="aa">2、照片无逆光、无PS、无过度美颜处理</text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <view class="adduser_list_item_ipt1_upload" @click="upload('faceImg')" v-if="!withUserList.faceImgUrl">
                        <u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon>
              <view
                class="adduser_list_item_ipt1_upload"
                @click="upload('faceImg')"
                v-if="!withUserList.faceImgUrl"
              >
                <u-icon
                  name="plus"
                  color="rgb(153, 153, 153)"
                  size="28"
                ></u-icon>
                     </view>
                     <view class="adduser_list_item_ipt1_upload" @click="upload('faceImg')" v-else>
              <view
                class="adduser_list_item_ipt1_upload"
                @click="upload('faceImg')"
                v-else
              >
                        <image :src="withUserList.faceImgUrl" mode="widthFix"></image>
                     </view>
                  </view>
@@ -304,10 +428,22 @@
                     <text v-if="visit === '1'">*</text>
                  </view>
                  <view class="adduser_list_item_ipt">
                     <view class="adduser_list_item_ipt1_upload" @click="upload('imgurl')" v-if="!withUserList.imgurlUrl">
                        <u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon>
              <view
                class="adduser_list_item_ipt1_upload"
                @click="upload('imgurl')"
                v-if="!withUserList.imgurlUrl"
              >
                <u-icon
                  name="plus"
                  color="rgb(153, 153, 153)"
                  size="28"
                ></u-icon>
                     </view>
                     <view class="adduser_list_item_ipt1_upload" @click="upload('imgurl')" v-else>
              <view
                class="adduser_list_item_ipt1_upload"
                @click="upload('imgurl')"
                v-else
              >
                        <image :src="withUserList.imgurlUrl" mode="widthFix"></image>
                     </view>
                  </view>
@@ -319,7 +455,13 @@
            </view>
         </view>
      </u-popup>
      <u-picker keyName="name" :show="show6" :columns="columns1" @confirm="seleIdcard" @cancel="show6 = false"></u-picker>
    <u-picker
      keyName="name"
      :show="show6"
      :columns="columns1"
      @confirm="seleIdcard"
      @cancel="show6 = false"
    ></u-picker>
   </view>
</template>

@@ -365,7 +507,7 @@
            form: {},
            accessControl: '',
            verify: ''
         };
    }
      },
      onLoad(options) {
         // this.form = JSON.parse(options.data)
@@ -380,11 +522,11 @@
               icon: 'none'
            })
            if (!this.form1.starttime) return uni.showToast({
               title: '入场时间不能为空',
        title: '入园时间不能为空',
               icon: 'none'
            })
            if (!this.form1.endtime) return uni.showToast({
               title: '离场时间不能为空',
        title: '离园时间不能为空',
               icon: 'none'
            })
            if (!this.form1.doorSelectName) return uni.showToast({
@@ -464,7 +606,7 @@
         upload(type) {
            uni.chooseImage({
               success: (chooseImageRes) => {
                  uni.showLoading({ title: '上传中', mask: true });
          uni.showLoading({ title: '上传中', mask: true })
                  for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                     uni.uploadFile({
                        url: `${this.$baseUrl}public/api/uploadFtp.do`,
@@ -485,13 +627,13 @@
                        },
                        complete() {
                           if (i === chooseImageRes.tempFilePaths.length - 1) {
                              uni.hideLoading();
                  uni.hideLoading()
                           }
                        }
                     });
            })
                  }
               }
            });
      })
         },
         submitMJ() {
            let arr = []
@@ -518,11 +660,11 @@
            })
         },
         setinDate(e) {
            this.form1.starttime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
      this.form1.starttime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
            this.show4 = false
         },
         setoutDate(e) {
            this.form1.endtime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
      this.form1.endtime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
            this.show5 = false
         },
         // 查询用户
@@ -599,7 +741,7 @@
</script>
<style>
   page {
      background-color: #F7F7F7 !important;
  background-color: #f7f7f7 !important;
   }
   .u-upload__button {
      margin: 0 !important;
@@ -700,7 +842,7 @@
               align-items: center;
               justify-content: center;
               border-radius: 10rpx;
               background-color: #025EEF;
        background-color: #025eef;
               color: #ffffff;
               font-size: 26rpx;
               margin-left: 30rpx;
@@ -729,7 +871,7 @@
               width: 100%;
               padding: 24rpx 0;
               box-sizing: border-box;
               border-bottom: 1rpx solid #E5E5E5;
        border-bottom: 1rpx solid #e5e5e5;
               display: flex;
               align-items: center;
               justify-content: space-between;
@@ -747,7 +889,7 @@
                        font-size: 30rpx;
                        font-family: PingFangSC, PingFang SC;
                        font-weight: 400;
                        color: #E0312A;
              color: #e0312a;
                     }
                  }
                  .aa {
@@ -771,7 +913,7 @@
                        font-size: 30rpx;
                        font-family: PingFangSC, PingFang SC;
                        font-weight: 400;
                        color: #E0312A;
              color: #e0312a;
                     }
                  }
               }
@@ -815,7 +957,7 @@
            align-items: center;
            justify-content: space-between;
            .t {
               background: #025EEF !important;
        background: #025eef !important;
               color: #ffffff !important;
            }
            .adduser_footer_item {
@@ -824,11 +966,11 @@
               line-height: 88rpx;
               text-align: center;
               border-radius: 44rpx;
               border: 1rpx solid #025EEF;
        border: 1rpx solid #025eef;
               font-size: 32rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               color: #025EEF;
        color: #025eef;
               margin-right: 18rpx;
               &:last-child {
                  margin: 0 !important;
@@ -853,7 +995,7 @@
            height: 100rpx;
            line-height: 100rpx;
            text-align: center;
            background: #F7F7F7;
      background: #f7f7f7;
            border-radius: 50rpx;
            margin-top: 60rpx;
            input {
@@ -872,7 +1014,7 @@
            justify-content: space-between;
            margin-top: 60rpx;
            .t {
               background: #025EEF !important;
        background: #025eef !important;
               color: #ffffff !important;
            }
            .addcar_footer_item {
@@ -881,10 +1023,10 @@
               line-height: 88rpx;
               font-size: 32rpx;
               font-weight: 400;
               color: #025EEF;
        color: #025eef;
               text-align: center;
               border-radius: 44rpx;
               border: 1rpx solid #025EEF;
        border: 1rpx solid #025eef;
               margin-right: 18rpx;
               &:last-child {
                  margin-right: 0 !important;
@@ -918,7 +1060,7 @@
                  height: 100%;
                  padding: 0 30rpx;
                  box-sizing: border-box;
                  background: #F7F7F7;
          background: #f7f7f7;
                  border-radius: 4rpx;
                  display: flex;
                  align-items: center;
@@ -933,7 +1075,7 @@
                     height: 100%;
                     font-size: 26rpx;
                     font-weight: 400;
                     color: #B2B2B2;
            color: #b2b2b2;
                  }
               }
               text {
@@ -941,7 +1083,7 @@
                  margin-left: 30rpx;
                  font-size: 28rpx;
                  font-weight: 400;
                  color: #025EEF;
          color: #025eef;
               }
            }
            .search-box-total {
@@ -961,7 +1103,7 @@
               height: 102rpx;
               display: flex;
               align-items: center;
               border-bottom: 1rpx solid #E5E5E5;
        border-bottom: 1rpx solid #e5e5e5;
               &:last-child {
                  border: none;
               }
@@ -1040,16 +1182,15 @@
               height: 72rpx;
               line-height: 72rpx;
               text-align: center;
               background: #025EEF;
        background: #025eef;
               border-radius: 8rpx;
               font-size: 28rpx;
               font-weight: 500;
               color: #FFFFFF;
        color: #ffffff;
               border-radius: 44rpx;
            }
         }
      }
		    

      .head {
         width: 100%;
@@ -1077,7 +1218,7 @@
            display: flex;
            align-items: center;
            justify-content: space-between;
            border-bottom: 1rpx solid #E5E5E5;
      border-bottom: 1rpx solid #e5e5e5;

            .list_item_label {
               flex-shrink: 0;
@@ -1094,7 +1235,7 @@
                  &:nth-child(2) {
                     font-size: 30rpx;
                     font-weight: 400;
                     color: #E42D2D;
            color: #e42d2d;
                  }
               }
            }
@@ -1151,7 +1292,7 @@
               height: 64rpx;
               padding: 0 20rpx;
               box-sizing: border-box;
               background-color: #EEEEEE;
        background-color: #eeeeee;
               border-radius: 4rpx;
               margin-right: 20rpx;
               margin-bottom: 20rpx;
@@ -1180,12 +1321,12 @@
            justify-content: center;
            background: rgba(2, 94, 239, 0);
            border-radius: 25rpx;
            border: 1rpx solid #025EEF;
      border: 1rpx solid #025eef;
            font-size: 22rpx;
            font-family: PingFangSC, PingFang SC;
            font-weight: 400;
            margin-top: 20rpx;
            color: #025EEF;
      color: #025eef;
            margin: 0 auto;
         }
      }
@@ -1209,11 +1350,11 @@
            height: 88rpx;
            line-height: 88rpx;
            text-align: center;
            background: #025EEF;
      background: #025eef;
            border-radius: 44rpx;
            font-size: 32rpx;
            font-weight: 500;
            color: #FFFFFF;
      color: #ffffff;
         }
      }
   }