Merge remote-tracking branch 'origin/master'

k94314517

2024-10-12 51e18e190dafdec70dc1f4a3a9ecd76fb2116726

 admin/src/views/business/visits_hk.vue

@@ -8,8 +8,8 @@
            <el-form-item label="身份证号" prop="idcardNo">
                <el-input v-model="searchForm.idcardNo" placeholder="请输入身份证号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input>
            <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="status">
                <el-select v-model="searchForm.status" placeholder="请选择">
@@ -46,7 +46,7 @@
                <el-table-column type="selection" width="55"></el-table-column>
                <el-table-column prop="name" label="访客姓名" min-width="100px"></el-table-column>
                <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
                <el-table-column prop="companyName" label="公司名称" min-width="100px"></el-table-column>
                <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">
@@ -68,17 +68,6 @@
                </el-table-column>
                <el-table-column prop="status" fixed="right" label="状态" min-width="100px">
                    <template slot-scope="{row}">
                      <el-option label="待审核" value="1"></el-option>
                      <el-option label="正常" value="2"></el-option>
                      <el-option label="迟到" value="3"></el-option>
                      <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="8"></el-option>
                      <el-option label="审核失效" value="9"></el-option>
                      <el-option label="邀约中" value="10"></el-option>
                      <el-option label="邀约失效" value="11"></el-option>
                        <span v-if="row.status === 1">待审核</span>
                        <span v-if="row.status === 2">正常</span>
                        <span v-if="row.status === 3">迟到</span>
@@ -99,7 +88,7 @@
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('详情', row.id)" v-permissions="['business:visits:update']">查看详情</el-button>
                        <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('详情', row.id)"  >查看详情</el-button>
<!--                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">查询审批结果</el-button>-->
                    </template>
                </el-table-column>
@@ -112,7 +101,7 @@
            </pagination>
            <!--      详情      -->
            <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
            <OperaVisitsHkWindow ref="OperaVisitsHkWindow" />
            <OperaVisitsHkWindow ref="OperaVisitsHkWindow" @success="search()" />
        </template>
    </TableLayout>
</template>
@@ -148,6 +137,7 @@
    this.search()
  },
  methods: {

  }
}
</script>