Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

6 小时以前 5841a771d4455d25adb185b8a0637c9ba498aab2

 admin/src/views/business/visits.vue

@@ -12,6 +12,22 @@
        <el-form-item label="访客单位" prop="companyName">
          <el-input v-model="searchForm.companyName" placeholder="请输入访客单位" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="拜访时间" prop="date">
          <el-date-picker
            v-model="searchForm.queryStarttime"
            type="datetime"
            clearable
            value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            placeholder="开始时间" />
          <el-date-picker
            v-model="searchForm.queryEndtime"
            type="datetime"
            value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            clearable
            placeholder="结束时间" />
        </el-form-item>
        <el-form-item label="审批状态" prop="status">
          <el-select v-model="searchForm.status" placeholder="请选择">
            <el-option label="待提交审批" value="0"></el-option>
@@ -21,7 +37,7 @@
            <el-option label="取消" value="4"></el-option>
            <el-option label="下发成功" value="5"></el-option>
            <el-option label="下发失败" value="6"></el-option>
            <el-option label="拜访中" value="7"></el-option>
            <el-option label="已登记" value="7"></el-option>
            <el-option label="已签离" value="8"></el-option>
            <el-option label="已失效" value="9"></el-option>
          </el-select>
@@ -50,19 +66,10 @@
        <el-table-column prop="companyName" label="访客单位" min-width="100px"></el-table-column>
        <el-table-column prop="receptMemberName" label="被访人" min-width="100px"></el-table-column>
        <el-table-column prop="reason" label="拜访事由" min-width="100px"></el-table-column>
        <el-table-column label="预约时间" min-width="170px">
        <el-table-column label="拜访时间" min-width="170px">
          <template slot-scope="{row}">
            <span>起：{{ row.starttime }}</span><br />
            <span>止：{{ row.endtime }}</span>
          </template>
        </el-table-column>
        <el-table-column label="签到时间" min-width="170px">
          <template slot-scope="{row}">
            <div v-if="row.inDate && row.outDate">
              <span>起：{{ row.inDate }}</span><br />
              <span>止：{{ row.outDate }}</span>
            </div>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column label="施工人员" min-width="100px">
@@ -85,12 +92,22 @@
            <span v-if="row.status === 4" style="color: gray">取消</span>
            <span v-if="row.status === 5" style="color: green">下发成功</span>
            <span v-if="row.status === 6" style="color: gray">下发失败</span>
            <span v-if="row.status === 7" style="color: green">拜访中</span>
            <span v-if="row.status === 7" style="color: green">已登记</span>
            <span v-if="row.status === 8" style="color: red">已签离</span>
            <span v-if="row.status === 9" style="color: gray">已失效</span>
          </template>
        </el-table-column>
        <el-table-column label="在园状态" min-width="100px">
          <template slot-scope="{row}">
            <div v-if="row.status == 7">
              <span v-if="row.retentionNum && row.retentionNum >0 ">是</span>
              <span v-if="!row.retentionNum ||  row.retentionNum ==0 " >否</span>
            </div>
            <div v-else >-</div>
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="下发备注" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="170px"></el-table-column>
        <el-table-column   label="操作"
          min-width="200" fixed="right">
          <template slot-scope="{row}">
@@ -136,7 +153,10 @@
        companyName: '',
        idcardNo: '',
        status: '',
        type: 0
        type: 0,
        queryStarttime: '',
        queryEndtime: '',
        date: []
      }
    }
  },
@@ -158,6 +178,13 @@
    })
  },
  methods: {
    // 搜索框重置
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.queryStarttime = ''
      this.searchForm.queryEndtime = ''
      this.search()
    },
    handleDetail(row) {
      this.isShowDetail = true
      console.log('row', row)