流程查询

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

@@ -4,6 +4,7 @@ import "time"
 
 type OilPaymentInfo struct {
 	Id             int       `xorm:"not null pk autoincr INT(11)"`
+	SrcId          int       `xorm:"INT(11)"`
 	SupplierId     int       `xorm:"comment('Supplier表') INT(11)"`
 	SupplierCertId int       `xorm:"comment('SupplierCert表') INT(11)"`
 	USCCode        string    `xorm:"comment('统一社会信用代码') VARCHAR(40)"`

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

@@ -920,6 +920,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 			//}
 			var payinfo paymentinfo.OilPaymentInfo
 			payinfo.SupplierId = list.SupplierId
+			payinfo.SrcId = list.Id
 			payinfo.SupplierCertId = list.CerId
 			payinfo.USCCode = supplierEntity.CommercialNo
 			payinfo.SupplierName = supplierEntity.SupplierName

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

@@ -179,6 +179,47 @@ func (this *PaymentInfoController) UpdateEntity() {
 	}
 }
 
+// @Title 修改金额
+// @Description 修改实体
+// @Param 	body body paymentinfo.Paymentinfo
+// @Success	200	{object} controllers.Request
+// @router /updateAmount/:id [post]
+func (this *PaymentInfoController) UpdateAmount() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model paymentinfo.OilPaymentInfo
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+
+	cols := []string{
+		"Amount",
+	}
+	_, err := svc.UpdateEntityByIdCols(id, &model, cols)
+
+
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 type BillInfoSure struct {
 	SupplierEntity supplier.OilSupplier
 	DataInfos [2]DataInfo

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

@@ -310,7 +310,7 @@ func (this *SelectController) GetProcessAuditList() {
 	if tabinx == "0" {
 		var list []supplier.OilSupplierView
 
-		total = svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+		total = svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, "b.Id", asc, &list, where)
 		datainfo.Items = list
 	} else if tabinx == "1" {
 		whereapp := "1=1"

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

@@ -989,6 +989,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					//}
 					var payinfo paymentinfo.OilPaymentInfo
 					payinfo.SupplierId = supplierCertEntity.SupplierId
+					payinfo.SrcId = supplierCertEntity.Id
 					payinfo.SupplierCertId = supplierCertEntity.Id
 					payinfo.USCCode = supplierEntity.CommercialNo
 					payinfo.SupplierName = supplierEntity.SupplierName

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

@@ -805,6 +805,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					//	Amount = 8000
 					//}
 					var payinfo paymentinfo.OilPaymentInfo
+					payinfo.SrcId = supplierCertAppendEntity.Id
 					payinfo.SupplierId = supplierCertAppendEntity.SupplierId
 					payinfo.SupplierCertId = supplierCertAppendEntity.SupplierCertId
 					payinfo.USCCode = supplierEntity.CommercialNo

src/dashoo.cn/backend/api/controllers/workflow/workflow.go

@@ -1,11 +1,14 @@
 package workflow
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
+	"fmt"
 	"sort"
 )
 
@@ -27,7 +30,9 @@ func (this *WorkflowController) GetHistoricTask() {
 	var historicTasks []workflow.ActiHistoricTask
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	historicTasks = svcActiviti.GetHistoricTasks(processKey, businessKey, processInstanceId)
-
+	sort.Slice(historicTasks, func(i, j int) bool {
+		return historicTasks[i].StartTime < historicTasks[j].StartTime
+	})
 	var datainfo DataInfo
 	datainfo.Items = historicTasks
 	this.Data["json"] = &datainfo
@@ -114,3 +119,56 @@ func (this *WorkflowController) GetHistoricImg() {
 	this.Ctx.Output.Body(entity)
 }
 
+// @Title 获取实体by SrcId
+// @Description 获取实体by SrcId
+// @Success 200 {object} paymentinfo.PaymentinfoList
+// @router /getWorkflowNodeBySrcId [get]
+func (this *WorkflowController) GetWorkflowNodeBySrcId() {
+	srcid := this.GetString("srcid")
+	var model paymentinfo.OilPaymentInfo
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+	where := "SrcId=" + srcid
+	has := svc.GetEntity(&model, where)
+
+	fmt.Println(has)
+
+	var historicTasks []workflow.ActiHistoricTask
+
+
+	if has {
+		var historicTask workflow.ActiHistoricTask
+		historicTask.TaskName = "缴费"
+		historicTask.StartTime = model.CreateOn.Unix() * 1000
+		historicTask.EndTime = model.ModifiedOn.Unix() * 1000
+		historicTask.Assignee = "--"
+		if model.IsPay == "0" {
+			historicTask.Remarks = "未确认"
+		} else if model.IsPay == "1" {
+			historicTask.Remarks = "已确认"
+		} else if model.IsPay == "2" {
+			historicTask.Remarks = "已缴费"
+		}
+		historicTasks = append(historicTasks, historicTask)
+	}
+
+	if model.IsPay == "2" {
+		var cert suppliercert.OilSupplierCert
+		has := svc.GetEntity(&cert, "Id=" + srcid)
+		if has {
+			var historicTask workflow.ActiHistoricTask
+			historicTask.StartTime = 0
+			historicTask.EndTime = 0
+			historicTask.TaskName = "入库"
+			historicTask.Assignee = "--"
+			if cert.Status == "7" {
+				historicTask.Remarks = "待入库"
+			} else {
+				historicTask.Remarks = "已入库"
+			}
+			historicTasks = append(historicTasks, historicTask)
+		}
+	}
+
+	this.Data["json"] = &historicTasks
+	this.ServeJSON()
+}

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

@@ -19,6 +19,13 @@ export default {
       data: formData
     })
   },
+  updateAmount (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/updateAmount/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
   getBillList (params, myAxios) {
     return myAxios({
       url: '/paymentinfo/getbillinfo',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/_opera/operation.vue

@@ -31,7 +31,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费金额">
-              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '1'" ></el-input>
+              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '0'" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -39,10 +39,11 @@
               <el-select v-model="formData.PayType" disabled >
                 <el-option label="准入缴费" value="1"></el-option>
                 <el-option label="年审缴费" value="2"></el-option>
+                <el-option label="增项缴费" value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="formData.IsPay == '2'">
             <el-form-item label="缴费方式">
               <!--<el-input v-model="formData.PayMode" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>-->
               <el-select v-model="formData.PayMode" placeholder="请选择" style="width: 100%"
@@ -52,8 +53,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="缴费日期">
+          <el-col :span="8" v-if="formData.IsPay == '2'">
+            <el-form-item label="缴费日期" >
               <el-date-picker
                 v-model="formData.PayDate"
                 type="date"
@@ -61,24 +62,24 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="银行流水号">
-              <el-input v-model="formData.BankSerialNum" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+          <el-col :span="8" v-if="formData.IsPay == '2'">
+            <el-form-item label="银行流水号" >
+              <el-input v-model="formData.BankSerialNum" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="16" v-if="formData.IsPay == '2'">
             <el-form-item label="银行名称">
-              <el-input v-model="formData.BankName" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+              <el-input v-model="formData.BankName" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-if="formData.IsPay == '0'">
             <el-form-item label="备注">
-              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item :span="24" style="text-align: center;">
-          <el-button type="primary" size="small" @click="updateEntity" v-if="formData.IsPay == '1'"><i class="el-icon-circle-check"></i>保存</el-button>
+          <el-button type="primary" size="small" @click="updateEntity" v-if="formData.IsPay == '0'"><i class="el-icon-circle-check"></i>保存</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -219,7 +220,6 @@
       initDatas () {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
-            console.log(res.data, 'res.data')
             this.formData = res.data
             if (this.formData && this.formData.PayDate === '0001-01-01T00:00:00Z') {
               this.formData.PayDate = new Date()
@@ -230,7 +230,7 @@
         }
       },
       updateEntity () {
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+        api.updateAmount(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initDatas()

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -240,6 +240,7 @@
           ModifiedBy: ''
         },
         entrydetail: {
+          Id: '',
           process: '',
           business: '',
           instance: '',
@@ -264,17 +265,20 @@
       },
       openwfhistory (val) {
         if (this.tabinx == '0') { // 准入
+          this.entrydetail.Id = val.CertId
           this.entrydetail.business = val.CertId
           this.entrydetail.instance = val.WorkflowId
           this.entrydetail.status = val.Status
           this.entrydetail.process = val.ProcessKey
           this.dialogVisible = true
         } else if (this.tabinx == '1') { //  增项
+          this.entrydetail.Id = val.Id
           this.entrydetail.business = val.Id
-          this.entrydetail.instance = val.WorkflowId
+          this.entrydetail.instance = val.WorkFlowId
           this.entrydetail.process = val.ProcessKey
           this.dialogVisible = true
         } else if (this.tabinx == '2') { // 年审
+          this.entrydetail.Id = val.Id
           this.entrydetail.business = val.Id
           this.entrydetail.instance = val.WorkflowId
           this.entrydetail.process = 'oil_audit_apply'
@@ -433,6 +437,8 @@
             return '已入库'
           case '9':
             return '未通过'
+          case '10':
+            return '待分办'
           default:
             return val
         }

src/dashoo.cn/frontend_web/src/pages/select/processselect/wfmultihistory.vue

@@ -23,7 +23,7 @@
       </el-table-column>
       <el-table-column prop="startTime" sortable min-width="150" label="开始时间" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{ timestampToTime(scope.row.startTime) }}
+          {{ jstimehandle(timestampToTime(scope.row.startTime)) }}
         </template>
       </el-table-column>
       <el-table-column prop="endTime" sortable min-width="150" label="结束时间" align="center" show-overflow-tooltip>
@@ -42,6 +42,7 @@
   import {
     mapGetters
   } from 'vuex'
+  import payapi from '@/api/oilsupplier/paymentinfo'
 
   export default {
     name: 'wfmultihistory',
@@ -82,6 +83,7 @@
     },
     methods: {
       getHistoryTask () {
+        this.historyTask = []
         console.log(this.entryinfo, 'this.entryinfo')
         let _this = this
         this.$axios.get('/audithistory/list?id=' + this.entryinfo.business)
@@ -138,18 +140,18 @@
       assigneeToUsers(users) {
         let userNames = ""
         let userArr = users.split(',')
-        for(let idx=0; idx<userArr.length; idx++) {
+        for (let idx = 0; idx < userArr.length; idx++) {
           let val = userArr[idx]
           for (let i = 0; i < this.userlist.length; i++) {
             if (parseInt(val) == parseInt(this.userlist[i].Id)) {
-              userNames += this.userlist[i].Realname + ", "
+              userNames += this.userlist[i].Realname + ', '
             }
           }
         }
-        if(userNames.length > 0) {
-          userNames = userNames.substring(0, userNames.length-2)
+        if (userNames.length > 0) {
+          userNames = userNames.substring(0, userNames.length - 2)
         }
-        return userNames;
+        return userNames
       },
       getuserlist (val) {
         this.$axios.post('workflow/userlist_post?userids=' + val)
@@ -157,14 +159,25 @@
             // response
             this.userlist = res.data.items
             this.historyTask = this.tmp_historyTask
+            this.getpayinfo()
           })
           .catch(err => {
             // handle error
             console.error(err)
           })
       },
-      timestampToTime(val) {
-        var date = new Date(val) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      getpayinfo () {
+        let params = {
+          srcid: this.entryinfo.Id
+        }
+        this.$axios.get('/workflow/getWorkflowNodeBySrcId', {params}).then(res => {
+          if (res.data !== null) {
+            this.historyTask = this.historyTask.concat(res.data)
+          }
+        })
+      },
+      timestampToTime (val) {
+        var date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
         var Y = date.getFullYear() + '-'
         var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
         var D = date.getDate() + ' '
@@ -173,7 +186,7 @@
         var s = date.getSeconds()
         return Y + M + D + h + m + s
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -184,14 +197,15 @@
           return '----'
         } else if (val === '1970-01-1 8:0:0') {
           return '----'
+        } else if (val === '1-01-1 8:5:43') {
+          return '----'
         } else {
           val = val.replace('T', ' ')
           return val.substring(0, 19)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>