银行接口

src/dashoo.cn/backend/api/business/bankapi/icbc.go

@@ -42,6 +42,15 @@ type BillReceiveMoneyParams struct {
 	ReceiveAmount  float64   `json:"receiveAmount"`
 }
 
+type BillReceiveMoneyParamsICBC struct {
+	Ids 		   string 	 `json:"ids"`
+	PayMode        string    `json:"payMode"`
+	PayDate        string `json:"payDate"`
+	BankSerialNum  string    `json:"bankSerialNum"`
+	BankName       string    `json:"bankName"`
+	ReceiveAmount  string   `json:"receiveAmount"`
+}
+
 type BillReceiveMoneyAgainParams struct {
 	BillId 		   string 	 `json:"BillId"`
 	PayMode        string    `json:"payMode"`
@@ -56,6 +65,11 @@ type BillCheckMoneyParams struct {
 	EndTime         time.Time `json:"endTime"`
 }
 
+type BillCheckMoneyParamsICBC struct {
+	StartTime       string `json:"startTime"`
+	EndTime         string `json:"endTime"`
+}
+
 type BillCheckMoneyRet struct {
 	PaymentInfos    	[] paymentinfo.OilPaymentInfo
 	PaymentBankInfos    [] paymentbankinfo.OilPaymentBankInfo

src/dashoo.cn/backend/api/controllers/bankapi/icbc.go

@@ -2,6 +2,9 @@ package bankapi
 
 import (
 	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
 
 	"dashoo.cn/backend/api/business/bankapi"
 
@@ -38,8 +41,18 @@ func (this *ICBCController) GetBillList() {
 // @router /update-bill-list [post]
 func (this *ICBCController) UpdateBillList() {
 
+	var billParamsICBC bankapi.BillReceiveMoneyParamsICBC
 	var billParams bankapi.BillReceiveMoneyParams
-	json.Unmarshal(this.Ctx.Input.RequestBody, &billParams)
+	fmt.Println("RequestBody:= " + string(this.Ctx.Input.RequestBody))
+	json.Unmarshal(this.Ctx.Input.RequestBody, &billParamsICBC)
+
+	billParams.BankName = billParamsICBC.BankName
+	billParams.BankSerialNum = billParamsICBC.BankSerialNum
+	billParams.Ids = billParamsICBC.Ids
+	billParams.PayMode = billParamsICBC.PayMode
+	billParams.ReceiveAmount,_ = strconv.ParseFloat(billParamsICBC.ReceiveAmount, 64)
+	billParams.PayDate, _= time.Parse("2006-01-02", billParamsICBC.PayDate)
+
 	svc := bankapi.GetICBCService(utils.DBE)
 	var errinfo ErrorInfo
 	ret := svc.ReceiveMoneyBillList(billParams)
@@ -71,8 +84,12 @@ func (this *ICBCController) UpdateBillListAgain() {
 func (this *ICBCController) CheckMoneyList() {
 	svc := bankapi.GetICBCService(utils.DBE)
 	var checkMoneyParams bankapi.BillCheckMoneyParams
+	var checkMoneyParamsICBC bankapi.BillCheckMoneyParamsICBC
 	var jsonBlob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonBlob, &checkMoneyParams)
+	json.Unmarshal(jsonBlob, &checkMoneyParamsICBC)
+
+	checkMoneyParams.EndTime, _ = time.Parse("2006-01-02", checkMoneyParamsICBC.EndTime)
+	checkMoneyParams.StartTime, _ = time.Parse("2006-01-02", checkMoneyParamsICBC.StartTime)
 
 	var datainfo DataInfo
 	ret := svc.CheckMoneyBillList(checkMoneyParams)

src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -345,6 +345,16 @@ func (this *PaymentInfoController) SureEntity() {
 	this.ServeJSON()
 }
 
+const (
+	timeFormat = "2006-01-02 15:04:05"
+)
+type Time time.Time
+func (t *Time) UnmarshalJSON(data []byte) (err error) {
+	now, err := time.ParseInLocation(`"`+timeFormat+`"`, string(data), time.Local)
+	*t = Time(now)
+	return
+}
+
 // @Title 确认缴费单--回调
 // @Description 确认缴费单
 // @Success	200	{object} controllers.Request

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -9,7 +9,7 @@
           </el-carousel-item>
         </el-carousel>
         <section class="login">
-          <el-card class="box-card" style="background:rgba(255,255,255,0.7)">
+          <el-card class="box-card" style="background:rgba(255,255,255,0.8)">
             <div slot="header" class="clearfix">
               <i class="el-icon-s-cooperation"></i>
               <span style="font-weight: bold; margin-left: 5px">登录</span>
@@ -84,7 +84,7 @@
                                 label=""
                                 prop="username">
                     <el-input prefix-icon="el-icon-user-solid"
-                              type="text" style="background:rgba(255,255,255,0.5)"
+                              type="text" style="background:rgba(255,255,255,0.8)"
                               v-model="model.username"
                               placeholder="请输入用户名">
                       <el-select v-model="loginMode"
@@ -135,12 +135,12 @@
                   <el-row style="margin-top: 5px" :gutter="10">
                     <el-col :span="12">
                       <router-link :to="'/signup'">
-                        <el-button type="plain" style="background:rgba(255,255,255,0.7)">注册账号</el-button>
+                        <el-button type="plain" style="background:rgba(255,255,255,0.8)">注册账号</el-button>
                       </router-link>
                     </el-col>
                     <el-col :span="12">
                       <router-link :to="'/passwordback'">
-                        <el-button type="plain" style="background:rgba(255,255,255,0.7)">忘记密码</el-button>
+                        <el-button type="plain" style="background:rgba(255,255,255,0.8)">忘记密码</el-button>
                       </router-link>
                     </el-col>
                   </el-row>
@@ -155,6 +155,7 @@
     </div>
     <div >
       <footer class="login-footer" style="color:#A9A9A9;padding-bottom: 30px">
+        <span style="font-size: 16px">技术支持：李琛 022-25920812<br></span>
         <span style="font-size: 16px">推荐使用谷歌浏览器、360浏览器(极速模式)等，Chrome内核浏览器打开本系统</span>
       </footer>
     </div>
@@ -258,7 +259,7 @@ import SIdentify from '@/components/VCode.vue'
   },
   methods: {
     getRowstyle () {
-      return 'background:rgba(255,255,255,0.7)'
+      return 'background:rgba(255,255,255,0.8)'
     },
     // 生成随机数
     randomNum (min, max) {
@@ -674,7 +675,7 @@ export default class Login extends Vue {
 
   .el-table,
   .el-table__expanded-cell {
-    background-color: rgba(255,255,255,0.7)
+    background-color: rgba(255,255,255,0.8)
   }
 
 }

src/dashoo.cn/frontend_web/src/pages/oilbank/icbclist.vue

@@ -222,7 +222,7 @@
         let sumMoeny = 0.0
         for (let idx in this.entityList) {
           idlist += this.entityList[idx].Id + ','
-          sumMoeny += this.entityList[idx].Amount + 0.0
+          sumMoeny += parseFloat(this.entityList[idx].Amount) + 0.0
         }
         let params = {
           ids: idlist,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/icbclist.vue

@@ -226,7 +226,7 @@
         let sumMoeny = 0.0
         for (let idx in this.entityList) {
           idlist += this.entityList[idx].Id + ','
-          sumMoeny += this.entityList[idx].Amount + 0.0
+          sumMoeny += parseFloat(this.entityList[idx].Amount) + 0.0
         }
         let params = {
           ids: idlist,
@@ -375,7 +375,7 @@
         let s = 0
         if (this.entityList && this.entityList != null) {
           for (let i = this.entityList.length - 1; i >= 0; i--) {
-            s += parseInt(this.entityList[i].Amount)
+            s += parseFloat(this.entityList[i].Amount)
           }
         }
         return s

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -293,7 +293,6 @@
                style="margin-top: -30px;">
         <el-tab-pane label="准入编码"
                      name="1">
-          {{loading}}
           <el-form label-width="150px" v-loading="dialogloading" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData" style="padding-top: 15px">
             <el-row style="margin-top: -10px">
               <el-col :span="12">