|
|
@@ -8,6 +8,7 @@ import (
|
|
|
"app.yhyue.com/moapp/jybase/go-xweb/log"
|
|
|
"app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
"app.yhyue.com/moapp/jybase/mail"
|
|
|
+ "app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
|
|
|
"bytes"
|
|
|
"database/sql"
|
|
|
"encoding/json"
|
|
|
@@ -1360,6 +1361,20 @@ func (this *Invoice) Invoiceinfo() {
|
|
|
isCanInvoic = IsAllowInvoice(*status)
|
|
|
}
|
|
|
(*status)["is_can_invoice"] = isCanInvoic
|
|
|
+ filter := dataexport.SieveCondition{}
|
|
|
+ err := json.Unmarshal([]byte((*status)["filter"].(string)), &filter)
|
|
|
+ if err == nil {
|
|
|
+ // 处理行业其他
|
|
|
+ tmpIndustry := []string{}
|
|
|
+ for i := 0; i < len(filter.Industry); i++ {
|
|
|
+ cIndustry := filter.Industry[i]
|
|
|
+ if strings.Contains(cIndustry, "其它") {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ tmpIndustry = append(tmpIndustry, cIndustry)
|
|
|
+ }
|
|
|
+ filter.Industry = tmpIndustry
|
|
|
+ }
|
|
|
//是否存在可查看发票
|
|
|
(*status)["invoice_show"] = len(ShowList(order_code)) > 0
|
|
|
this.ServeJson(map[string]interface{}{
|
