瀏覽代碼

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

wenmenghao321 1 年之前
父節點
當前提交
9c1e5d1d98
共有 27 個文件被更改,包括 348 次插入318 次删除
  1. 10 9
      src/jfw/front/dataExport.go
  2. 1 1
      src/jfw/modules/subscribepay/src/entity/equityActive.go
  3. 1 0
      src/jfw/modules/subscribepay/src/filter/sessionfilter.go
  4. 1 1
      src/jfw/modules/subscribepay/src/invoice.json
  5. 1 1
      src/jfw/modules/subscribepay/src/mailtemplate.html
  6. 94 69
      src/jfw/modules/subscribepay/src/service/invoice.go
  7. 8 8
      src/jfw/modules/subscribepay/src/service/orderListDetails.go
  8. 1 1
      src/jfw/modules/subscribepay/src/service/salesCreateOrder.go
  9. 6 4
      src/web/staticres/electronic_invoice/css/check_invoice.css
  10. 2 1
      src/web/templates/areaPack/pc/page_order.html
  11. 10 9
      src/web/templates/frontRouter/pc/dataFile/sess/orderDetail.html
  12. 10 9
      src/web/templates/order/pc/bidfile/bidfileDetail.html
  13. 10 9
      src/web/templates/order/pc/buyerPortraitPack/detail.html
  14. 10 9
      src/web/templates/order/pc/datareport/detail.html
  15. 10 9
      src/web/templates/order/pc/filePack/detail.html
  16. 10 9
      src/web/templates/order/pc/integral/integralDetail.html
  17. 10 9
      src/web/templates/pc/aiPack_orderDetail.html
  18. 20 17
      src/web/templates/pc/check_invoice.html
  19. 10 9
      src/web/templates/pc/dataPack/packDetail.html
  20. 10 9
      src/web/templates/pc/entniche_orderDetail.html
  21. 57 76
      src/web/templates/pc/invoice.html
  22. 10 9
      src/web/templates/pc/medaratus_orderDetail.html
  23. 11 10
      src/web/templates/pc/member_orderDetail.html
  24. 12 11
      src/web/templates/pc/myOrder.html
  25. 3 1
      src/web/templates/pc/orderDetail.html
  26. 10 9
      src/web/templates/pc/subAccount_orderDetail.html
  27. 10 9
      src/web/templates/pc/vip_orderDetail.html

+ 10 - 9
src/jfw/front/dataExport.go

@@ -351,13 +351,14 @@ func IsAllowInvoice(res map[string]interface{}) bool {
 	filter := util.ObjToString(res["filter"].(string))
 	filter_map := map[string]interface{}{}
 	_ = json.Unmarshal([]byte(filter), &filter_map)
-	if util.IntAll(res["order_status"]) == 1 && util.InterfaceToStr(filter_map["badge"]) != "exchange" &&
-		//用户下单|| 代用户下单|| qmx下单 已全额回款 发票企业为剑鱼
-		(util.IntAll(res["is_backstage_order"]) == 0 || util.InterfaceToStr(res["order_channel"]) == "xdqd04" ||
-			(util.IntAll(res["return_status"]) == 1 && public.Mysql.Count("invoice", map[string]interface{}{
-				"order_code": res["order_code"],
-			}) == 0 && util.InterfaceToStr(res["signing_subject"]) == "北京剑鱼信息技术有限公司")) {
-		return true
+	if util.IntAll(res["order_status"]) == 1 && util.InterfaceToStr(filter_map["badge"]) != "exchange" {
+		//用户下单|| 代用户下单
+		if util.IntAll(res["is_backstage_order"]) == 0 || util.InterfaceToStr(res["order_channel"]) == "xdqd04" {
+			return len(ShowList(util.InterfaceToStr(res["order_code"]))) == 0
+		} else { //qmx下单 已全额回款 发票企业为剑鱼
+			return util.IntAll(res["return_status"]) == 1 && util.InterfaceToStr(res["signing_subject"]) == "h01" &&
+				len(ShowList(util.InterfaceToStr(res["order_code"]))) == 0
+		}
 	}
 	return false
 }
@@ -429,8 +430,8 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 		create_time_str := util.ObjToString(orderDetail["create_time"])
 		create_time, _ := time.ParseInLocation(Date_Full_Layout, create_time_str, time.Local)
 		if create_time.Unix() > 1704038400 {
-			//剩余可开票金额
-			isCanInvoic = IsAllowInvoice(orderDetail) && InvoicePrice(orderDetail) > 0
+			//可开票
+			isCanInvoic = IsAllowInvoice(orderDetail)
 		}
 		orderDetail["is_can_invoice"] = isCanInvoic
 		//是否存在可查看发票

+ 1 - 1
src/jfw/modules/subscribepay/src/entity/equityActive.go

@@ -331,7 +331,7 @@ func (e *EquityActive) SendPayRaffleMsg() {
 	prizeOrder := map[string]interface{}{
 		"active_id":   activityInfo.ActivityId,
 		"phone":       e.Phone,
-		"position_id": common.If(e.positionId>0,e.positionId,nil),
+		"position_id": common.If(e.positionId > 0, e.positionId, nil),
 		"mgo_user_id": e.mgoId,
 		"order_code":  e.OrderCode,
 		"create_time": date.NowFormat(date.Date_Full_Layout),

+ 1 - 0
src/jfw/modules/subscribepay/src/filter/sessionfilter.go

@@ -25,6 +25,7 @@ func (l *sessionfilter) Do() bool {
 		strings.HasPrefix(rqu, "/jypay/free/") || //销售代创建订单
 		strings.HasPrefix(rqu, "/jypay/invoice/submit") || //发票信息提交
 		strings.HasPrefix(rqu, "/jypay/invoice/query") || //发票信息查询
+		strings.HasPrefix(rqu, "/jypay/invoice/newReplace") || //扫码换票
 		rqu == "/jypay/wx/getwxSdkSign" ||
 		rqu == "/jypay/user/company/association" || rqu == "/jypay/getDomain" { //微信js调用参数
 		return true

+ 1 - 1
src/jfw/modules/subscribepay/src/invoice.json

@@ -12,7 +12,7 @@
   "invoice_switch": true,
   "red_invoice_switch": true,
   "red_invoice_msg": "由于系统升级,线上换开发票功能暂时维护阶段,如需换开请直接联系在线客服!",
-  "third_party_switch": false,
+  "third_party_switch": true,
   "order_createtime": 1704038400,
   "submit_num": 3,
   "signing_Subject":"北京剑鱼信息技术有限公司",

+ 1 - 1
src/jfw/modules/subscribepay/src/mailtemplate.html

@@ -54,6 +54,6 @@
             </p>
             <p class="item">
                 <span class="label">发票内容:</span>
-                <span class="value">信息技术服务-技术服务费</span>
+                <span class="value">%s</span>
             </p>
             %s

+ 94 - 69
src/jfw/modules/subscribepay/src/service/invoice.go

@@ -457,7 +457,7 @@ func (this *Invoice) ShowinvoiceList() {
 		for _, data := range invoices {
 			//是否换过票
 			isChanged := qutil.IntAll(data["isChanged"]) > 1
-			if isChanged && data["invoice_changed"] == 0 { //换过票的 只展示换票后的数据
+			if isChanged && qutil.IntAll(data["invoice_changed"]) == 0 { //换过票的 只展示换票后的数据
 				continue
 			}
 			delete(data, "user_id")
@@ -483,6 +483,7 @@ func (this *Invoice) ShowinvoiceList() {
 					"order_code":       order_code,
 				})+1 >= config.InvoiceConfig.SubmitNum
 			}
+			data["only_Identifying"] = encrypt.SE.EncodeString(qutil.InterfaceToStr(data["only_Identifying"]))
 			data["isReopen"] = isReopen
 			invoiceData = append(invoiceData, data)
 		}
@@ -525,9 +526,10 @@ func (this *Invoice) NewInvoiceShow() {
 	case "1": //订单回显金额
 		data["pay_money"] = ResidueMoney(code)
 	case "2": //发票信息回显
-		invoice := util.Mysql.FindOne("invoice", map[string]interface{}{"id": encrypt.SE.Decode4Hex(code)}, "id,only_Identifying,order_code,invoice_money,invoice_type,invoice_content,invoice_variety,company_name,phone,mail,taxpayer_identnum,invoice_money,invoice_order_money,company_address,bank_name,recipient,delivery_address,bank_account,company_phone", "")
+		invoice := util.Mysql.FindOne("invoice", map[string]interface{}{"id": encrypt.SE.Decode4Hex(code)}, "id,only_Identifying,order_code,invoice_money,remark,invoice_type,invoice_content,invoice_variety,company_name,phone,mail,taxpayer_identnum,invoice_money,invoice_order_money,company_address,bank_name,recipient,delivery_address,bank_account,company_phone", "")
 		if invoice != nil {
 			(*invoice)["id"] = code
+			(*invoice)["only_Identifying"] = encrypt.SE.EncodeString(qutil.InterfaceToStr((*invoice)["only_Identifying"]))
 		}
 		data["invoice"] = invoice
 	}
@@ -1121,7 +1123,7 @@ func (this *Invoice) NewReplaceinvoice() {
 	//userId := qutil.ObjToString(this.GetSession("userId"))  支持扫描换票
 	//order_code := this.GetString("order_code")
 	sid := encrypt.SE.Decode4Hex(this.GetString("sid"))
-	oRes := util.Mysql.FindOne(dbname, map[string]interface{}{"id": sid, "invoice_changed": 0}, "", "") //仅线上开发票可换票
+	oRes := util.Mysql.FindOne(dbname, map[string]interface{}{"id": sid, "invoice_changed": 0, "invoice_status": 1}, "", "") //仅线上开发票可换票
 	if oRes != nil && len(*oRes) > 0 &&
 		((*oRes)["invoicing_entity"] == nil || qutil.InterfaceToStr((*oRes)["invoicing_entity"]) == config.InvoiceConfig.SigningSubject) {
 		var (
@@ -1130,19 +1132,16 @@ func (this *Invoice) NewReplaceinvoice() {
 			//saveData []map[string]interface{}
 			resArr []map[string]interface{}
 		)
-		if qutil.IntAll((*oRes)["invoice_status"]) == -2 {
-			this.ServeJson(map[string]interface{}{
-				"invoice_status": -2,
-			})
-			return
-		}
+		pCode := qutil.InterfaceToStr((*oRes)["order_code"])
+		//多订单联合开票
 		if invoice_order_code := qutil.InterfaceToStr((*oRes)["invoice_order_code"]); len(strings.Split(invoice_order_code, ",")) > 1 {
-			qSql = fmt.Sprintf(`SELECT * FROM invoice WHERE invoice_order_code = '%s' `, qutil.InterfaceToStr((*oRes)["invoice_order_code"]))
+			pCode = invoice_order_code
+			qSql = fmt.Sprintf(`SELECT * FROM invoice WHERE invoice_order_code = '%s' and invoice_changed = 0 and invoice_status = 1`, qutil.InterfaceToStr((*oRes)["invoice_order_code"]))
 			res1 := util.Mysql.SelectBySql(qSql)
 			if res1 != nil && len(*res1) > 0 {
 				resArr = *res1
 			}
-		} else { //多订单联合开票
+		} else {
 			resArr = append(resArr, *oRes)
 		}
 		var isMail bool
@@ -1159,55 +1158,65 @@ func (this *Invoice) NewReplaceinvoice() {
 			}) > 1 {
 				continue
 			}
-			res["phone"] = phone
-			res["mail"] = e_mail
-			res["invoice_content"] = invoiceContent
+
 			res["company_phone"] = this.GetString("company_phone")
-			res["taxpayer_identnum"] = id_num
 			res["operable_time"] = FormatDate(&tm, Date_Full_Layout)
-			res["remark"] = remark
-			res["invoice_variety"] = invoiceVariety
 			res["bank_account"] = this.GetString("bank_account")
 			res["company_address"] = this.GetString("company_address")
 			res["bank_name"] = this.GetString("bank_name")
 			res["recipient"] = this.GetString("recipient")
 			res["delivery_address"] = this.GetString("delivery_address")
-			res["company_name"] = company_name
-			res["invoice_type"] = invoice_type
 			data := res
 			delete(data, "id")
 			switch IsEdit(res, phone, e_mail, id_num, company_name, invoice_type, invoiceContent, remark, invoiceVariety) {
 			case true:
-				var html string
-				if invoice_type == "个人" {
-					emailHtml := emailHtml_gr
-					emailHtmls := fmt.Sprintf(emailHtml, phone, e_mail)
-					html = fmt.Sprintf(email_format, res["order_code"], res["url"], emailHtmls)
-				} else {
-					emailHtml := emailHtml_gs
-					emailHtmls := fmt.Sprintf(emailHtml, company_name, id_num, phone, e_mail)
-					html = fmt.Sprintf(email_format, res["order_code"], res["url"], emailHtmls)
-				}
+				data["phone"] = phone
+				data["mail"] = e_mail
+				data["invoice_content"] = invoiceContent
+				data["company_name"] = company_name
+				data["invoice_type"] = invoice_type
+				data["taxpayer_identnum"] = id_num
+				data["remark"] = remark
+				data["invoice_variety"] = invoiceVariety
+				//var html string
+				//if invoice_type == "个人" {
+				//	emailHtml := emailHtml_gr
+				//	emailHtmls := fmt.Sprintf(emailHtml, phone, e_mail)
+				//	html = fmt.Sprintf(email_format, data["order_code"], data["url"], emailHtmls)
+				//} else {
+				//	emailHtml := emailHtml_gs
+				//	emailHtmls := fmt.Sprintf(emailHtml, company_name, id_num, phone, e_mail)
+				//	html = fmt.Sprintf(email_format, data["order_code"], data["url"], emailHtmls)
+				//}
 				data["invoice_changed"] = 1
 				data["invoice_status"] = 1
 				data["billing_time"] = tm.Unix()
 				data["create_time"] = tm.Unix()
 				order_id := util.Mysql.Insert(dbname, data)
 				if order_id == -1 {
-					errCode = append(errCode, fmt.Sprintf("%s_%s", res["order_code"], res["invoice_order_code"]))
+					errCode = append(errCode, fmt.Sprintf("%s_%s", data["order_code"], data["invoice_order_code"]))
 				}
 				if !isMail { //成功发邮件
 					isMail = true
-					InvoiceSendMail(res["mail"].(string), html, "电子发票")
+					sendMail(invoice_type, pCode, company_name, id_num, e_mail, phone, qutil.InterfaceToStr(data["url"]), invoiceContent)
+					//InvoiceSendMail(data["mail"].(string), html, "电子发票")
 				}
 			case false:
-				if util.Mysql.Count(dbname, map[string]interface{}{
-					"order_code":       res["order_code"],
-					"user_id":          res["user_id"],
-					"only_Identifying": res["only_Identifying"],
-				}) > 1 {
-					continue
+				if !config.InvoiceConfig.Third_party_switch {
+					this.ServeJson(map[string]interface{}{
+						"error_code": -2,
+						"error_msg":  "暂不支持换票",
+					})
+					return
 				}
+				data["phone"] = phone
+				data["mail"] = e_mail
+				data["invoice_content"] = invoiceContent
+				data["company_name"] = company_name
+				data["invoice_type"] = invoice_type
+				data["taxpayer_identnum"] = id_num
+				data["remark"] = remark
+				data["invoice_variety"] = invoiceVariety
 				dataexport_data := make(map[string]interface{})
 				if invoice_type == "个人" {
 					dataexport_data["applyBill_type"] = 0
@@ -1230,20 +1239,20 @@ func (this *Invoice) NewReplaceinvoice() {
 				data["invoice_status"] = invoice_status
 				order_id := util.Mysql.Insert(dbname, data)
 				if order_id == -1 {
-					errCode = append(errCode, fmt.Sprintf("%s_%s", res["order_code"], res["invoice_order_code"]))
+					errCode = append(errCode, fmt.Sprintf("%s_%s", data["order_code"], data["invoice_order_code"]))
 				}
 			}
 		}
 		log.Println("换票错误信息:", errCode)
-		if !config.InvoiceConfig.Third_party_switch {
-			this.ServeJson(map[string]interface{}{
-				"invoice_status": invoice_status,
-			})
-			return
-		}
+		this.ServeJson(map[string]interface{}{
+			"error_code": 0,
+			"error_msg":  "",
+		})
+
 	} else {
 		this.ServeJson(map[string]interface{}{
-			"invoice_status": -1,
+			"error_code": -1,
+			"error_msg":  "订单状态异常",
 		})
 		return
 	}
@@ -1252,7 +1261,8 @@ func (this *Invoice) NewReplaceinvoice() {
 
 func IsEdit(res map[string]interface{}, phone, e_mail, id_num, company_name, invoice_type, invoiceContent, remark, invoiceVariety string) bool {
 	if invoice_type == "个人" {
-		if phone == res["phone"] && e_mail == res["mail"] && res["invoice_type"] == "个人" {
+		if phone == res["phone"] && e_mail == res["mail"] && res["invoice_type"] == "个人" &&
+			res["invoice_content"] == invoiceContent && res["remark"] == remark && res["invoice_variety"] == invoiceVariety {
 			return true
 		}
 	} else {
@@ -1382,13 +1392,14 @@ func IsAllowInvoice(res map[string]interface{}) bool {
 	filter := qutil.ObjToString(res["filter"].(string))
 	filter_map := map[string]interface{}{}
 	_ = json.Unmarshal([]byte(filter), &filter_map)
-	if qutil.IntAll(res["order_status"]) == 1 && qutil.InterfaceToStr(filter_map["badge"]) != "exchange" &&
-		//用户下单|| 代用户下单|| qmx下单 已全额回款 发票企业为剑鱼
-		(qutil.IntAll(res["is_backstage_order"]) == 0 || qutil.InterfaceToStr(res["order_channel"]) == "xdqd04" ||
-			(qutil.IntAll(res["return_status"]) == 1 && util.Mysql.Count("invoice", map[string]interface{}{
-				"order_code": res["order_code"],
-			}) == 0 && qutil.InterfaceToStr(res["signing_subject"]) == config.InvoiceConfig.SigningSubject)) {
-		return true
+	if qutil.IntAll(res["order_status"]) == 1 && qutil.InterfaceToStr(filter_map["badge"]) != "exchange" {
+		//用户下单|| 代用户下单
+		if qutil.IntAll(res["is_backstage_order"]) == 0 || qutil.InterfaceToStr(res["order_channel"]) == "xdqd04" {
+			return len(ShowList(qutil.InterfaceToStr(res["order_code"]))) == 0
+		} else { //qmx下单 已全额回款 发票企业为剑鱼
+			return qutil.IntAll(res["return_status"]) == 1 && qutil.InterfaceToStr(res["signing_subject"]) == "h01" &&
+				len(ShowList(qutil.InterfaceToStr(res["order_code"]))) == 0
+		}
 	}
 	return false
 }
@@ -1413,6 +1424,8 @@ func (this *Invoice) Available() {
 					status = 1
 				}
 			}
+		} else {
+			status = 1
 		}
 	}
 	this.ServeJson(map[string]interface{}{
@@ -1468,8 +1481,8 @@ func (this *Invoice) InvoiceSubmit() {
 		return
 	}
 	now := time.Now()
-	again, _ := this.GetInteger("again")                       //是否是失败重新开票 0 首次提交  1 再此提交
-	oldOnlyIdentifying := this.GetString("oldOnlyIdentifying") //最后一次失败的发票信息唯一标识
+	again, _ := this.GetInteger("again")                                                //是否是失败重新开票 0 首次提交  1 再此提交
+	oldOnlyIdentifying := encrypt.SE.DecodeString(this.GetString("oldOnlyIdentifying")) //最后一次失败的发票信息唯一标识
 	data := map[string]interface{}{
 		"company_name":      this.GetString("company_name"),
 		"phone":             this.GetString("phone"),
@@ -1561,9 +1574,9 @@ func JyOpenInvoice(orderCode, userId string, data map[string]interface{}) error
 	if qutil.ObjToString((*orderInfo)["signing_subject"]) == "h02" {
 		return errors.New("签约主体为拓普")
 	}
-	if qutil.IntAll((*orderInfo)["applybill_status"]) != 0 {
+	/*if qutil.IntAll((*orderInfo)["applybill_status"]) != 0 {
 		return errors.New("已提交发票信息")
-	}
+	}*/
 	invoicedMoney := InvoiceAmount(orderCode) //已开票金额
 	invoiceMoney := qutil.Int64All((*orderInfo)["pay_money"]) - invoicedMoney
 	data["order_code"] = orderCode
@@ -1595,6 +1608,10 @@ func JyOpenInvoice(orderCode, userId string, data map[string]interface{}) error
 }
 
 func AdminOpenInvoice(onlyIdentifying, invoiceMoney, operator string, data map[string]interface{}) error {
+	//二维码
+	path := "/front/invoiceScan/qr"
+	urlStr := fmt.Sprintf("onlyIdentifying=%s&invoiceMoney=%s&operator=%s", encrypt.SE.EncodeString(onlyIdentifying), encrypt.SE.EncodeString(invoiceMoney), encrypt.SE.Encode2HexByCheck(operator))
+	fullUrl := path + "?" + urlStr
 	oldData := util.Mysql.FindOne("invoice", map[string]interface{}{
 		"only_Identifying": onlyIdentifying,
 	}, "id", "")
@@ -1642,6 +1659,7 @@ func AdminOpenInvoice(onlyIdentifying, invoiceMoney, operator string, data map[s
 			data["user_id"] = qutil.ObjToString((*orderInfo)["user_id"])
 			data["operator"] = operator
 			data["source"] = 1
+			data["code_url"] = fullUrl
 			if util.Mysql.Insert("invoice", data) <= 0 {
 				log.Println("扫码开票插入invoice表出错", orderCode)
 				return false
@@ -1674,6 +1692,7 @@ func InvoiceFailRecord(oldOnlyIdentifying string) bool {
 	ok := util.Mysql.ExecTx("插入开票失败记录表", func(tx *sql.Tx) bool {
 		for _, val := range *invoiceData {
 			delete(val, "id")
+			delete(val, "code_url")
 			if util.Mysql.InsertByTx(tx, "invoice_fail_record", val) <= 0 {
 				return false
 			}
@@ -1713,7 +1732,7 @@ func (this *Invoice) InvoiceQuery() {
 	}
 	invoiceOne := util.Mysql.FindOne("invoice", map[string]interface{}{
 		"only_Identifying": onlyIdentifying,
-	}, "id,invoice_changed,order_code, bank_account, company_phone,company_name, phone, mail,company_phone, invoice_type, invoice_content, url, invoice_status, invoice_serialnum, taxpayer_identnum,    operator, operable_time, invoicing_entity, remark, invoice_variety, logistics_code, company_address, bank_name, recipient, delivery_address", " create_time   DESC")
+	}, "id,invoice_changed,order_code, bank_account,invoice_code, create_time,invoice_number,company_phone,company_name, phone, mail,company_phone, invoice_type, invoice_content, url, invoice_status, invoice_serialnum, taxpayer_identnum,operator, operable_time, invoicing_entity, remark, invoice_variety, logistics_code, company_address, bank_name, recipient, delivery_address,only_Identifying", " create_time   DESC")
 	companyName := ""
 	if invoiceOne == nil {
 		//查询公司名称
@@ -1723,20 +1742,26 @@ func (this *Invoice) InvoiceQuery() {
 			companyName = qutil.ObjToString((*orderArr)[0]["company_name"])
 		}
 	} else {
+		(*invoiceOne)["id"] = encrypt.SE.Encode2Hex(qutil.InterfaceToStr((*invoiceOne)["id"]))
+		timeLimit := qutil.Int64All((*invoiceOne)["create_time"]) <= config.InvoiceConfig.Order_createtime //24年之前的发票不让换票
 		switch qutil.IntAll((*invoiceOne)["invoice_status"]) {
 		case 1:
-			//是否换
-			isJyInvoice := !strings.Contains(qutil.InterfaceToStr((*invoiceOne)["url"]), "/jyInvoice/") //非数电票
+			isJyInvoice := !(qutil.InterfaceToStr((*invoiceOne)["invoice_number"]) != "" && qutil.InterfaceToStr((*invoiceOne)["invoice_code"]) == "") //非数电
+			isJyEntity := (*invoiceOne)["invoicing_entity"] != nil && qutil.InterfaceToStr((*invoiceOne)["invoicing_entity"]) != config.InvoiceConfig.SigningSubject
 			isChanged := util.Mysql.Count("invoice", map[string]interface{}{
 				"only_Identifying": onlyIdentifying,
 				"order_code":       (*invoiceOne)["order_code"],
 			}) > 1
-			(*invoiceOne)["changed"] = qutil.If(isJyInvoice || isChanged, true, false)
+			(*invoiceOne)["changed"] = qutil.If(isJyInvoice || isChanged || isJyEntity || timeLimit, true, false)
 		case -1: //失败支持重新提交否
-			(*invoiceOne)["isReopen"] = util.Mysql.Count("invoice_fail_record", map[string]interface{}{
-				"only_Identifying": (*invoiceOne)["only_Identifying"],
-				"order_code":       (*invoiceOne)["order_code"],
-			})+1 >= config.InvoiceConfig.SubmitNum
+			if !timeLimit {
+				(*invoiceOne)["isReopen"] = util.Mysql.Count("invoice_fail_record", map[string]interface{}{
+					"only_Identifying": onlyIdentifying,
+					"order_code":       (*invoiceOne)["order_code"],
+				})+1 >= config.InvoiceConfig.SubmitNum
+			} else {
+				(*invoiceOne)["isReopen"] = false
+			}
 		}
 	}
 	this.ServeJson(NewResult(map[string]interface{}{
@@ -1783,7 +1808,7 @@ func htjs(body map[string]interface{}, orderCode []string, invoiceType, companyN
 			defer response.Body.Close()
 			resData := (*resMap)["data"].(map[string]interface{})
 			if invoice_status == 1 {
-				sendMail(invoiceType, strings.Join(orderCode, ","), companyName, taxpayerIdentnum, mail, phone, qutil.InterfaceToStr(resData["path"]))
+				sendMail(invoiceType, strings.Join(orderCode, ","), companyName, taxpayerIdentnum, mail, phone, qutil.InterfaceToStr(resData["path"]), "")
 			}
 			for _, v := range orderCode {
 				util.Mysql.Update(dbname, map[string]interface{}{"order_code": v, "invoice_status": 0}, map[string]interface{}{
@@ -1829,16 +1854,16 @@ func InvoiceStatusHandle(orderCode string) bool {
 }
 
 // 电子普票发邮箱
-func sendMail(invoiceType, orderCode, companyName, taxpayerIdentnum, mail, phone, url string) {
+func sendMail(invoiceType, orderCode, companyName, taxpayerIdentnum, mail, phone, url, invoiceContent string) {
 	if invoiceType == "个人" {
 		emailHtml := emailHtml_gr
 		emailHtmls := fmt.Sprintf(emailHtml, phone, mail)
-		html := fmt.Sprintf(email_format, orderCode, "电子普通发票", fmt.Sprintf("<a href=\"%s\" download class=\"download\">下载发票</a>", url), "电子普通发票", emailHtmls)
+		html := fmt.Sprintf(email_format, orderCode, "电子普通发票", fmt.Sprintf("<a href=\"%s\" download class=\"download\">查看发票</a>", url), "电子普通发票", invoiceContent, emailHtmls)
 		InvoiceSendMail(mail, html, "电子发票")
 	} else {
 		emailHtml := emailHtml_gs
 		emailHtmls := fmt.Sprintf(emailHtml, companyName, taxpayerIdentnum, phone, mail)
-		html := fmt.Sprintf(email_format, orderCode, "电子普通发票", fmt.Sprintf("<a href=\"%s\" download class=\"download\">下载发票</a>", url), "电子普通发票", emailHtmls)
+		html := fmt.Sprintf(email_format, orderCode, "电子普通发票", fmt.Sprintf("<a href=\"%s\" download class=\"download\">查看发票</a>", url), "电子普通发票", invoiceContent, emailHtmls)
 		InvoiceSendMail(mail, html, "电子发票")
 	}
 }

+ 8 - 8
src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -59,7 +59,7 @@ var (
 // 订单数据展示(订单详情页面)
 func (this *OrderListDetails) GetOrderPayAllMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
-	fields := "id,order_code,order_channel,prepay_time,del_status,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime,expiration_time,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_channel,prepay_time,del_status,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime,expiration_time,buy_subject,buy_count"
 	data, t, transaction_id := CommonDetail(4, fields, userId, this.GetString("orderCode"), this.Session())
 	r := &entity.FuncResult{true, nil, map[string]interface{}{
 		"order":          data,
@@ -413,7 +413,7 @@ func (o *OrderListDetails) GetVipOrderInfo() {
 // 企业商机管理详情页
 func (o *OrderListDetails) GetEntnicheDetails() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,buy_subject,buy_count"
 	data, _, _ := CommonDetail(3, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -667,7 +667,7 @@ func (o *OrderListDetails) Datas(sql string, pageNum, pagesize_max int) (haveNex
 			var isCanInvoic bool
 			if create_time.Unix() > config.InvoiceConfig.Order_createtime {
 				//剩余可开票金额
-				isCanInvoic = IsAllowInvoice(result[i]) && InvoicePrice(result[i]) > 0
+				isCanInvoic = IsAllowInvoice(result[i])
 			}
 			result[i]["is_can_invoice"] = isCanInvoic
 			//是否存在可查看发票
@@ -837,7 +837,7 @@ func (o *OrderListDetails) IsOver() {
 // 大会员详情订单(AI中标预测包订单详情也查询此接口)
 func (o *OrderListDetails) GetMemberDetail() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,is_backstage_order,return_status,billingMode,discount_price,buy_subject,buy_count,order_channel"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,is_backstage_order,return_status,billingMode,discount_price,buy_subject,buy_count,order_channel"
 	data, _, _ := CommonDetail(0, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -846,7 +846,7 @@ func (o *OrderListDetails) GetMemberDetail() {
 
 func (o *OrderListDetails) GetBidfileDetail() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,discount_price,d_relation_id,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,discount_price,d_relation_id,buy_subject,buy_count"
 	data, _, _ := CommonDetail(1, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -877,8 +877,8 @@ func CommonDetail(bigm int, fields, userId, order_code string, session *httpsess
 				//是否满足可开票
 				var isCanInvoic bool
 				if t.Unix() > config.InvoiceConfig.Order_createtime {
-					//剩余可开票金额
-					isCanInvoic = IsAllowInvoice(data) && InvoicePrice(data) > 0
+					//可开票
+					isCanInvoic = IsAllowInvoice(data)
 				}
 				data["is_can_invoice"] = isCanInvoic
 				//是否存在可查看发票
@@ -1057,7 +1057,7 @@ func deleteRepeat(slice []int) []int {
 // typ 类型
 // @return sql语句 countsql语句
 func getOrderSql(userId, fromPage, typ string) (string, string) {
-	sql := fmt.Sprintf(`select id,order_code,order_channel,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time,buy_subject,buy_count from dataexport_order
+	sql := fmt.Sprintf(`select id,order_code,order_channel,signing_subject,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time,buy_subject,buy_count from dataexport_order
 		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
 	sqlC := fmt.Sprintf(`select count(1) from dataexport_order
 		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)

+ 1 - 1
src/jfw/modules/subscribepay/src/service/salesCreateOrder.go

@@ -587,7 +587,7 @@ func (o *SalesCreateOrder) GetOrderPayAllMsg() {
 			//	r.Err = errors.New("获取订单信息失败")
 			//	goto env
 			//}
-			field := "id,order_code,del_status,prepay_time,create_time,pay_time,pay_way,user_phone,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime"
+			field := "id,signing_subject,order_code,del_status,prepay_time,create_time,pay_time,pay_way,user_phone,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime"
 			data, t, transactionId = CommonDetail(4, field, userId, order_code, o.Session())
 			//如果手机号号为空查找通过userid查找手机号
 			//if qutil.InterfaceToStr(data["user_phone"]) == "" {

+ 6 - 4
src/web/staticres/electronic_invoice/css/check_invoice.css

@@ -148,8 +148,8 @@
   height: 38px;
   line-height: 38px;
   text-align: center;
-  background-color: #BFBFBF;
-  color: white;
+  background-color: #bfbfbf;
+  color: #fff;
   float: left;
   margin-right: 8px;
 }
@@ -167,7 +167,7 @@
   width: 0;
   height: 0;
   border-top: 20px solid transparent;
-  border-left: 23px solid #2CB7CA;
+  border-left: 23px solid #72DAE8;
   border-bottom: 19px solid transparent;
 }
 
@@ -216,7 +216,9 @@
   border-left: 23px solid #2CB7CA;
   border-bottom: 19px solid transparent;
 }
-
+#check_invoice .step .c.finish::after{
+  border-left: 23px solid #72DAE8;
+}
 /* 财务处理*/
 #check_invoice .step .ci {
   position: relative;

+ 2 - 1
src/web/templates/areaPack/pc/page_order.html

@@ -223,7 +223,8 @@
                             //发票
                             if (r.data.order.is_can_invoice) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            }
+                            if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })

+ 10 - 9
src/web/templates/frontRouter/pc/dataFile/sess/orderDetail.html

@@ -191,7 +191,8 @@
                             //发票
                             if (r.data.order.is_can_invoice) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2 ) {
+                            }
+                            if (r.data.invoice_show) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })
@@ -304,14 +305,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/order/pc/bidfile/bidfileDetail.html

@@ -180,7 +180,8 @@
                         //发票
                         if (r.data.is_can_invoice) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        }
+                        if (r.data.invoice_show) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)
                             })
@@ -318,14 +319,14 @@
 
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/order/pc/buyerPortraitPack/detail.html

@@ -192,7 +192,8 @@
                             //发票
                             if (r.data.order.is_can_invoice) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            }
+                            if (r.data.invoice_show) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })
@@ -307,14 +308,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/order/pc/datareport/detail.html

@@ -168,7 +168,8 @@
                         //发票
                         if (r.data.orderInfo.is_can_invoice) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        }
+                        if (r.data.invoice_show) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)
                             })
@@ -251,14 +252,14 @@
 
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/order/pc/filePack/detail.html

@@ -192,7 +192,8 @@
                             //发票
                             if (r.data.order.is_can_invoice) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            }
+                            if (r.data.invoice_show) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })
@@ -307,14 +308,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/order/pc/integral/integralDetail.html

@@ -202,7 +202,8 @@
                         //发票
                         if (r.data.is_can_invoice) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        }
+                        if (r.data.invoice_show) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)
                             })
@@ -340,14 +341,14 @@
 
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/pc/aiPack_orderDetail.html

@@ -227,7 +227,8 @@
                                 //发票
                                 if (r.data.is_can_invoice) {
                                     $(".openinvoice").css("display", "");
-                                }  else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                }
+                                if (r.data.invoice_show) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)
                                     })
@@ -376,14 +377,14 @@
 
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 20 - 17
src/web/templates/pc/check_invoice.html

@@ -75,9 +75,9 @@
         </div>
         <div class="w step clearfix" v-if="selectinvoice.invoice_status !== -1">
             <!-- 进行中 类名为 active  已完成 类名为 finish  未完成默认颜色-->
-            <div id="l" class="pro l" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">已完成</div>
-            <div id="c" class="pro c" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">财务处理</div>
-            <div id="r" class="pro r" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1, 'finish': selectinvoice.invoice_status === 1}">发票开具</div>
+            <div id="l" class="pro l active finish">已提交</div>
+            <div id="c" class="pro c" :class="{'active': selectinvoice.invoice_status === 0, 'finish': selectinvoice.invoice_status === 1}">财务处理</div>
+            <div id="r" class="pro r" :class="{'active': selectinvoice.invoice_status === 1}">发票开具</div>
             <div class="rules" data-toggle="modal" data-target="#ruleModal">开票规则</div>
         </div>
         <div class="w step invoice_fail_container" v-else>
@@ -106,28 +106,29 @@
                 <div class="list_tbody">
 					          <p>发票抬头:<span>${selectinvoice.invoice_type}</span></p>
                     <div v-if="selectinvoice.invoice_type == '单位'">
-                      <p class="displaynone company_p">公司名称:<span class="company_name">${selectinvoice.company_name}</span></p>
-                      <p class="displaynone tax_p">单位税号:<span class="tax_num">${selectinvoice.taxpayer_identnum}</span></p>
-                      <p>单位地址:<span class="company_address">${selectinvoice.company_address}</span></p>
-                      <p>电话号码:<span class="phonenum">${selectinvoice.company_phone}</span></p>
-                      <p>开户银行:<span class="bank_name">${selectinvoice.bank_name}</span></p>
-                      <p>银行账号:<span class="bank_account">${selectinvoice.bank_account}</span></p>
-                      <p>开票备注:<span class="remark">${selectinvoice.remark || '-'}</span></p>
+                      <p>公司名称:<span class="company_name">${selectinvoice.company_name || '--'}</span></p>
+                      <p>单位税号:<span class="tax_num">${selectinvoice.taxpayer_identnum || '--'}</span></p>
+                      <p>单位地址:<span class="company_address">${selectinvoice.company_address || '--'}</span></p>
+                      <p>电话号码:<span class="phonenum">${selectinvoice.company_phone || '--'}</span></p>
+                      <p>开户银行:<span class="bank_name">${selectinvoice.bank_name || '--'}</span></p>
+                      <p>银行账号:<span class="bank_account">${selectinvoice.bank_account || '--'}</span></p>
+                      <p>开票备注:<span class="remark">${selectinvoice.remark || '--'}</span></p>
                     </div>
-                    <p>联系电话:<span class="phonenum">${selectinvoice.phone}</span></p>
-                    <p>电子邮箱:<span class="mail">${selectinvoice.mail}</span></p>
-                    <p v-if="selectinvoice.invoice_type == '个人'">开票备注:<span class="remark">${selectinvoice.remark || '-'}</span></p>
+                    <p>联系电话:<span class="phonenum">${selectinvoice.phone || '--'}</span></p>
+                    <p>电子邮箱:<span class="mail">${selectinvoice.mail || '--'}</span></p>
+                    <p v-if="selectinvoice.invoice_type == '个人'">开票备注:<span class="remark">${selectinvoice.remark || '--'}</span></p>
                 </div>
             </div>
             <!-- 状态 -->
             <div class="btn-cells">
               <!-- <p class="backInvoice backP" style="display: none;padding-bottom: 8px;color: red;">系统问题,开票失败</p> -->
-              <button class="btn btn-confirm" id="ing" disabled v-if="selectinvoice.invoice_status == 0" style="border: 0;">开票中</button>
+              <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="concatKf" v-if="selectinvoice.isReopen">联系客服</button>
-              <p style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票已由平台开具并发送至您的邮箱,请注意查收。</p>
+              <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>
             </div>
         </div>
         <!-- 开票规则弹窗 -->
@@ -442,7 +443,8 @@
             selectinvoice: {},
             loading: true,
             leftBtn: false,
-            rightBtn: true
+            rightBtn: true,
+            invoice_text: ''
           }
         },
         created() {
@@ -536,6 +538,7 @@
               if(currentLeft >= 0) {
                 this.leftBtn = false
                 this.rightBtn = true
+                invoiceStatusList.css('left', 0 + 'px');
                 return;
               }
               this.rightBtn = true
@@ -550,7 +553,7 @@
           },
           // 换开发票
           againInvoice(type) {
-            window.open(`/front/order/invoice/${order_code}?type=${type}&invoiceid=${this.selectinvoice.id}`, '_blank');
+            location.href = `/front/order/invoice/${order_code}?type=${type}&invoiceid=${this.selectinvoice.id}`
           },
           // 封装公共ajax
           ajaxComponent(url, params, contentType) {

+ 10 - 9
src/web/templates/pc/dataPack/packDetail.html

@@ -220,7 +220,8 @@
                             //发票 "item.applybill_status === 0 &&  && item.is_backstage_order === 0"
                             if (r.data.order.is_can_invoice) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            } 
+                            if (r.data.invoice_show) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })
@@ -382,14 +383,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
         // 获取服务端时间

+ 10 - 9
src/web/templates/pc/entniche_orderDetail.html

@@ -157,7 +157,8 @@
                         //发票
                         if (r.data.is_can_invoice) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        }
+                        if (r.data.invoice_show) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)//查看发票
                             })
@@ -217,14 +218,14 @@
 
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 57 - 76
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="电话号码:">
-                      <el-input maxlength="11" placeholder="请输入电话号码" v-model="ruleForm.company_phone"></el-input>
+                    <el-form-item label="电话号码:" prop="company_phone" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入电话号码', trigger: 'blur' }, { validator: ruleForm.invoice_variety == '电子专用发票' ? validateTelPhone : '', trigger: 'blur' }]">
+                      <el-input placeholder="请输入电话号码" v-model="ruleForm.company_phone"></el-input>
                     </el-form-item>
-                    <el-form-item label="开户银行:">
+                    <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="银行账号:">
+                    <el-form-item label="银行账号:" prop="bank_account" :rules="[{ required: ruleForm.invoice_variety == '电子专用发票', message: '请输入银行账号', trigger: 'blur' }, { validator: ruleForm.invoice_variety == '电子专用发票' ? 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="开票备注:">
@@ -125,7 +125,7 @@
                     </el-form-item>
                   </div>
                   <el-form-item label="联系电话:" prop="phone">
-                    <el-input maxlength="11" placeholder="请输入手机号" v-model="ruleForm.phone"></el-input>
+                    <el-input placeholder="请输入手机号" v-model="ruleForm.phone"></el-input>
                   </el-form-item>
                   <el-form-item  label="电子邮箱:" prop="mail">
                     <el-input placeholder="邮箱用于接收电子发票" v-model="ruleForm.mail"></el-input>
@@ -186,11 +186,10 @@
 	{{include "/common/pcbottom.html"}}
 	{{include "/common/baiducc.html"}}
     <!-- footer -->
-    <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script> -->
     <!-- custom_select.js 为封装select控件 修改原生select样式 -->
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script> -->
 	<script>
 		  $(function(){
         var order_code = {{.T.order_code}};
@@ -253,7 +252,7 @@
                   { required: true, message: '请输入邮箱地址', trigger: 'blur' }
                 ],
                 company_name: [
-                  { required: true, message: '请输入单位名称', trigger: 'blur' },
+                  { required: true, message: '请输入公司名称', trigger: 'blur' },
                   { validator: this.validateCompany, trigger: 'blur' }
                 ],
                 taxpayer_identnum: [
@@ -264,6 +263,17 @@
                 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: [],
@@ -274,8 +284,6 @@
               },
               addressHeight: 36,
               remarkHeight: 36,
-              isFormValid: [], // 表单校验结果
-              isValid: false,  // 表单是否通过校验
               loading: false
             }
           },
@@ -293,14 +301,15 @@
           watch: {
             'ruleForm.invoice_variety': {
               handler (val) {
+                // 清空校验
                 if (val === '电子专用发票') {
                   this.ruleForm.invoice_type = '单位'
-                  this.isFormValid = [false, false, false, false, false]
-                } else {
-                  this.isFormValid = [false, false, false, false]
+                }
+                if(val) {
+                  this.$refs['ruleForm'].clearValidate();
                 }
               },
-              immediate: true
+              // immediate: true
             },
             'ruleForm.company_address': {
               handler() {
@@ -319,13 +328,6 @@
               }
             }
           },
-          computed: {
-            getValidateResult() {
-              console.info(this.isFormValid, 'isFormValid')
-              let hasFalse = this.isFormValid.includes(false);
-              return hasFalse
-            }
-          },
           methods: {
             // 查询是否可以开发票
             setPageOver () {
@@ -389,83 +391,74 @@
             validateCode: (rule, value, callback) => {
               const regCode = /(^[A-Za-z0-9]{15}$)|(^[A-Za-z0-9]{17,18}$)|(^[A-Za-z0-9]{20}$)/;
               if (!value) {
-                invoiceNode.setFormValidate(invoiceNode.isFormValid)
                 return callback(new Error('请输入纳税人识别号'))
               } else {
                 if (regCode.test(value)) {
-                  invoiceNode.isFormValid.push(true)
                   return callback()
                 } else {
-                  invoiceNode.setFormValidate(invoiceNode.isFormValid)
                   return callback(new Error('请输入正确的纳税人识别号'))
                 }
               }
             },
             validatePhone: (rule, value, callback) => {
-              const regPhone = /^1[3-9]\d{9}$/;
+              const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
+              const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
               if(!value) {
-                invoiceNode.setFormValidate(invoiceNode.isFormValid)
                 return callback(new Error('请输入手机号'));
               } else {
-                if (regPhone.test(value)) {
-                  invoiceNode.isFormValid.push(true)
+                if (regPhone.test(value) || regTel.test(value)) {
                   return callback()
                 } else {
-                  invoiceNode.setFormValidate(invoiceNode.isFormValid)
-                  return callback(new Error('请输入正确的手机号'))
+                  return callback(new Error('联系电话格式不正确'))
                 }
               }
             },
+            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()
+              } else {
+                return callback(new Error('电话号码格式不正确'))
+              }
+            },
+            validateBankAccount: (rule, value, callback) => {
+              const regAccount = /^\d+$/;
+              if (regAccount.test(value)) {
+                return callback()
+              } else {
+                return callback(new Error('请输入正确的银行账号'))
+              }
+            },
             validateMail: (rule, value, callback) => {
-              console.info(rule, value,'isFormValid')
               const regEmail = /^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/
               if(!value) {
-                invoiceNode.setFormValidate(invoiceNode.isFormValid)
                 return callback(new Error('请输入邮箱'))
               } else {
                 if (regEmail.test(value.trim())) {
-                  invoiceNode.isFormValid.push(true)
                   return callback()
                 } else {
-                  invoiceNode.setFormValidate(invoiceNode.isFormValid)
-                  return callback(new Error('请输入正确的邮箱'))
+                  return callback(new Error('邮箱格式不正确'))
                 }
               }
             },
             validateCompany: (rule, value, callback) => {
               const regCompany=/^[\u4e00-\u9fa5_a-zA-Z0-9_\(_\)_\uff08_\uff09\)]{2,50}$/;
               if(!value) {
-                invoiceNode.setFormValidate(invoiceNode.isFormValid)
                 return callback(new Error('请输入公司名称'))
               } else {
                 if (regCompany.test(value)) {
-                  invoiceNode.isFormValid.push(true)
                   return callback()
                 } else {
-                  invoiceNode.setFormValidate(invoiceNode.isFormValid)
                   return callback(new Error('请输入正确的公司名称'))
                 }
               }
             },
             validateAddress: (rule, value, callback) => {
               if (value.trim().length > 0) {
-                invoiceNode.isFormValid.push(true)
                 return callback()
-              } else {
-                invoiceNode.setFormValidate(invoiceNode.isFormValid)
               }
             },
-            setFormValidate (array) {
-              let data = Array.from(array)
-              console.info(data.length, 'array')
-              data.forEach((e, i) => {
-                if(e) {
-                  data.splice(i, 1)
-                  data.push(false)
-                }
-              });
-              this.isFormValid = data
-            },
             setHighLight(item) {
               const keyword = utils.replaceKeyword(item.name, this.ruleForm.company_name, '<span class="highlight-text">' + this.ruleForm.company_name + '</span>')
               return keyword
@@ -510,6 +503,8 @@
                     params.sid = this.urlParams.invoiceid
                   } else if(this.urlParams.type === 'again') {
                     // 开票失败,再次开票
+                    params.again = 1
+                    params.oldOnlyIdentifying = this.urlParams.only_Identifying
                     params.only_Identifying = this.urlParams.only_Identifying
                   }
                   this.onConfirm(url, params)
@@ -527,14 +522,7 @@
                   // 新窗口打开
                   // 判断窗口是不是window.open打开的
                   setTimeout(() => {
-                    if (window.opener && window.opener !== window) {
-                      window.close()
-                    } else {
-                        if (history.length <= 1) {
-                            window.close()
-                        }
-                        history.back()
-                    }
+                    window.location.replace("/front/order/check_invoice/" + order_code)
                   }, 2000)
                 } else {
                   this.loading = false
@@ -546,20 +534,13 @@
               })
             },
             resetForm(formName) {
-              this.ruleForm = {
-                order_code: '',
-                invoice_content: '信息技术服务-技术服务费',
-                invoice_type: '单位',
-                invoice_variety: '电子普通发票',
-                mail: '',
-                phone: '',
-                remark: '',
-                company_name: '',
-                taxpayer_identnum: '',
-                company_address: '',
-                company_phone: '',
-                bank_name: '',
-                bank_account: ''
+              if (window.opener && window.opener !== window) {
+                window.close()
+              } else {
+                if (history.length <= 1) {
+                    window.close()
+                }
+                history.back()
               }
             },
             handleInput(value) {

+ 10 - 9
src/web/templates/pc/medaratus_orderDetail.html

@@ -297,7 +297,8 @@
                             if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
                                 if (r.data.is_can_invoice) {
                                     $(".openinvoice").css("display", "");
-                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                } 
+                                if (r.data.invoice_show) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })
@@ -616,14 +617,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
         // 获取服务端时间

+ 11 - 10
src/web/templates/pc/member_orderDetail.html

@@ -359,7 +359,8 @@
                                         // return false // 待可开发票时删除
                                         window.open("/front/order/invoice/" + orderCode, '_self');
                                     });
-                                }else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                }
+                                if (r.data.invoice_show) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })
@@ -560,15 +561,15 @@
 
         //查看发票
         function checkinvoice(flag, orderCode, str) {
-            if (flag === 2) {
-                var tempStr = str || '您已开具发票<br>如有问题请联系客服<br>400-108-6670'
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">'+tempStr+'</div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var tempStr = str || '您已开具发票<br>如有问题请联系客服<br>400-108-6670'
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">'+tempStr+'</div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 12 - 11
src/web/templates/pc/myOrder.html

@@ -557,7 +557,7 @@
                     <div v-if="item.order_status === 1 && item.filter.badge!='exchange'">
                       <p><a v-if="item.is_can_invoice" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>
-                      <p><a v-if="item.invoice_show" data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
+                      <p><a v-if="item.invoice_show" data-jy-track="click-hover" @click="goInvoice(item, 'info')">发票信息</a></p>
                     </div>
                   </div>
                   <div class="handleBox" v-else-if="item.product_type === '大会员-AI中标预测包'
@@ -572,12 +572,12 @@
                       <p><a class="go_pay" data-jy-track="click-hover" @click="goPay(item)">去支付</a></p>
                       <p><a data-jy-track="click-hover" @click="goCancel(item)">取消订单</a></p>
                     </div>
-                    <div v-if="item.order_status === 1 && (item.filter.source || '') === ''&& item.filter.badge!='exchange'">
+                    <div v-if="item.order_status === 1 && item.filter.badge!='exchange'">
                       <!--                                        <div v-if="(item.filter.canInvoice !=undefined  && !item.filter.canInvoice)">-->
                       <p><a v-if="item.is_can_invoice" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>
                       <p><a v-if="item.invoice_show"
-                          data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
+                          data-jy-track="click-hover" @click="goInvoice(item, 'info')">发票信息</a></p>
                       <!--                                        </div>-->
                     </div>
                   </div>
@@ -595,7 +595,7 @@
                     <p v-if="item.order_status === 1 && item.filter.badge!='exchange'"><a
                         v-if="item.is_can_invoice"
                         data-jy-track="click-hover" @click="goInvoice(item)">开发票</a></p>
-                    <p v-if="item.order_status === 1"><a v-if="item.invoice_show" data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
+                    <p v-if="item.order_status === 1"><a v-if="item.invoice_show" data-jy-track="click-hover" @click="goInvoice(item, 'info')">发票信息</a></p>
                     <!--已取消-->
                     <!--历史数据 再次购买-->
                     <p v-if="item.product_type === '历史数据'"><a target="_parent" :href="'/front/dataExport/toSieve?id=' + item.filter_id">再次购买</a>
@@ -1352,8 +1352,8 @@
             }
           });
         },
-        goInvoice: function (item) {
-          if (item.applybill_status === 0) {
+        goInvoice: function (item, look) {
+          if (!look) {
             // $.alert({
             //     title: '温馨提示',
             //     titleClass: 'custom-alert-title',
@@ -1389,11 +1389,12 @@
               window.open("/front/order/invoice/" + item.order_code);
             }
           } else {
-            if (item.applybill_status === 2) {
-              this.goShowTipForInvoice()
-            } else {
-              this.goLookInvoice(item)
-            }
+            // if (item.applybill_status === 2) {
+            //   this.goShowTipForInvoice()
+            // } else {
+            //   this.goLookInvoice(item)
+            // }
+            this.goLookInvoice(item)
           }
         },
         goShowTipForInvoice: function (str) {

+ 3 - 1
src/web/templates/pc/orderDetail.html

@@ -517,6 +517,7 @@
         var orderStatus = {{ .T.o.order_status }};
         var invoiceStatus = {{ .T.o.applybill_status }}
         var is_can_invoice = {{ .T.o.is_can_invoice }}
+        var invoice_show = {{ .T.o.invoice_show }}
         var orderCode = {{.T.o.order_code}}
 
         if (orderStatus === 0) {
@@ -527,7 +528,8 @@
             $("#status_success").show();
             if (is_can_invoice) {
                 $(".openinvoice").show();
-            } else if (invoiceStatus === 1 || invoiceStatus === 2) {
+            }
+            if (invoice_show) {
                 $(".lookinvoice").show().on("click", function () {
                     checkinvoice({{.T.o.applybill_status}}, orderCode)
                 });

+ 10 - 9
src/web/templates/pc/subAccount_orderDetail.html

@@ -219,7 +219,8 @@
                             if (r.data.is_backstage_order!==1){
                                 if (r.data.is_can_invoice) {
                                     $(".openinvoice").css("display", "");
-                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                }
+                                if (r.data.invoice_show) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })
@@ -365,14 +366,14 @@
         }
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
     </script>

+ 10 - 9
src/web/templates/pc/vip_orderDetail.html

@@ -304,7 +304,8 @@
                             if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
                                 if (r.data.order.is_can_invoice) {
                                     $(".openinvoice").css("display", "");
-                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                }
+                                if (r.data.invoice_show) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })
@@ -629,14 +630,14 @@
         };
         //查看发票
         function checkinvoice(flag, orderCode) {
-            if (flag === 2) {
-                var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
-                var div_invoice_tip = document.createElement('div');
-                div_invoice_tip.innerHTML = showHtml;
-                div_invoice_tip.id = "invoice_tip"
-                document.body.appendChild(div_invoice_tip)
-                return
-            }
+            // if (flag === 2) {
+            //     var showHtml = '<div style="width: 100%;height: 100%;z-index: 999; position: absolute;top: 0;background: rgba(0, 0, 0, 0.65);">   <div style="position: fixed;z-index: 9999;width: 540px;height: 262px;left: 50%;top: 30%;margin-left: -270px;background-color: #fff;border-radius: 6px;padding: 32px;display: flex;flex-direction: column;justify-items: center;align-items: center;">       <div class="invoice_title" style="color: #1D1D1D;font-size: 18px;line-height: 28px;">提示</div>       <div class="invoice_body"            style="height: 78px;margin: 20px 0px;font-size: 14px;line-height: 24px;text-align: center;">           您已开具发票<br>           如有问题请联系客服<br>           400-108-6670       </div>       <div class="invoice_control"            style="width: 132px;height: 36px;text-align: center;background: #2CB7CA;border-radius: 6px;font-size: 16px;line-height: 36px;color: #FFFFFF;cursor: pointer;"            onclick="document.querySelector(\'#invoice_tip\').remove()"       >           我知道了       </div>   </div>\n</div>'
+            //     var div_invoice_tip = document.createElement('div');
+            //     div_invoice_tip.innerHTML = showHtml;
+            //     div_invoice_tip.id = "invoice_tip"
+            //     document.body.appendChild(div_invoice_tip)
+            //     return
+            // }
             window.open("/front/order/check_invoice/" + orderCode, '_self');
         }
         // 获取服务端时间