From e9e795a8b729808a891d3c6a6b016f0968c1a9b0 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 27 Aug 2021 10:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessManagement/BusinessManagement.vue | 20 -------
 .../businessManagement/ContactManagement.vue  | 18 +-----
 .../modules/BusinessManagementModule.vue      | 58 +++++++++++++++++--
 .../modules/ContactManagementModule.vue       |  4 +-
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue
index 31e2078..2e754da 100644
--- a/src/views/businessManagement/BusinessManagement.vue
+++ b/src/views/businessManagement/BusinessManagement.vue
@@ -47,26 +47,6 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange"
           class="j-table-force-nowrap">
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img
-              v-else
-              :src="getImgView(text)"
-              height="25px"
-              alt=""
-              style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <j-ellipsis
-              @click.native="uploadFile(record.chargeNoticeFileId)"
-              style="color:#219AFF;cursor: pointer"
-              :value="text"
-              :length="20"/>
-        </template>
 
         <template slot="text" slot-scope="text,record">
           <j-ellipsis :value="text" :length="20"></j-ellipsis>
diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue
index afbc4c4..d80d20f 100644
--- a/src/views/businessManagement/ContactManagement.vue
+++ b/src/views/businessManagement/ContactManagement.vue
@@ -57,22 +57,6 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange"
           class="j-table-force-nowrap">
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <j-ellipsis
-              @click.native="uploadFile(record.chargeNoticeFileId)"
-              style="color:#219AFF;cursor: pointer"
-              :value="text"
-              :length="20"/>
-        </template>
 
         <template slot="sex" slot-scope="text, record">
           <div>{{ text === 1 ? '男' : text === 2 ? '女' : '' }}</div>
@@ -121,7 +105,7 @@ export default {
         deleteBatch: '/company/payContactsManagement/deleteBatch',
         exportXlsUrl: '/company/payContactsManagement/exportXls',
         importExcelUrl: '/company/payContactsManagement/importExcel',
-        downTemplateUrl: ''
+        downTemplateUrl: '/company/payContactsManagement/downloadExcelModel'
       },
       columns: [
         {
diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue
index 17ae876..ea57866 100644
--- a/src/views/businessManagement/modules/BusinessManagementModule.vue
+++ b/src/views/businessManagement/modules/BusinessManagementModule.vue
@@ -32,7 +32,7 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="公司电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入公司电话"
-                       v-decorator="['companyPhone',validatorRules.companyPhone]"
+                       v-decorator="['companyPhone', validatorRules.companyPhone]"
                        :maxLength='15'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
@@ -40,7 +40,7 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
               <a-input placeholder="请输入邮政编码"
-                       v-decorator="['postalCode',validatorRules.postalCode]"
+                       v-decorator="['postalCode', validatorRules.postalCode]"
                        :maxLength='50'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
               <a class="search-postcode" href="https://www.youbianku.com" target="_blank">查询邮编</a>
@@ -69,7 +69,7 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="银行账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入银行账号"
-                       v-decorator="['bankAccount']"
+                       v-decorator="['bankAccount', validatorRules.bankAccount]"
                        :maxLength='50'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
@@ -77,7 +77,7 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入税号"
-                       v-decorator="['dutyCode']"
+                       v-decorator="['dutyCode', validatorRules.dutyCode]"
                        :maxLength='50'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
@@ -101,13 +101,25 @@
 </template>
 
 <script>
-import { postcode, phoneReg, isPhone } from '@/utils/validate'
+import { postcode, phoneReg, isPhone, taxNo, number } from '@/utils/validate'
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
 import { duplicateCheck } from '@api/api'
 
 export default {
   name: 'BusinessMangementModule',
+  props: {
+    // 数据来源，用于给后端接口传值，1--管理端，2--报名
+    dataForm: {
+      type: Number,
+      required: false,
+      default: 1
+    },
+    // 报名新增，用于给后端接口传值，1--管理端，2--报名
+    applyAdd: {
+
+    }
+  },
   data() {
     return {
       title: '操作',
@@ -142,6 +154,12 @@ export default {
         },
         postalCode: {
           rules: [{ required: false, validator: this.checkPostcode }]
+        },
+        bankAccount: {
+          rules: [{ validator: this.checkBankAccount }]
+        },
+        dutyCode: {
+          rules: [{ validator: this.checkDutyCode }]
         }
       },
       url: {
@@ -231,6 +249,36 @@ export default {
       }
       callback()
     },
+    /**
+     * 限制银行账号只能输入数字
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkBankAccount(rules, value, callback) {
+      if (value) {
+        if (number(value)) {
+          callback()
+        } else {
+          callback('请输入数字')
+        }
+      }
+    },
+    /**
+     * 校验税号
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkDutyCode(rules, value, callback) {
+      if (value) {
+        if (taxNo(value)) {
+          callback()
+        } else {
+          callback('请输入15位、17位、18位、20位数字和大写英文字母')
+        }
+      }
+    },
     /**
      * 企业名称唯一性校验
      * @param rules
diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue
index 4f191e2..3afd37f 100644
--- a/src/views/businessManagement/modules/ContactManagementModule.vue
+++ b/src/views/businessManagement/modules/ContactManagementModule.vue
@@ -220,13 +220,11 @@ export default {
           values.companyId = values.company.id
           values.gender = Number(values.gender)
           let httpurl = ''
-          let method = ''
+          let method = 'post'
           if (!this.model.id) {
             httpurl += this.url.add
-            method = 'post'
           } else {
             httpurl += this.url.edit
-            method = 'put'
           }
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)