企业相关，费用权限问题

front-vue/src/api/service/company/company.js

@@ -89,4 +89,16 @@ export function listRel(query) {
     method: 'get',
     params: query
   })
+}
+
+// 更改为核心企业
+export function companyToCore(scyId) {
+  const data = {
+    scyId
+  }
+  return request({
+    url: '/sc-service/company/companyToCore',
+    method: 'put',
+    data: data
+  })
 }

front-vue/src/views/service/company/coreCompanyManage.vue

@@ -14,7 +14,7 @@
         <el-input
           maxlength="30"
           v-model="queryParams.scyName"
-          placeholder="请输入公司名称"
+          placeholder="请输入企业名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -294,35 +294,35 @@ export default {
       // 表单校验
       rules: {
         scyName: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
+          { required: true, message: "企业名称不能为空", trigger: "blur"},
           {
-            pattern: /^[\u2E80-\u9FFF]|\w|[,，\.。]+$/,
-            message: "公司名称不能含有特殊字符",
-            trigger: "blur",
+            pattern: /^([\u4e00-\u9fa5]+|[a-zA-Z0-9]+)$/,
+            message: "企业名称不能含有特殊字符",
+            trigger: ["blur", "change"]
           }
         ],
         nickName: [
-          { required: true, message: "联系人不能为空", trigger: "blur" },
+          { required: true, message: "联系人不能为空", trigger: "blur"},
           {
-            pattern: /^[\u2E80-\u9FFF]|\w|[,，\.。]+$/,
+            pattern: /^([\u4e00-\u9fa5]+|[a-zA-Z0-9]+)$/,
             message: "联系人不能含有特殊字符",
-            trigger: "blur",
+            trigger: ["blur", "change"]
           }
         ],
         userName: [
-          { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+          { required: true, message: "联系人手机号不能为空", trigger: "blur"},
           {
             pattern: /^((\d{3}-\d{7,8}|\d{4}-\d{7,8})|(1[3465789]\d{9}))$/,
             message: "手机号格式不正确",
-            trigger: "blur",
+            trigger: ["blur", "change"]
           }
         ],
         scySocialCode: [
-          { required: true, message: "企业统一代码不能为空", trigger: "blur" },
+          { required: true, message: "企业统一代码不能为空", trigger: "blur"},
           {
             pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})||([1-9]\d{15})$/,
             message: "企业统一代码格式不正确",
-            trigger: "blur"
+            trigger: ["blur", "change"]
           }
         ],
       },

front-vue/src/views/service/company/supCompanyManage.vue

@@ -14,7 +14,7 @@
         <el-input
           maxlength="30"
           v-model="queryParams.scyName"
-          placeholder="请输入公司名称"
+          placeholder="请输入企业名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -124,6 +124,12 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['service:company:delete']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleToCore(scope.row)"
+            v-hasPermi="['service:company:companyToCore']"
+          >改为核心企业</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -197,7 +203,8 @@
 </template>
 
 <script>
-import { listCompany, companyQuery, addCompany, updateCompany, updateCompanyStatus, getElementStatus, removeCompany } from "@/api/service/company/company";
+import { listCompany, companyQuery, addCompany, updateCompany, updateCompanyStatus,
+ getElementStatus, removeCompany, companyToCore} from "@/api/service/company/company";
 import { uploadFileNew } from "@/api/common/file";
 import { getToken } from "@/utils/auth";
 import {columnQuery,columnfilter} from "@/api/common/columnSetting";
@@ -219,7 +226,7 @@ export default {
       },
       examRules:{
         state: [
-          { required: true, message: "审核状态不能为空", trigger: "blur" },
+          { required: true, message: "审核状态不能为空", trigger: "blur" },
         ]
       },
       // 遮罩层
@@ -294,25 +301,35 @@ export default {
       // 表单校验
       rules: {
         scyName: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" },
+          { required: true, message: "企业名称不能为空", trigger: ["blur", "change"]},
+          {
+            pattern: /^([\u4e00-\u9fa5]+|[a-zA-Z0-9]+)$/,
+            message: "企业名称不能含有特殊字符",
+            trigger: ["blur", "change"]
+          }
         ],
-        scyLegal: [
-          { required: true, message: "联系人不能为空", trigger: "blur" },
+        nickName: [
+          { required: true, message: "联系人不能为空", trigger: ["blur", "change"]},
+          {
+            pattern: /^([\u4e00-\u9fa5]+|[a-zA-Z0-9]+)$/,
+            message: "联系人不能含有特殊字符",
+            trigger: ["blur", "change"]
+          }
         ],
-        scyPhone: [
-          { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+        userName: [
+          { required: true, message: "联系人手机号不能为空", trigger: ["blur", "change"]},
           {
             pattern: /^((\d{3}-\d{7,8}|\d{4}-\d{7,8})|(1[3465789]\d{9}))$/,
             message: "手机号格式不正确",
-            trigger: "blur",
+            trigger: ["blur", "change"]
           }
         ],
         scySocialCode: [
-          { required: true, message: "企业统一代码不能为空", trigger: "blur" },
+          { required: true, message: "企业统一代码不能为空", trigger: ["blur", "change"]},
           {
             pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})||([1-9]\d{15})$/,
             message: "企业统一代码格式不正确",
-            trigger: "blur"
+            trigger: ["blur", "change"]
           }
         ],
       },
@@ -468,7 +485,7 @@ export default {
     handleDelete(row) {
       const scyId = row.scyId || this.ids;
       const scyName = row.scyName;
-      this.$confirm('是否确认删除公司名称为"' + scyName + '"的数据?', "警告", {
+      this.$confirm('是否确认删除企业名称为"' + scyName + '"的数据?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -487,6 +504,29 @@ export default {
         }); 
     },
 
+    /** 更改为核心企业 */
+    handleToCore(row) {
+      const scyId = row.scyId || this.ids;
+      const scyName = row.scyName;
+      this.$confirm('确认把名称为"' + scyName + '"的企业改为核心企业?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return companyToCore(scyId);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {
+          this.$message({
+            type: "warning",
+            message: "已取消删除",
+           
+          });
+        }); 
+    },
+
     scyStatusFormat(row, column) {
       if(row.scyStatus == '02' || row.scyStatus == '03' || row.scyStatus == '04'){
       return this.selectDictLabel(this.scyStatusOptions, "02");

front-vue/src/views/service/cost/userCostManage.vue

@@ -120,7 +120,7 @@
             size="mini"
             type="text"
             @click="handleApply(scope.row)"
-            v-hasPermi="['service:cost:update']"
+            v-hasPermi="['service:cost:apply']"
           >申请开票</el-button>
         </template>
       </el-table-column>