标签租户 改为 企业

src/api/login.js

@@ -1,6 +1,6 @@
 import request from '@/router/axios';
 
-// 获取域名租户
+// 获取域名企业
 export function getDomainName(params) {
   return request({
     url: '/api/blade-system/tenant/info',

src/api/system/tenant.js

@@ -80,7 +80,7 @@ export const info = (domain) => {
   })
 }
 
-// 租户复制
+// 企业复制
 export const tenantCopyData = (params) => {
   return request({
     url: '/api/blade-system/tenant/copyData',

src/components/selectComponent/configuration/userOption.json

@@ -25,7 +25,7 @@
             "index": 1,
             "width":120
         },{
-            "label": "所属租户",
+            "label": "所属企业",
             "prop": "tenantName",
             "index": 2,
             "width":120

src/components/third-register/main.vue

@@ -7,8 +7,8 @@
              :show-close="false"
              width="20%">
     <el-form :model="form" ref="form" label-width="80px">
-      <el-form-item v-if="tenantMode" label="租户编号">
-        <el-input v-model="form.tenantId" placeholder="请输入租户编号"></el-input>
+      <el-form-item v-if="tenantMode" label="企业编号">
+        <el-input v-model="form.tenantId" placeholder="请输入企业编号"></el-input>
       </el-form-item>
       <el-form-item label="用户姓名">
         <el-input v-model="form.name" placeholder="请输入用户姓名"></el-input>
@@ -70,7 +70,7 @@
     methods: {
       handleRegister() {
         if (this.form.tenantId === '') {
-          this.$message.warning("请先输入租户编号");
+          this.$message.warning("请先输入企业编号");
           return;
         }
         if (this.form.account === '') {

src/config/website.js

@@ -8,8 +8,8 @@ export default {
   indexTitle: 'Admin',
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
-  tenantMode: true, // 是否开启租户模式
-  tenantId: "000000", // 管理组租户编号
+  tenantMode: true, // 是否开启企业模式
+  tenantId: "000000", // 管理组企业编号
   captchaMode: false, // 是否开启验证码模式
   switchMode: false, // 是否开启部门切换模式
   lockPage: '/lock',

src/lang/zh.js

@@ -69,7 +69,7 @@ export default {
   login: {
     title: '登录 ',
     info: '企业级开发平台',
-    tenantId: '请输入租户ID',
+    tenantId: '请输入企业ID',
     username: '请输入账号',
     password: '请输入密码',
     wechat: '微信',

src/page/login/userlogin.vue

@@ -89,7 +89,7 @@
         tenantMode: this.website.tenantMode,
         rememberMe:false,
         loginForm: {
-          //租户ID
+          //企业ID
           tenantId: '',
           //部门ID
           deptId: "",
@@ -110,7 +110,7 @@
         },
         loginRules: {
           tenantId: [
-            {required: false, message: "请输入租户ID", trigger: "blur"}
+            {required: false, message: "请输入企业ID", trigger: "blur"}
           ],
           username: [
             {required: true, message: "请输入用户名", trigger: "blur"}
@@ -180,7 +180,7 @@
         this.loginForm.tenantId = res.data.data.tenantId? res.data.data.tenantId: '';
       })
       if (this.saveTenantId == '') {
-        if(localStorage.getItem("tenantId")) this.loginForm.tenantId = CryptoJS.decrypt(localStorage.getItem("tenantId")) //租户ID
+        if(localStorage.getItem("tenantId")) this.loginForm.tenantId = CryptoJS.decrypt(localStorage.getItem("tenantId")) //企业ID
       }
       if(localStorage.getItem("username")) this.loginForm.username = CryptoJS.decrypt(localStorage.getItem("username")) //用户名
       if(localStorage.getItem("password")) this.loginForm.password = CryptoJS.decrypt(localStorage.getItem("password")) //密码

src/views/SpecialTrade/dispatchingCars/detailPage.vue

@@ -2037,7 +2037,7 @@ export default {
         //   this.key++
         // }
         this.$refs.other.show = false
-        // 非租户模式默认加载管理组数据
+        // 非企业模式默认加载管理组数据
         if (!website.tenantMode) {
             this.initData(website.tenantId);
         } else {

src/views/SpecialTrade/placeAnOrder/detailPage.vue

@@ -1816,7 +1816,7 @@ export default {
       this.oldvehicleList = this.deepClone(this.vehicleList)
       this.oldorderFilesList = this.deepClone(this.orderFilesList)
     }
-    // 非租户模式默认加载管理组数据
+    // 非企业模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     } else {

src/views/TaskKanban/index.vue

@@ -497,7 +497,7 @@ import {getDetailByTask, addComment, removeComment} from "@/api/TaskKanban/comme
       async created() {
       this.user = JSON.parse(localStorage.getItem('saber-userInfo'));
           this.option = await this.getColumnData(this.getColumnName(288), this.optionBack);
-        // 传租户号查询岗位信息
+        // 传企业号查询岗位信息
         this.getPostListfun(JSON.parse(localStorage.getItem('saber-tenantId')).content)
 
           // 获取当前登录人的名称和id

src/views/approval/processConfig/index.vue

@@ -245,7 +245,7 @@ export default {
         status: 'A',
       },
       dataRule: {},
-      tenantId: null, // 租户
+      tenantId: null, // 企业
       // dicData: [],
       props: {
         multiple: true,

src/views/approval/processConfigH/index.vue

@@ -262,7 +262,7 @@ export default {
         status: 'A',
       },
       dataRule: {},
-      tenantId: null, // 租户
+      tenantId: null, // 企业
       // dicData: [],
       props: {
         multiple: true,

src/views/approval/processConfigL/index.vue

@@ -262,7 +262,7 @@ export default {
         status: 'A',
       },
       dataRule: {},
-      tenantId: null, // 租户
+      tenantId: null, // 企业
       // dicData: [],
       props: {
         multiple: true,

src/views/authority/role.vue

@@ -134,7 +134,7 @@
               ]
             },
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
@@ -150,7 +150,7 @@
               search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入所属租户",
+                message: "请输入所属企业",
                 trigger: "click"
               }]
             },

src/views/basicData/commodityType/index.vue

@@ -245,7 +245,7 @@ export default {
             display: false
           },
           {
-            label: "所属租户",
+            label: "所属企业",
             prop: "tenantName",
             slot: true,
             display: false
@@ -386,7 +386,7 @@ export default {
   },
   mounted() {
     option.height = window.innerHeight - 210;
-    // 非租户模式默认加载管理组数据
+    // 非企业模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     }

src/views/businessManagement/receipt/index.vue

@@ -106,7 +106,7 @@ export default {
   },
   data() {
     return {
-        // 租户号
+        // 企业号
         saberTenantId:'',
         // 加载动画
         loadingfalse:false,
@@ -149,7 +149,7 @@ export default {
     }
   },
   async created() {
-      // 获取租户信息
+      // 获取企业信息
       this.saberTenantId = JSON.parse(localStorage.getItem('saber-tenantId'))
     // this.search.businessDate = defaultDate(1)
     this.search.createTime = defaultDate(3)

src/views/businessManagement/salesOrder/index.vue

@@ -174,12 +174,12 @@ export default {
       warehouseList: [],
         // 车号弹窗显示位置
         dialogVisible:false,
-        // 当前用户的租户号
+        // 当前用户的企业号
         hctenantId:null,
     };
   },
   async created() {
-      // 获取缓存里的租户号信息
+      // 获取缓存里的企业号信息
       this.hctenantId = JSON.parse(localStorage.getItem('saber-tenantId')).content
       // 获取当前登录人的基本信息
       this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content

src/views/financialManagement/compareBill/receiptSettleDetailsPage.vue

@@ -815,7 +815,7 @@
           })
         }
 
-          // 达沃特租户人民币可以编辑不需要计算
+          // 达沃特企业人民币可以编辑不需要计算
           if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
               // this.findObject(this.option.column, "amount").disabled = false
           }else {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -483,7 +483,7 @@ export default {
 
   },
   mounted() {
-      // 达沃特租户人民币可以编辑不需要计算
+      // 达沃特企业人民币可以编辑不需要计算
       if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
           this.findObject(this.option.column, "amount").disabled = false
       }
@@ -787,7 +787,7 @@ export default {
         })
       }
 
-        // 达沃特租户人民币可以编辑不需要计算
+        // 达沃特企业人民币可以编辑不需要计算
         if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
             // this.findObject(this.option.column, "amount").disabled = false
         }else {

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -571,7 +571,7 @@
       }
     },
     mounted() {
-        // 达沃特租户人民币可以编辑不需要计算
+        // 达沃特企业人民币可以编辑不需要计算
         if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
             this.findObject(this.option.column, "amount").disabled = false
         }
@@ -884,7 +884,7 @@
           })
         }
 
-          // 达沃特租户人民币可以编辑不需要计算
+          // 达沃特企业人民币可以编辑不需要计算
           if (JSON.parse(localStorage.getItem('saber-tenantId')).content == '681169') {
               // this.findObject(this.option.column, "amount").disabled = false
           }else {

src/views/flow/manager.vue

@@ -157,7 +157,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: '租户编号',
+              label: '企业编号',
               prop: 'tenantId',
               slot: true,
               width: 120,

src/views/flow/model.vue

@@ -157,7 +157,7 @@
               ],
             },
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantId",
               type: "tree",
               multiple: true,
@@ -171,7 +171,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择所属租户',
+                  message: '请选择所属企业',
                   trigger: 'blur'
                 }
               ],

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -1149,7 +1149,7 @@ export default {
           this.findObject(this.goodsOptionFormTwo.column, 'freightPay').display = false
           // this.goodsOptionFormTwo.disabled = true
         }
-   
+
       }
     }
   },
@@ -2204,7 +2204,7 @@ export default {
           this.findObject(this.goodsOptionForm.column, "unitPrice").display =false
           this.findObject(this.goodsOptionForm.column, "freightCollect").display=false
           this.findObject(this.goodsOptionFormTwo.column, "freightPay").display=false
-          
+
      }
     if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
       this.activeIndex = this.roleName.indexOf('调度中心业务员') !== -1 ? '2' : this.roleName.indexOf('调度中心经理') !== -1 ? '2' : '1'
@@ -2419,7 +2419,7 @@ export default {
       this.oldvehicleList = this.deepClone(this.vehicleList)
       this.oldorderFilesList = this.deepClone(this.orderFilesList)
     }
-    // 非租户模式默认加载管理组数据
+    // 非企业模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     } else {

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -1475,7 +1475,7 @@ export default {
     //   this.key++
     // }
     this.$refs.other.show = false
-    // 非租户模式默认加载管理组数据
+    // 非企业模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     } else {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1538,7 +1538,7 @@ export default {
       this.oldvehicleList = this.deepClone(this.vehicleList)
       this.oldorderFilesList = this.deepClone(this.orderFilesList)
     }
-    // 非租户模式默认加载管理组数据
+    // 非企业模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     } else {

src/views/resource/oss.vue

@@ -116,14 +116,14 @@
               }]
             },
             {
-              label: "租户号",
+              label: "企业号",
               prop: "tenantId",
               span: 24,
               width: 120,
               search: true,
               rules: [{
                 required: true,
-                message: "请输入租户号",
+                message: "请输入企业号",
                 trigger: "blur"
               }]
             },

src/views/system/businessLock/config/mainList.json

@@ -20,7 +20,7 @@
   "expand": false,
   "expandWidth": 38,
   "column": [{
-      "label": "租户",
+      "label": "企业",
       "prop": "tenantId",
       "search": true,
       "type": "select",

src/views/system/dept.vue

@@ -133,7 +133,7 @@
               }]
             },
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
@@ -149,7 +149,7 @@
               search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入所属租户",
+                message: "请输入所属企业",
                 trigger: "click"
               }]
             },
@@ -349,7 +349,7 @@
           this.regionList = JSON.parse(localStorage.getItem('areaTypeTree'))
           // 判断是否是admin 权限
           let arr = localStorage.getItem('roleName').split(',')
-          // 根据 租户好判断是否要显示 积分余额
+          // 根据 企业好判断是否要显示 积分余额
           const content = JSON.parse(localStorage.getItem('saber-tenantId')).content
           this.$nextTick(()=>{
               if (arr.indexOf('admin') != -1) {

src/views/system/post.vue

@@ -65,7 +65,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
@@ -80,7 +80,7 @@
               hide: !website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入所属租户",
+                message: "请输入所属企业",
                 trigger: "click"
               }]
             },

src/views/system/tenant.vue

@@ -55,20 +55,20 @@
         <el-tag>{{ row.expireTime ? row.expireTime : '不限制' }}</el-tag>
       </template>
     </avue-crud>
-    <el-dialog title="租户授权配置"
+    <el-dialog title="企业授权配置"
                append-to-body
                :visible.sync="box"
                width="450px">
       <avue-form :option="settingOption" v-model="settingForm" @submit="handleSubmit"/>
     </el-dialog>
-    <el-dialog title="租户数据源配置"
+    <el-dialog title="企业数据源配置"
                append-to-body
                :visible.sync="datasourceBox"
                width="450px">
       <avue-form :option="datasourceOption" v-model="datasourceForm" @submit="handleDatasourceSubmit"/>
     </el-dialog>
 
-      <el-dialog title="租户复制"
+      <el-dialog title="企业复制"
                  append-to-body
                  :visible.sync="CopyVisible"
                  width="450px">
@@ -92,7 +92,7 @@ export default {
       loading: true,
       box: false,
       datasourceBox: false,
-      CopyVisible:false, // 复制租户弹窗
+      CopyVisible:false, // 复制企业弹窗
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -113,7 +113,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "租户ID",
+            label: "企业ID",
             prop: "tenantId",
             width: 100,
             search: true,
@@ -122,12 +122,12 @@ export default {
             span: 24,
             rules: [{
               required: true,
-              message: "请输入租户ID",
+              message: "请输入企业ID",
               trigger: "blur"
             }]
           },
           {
-            label: "租户名称",
+            label: "企业名称",
             prop: "tenantName",
             search: true,
             width: 180,
@@ -211,7 +211,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "对应平台(租户id)",
+            label: "对应平台(企业id)",
             prop: "terrace",
             labelWidth: 140,
             width: 140,
@@ -264,7 +264,7 @@ export default {
       CopyOption: {
           column: [
               {
-                  label: "租户",
+                  label: "企业",
                   prop: "tenantIdCopy",
                   dicData:[],
                   type: "select",
@@ -279,7 +279,7 @@ export default {
                   span: 24,
                   rules: [{
                       required: true,
-                      message: "请选择租户",
+                      message: "请选择企业",
                       trigger: "blur"
                   }]
               },
@@ -379,7 +379,7 @@ export default {
     }
   },
   methods: {
-    // 复制租户
+    // 复制企业
     copyTenantfun(form, done, loading){
         tenantCopyData({
             tenantId:this.selectionList[0].tenantId,

src/views/system/user.vue

@@ -304,7 +304,7 @@
               display: false
             },
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantName",
               slot: true,
               display: false
@@ -378,7 +378,7 @@
               icon: 'el-icon-user-solid',
               column: [
                 {
-                  label: "所属租户",
+                  label: "所属企业",
                   prop: "tenantId",
                   type: "tree",
                   dicUrl: "/api/blade-system/tenant/select",
@@ -392,7 +392,7 @@
                   viewDisplay: website.tenantMode,
                   rules: [{
                     required: true,
-                    message: "请输入所属租户",
+                    message: "请输入所属企业",
                     trigger: "click"
                   }],
                   span: 24,
@@ -663,7 +663,7 @@
               display: false
             },
             {
-              label: "所属租户",
+              label: "所属企业",
               prop: "tenantName",
               slot: true,
               display: false
@@ -805,7 +805,7 @@
       },
     },
       created() {
-        // 根据 租户好判断是否要显示 积分余额
+        // 根据 企业好判断是否要显示 积分余额
         //   const content = JSON.parse(localStorage.getItem('saber-tenantId')).content
         //   if (content == 171757) {
         //       this.$nextTick(()=>{
@@ -835,7 +835,7 @@
           })
       },
       mounted() {
-      // 非租户模式默认加载管理组数据
+      // 非企业模式默认加载管理组数据
       if (!website.tenantMode) {
         this.initData(website.tenantId);
       }

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -126,7 +126,7 @@ export default {
       reminder: false,
       sendACar: false,
       track: false,
-      // 租户号
+      // 企业号
       zhcontent: null,
       largeScreenToken:'',
     };

src/views/work/start.vue

@@ -116,7 +116,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: '租户编号',
+              label: '企业编号',
               prop: 'tenantId',
               slot: true,
               width: 120,

src/views/workManagement/main-items/configuration/startDialog.json

@@ -17,7 +17,7 @@
   "menuWidth": 150,
   "column":[
     {
-      "label": "租户编号",
+      "label": "企业编号",
       "prop": "tenantId",
       "search": true,
       "index": 1,

src/views/workManagement/main-items/configuration/userList.json

@@ -25,7 +25,7 @@
             "index": 1,
             "width":120
         },{
-            "label": "所属租户",
+            "label": "所属企业",
             "prop": "tenantName",
             "index": 2,
             "width":120