sqg 4 роки тому
батько
коміт
27731e2e04

+ 35 - 23
front-vue/src/views/service/company/coreCompanyManage.vue

@@ -30,9 +30,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系人" prop="scyLegal">
+      <el-form-item label="联系人" prop="nickName">
         <el-input
-          v-model="queryParams.scyLegal"
+          v-model="queryParams.nickName"
           maxlength="30"
           placeholder="请输入联系人"
           clearable
@@ -40,10 +40,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系电话" prop="scyPhone">
+      <el-form-item label="联系电话" prop="userName">
         <el-input
-          v-model="queryParams.scyPhone"
-          maxlength="11"
+          v-model="queryParams.userName"
           placeholder="请输入联系电话"
           clearable
           size="small"
@@ -86,8 +85,8 @@
       </el-table-column>
       <el-table-column label="企业名称" align="center" prop="scyName" :show-overflow-tooltip="true" v-if="uncheckList.scyName"/>
       <el-table-column label="社会统一代码" align="center" prop="scySocialCode" v-if="uncheckList.scySocialCode"/>
-      <el-table-column label="联系人" align="center" prop="scyLegal" v-if="uncheckList.scyLegal" />
-      <el-table-column label="联系电话" align="center" prop="scyPhone" v-if="uncheckList.scyPhone"/>
+      <el-table-column label="联系人" align="center" prop="nickName" v-if="uncheckList.nickName" />
+      <el-table-column label="联系电话" align="center" prop="userName" v-if="uncheckList.userName"/>
       <el-table-column label="状态" align="center" prop="scyStatus" :formatter="scyStatusFormat" v-if="uncheckList.scyStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -155,11 +154,11 @@
         <el-form-item label="企业统一代码" prop="scySocialCode">
           <el-input v-model="form.scySocialCode" placeholder="请输入企业统一代码" maxlength="18" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人" prop="scyLegal">
-          <el-input v-model="form.scyLegal" placeholder="请输入联系人" maxlength="5" show-word-limit/>
+        <el-form-item label="联系人" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入联系人" maxlength="5" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人手机号" prop="scyPhone">
-          <el-input v-model="form.scyPhone" placeholder="请输入联系人手机号" maxlength="11" show-word-limit/>
+        <el-form-item label="联系人手机号" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入手机号" maxlength="11" show-word-limit :disabled="phoneShow"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -172,16 +171,16 @@
     <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px" :inline="true">
         <el-form-item label="企业名称" prop="scyName" >
-          <el-input v-model="form.scyName" placeholder="请输入企业名称" disabled style="width:560px" maxlength="20" show-word-limit/>
+          <el-input v-model="form.scyName" disabled style="width:560px" maxlength="20" show-word-limit/>
         </el-form-item>
         <el-form-item label="企业统一代码" prop="scySocialCode">
-          <el-input v-model="form.scySocialCode" placeholder="请输入企业统一代码" disabled maxlength="18" show-word-limit/>
+          <el-input v-model="form.scySocialCode" disabled maxlength="18" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人" prop="scyLegal">
-          <el-input v-model="form.scyLegal" placeholder="请输入联系人" disabled maxlength="5" show-word-limit/>
+        <el-form-item label="联系人" prop="nickName">
+          <el-input v-model="form.nickName" disabled maxlength="5" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人手机号" prop="scyPhone">
-          <el-input v-model="form.scyPhone" placeholder="请输入联系人手机号" disabled maxlength="11" show-word-limit/>
+        <el-form-item label="联系人手机号" prop="userName">
+          <el-input v-model="form.userName" disabled maxlength="11" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -211,6 +210,7 @@ export default {
       //四要素审核相关
       examTitle:'',
       examOpen:false,
+      phoneShow:false,
       examForm:{
         scyId:null,
         state:null
@@ -245,8 +245,8 @@ export default {
         pageSize: 10,
         scyName: null,
         scySocialCode: null,
-        scyLegal : null,
-        scyPhone : null,
+        nickName : null,
+        userName : null,
         scyStatus : null,
         scyType : '01'//核心企业
       },
@@ -265,11 +265,11 @@ export default {
               value: '社会统一代码'
             },
             {
-              label: 'scyLegal',
+              label: 'nickName',
               value: '联系人'
             },
             {
-              label: 'scyPhone',
+              label: 'userName',
               value: '联系电话'
             },
             {
@@ -287,11 +287,21 @@ export default {
       rules: {
         scyName: [
           { required: true, message: "公司名称不能为空", trigger: "blur" },
+          {
+            pattern: /^[\u2E80-\u9FFF]|\w|[,,\.。]+$/,
+            message: "公司名称不能含有特殊字符",
+            trigger: "blur",
+          }
         ],
-        scyLegal: [
+        nickName: [
           { required: true, message: "联系人不能为空", trigger: "blur" },
+          {
+            pattern: /^[\u2E80-\u9FFF]|\w|[,,\.。]+$/,
+            message: "联系人不能含有特殊字符",
+            trigger: "blur",
+          }
         ],
-        scyPhone: [
+        userName: [
           { required: true, message: "联系人手机号不能为空", trigger: "blur" },
           {
             pattern: /^((\d{3}-\d{7,8}|\d{4}-\d{7,8})|(1[3465789]\d{9}))$/,
@@ -396,11 +406,13 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.phoneShow = false,
       this.title = "新增企业信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.phoneShow = true;
       let scyId = row.scyId || this.ids
       companyQuery(scyId).then(response => {
         this.form = response.data[0];

+ 20 - 84
front-vue/src/views/service/company/supCompanyManage.vue

@@ -30,9 +30,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系人" prop="scyLegal">
+      <el-form-item label="联系人" prop="nickName">
         <el-input
-          v-model="queryParams.scyLegal"
+          v-model="queryParams.nickName"
           maxlength="30"
           placeholder="请输入联系人"
           clearable
@@ -40,9 +40,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="联系电话" prop="scyPhone">
+      <el-form-item label="联系电话" prop="userName">
         <el-input
-          v-model="queryParams.scyPhone"
+          v-model="queryParams.userName"
           maxlength="11"
           placeholder="请输入联系电话"
           clearable
@@ -75,8 +75,8 @@
       </el-table-column>
       <el-table-column label="企业名称" align="center" prop="scyName" :show-overflow-tooltip="true" v-if="uncheckList.scyName"/>
       <el-table-column label="社会统一代码" align="center" prop="scySocialCode" v-if="uncheckList.scySocialCode"/>
-      <el-table-column label="联系人" align="center" prop="scyLegal" v-if="uncheckList.scyLegal" />
-      <el-table-column label="联系电话" align="center" prop="scyPhone" v-if="uncheckList.scyPhone"/>
+      <el-table-column label="联系人" align="center" prop="nickName" v-if="uncheckList.nickName" />
+      <el-table-column label="联系电话" align="center" prop="userName" v-if="uncheckList.userName"/>
       <el-table-column label="状态" align="center" prop="scyStatus" :formatter="scyStatusFormat" v-if="uncheckList.scyStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -144,11 +144,11 @@
         <el-form-item label="企业统一代码" prop="scySocialCode">
           <el-input v-model="form.scySocialCode" placeholder="请输入企业统一代码" maxlength="18" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人" prop="scyLegal">
-          <el-input v-model="form.scyLegal" placeholder="请输入联系人" maxlength="5" show-word-limit/>
+        <el-form-item label="联系人" prop="nickMame">
+          <el-input v-model="form.nickMame" placeholder="请输入联系人" maxlength="5" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人手机号" prop="scyPhone">
-          <el-input v-model="form.scyPhone" placeholder="请输入联系人手机号" maxlength="11" show-word-limit/>
+        <el-form-item label="联系人手机号" prop="userName">
+          <el-input v-model="form.userName" disabled maxlength="11" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -161,16 +161,16 @@
     <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px" :inline="true">
         <el-form-item label="企业名称" prop="scyName" >
-          <el-input v-model="form.scyName" placeholder="请输入企业名称" disabled style="width:560px" maxlength="20" show-word-limit/>
+          <el-input v-model="form.scyName" disabled style="width:560px" maxlength="20" show-word-limit/>
         </el-form-item>
         <el-form-item label="企业统一代码" prop="scySocialCode">
-          <el-input v-model="form.scySocialCode" placeholder="请输入企业统一代码" disabled maxlength="18" show-word-limit/>
+          <el-input v-model="form.scySocialCode" disabled maxlength="18" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人" prop="scyLegal">
-          <el-input v-model="form.scyLegal" placeholder="请输入联系人" disabled maxlength="5" show-word-limit/>
+        <el-form-item label="联系人" prop="nickName">
+          <el-input v-model="form.nickName" disabled maxlength="5" show-word-limit/>
         </el-form-item>
-        <el-form-item label="联系人手机号" prop="scyPhone">
-          <el-input v-model="form.scyPhone" placeholder="请输入联系人手机号" disabled maxlength="11" show-word-limit/>
+        <el-form-item label="联系人手机号" prop="userName">
+          <el-input v-model="form.userName" disabled maxlength="11" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -246,8 +246,8 @@ export default {
         pageSize: 10,
         scyName: null,
         scySocialCode: null,
-        scyLegal : null,
-        scyPhone : null,
+        nickName : null,
+        userName : null,
         scyStatus : null,
         scyType : '02'//供应商
       },
@@ -266,11 +266,11 @@ export default {
               value: '社会统一代码'
             },
             {
-              label: 'scyLegal',
+              label: 'nickName',
               value: '联系人'
             },
             {
-              label: 'scyPhone',
+              label: 'userName',
               value: '联系电话'
             },
             {
@@ -387,29 +387,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.scyId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增企业信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      let scyId = row.scyId || this.ids
-      companyQuery(scyId).then(response => {
-        this.form = response.data[0];
-        this.open = true;
-        this.title = "修改企业信息";
-      });
-    },
-
     /* 企业详情 */
     handleDetail(row) {
       this.reset();
@@ -428,47 +405,6 @@ export default {
       });
       }
     },
-
-    /** 提交按钮 */
-    submitForm() {
-        var self = this;
-        this.$refs["form"].validate(valid => {
-          let fd = new FormData();
-          for(var key in self.form){
-            fd.append(key, self.form[key]);
-          }
-          if (valid) {
-            if (this.form.scyId != null) {
-              const loading = this.$loading({
-                lock: true,
-                text: "Loading",
-                spinner: "el-icon-loading",
-                background: "rgba(0, 0, 0, 0.7)",
-              })
-              updateCompany(self.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-              loading.close();
-            } else {
-              const loading = this.$loading({
-                lock: true,
-                text: "Loading",
-                spinner: "el-icon-loading",
-                background: "rgba(0, 0, 0, 0.7)",
-              })
-              addCompany(self.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-              loading.close();
-            }
-          }
-        });
-    },
-
     /* 冻结 */
     handleCompanyFrozen(row) {
       const scyId = row.scyId || this.ids;