Merge remote-tracking branch 'origin/master'

jiangping

2024-10-21 9f075b3467044ca553b1efcb4668e7a483237152

 h5/pages/staff/visitorReport.vue

@@ -107,18 +107,26 @@
            placeholder-style="color: #999999;"
        /></view>
      </view>
      <view class="list_item">
      <view class="list_item" @click="isShowReason = true">
        <view class="list_item_label">
          <text>*</text>
          <text>来访事由</text>
        </view>
        <view class="list_item_content"
            <view class="list_item_content">
              <text
                class="mr6"
                :style="{ color: form1.reason ? '#000000' : '#999999' }"
                >{{ form1.reason ? form1.reason : "请选择" }}</text
              >
              <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
        <!-- <view class="list_item_content"
          ><input
            type="text"
            v-model="form1.reason"
            placeholder="请输入来访事由"
            placeholder-style="color: #999999;"
        /></view>
        /></view> -->
      </view>
    </view>
    <view class="zw"></view>
@@ -163,6 +171,17 @@
        </view>
      </view>
    </u-popup>
      <!-- 来访是由 -->
      <u-picker
        keyName="title"
        :show="isShowReason"
        closeOnClickOverlay
        :columns="reasonList"
        @confirm="reasonSel"
        @close="isShowReason = false"
        @cancel="isShowReason = false"
      ></u-picker>
		
    <u-picker
      keyName="name"
      :show="showName"
@@ -189,7 +208,7 @@
import keyboardInput from '@/components/keyboard-input/keyboard-input.vue'
import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue'
import { getDaysAfterDate } from '@/utils/utils.js'
import { createVisit, getVisitedMember } from '@/api'
import { createVisit, getVisitedMember, getVisitReason } from '@/api'
export default {
  data() {
    return {
@@ -201,8 +220,10 @@
      show4: false,
      show5: false,
      show7: false,
      isShowReason: false,
      showName: false,
      fileList: [],
         reasonList: [],
      memberList: [[{ name: '身份证', id: 0 }, { name: '港澳证件', id: 1 }, { name: '护照', id: 2 }]],
      columnsNames: [[{ name: '张三', id: 0 }, { name: '张三', id: 1 }, { name: '张三', id: 2 }]],
      columns: [],
@@ -260,10 +281,18 @@
      this.$set(this.form1, 'receptCompanyName', e.value[0].companyName)
      this.showName = false
    },
      reasonSel(e) {
         console.log('e',e);
         this.$set(this.form1, 'reason', e.value[0].title)
         this.isShowReason = false
      },
    getUser() {
      getVisitedMember().then(res => {
        this.memberList = [res.data || []]
      })
         getVisitReason().then(res => {
            this.reasonList = [res.data || []]
         })
    },
    closeInput() {
      this.$refs.keyboard.close()