Merge branch 'feature/v4.9.21' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.9.21_wmh

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -477,11 +477,11 @@ func (this *Invoice) ShowinvoiceList() {
 			//}
 			isReopen := timeLimit
 			//var isReopen bool
-			if data["invoice_status"] == -1 && !isReopen {
+			if qutil.IntAll(data["invoice_status"]) == -1 && !isReopen {
 				isReopen = util.Mysql.Count("invoice_fail_record", map[string]interface{}{
 					"only_Identifying": data["only_Identifying"],
 					"order_code":       order_code,
-				})+1 >= config.InvoiceConfig.SubmitNum
+				}) >= config.InvoiceConfig.SubmitNum
 			}
 			data["only_Identifying"] = encrypt.SE.EncodeString(qutil.InterfaceToStr(data["only_Identifying"]))
 			data["isReopen"] = isReopen
@@ -1548,14 +1548,14 @@ func OpenInvoiceAgain(oldOnlyIdentifying string, data map[string]interface{}) er
 	if oldOnlyIdentifying == "" {
 		return errors.New("缺少关键参数")
 	}
+	if util.Mysql.Count("invoice_fail_record", map[string]interface{}{"only_Identifying": oldOnlyIdentifying}) >= config.InvoiceConfig.SubmitNum {
+		return errors.New("提交次数已达上限")
+	}
 	ok := InvoiceFailRecord(oldOnlyIdentifying)
 	if !ok {
 		return errors.New("插入失败记录出错")
 	}
-	if util.Mysql.Count("invoice_fail_record", map[string]interface{}{"only_Identifying": oldOnlyIdentifying}) >= config.InvoiceConfig.SubmitNum {
-		return errors.New("提交次数已达上限")
-	}
-	if !util.Mysql.Update("invoice", map[string]interface{}{"only_Identifying": oldOnlyIdentifying}, data) {
+	if !util.Mysql.Update("invoice", map[string]interface{}{"only_Identifying": oldOnlyIdentifying, "invoice_status": -1}, data) {
 		return errors.New("再次开票更新发票信息出错")
 	}
 	return nil

src/web/staticres/electronic_invoice/css/check_invoice.css

@@ -82,6 +82,7 @@
   height: 40px;
   min-width: 1200px;
   max-width: 100%;
+  transition: left 0.5s ease-in-out;
 }
 #check_invoice .invoice_status .invoice_status_item{
   flex: none;

src/web/templates/pc/aiPack_orderDetail.html

@@ -222,18 +222,14 @@
                             $(".pay_num").text(r.data.prepay_id);
                             $(".pay_num_p").css("display", "");
                         }
-                        if (source===""){
-                            if (r.data.is_backstage_order!==1){
-                                //发票
-                                if (r.data.is_can_invoice) {
-                                    $(".openinvoice").css("display", "");
-                                }
-                                if (r.data.invoice_show) {
-                                    $(".lookinvoice").css("display", "").on("click", function () {
-                                        checkinvoice(r.data.applybill_status, orderCode)
-                                    })
-                                }
-                            }
+                        //发票
+                        if (r.data.is_can_invoice) {
+                            $(".openinvoice").css("display", "");
+                        }
+                        if (r.data.invoice_show) {
+                            $(".lookinvoice").css("display", "").on("click", function () {
+                                checkinvoice(r.data.applybill_status, orderCode)
+                            })
                         }
                     }
                     if (r.data.order_status === -2) {

src/web/templates/pc/check_invoice.html

@@ -53,7 +53,7 @@
             <a href="javascript:;" class="active">查看发票</a>
         </div>
         <div class="w invoice_status" v-if="invoiceData.length > 1">
-          <div class="white_shadow left_shadow" @click="clickArrow('left')" v-if="invoiceData.length > 6 && leftBtn">
+          <div class="white_shadow left_shadow" @click="clickArrow('left')" v-if="leftBtn">
             <div class="el-iconfont">
               <i class="el-icon-arrow-left"></i>
             </div>
@@ -67,7 +67,7 @@
               </div>
             </div>
           </div>
-          <div class="white_shadow right_shadow" @click="clickArrow('right')" v-if="invoiceData.length > 6 && rightBtn">
+          <div class="white_shadow right_shadow" @click="clickArrow('right')" v-if="showRightBtn && rightBtn">
             <div class="el-iconfont">
               <i class="el-icon-arrow-right"></i>
             </div>
@@ -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>
@@ -444,7 +444,8 @@
             loading: true,
             leftBtn: false,
             rightBtn: true,
-            invoice_text: ''
+            invoice_text: '',
+            showRightBtn: false
           }
         },
         created() {
@@ -452,6 +453,20 @@
         },
         mounted() {
           $('#check_invoice').show()
+          this.$nextTick(() => {
+            const checkInvoiceDisplay = () => {
+              let canhandleNum = 0
+              const itemAllWidth = $('.invoice_status_item').map(function() {
+                return $(this).outerWidth() + 12;
+              }).get();
+              this.showRightBtn = itemAllWidth.reduce((sum, width) => sum + width, 0) - 1200 > 0;
+              if (itemAllWidth.length === 0 && canhandleNum < 10) {
+                canhandleNum++
+                setTimeout(checkInvoiceDisplay, 50)
+              }
+            }
+            checkInvoiceDisplay()
+          })
         },
         methods: {
           // 联系客服
@@ -520,7 +535,6 @@
           clickArrow(data) {
             var invoiceStatusList = $('.invoice_status_list');
             var invoiceStatusListWidth = invoiceStatusList.width();
-            var invoiceStatusItem = $('.invoice_status_item')
             var itemAllWidth = $('.invoice_status_item').map(function() {
               return $(this).outerWidth() + 12; // 获取包括内边距的宽度 + margin值
             }).get();

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

src/web/templates/pc/medaratus_orderDetail.html

@@ -293,16 +293,13 @@
                                 $(".pay_num").text(r.data.transaction_id);
                             }
                             //发票
-                            // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
-                            if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
-                                if (r.data.is_can_invoice) {
-                                    $(".openinvoice").css("display", "");
-                                } 
-                                if (r.data.invoice_show) {
-                                    $(".lookinvoice").css("display", "").on("click", function () {
-                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                                    })
-                                }
+                            if (r.data.is_can_invoice) {
+                                $(".openinvoice").css("display", "");
+                            } 
+                            if (r.data.invoice_show) {
+                                $(".lookinvoice").css("display", "").on("click", function () {
+                                    checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                                })
                             }
                         }
                     }

src/web/templates/pc/member_orderDetail.html

@@ -340,10 +340,6 @@
                                 $(".pay_way_p").css("display", "");
 
                                 $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                                $(".openinvoice").css({
-                                    'background': '#EDEFF2',
-                                    'color': '#5F5E64'
-                                })
                             }
                         }
 
@@ -352,22 +348,18 @@
                           $(".pay_num").text(r.data.prepay_id);
                            $(".pay_num_p").show();
                         }
-                        if (source===""){
-                            if(r.data.is_backstage_order!==1){ //发票
-                                if (r.data.is_can_invoice) {
-                                    $(".openinvoice").css("display", "").on("click", function () {
-                                        // return false // 待可开发票时删除
-                                        window.open("/front/order/invoice/" + orderCode, '_self');
-                                    });
-                                }
-                                if (r.data.invoice_show) {
-                                    $(".lookinvoice").css("display", "").on("click", function () {
-                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                                    })
-                                }
-                            }
-
-                        }else{
+                        if (r.data.is_can_invoice) {
+                            $(".openinvoice").css("display", "").on("click", function () {
+                                // return false // 待可开发票时删除
+                                window.open("/front/order/invoice/" + orderCode, '_self');
+                            });
+                        }
+                        if (r.data.invoice_show) {
+                            $(".lookinvoice").css("display", "").on("click", function () {
+                                checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                            })
+                        }
+                        if(source){
                           // 自定义大会员展示服务列表
                           var buchongbaoHtml = '';
                           var serversName = filterObj.serversName;

src/web/templates/pc/myOrder.html

@@ -1383,8 +1383,6 @@
                 location.href = href
               }
               return
-            } else if (item.product_type === '大会员' && item.pay_way === 'transferAccounts') {
-              this.goShowTipForInvoice('请联系客服开票<br>客服热线：400-108-6670')
             } else {
               window.open("/front/order/invoice/" + item.order_code);
             }

src/web/templates/pc/subAccount_orderDetail.html

@@ -214,18 +214,13 @@
 
                         if (r.data.prepay_id) $(".pay_num").text(r.data.prepay_id);
 
-                        if (source===""){
-                          //发票
-                            if (r.data.is_backstage_order!==1){
-                                if (r.data.is_can_invoice) {
-                                    $(".openinvoice").css("display", "");
-                                }
-                                if (r.data.invoice_show) {
-                                    $(".lookinvoice").css("display", "").on("click", function () {
-                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                                    })
-                                }
-                            }
+                        if (r.data.is_can_invoice) {
+                            $(".openinvoice").css("display", "");
+                        }
+                        if (r.data.invoice_show) {
+                            $(".lookinvoice").css("display", "").on("click", function () {
+                                checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                            })
                         }
                     }
                     if (r.data.order_status === -2) {

src/web/templates/pc/vip_orderDetail.html

@@ -300,16 +300,13 @@
                                 $(".pay_num").text(r.data.transaction_id);
                             }
                             //发票
-                            // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
-                            if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
-                                if (r.data.order.is_can_invoice) {
-                                    $(".openinvoice").css("display", "");
-                                }
-                                if (r.data.invoice_show) {
-                                    $(".lookinvoice").css("display", "").on("click", function () {
-                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                                    })
-                                }
+                            if (r.data.order.is_can_invoice) {
+                                $(".openinvoice").css("display", "");
+                            }
+                            if (r.data.invoice_show) {
+                                $(".lookinvoice").css("display", "").on("click", function () {
+                                    checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                                })
                             }
                         }
                     }