sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分包商改为分包单位

dev_xds
姜玉琦 2024-05-13 22:13:20 +08:00
parent d6262c7f4b
commit ed4601e356
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/views/project/attendance/index.vue
View File

@ -13,8 +13,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分包商类型" prop="companyTypeId">
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包商类型" clearable>
<el-form-item label="分包单位类型" prop="companyTypeId">
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包单位类型" clearable>
<el-option value="0" label="所有"></el-option>
<el-option value="101" label="总包人员"></el-option>
<el-option value="102" label="监理人员"></el-option>
@ -84,7 +84,7 @@
<i v-else class="el-icon-close" style="color:red;"></i>
</template>
</el-table-column>
<el-table-column label="分包商名称" align="center" prop="companyName" />
<el-table-column label="分包单位名称" align="center" prop="companyName" />
<el-table-column label="所属班组" align="center" prop="groupName" />
<el-table-column label="工种" align="center" prop="workTypeName" />

6
ruoyi-ui/src/views/project/attendanceWorker/index.vue
View File

@ -15,8 +15,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分包商类型" prop="companyTypeId">
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包商类型" clearable style="width: 100px;">
<el-form-item label="分包单位类型" prop="companyTypeId">
<el-select v-model="queryParams.companyTypeId" placeholder="请选择分包单位类型" clearable style="width: 100px;">
<el-option value="" label="所有"></el-option>
<el-option value="101" label="总包人员"></el-option>
<el-option value="102" label="监理人员"></el-option>
@ -79,7 +79,7 @@
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="{row}">{{ row.state == 1 ? '已退场' : '进场' }}</template>
</el-table-column>
<el-table-column label="分包商名称" align="center" prop="companyName">
<el-table-column label="分包单位名称" align="center" prop="companyName">
<template slot-scope="{row}">{{ row.companyName || row.remark }}</template>
</el-table-column>
<el-table-column label="所属班组" align="center" prop="groupName" />

50
ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
View File

@ -25,42 +25,42 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分包商统一社会信用代码" prop="companyCode">
<el-form-item label="分包单位统一社会信用代码" prop="companyCode">
<el-input
v-model="queryParams.companyCode"
placeholder="请输入分包商统一社会信用代码"
placeholder="请输入分包单位统一社会信用代码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分包商ID" prop="companyId">
<el-form-item label="分包单位ID" prop="companyId">
<el-input
v-model="queryParams.companyId"
placeholder="请输入分包商ID"
placeholder="请输入分包单位ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分包商名称" prop="companyName">
<el-form-item label="分包单位名称" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入分包商名称"
placeholder="请输入分包单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分包商类型" prop="companyTypeId">
<el-form-item label="分包单位类型" prop="companyTypeId">
<el-input
v-model="queryParams.companyTypeId"
placeholder="请输入分包商类型"
placeholder="请输入分包单位类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="平台对应分包商ID" prop="vendorId">
<el-form-item label="平台对应分包单位ID" prop="vendorId">
<el-input
v-model="queryParams.vendorId"
placeholder="请输入平台对应分包商ID"
placeholder="请输入平台对应分包单位ID"
clearable
@keyup.enter.native="handleQuery"
/>
@ -227,11 +227,11 @@
<el-table-column label="${comment}" align="center" prop="cfgid" />
<el-table-column label="服务器主键id" align="center" prop="serverid" />
<el-table-column label="营业执照号" align="center" prop="bizLicense" />
<el-table-column label="分包商统一社会信用代码" align="center" prop="companyCode" />
<el-table-column label="分包商ID" align="center" prop="companyId" />
<el-table-column label="分包商名称" align="center" prop="companyName" />
<el-table-column label="分包商类型" align="center" prop="companyTypeId" />
<el-table-column label="平台对应分包商ID" align="center" prop="vendorId" />
<el-table-column label="分包单位统一社会信用代码" align="center" prop="companyCode" />
<el-table-column label="分包单位ID" align="center" prop="companyId" />
<el-table-column label="分包单位名称" align="center" prop="companyName" />
<el-table-column label="分包单位类型" align="center" prop="companyTypeId" />
<el-table-column label="平台对应分包单位ID" align="center" prop="vendorId" />
<el-table-column label="班组名称" align="center" prop="name" />
<el-table-column label="班组长名称" align="center" prop="leaderName" />
<el-table-column label="班组长电话" align="center" prop="leaderPhone" />
@ -287,20 +287,20 @@
<el-form-item label="营业执照号" prop="bizLicense">
<el-input v-model="form.bizLicense" placeholder="请输入营业执照号" />
</el-form-item>
<el-form-item label="分包商统一社会信用代码" prop="companyCode">
<el-input v-model="form.companyCode" placeholder="请输入分包商统一社会信用代码" />
<el-form-item label="分包单位统一社会信用代码" prop="companyCode">
<el-input v-model="form.companyCode" placeholder="请输入分包单位统一社会信用代码" />
</el-form-item>
<el-form-item label="分包商ID" prop="companyId">
<el-input v-model="form.companyId" placeholder="请输入分包商ID" />
<el-form-item label="分包单位ID" prop="companyId">
<el-input v-model="form.companyId" placeholder="请输入分包单位ID" />
</el-form-item>
<el-form-item label="分包商名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入分包商名称" />
<el-form-item label="分包单位名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入分包单位名称" />
</el-form-item>
<el-form-item label="分包商类型" prop="companyTypeId">
<el-input v-model="form.companyTypeId" placeholder="请输入分包商类型" />
<el-form-item label="分包单位类型" prop="companyTypeId">
<el-input v-model="form.companyTypeId" placeholder="请输入分包单位类型" />
</el-form-item>
<el-form-item label="平台对应分包商ID" prop="vendorId">
<el-input v-model="form.vendorId" placeholder="请输入平台对应分包商ID" />
<el-form-item label="平台对应分包单位ID" prop="vendorId">
<el-input v-model="form.vendorId" placeholder="请输入平台对应分包单位ID" />
</el-form-item>
<el-form-item label="班组名称" prop="name">
<el-input v-model="form.name" placeholder="请输入班组名称" />