Merge branch 'feature/v4.9.21' into dev/v4.9.21_rjj

src/web/templates/pc/check_invoice.html

@@ -125,7 +125,7 @@
               <button class="btn btn-confirm" id="ing" disabled v-if="selectinvoice.invoice_status == 0 || selectinvoice.invoice_status == 2">开票中</button>
               <button class="btn btn-confirm" @click="lookInvoice" id="look_invoice" v-if="selectinvoice.invoice_status == 1">查看发票</button>
               <button class="btn btn-cancel" @click="againInvoice('replace')" id="again_invoice" v-if="selectinvoice.invoice_status == 1 && !selectinvoice.changed">换开申请</button>
-              <button class="btn btn-confirm" @click="againInvoice('again')" v-if="selectinvoice.invoice_status == -1">再次开票</button>
+              <button class="btn btn-confirm" @click="againInvoice('again')" v-if="selectinvoice.invoice_status == -1 && !selectinvoice.isReopen">再次开票</button>
               <button class="btn btn-confirm" @click="concatKf" v-if="selectinvoice.isReopen">联系客服</button>
               <p v-if="selectinvoice.invoice_status == 0 || selectinvoice.invoice_status == 2" style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票将在3个工作日内由平台开具并发送至您的邮箱，请注意查收。</p>
               <p v-if="selectinvoice.invoice_status == 1" style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票已由平台开具并发送至您的邮箱，请注意查收。</p>

src/web/templates/pc/invoice.html

@@ -111,13 +111,13 @@
                     <el-form-item style="min-height: 36px;height: auto;" label="单位地址：" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入单位地址', trigger: 'blur' }]" prop="company_address">
                       <el-input ref="company_address" :style="{height: addressHeight + 'px'}" type="textarea" :rows="1" placeholder="请输入单位地址" v-model="ruleForm.company_address"></el-input>
                     </el-form-item>
-                    <el-form-item label="电话号码：" prop="company_phone" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入电话号码', trigger: 'blur' }, { validator: ruleForm.invoice_variety == '电子专用发票' ? validateTelPhone : '', trigger: 'blur' }]">
+                    <el-form-item label="电话号码：" prop="company_phone" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入电话号码', trigger: 'blur' }, { validator: validateTelPhone, trigger: 'blur' }]">
                       <el-input placeholder="请输入电话号码" v-model="ruleForm.company_phone"></el-input>
                     </el-form-item>
                     <el-form-item label="开户银行：" prop="bank_name" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入开户银行', trigger: 'blur' }]">
                       <el-input placeholder="请输入开户银行" v-model="ruleForm.bank_name"></el-input>
                     </el-form-item>
-                    <el-form-item label="银行账号：" prop="bank_account" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入银行账号', trigger: 'blur' }, { validator: ruleForm.invoice_variety == '电子专用发票' ? validateBankAccount : '', trigger: 'blur' }]">
+                    <el-form-item label="银行账号：" prop="bank_account" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入银行账号', trigger: 'blur' }, { validator: validateBankAccount, trigger: 'blur' }]">
                       <el-input placeholder="请输入银行账号" v-model="ruleForm.bank_account"></el-input>
                     </el-form-item>
                     <el-form-item style="min-height: 36px;height: auto;" class="invoice_desc" label="开票备注：">
@@ -258,22 +258,6 @@
                 taxpayer_identnum: [
                   { required: true, message: '请输入纳税人识别号', trigger: 'blur' },
                   { validator: this.validateCode, trigger: 'blur' }
-
-                ],
-                company_address: [
-                  { required: true, message: '请输入单位地址', trigger: 'blur' },
-                  { validator: this.validateAddress, trigger: 'blur' }
-                ],
-                company_phone: [
-                  { required: true, message: '请输入电话号码', trigger: 'blur' },
-                  { validator: this.validateTelPhone, trigger: 'blur' }
-                ],
-                bank_name: [
-                  { required: true, message: '请输入开户行', trigger: 'blur' }
-                ],
-                bank_account: [
-                  { required: true, message: '请输入银行账号', trigger: 'blur' },
-                  { validator: this.validateBankAccount, trigger: 'blur' }
                 ]
               },
               companyList: [],
@@ -416,18 +400,44 @@
             validateTelPhone: (rule, value, callback) => {
               const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
               const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
-              if (regPhone.test(value) || regTel.test(value)) {
-                return callback()
+              if(invoiceNode.ruleForm.invoice_variety === '电子专用发票') {
+                if (regPhone.test(value) || regTel.test(value)) {
+                  return callback()
+                } else {
+                  return callback(new Error('电话号码格式不正确'))
+                }
               } else {
-                return callback(new Error('电话号码格式不正确'))
+                // 电子普通发票，电话号码非必填，不输入不校验，输入需校验
+                if(!value) {
+                  return callback()
+                } else {
+                  if(regPhone.test(value) || regTel.test(value)) {
+                    return callback()
+                  } else {
+                    return callback(new Error('电话号码格式不正确'))
+                  }
+                }
               }
             },
             validateBankAccount: (rule, value, callback) => {
               const regAccount = /^\d+$/;
-              if (regAccount.test(value)) {
-                return callback()
+              if(invoiceNode.ruleForm.invoice_variety === '电子专用发票') {
+                if (regAccount.test(value)) {
+                  return callback()
+                } else {
+                  return callback(new Error('请输入正确的银行账号'))
+                }
               } else {
-                return callback(new Error('请输入正确的银行账号'))
+                // 电子普通发票，银行账号非必填，不输入不校验，输入需校验
+                if(!value) {
+                  return callback()
+                } else {
+                  if (regAccount.test(value)) {
+                    return callback()
+                  } else {
+                    return callback(new Error('请输入正确的银行账号'))
+                  }
+                }
               }
             },
             validateMail: (rule, value, callback) => {
@@ -454,11 +464,6 @@
                 }
               }
             },
-            validateAddress: (rule, value, callback) => {
-              if (value.trim().length > 0) {
-                return callback()
-              }
-            },
             setHighLight(item) {
               const keyword = utils.replaceKeyword(item.name, this.ruleForm.company_name, '<span class="highlight-text">' + this.ruleForm.company_name + '</span>')
               return keyword