缴费确认

src/dashoo.cn/backend/api/business/paymentinfo/paymentinfo.go

@@ -23,6 +23,8 @@ type OilPaymentInfo struct {
 	ModifiedOn     time.Time `xorm:"DATETIME"`
 	ModifiedUserId int       `xorm:"INT(11)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+	ID_GF     	   int       `xorm:"INT(11)"`
+	SureBatchNo    string    `xorm:"VARCHAR(50)"`
 }
 
 type PaymentinfoList struct {

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

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/register"
 	"encoding/json"
 	"strconv"
+	"strings"
 	"time"
 
 	"dashoo.cn/backend/api/business/bankapi"
@@ -179,7 +180,8 @@ func (this *PaymentInfoController) UpdateEntity() {
 
 type BillInfoSure struct {
 	SupplierEntity supplier.OilSupplier
-	DataInfo DataInfo
+	DataInfos [2]DataInfo
+	AmountList [2]float64
 }
 
 // @Title 获取实体
@@ -212,13 +214,66 @@ func (this *PaymentInfoController) GetBillInfo() {
 	datainfo.CurrentItemCount = total
 	datainfo.PageIndex = page.CurrentPage
 	datainfo.ItemsPerPage = page.Size
+	amount1 := 0.0
+	for _, payItem := range paylist {
+		tmpAmount, _ := strconv.ParseFloat( payItem.Amount, 64 )
+		amount1 += tmpAmount
+	}
 
-	/*var models []paymentinfo.OilPaymentInfo
-	svc := paymentinfo.GetPaymentService(utils.DBE)
-	svc.GetEntities(&models, "SupplierId='"+ strconv.Itoa(supplierEntity.Id) +"' and IsPay='0' ")
-	*/
-	billInfoSure.DataInfo = datainfo
+	orderby2 := "p.Id"
+	where2 :=  "p.SupplierId='"+ strconv.Itoa(supplierEntity.Id) +"' and p.IsPay='1' "
+	var paylist2 []paymentinfo.PaymentinfoList
+	svc2 := paymentinfo.GetPaymentService(utils.DBE)
+	total2 := svc2.GetPaymentinfoList(page.CurrentPage, page.Size, orderby2, " ASC", &paylist2, where2)
+	//total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo2 DataInfo
+	datainfo2.Items = paylist2
+	datainfo2.CurrentItemCount = total2
+	datainfo2.PageIndex = page.CurrentPage
+	datainfo2.ItemsPerPage = page.Size
+	amount2 := 0.0
+	for _, payItem := range paylist2 {
+		tmpAmount, _ := strconv.ParseFloat( payItem.Amount, 64 )
+		amount2 += tmpAmount
+	}
+
+	billInfoSure.DataInfos[0] = datainfo
+	billInfoSure.DataInfos[1] = datainfo2
+	billInfoSure.AmountList[0] = amount1
+	billInfoSure.AmountList[1] = amount2
 
 	this.Data["json"] = &billInfoSure
 	this.ServeJSON()
 }
+
+
+type BillSure struct {
+	Ids string `json:"ids"`
+}
+// @Title 确认缴费单
+// @Description 确认缴费单
+// @Success	200	{object} controllers.Request
+// @router /bill-sure [post]
+func (this *PaymentInfoController) SureEntity() {
+
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+	var billSure BillSure
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &billSure)
+
+	strIds := strings.Trim(billSure.Ids, ",")
+
+	sql := "update OilPaymentInfo set IsPay = 1, "
+	sql += "SureBatchNo='" + strconv.FormatInt(time.Now().UnixNano(), 10) + "' "
+	/*sql += "ModifiedOn='" + time.Now().String() + "', "
+	sql += "ModifiedBy='" + this.User.Realname + "', "
+	sql += "ModifiedUserId='" + this.User.Id + "' "*/
+	sql += " where id in (" + strIds + ") and IsPay = 0"
+	svc.DBE.Query(sql)
+
+	var errinfo ErrorInfo
+	errinfo.Message = "修改成功！"
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
+}

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -133,21 +133,59 @@ module.exports = {
   },
 
   axios: {
-    baseURL: '/api/'   // 本机开发使用
-    // baseURL: '//47.92.249.239:10092/api/' // 供方管理服务器
+    baseURL: '//localhost:10091/api/' // 本机开发使用
+
+    /* --------Nuxt Start发版用 START-------------- */
+    // baseURL: '/api/'
+    /* --------Nuxt Start发版用 END-------------- */
+
   },
   /*
-  ** 客户端和服务端共享的环境变量,
-  ** 客户端使用：process.env.appclient 服务端使用：context.appclient
-  */
+   ** 客户端和服务端共享的环境变量,
+   ** 客户端使用：process.env.appclient 服务端使用：context.appclient
+   */
   env: {
-    appclient: 'gfgl', //供方信息管理平台
-    //upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
-    upfilehost: '/uploadfile', // 附件上传
-    baseURL: '/api/' //本地工作流图片
-    // baseURL: '//47.92.249.239:10092/api/' //线上工作流图片
+    appclient: 'gfgl',                                      //供方管理系统
+    imgserverhost: 'http://52.80.133.197:9081',             //BioBank服务地址,图片上传文件
+    upfilehost: 'http://weed1.labsop.cn:9333/dir/assign',   //附件上传
+    baseURL: '//localhost:10091/api/'                       //工作流图片
+
+    /* --------Nuxt Start发版用 START-------------- */
+    /*
+     appclient:  'gfgl',                            //供方信息管理平台
+     upfilehost: '/uploadfile',                     //附件上传
+     baseURL:    '/api/',                           //本地工作流图片
+     API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
+     */
+    /* --------Nuxt Start发版用 END-------------- */
   },
   ignore: [
-    /*'pages/setting/!**!/!*.*',*/
+    'pages/oilsupplier/addtionaudit/*.*',
+    'pages/oilsupplier/annualaudit/*.*',
+    'pages/oilsupplier/badrecord/*.*',
+    'pages/oilsupplier/basisbuild/*.*',
+    'pages/oilsupplier/compayaudit/*.*',
+    'pages/oilsupplier/goodsaptitude/*.*',
+    'pages/oilsupplier/infochange/*.*',
+    'pages/oilsupplier/infochangech/*.*',
+    'pages/oilsupplier/supplier/*.*',
+    'pages/oilsupplier/supplierappend/*.*',
+    'pages/oilsupplier/supplieraudit/*.*',
+    'pages/oilsupplier/suppliercert/*.*',
+    'pages/oilsupplier/supplierfile/*.*',
+
+    'pages/oilsupplier/suppliernopass/*.*',
+    'pages/oilsupplier/supplierps/*.*',
+    'pages/oilsupplier/supplierstorage/*.*',
+    'pages/oilsupplier/supplierstore/*.*',
+    'pages/oilsupplier/tablefieldsetting/*.*',
+    'pages/oilsupplier/technologyservice/*.*',
+    'pages/system/*/*.*',
+    'pages/setting/*/*.*',
+    'pages/select/*/*.*',
+    'pages/report/*/*.*',
+    'pages/oilbank/*/*.*',
+    'pages/log/*/*.*',
+    'pages/documentmanage/*/*.*',
   ]
 }

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -189,5 +189,5 @@ module.exports = {
     API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
     */
     /* --------Nuxt Start发版用 END-------------- */
-  }
+  },
 }

src/dashoo.cn/frontend_web/package.json

@@ -8,7 +8,7 @@
     "dev": "nuxt --max-old-space-size=4096",
     "dev2": "nuxt -c nuxt.config.ignore.js",
     "build": "nuxt build",
-    "build2": "nuxt build -c nuxt.config.ignore.js --spa",
+    "build2": "nuxt build --spa",
     "start": "cross-env HOST=0.0.0.0 PORT=9605 nuxt start",
     "start:pm2": "pm2 start yarn --name=shanlan -- start",
     "generate": "nuxt generate",

src/dashoo.cn/frontend_web/src/api/oilsupplier/paymentinfo.js

@@ -26,4 +26,12 @@ export default {
       params: params
     })
   },
+  BillSure (params, myAxios) {
+    console.log("BillSure = " + params)
+    return myAxios({
+      url: '/paymentinfo/bill-sure',
+      method: 'post',
+      data: params
+    })
+  },
 }

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

@@ -22,13 +22,13 @@
 
       <el-form label-width="120px" :inline="true">
         <el-form-item label="企业名称">
-          <span>上海国际会议中心</span>
+          <span>XXXXXXXXXX</span>
         </el-form-item>
         <el-form-item label="组织机构代码">
-          <span>9999999</span>
+          <span>XXXXXXXXXXX</span>
         </el-form-item>
         <el-form-item label="缴费总金额">
-          <span style="font-weight: bold; color: red;">10000 元</span>
+          <span style="font-weight: bold; color: red;">XXXXX 元</span>
         </el-form-item>
         <el-form-item label="">
           <el-button type="primary" icon="el-icon-money" @click="handleGetMoney">收款成功</el-button>
@@ -39,7 +39,7 @@
       <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
 
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
           <template slot-scope="scope">
             {{ transferStr(scope.row.PayType) }}

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

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 缴费确认
         </span>
         <span style="float: right;">
-          <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0">确认缴费单</el-button>
+          <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0" :loading="sureLoading" @click="BillSureClick">确认缴费单</el-button>
         </span>
       </div>
       <div class="table-layout" style="margin-top: 0px">
@@ -29,7 +29,7 @@
           <el-col :span="4" class="table-cell">{{this.formDataSup.Address}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.Telphone}}</el-col>
           <el-col :span="4" class="table-cell">{{this.formDataSup.LegalPerson}}</el-col>
-          <el-col :span="4" class="table-cell">{{this.formDataSup.SetupTime}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.jstimehandle(this.formDataSup.SetupTime)}}</el-col>
         </el-row>
 
         <el-row>
@@ -50,9 +50,18 @@
           <el-col :span="4" class="table-cell">{{this.formDataSup.CompanyTel}}</el-col>
         </el-row>
       </div>
-      <div style="height: 10px"></div>
+    </el-card>
+
+    <el-card class="box-card" style="margin-top: 5px" v-if="entityList && entityList.length > 0">
+      <div slot="header">
+        <span>
+          <span style="font-weight: bold;">
+            未确认缴费列表,  金额合计： <font color="red">{{this.amount1}} 元</font>
+          </span>
+        </span>
+      </div>
       <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
           <template slot-scope="scope">
@@ -67,11 +76,33 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-                     :total="currentItemCount">
-      </el-pagination>-->
+    </el-card>
 
+    <el-card class="box-card" style="margin-top: 5px" v-if="entityList2 && entityList2.length > 0">
+      <div slot="header">
+        <span style="font-weight: bold;">
+          已确认未支付缴费列表,  金额合计： <font color="red">{{this.amount2}} 元</font>
+        </span>
+        <!--<span style="float: right; font-weight: bold;">
+
+        </span>-->
+      </div>
+      <el-table :data="entityList2" size="mini" border style="width: 100%" @sort-change="orderby">
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>-->
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+          <template slot-scope="scope">
+            {{ transferStr(scope.row.PayType) }}
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        </el-table-column>
+        <el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
 
   </div>
@@ -97,6 +128,10 @@
         dialogVisible: false,
         serviceId: '',
         entityList: [],
+        entityList2: [],
+        amount1: 0,
+        amount2: 0,
+        sureLoading: false,
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -113,6 +148,23 @@
       this.initDatas()
     },
     methods: {
+      BillSureClick () {
+        this.sureLoading = true
+
+        let strIds = ''
+        for (let idx in this.entityList) {
+          strIds += this.entityList[idx].Id + ','
+        }
+        let params = {
+          ids: strIds
+        }
+        api.BillSure(params, this.$axios).then(res => {
+          this.initDatas()
+          this.sureLoading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       transferStr (val) {
         if (val === '1') {
           return '准入缴费'
@@ -153,9 +205,11 @@
           Prop: this.Column.Prop
         }
         api.getBillList(params, this.$axios).then(res => {
-          this.entityList = res.data.DataInfo.items
-          this.currentItemCount = res.data.DataInfo.currentItemCount
           this.formDataSup = res.data.SupplierEntity
+          this.entityList = res.data.DataInfos[0].items
+          this.entityList2 = res.data.DataInfos[1].items
+          this.amount1 = res.data.AmountList[0]
+          this.amount2 = res.data.AmountList[1]
         }).catch(err => {
           console.error(err)
         })
@@ -172,7 +226,7 @@
       },
 
       jstimehandle(val) {
-        if (val === '') {
+        if (!val) {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'