[update] 企业管理变更

src/utils/util.js

@@ -596,7 +596,7 @@ export function isRepeat(arr) {
 
 export function addZero(e) {
   // (e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}
-  console.log(e.target.value)
+  // console.log(e.target.value)
   // 判断是否包含 .
   let value = e.target.value
   // 判断是否包含小数点

src/views/businessManagement/BusinessManagement.vue

@@ -120,6 +120,11 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'companyPhone'
+        },{
+          title: '状态',
+          align: 'center',
+          width: 100,
+          dataIndex: 'status'
         }, {
           title: '创建时间',
           align: 'center',

src/views/businessManagement/modules/BusinessManagementModule.vue

@@ -19,6 +19,16 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="信用代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入信用代码"
+                       v-decorator="['dutyCode', validatorRules.dutyCode]"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="公司地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入公司地址"
@@ -27,8 +37,6 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="公司电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入公司电话"
@@ -37,6 +45,8 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
               <a-input placeholder="请输入邮政编码"
@@ -46,8 +56,6 @@
               <a class="search-postcode" href="https://www.youbianku.com" target="_blank">查询邮编</a>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="银行户名" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入银行户名"
@@ -56,6 +64,8 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入开户行"
@@ -64,8 +74,6 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="银行账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入银行账号"
@@ -74,14 +82,6 @@
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="税号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入税号"
-                       v-decorator="['dutyCode', validatorRules.dutyCode]"
-                       :maxLength='50'
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row>
           <a-col>
@@ -213,8 +213,8 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           that.confirmLoading = true
-          values.dataSource = this.dataForm
-          values.signingUp = this.applyAdd
+          // values.dataSource = this.dataForm
+          // values.signingUp = this.applyAdd
           let httpurl = ''
           let method = 'post'
           if (!this.model.id) {
@@ -293,21 +293,31 @@ export default {
       callback('请输入银行账号')
     },
     /**
-     * 校验税号
+     * 校验信用代码唯一性
      * @param rules
      * @param value
      * @param callback
      */
     checkDutyCode(rules, value, callback) {
       if (value) {
-        if (taxNo(value)) {
-          callback()
-        } else {
-          callback('请输入15位、17位、18位、20位数字和大写英文字母')
+        if (!this.model.id) {
+          const params = {
+            confusionCode: 'pay_company_duty_code',
+            fieldVal: value
+          }
+          duplicateCheck(params).then(res => {
+            if (res.success) {
+              callback()
+            } else {
+              callback('信用代码已存在')
+            }
+          })
+          return
         }
-        return
+        callback()
+      } else {
+        callback('请输入信用代码')
       }
-      callback('请输入税号')
     },
     /**
      * 企业名称唯一性校验

src/views/packManagement/modules/BatchIncomePaymentModule.vue

@@ -200,7 +200,6 @@ export default {
     },
     open() {
       this.dataSource = this.tableData
-      console.log(this.dataSource)
       this.loadData()
     },
     close() {
@@ -262,7 +261,6 @@ export default {
           }
         }
       })
-      console.log(this.dataSource)
     }
     ,
     /**

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue

@@ -70,7 +70,7 @@
                 <a @click="goDetail(record.id)">详情</a>
           </span>
 
-          <template slot="footer" slot-scope="currentPageData">
+          <template slot="footer">
 
             <a-table
               size="middle"