文字修改。

src/views/base/alarmConfig-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <!-- <el-select
           v-model="queryModel.companyId"
           size="mini"
@@ -102,7 +102,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         width="220"
         fixed="left"
       ></el-table-column>
@@ -196,7 +196,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
+        <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/approvalConfig-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select-tree
           :props="props"
           :options="companyResult"

src/views/base/checkinInfo-payment.vue

@@ -30,7 +30,7 @@
                   <el-input v-model="scope.row.unitPrice" oninput ="value=value.replace(/[^0-9.]/g,'')" />
                 </template>
               </el-table-column>
-              <el-table-column prop="unit" label="单位" ></el-table-column>
+              <el-table-column prop="unit" label="单位/部门" ></el-table-column>
           </el-table>
       </el-form>
     </div>

src/views/base/deviceInfo-detail.vue

@@ -19,7 +19,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <!-- <el-select
                 v-model="formModel.companyId"
                 filterable

src/views/base/deviceInfo-list.vue

@@ -137,7 +137,7 @@
         sortable="custom"></el-table-column>
       <el-table-column prop="code" label="内部编号" width="100" sort-by="a.code_"
         sortable="custom"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="250" show-overflow-tooltip sort-by="b.name_"
+      <el-table-column prop="companyName" label="单位/部门" width="250" show-overflow-tooltip sort-by="b.name_"
         sortable="custom"></el-table-column>
       <el-table-column prop="aliasName" label="设备别名" width="200" show-overflow-tooltip></el-table-column>
       <el-table-column prop="isOnline" label="运行状态" width="100" sort-by="a.is_online"

src/views/base/devicePerson-list.vue

@@ -47,7 +47,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -156,7 +156,7 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column prop="personInfo.companyName" label="单位" width="250"></el-table-column>
+      <el-table-column prop="personInfo.companyName" label="单位/部门" width="250"></el-table-column>
       <el-table-column prop="personInfo.phone" label="手机号" width="180"></el-table-column>
       <el-table-column prop="personInfo.idCard" label="身份证" width="100" show-overflow-tooltip></el-table-column>
       <el-table-column prop="deviceInfo.aliasName" label="绑定设备" width="150" show-overflow-tooltip></el-table-column>

src/views/base/employeeInfo-list.vue

@@ -14,7 +14,7 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select size="mini" v-model="queryModel.companyId" filterable placeholder="请选择">
           <el-option
             v-for="company in companyList"

src/views/base/holidayInfo-list.vue

@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="单位" prop="companyId">
+      <el-form-item label="单位/部门" prop="companyId">
         <el-select-tree
           :props="props"
           aria-setsize="mini"
@@ -186,7 +186,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <el-form-item label="单位">
+        <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/messageSendCondition-list.vue

@@ -29,7 +29,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         sortable="no"
         width="180"
       ></el-table-column>

src/views/base/payService-detail.vue

@@ -30,7 +30,7 @@
                 <el-form-item label="单价" prop="unitPrice">
                     <el-input v-model="formModel.unitPrice" placeholder="请输入单价" style="width:300px"></el-input>
                 </el-form-item>
-                <el-form-item label="单位" prop="unit">
+                <el-form-item label="单位/部门" prop="unit">
                     <el-input v-model="formModel.unit" placeholder="请输入单位" style="width:300px"></el-input>
                 </el-form-item>
                 <el-form-item label="是否激活" prop="isActivation">

src/views/base/payService-list.vue

@@ -42,7 +42,7 @@
             <el-table-column prop="name" label="收费项目" ></el-table-column>
             <el-table-column prop="desc" label="收费项目说明" ></el-table-column>
             <el-table-column prop="unitPrice" label="单价" ></el-table-column>
-            <el-table-column prop="unit" label="单位" ></el-table-column>
+            <el-table-column prop="unit" label="单位/部门" ></el-table-column>
             <el-table-column prop="isActivation" label="激活开关" >
                 <template slot-scope="{row}">
                     <el-switch

src/views/base/personDeviceLog-list.vue

@@ -43,7 +43,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <!-- <el-select
             v-model="queryModel.companyId"
             size="mini"

src/views/base/personHealthLedger-list.vue

@@ -32,7 +32,7 @@
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -137,7 +137,7 @@
       <el-table-column type="index" label="序号" :index="indexMethod" width="100"></el-table-column>
       <el-table-column prop="name" label="姓名" width="150"></el-table-column>
       <el-table-column prop="personHealthLedger.temperature" label="记录温度" width="150"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="220"></el-table-column>
+      <el-table-column prop="companyName" label="单位/部门" width="220"></el-table-column>
       <el-table-column prop="healthStatusN" label="健康情况" width="120">
         <template slot-scope="{row}">
           <span v-if="row.isUpHealth">{{row.personHealthLedger.healthStatusN}}</span>

src/views/base/personInfo-detail.vue

@@ -41,7 +41,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <el-select-tree
                 :props="props"
                 :options="companyResult"

src/views/base/personInfo-list-outsourcer.vue

@@ -79,7 +79,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -662,7 +662,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <!-- <el-form-item label="单位">
+        <!-- <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/personInfo-list.vue

@@ -79,7 +79,7 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -670,7 +670,7 @@
             >点击下载模板</el-link
           >
         </el-form-item>
-        <!-- <el-form-item label="单位">
+        <!-- <el-form-item label="单位/部门">
           <el-select-tree
             size="large"
             :props="props"

src/views/base/personPopedom-detail.vue

@@ -20,7 +20,7 @@
         :rules="ruleValidate"
         :label-width="'100px'"
       >
-        <el-form-item label="单位" prop="companyId">
+        <el-form-item label="单位/部门" prop="companyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -52,7 +52,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="服务公司"
           prop="serviceCompanyId"
           v-if="sceneId == '4'"
@@ -63,7 +63,7 @@
             v-model="formModel.serviceCompanyId"
             height="200"
           ></el-select-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="身份" prop="personRoleId">
           <el-select
             v-model="formModel.personRoleId"
@@ -107,13 +107,13 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="是否要求考勤" prop="enableAttendance">
+        <!-- <el-form-item label="是否要求考勤" prop="enableAttendance">
             <el-switch
               v-model="formModel.enableAttendance"
               active-color="#13ce66"
               inactive-color="#ff4949"
             ></el-switch>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/base/personPopedom-list.vue

@@ -42,7 +42,7 @@
       >
         <el-table-column
           prop="companyName"
-          label="单位"
+          label="单位/部门"
           width="200"
         ></el-table-column>
         <!-- <el-table-column
@@ -89,7 +89,7 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="enableAttendance"
           label="是否要求考勤"
           width="120"
@@ -102,7 +102,7 @@
               @change="handleUpdate(row)"
             ></el-switch>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="useEnable" label="默认" width="100">
           <template slot-scope="{ row }">
             <el-switch

src/views/base/temperatureRecord-list.vue

@@ -15,7 +15,7 @@
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
       <div>
-        <el-form-item label="单位" prop="parentId">
+        <el-form-item label="单位/部门" prop="parentId">
           <el-select-tree
             size="mini"
             :props="props"
@@ -36,7 +36,7 @@
             :picker-options="pickerOptions"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="单位" prop="companyId">
+        <!-- <el-form-item label="单位/部门" prop="companyId">
           <el-select
             v-model="queryModel.companyId"
             size="mini"

src/views/base/warningPusher-detail.vue

@@ -17,7 +17,7 @@
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="companyId">
+            <el-form-item label="单位/部门" prop="companyId">
               <!-- <el-select
                 v-model="formModel.companyId"
                 filterable

src/views/base/warningPusher-list.vue

@@ -83,7 +83,7 @@
       <el-table-column prop="name" label="姓名" width="100" fixed="left"></el-table-column>
       <el-table-column prop="remark" label="备注" width="150"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="120"></el-table-column>
-      <el-table-column prop="companyName" label="单位" width="120"></el-table-column>
+      <el-table-column prop="companyName" label="单位/部门" width="120"></el-table-column>
       <el-table-column prop="temperature" label="预警触发温度" width="120"></el-table-column>
       <el-table-column prop="times" label="上报触发次数" width="120"></el-table-column>
       <el-table-column prop="openId" label="是否绑定公众号" width="120">

src/views/base/workOver-list.vue

@@ -133,7 +133,7 @@
       ></el-table-column>
       <el-table-column
         prop="companyName"
-        label="单位"
+        label="单位/部门"
         width="180"
       ></el-table-column>
       

src/views/business/fillAttendance-list.vue

@@ -26,7 +26,7 @@
           v-model="queryModel.personName"
         ></el-input>
       </el-form-item>
-      <el-form-item label="单位" prop="parentId">
+      <el-form-item label="单位/部门" prop="parentId">
         <el-select-tree
           size="mini"
           :props="props"

src/views/business/workAttendance-list.vue

@@ -26,7 +26,7 @@
     >
       <div>
         <el-row>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <!-- <el-select
               v-model="queryModel.companyId"
               size="mini"

src/views/business/workScheduleAttendance-list.vue

@@ -34,7 +34,7 @@
               size="mini"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <el-select-tree
               :props="props"
               :options="companyResult"

src/views/business/workScheduleReport.vue

@@ -26,7 +26,7 @@
     >
       <div>
         <el-row>
-          <el-form-item label="单位" prop="companyId">
+          <el-form-item label="单位/部门" prop="companyId">
             <!-- <el-select
               v-model="queryModel.companyId"
               size="mini"