Merge remote-tracking branch 'origin/master'

k94314517

2025-04-08 76664d76edb8d6b28d11975bd7fe09c5e27caa34

 admin/src/views/business/visits.vue

@@ -50,19 +50,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">
@@ -91,6 +82,7 @@
          </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}">