From ed4601e356172f2a71cf161ec30db1a667d62dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 13 May 2024 22:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=95=86=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=88=86=E5=8C=85=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/project/attendance/index.vue    |  6 +--
 .../views/project/attendanceWorker/index.vue  |  6 +--
 .../project/gldAttendanceGroup/index.vue      | 50 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index ab04fdb1..01549899 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -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" />
       
diff --git a/ruoyi-ui/src/views/project/attendanceWorker/index.vue b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
index 91c36c5f..1181cebe 100644
--- a/ruoyi-ui/src/views/project/attendanceWorker/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceWorker/index.vue
@@ -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" />
diff --git a/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
index e15a9811..730525d6 100644
--- a/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
+++ b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
@@ -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="请输入班组名称" />