信息变更修改，添加审批历史，增加按钮

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochange.go

@@ -11,7 +11,9 @@ type OilInfoChange struct {
 	OldAccessCardNo     int       `xorm:"not null default 0 comment('曾用准入证号') INT(10)"`
 	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
 	Status              string    `xorm:"comment('状态标识') VARCHAR(10)"`
+	AuditIndex          int       `xorm:"default 0 comment('审批次数') INT(11)"`
 	Step                int       `xorm:"comment('页面上第几步') INT(10)"`
+	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	WorkFlowId          string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
 	OldSupplierName     string    `xorm:"comment('曾用名') VARCHAR(255)"`
 	SupplierTypeCode    string    `xorm:"comment('准入类别代码（1 物资类，2 基建类，3 技术服务类）') VARCHAR(5)"`
@@ -19,8 +21,11 @@ type OilInfoChange struct {
 	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
 	OldOilCertificateNo string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
 	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
+	OldGrade            string    `xorm:"comment('级别') VARCHAR(2)"`
 	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OldMgrUnit          string    `xorm:"comment('管理单位') VARCHAR(50)"`
 	OperType            string    `xorm:"comment('经营方式') CHAR(1)"`
+	OldOperType         string    `xorm:"comment('经营方式') CHAR(1)"`
 	Country             string    `xorm:"comment('国家') VARCHAR(20)"`
 	MaunAgent           string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
 	ConstructTeam       string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
@@ -100,6 +105,7 @@ type OilInfoChangeItem struct {
 
 type SuppModelInfo struct {
 	ConmmitTime        time.Time
+	InfoId             int
 	Id                 int       `xorm:"<- not null pk autoincr INT(10)"`
 	AccessCardNo       int       `xorm:"not null default 0 comment('准入证号') INT(10)"`
 	SupplierName       string    `xorm:"comment('企业名称') VARCHAR(255)"`

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochangeService.go

@@ -130,10 +130,11 @@ func (s *InfoChangeService) SubmitOrgAudit(workflowid, certId, annualId, wfName,
 	return processInstanceId
 }
 
-func (s *InfoChangeService) Insertentityinfo(infoname string, items string) (int64, error){
+func (s *InfoChangeService) Updateentityinfo(infoname string, items string, where string)  error{
 	allitem := strings.Split(items, ";")
 	var selectitem string
 	var selectiteval string
+	var err error
 	for i:=0; i<len(allitem); i++ {
 		infoitem := strings.Split(allitem[i],",")
 		selectitem = fmt.Sprintf("%s %s %s",selectitem, "Old"+strings.Trim(infoitem[0]," ") +",", strings.Trim(infoitem[0], " ")+"," )
@@ -141,29 +142,36 @@ func (s *InfoChangeService) Insertentityinfo(infoname string, items string) (int
 	}
 	selectitem = strings.Trim(selectitem, ",")
 	selectiteval = strings.Trim(selectiteval, ",")
-	var sql string
-	sql = `INSERT INTO ` + infoname + `(` + selectitem + `) VALUES (` + selectiteval +`)`
-	res, err := s.DBE.Exec(sql)
-	fmt.Println(res.LastInsertId())
-	infoid,_ := res.LastInsertId()
-	return infoid, err
+	var selectitemarr []string
+	var selectvalarr []string
+	selectitemarr = strings.Split(selectitem,",")
+	selectvalarr = strings.Split(selectiteval,",")
+
+	for i:=0; i<len(selectitemarr); i++ {
+		var sql string
+		sql = `UPDATE ` + infoname + ` set ` + selectitemarr[i] + ` = ` + selectvalarr[i] + ` where ` + where
+		_, err = s.DBE.Exec(sql)
+	}
+	//sql = `UPDATE ` + infoname + ` set DeletionStateCode = ` + deletionState + ` where ` + where
+	//sql = `INSERT INTO ` + infoname + `(` + selectitem + `) VALUES (` + selectiteval +`)`
+	return err
 }
 
 func (s *InfoChangeService) GetSuppPagingEntitiesWithOrderBytbl(supplierTableName, infoChangeName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
 	var resultsSlice []map[string][]byte
 
 	//获取总记录数
-	sqlCount := `select count(*) from ` + supplierTableName + ` a `
-	sqlCount += ` left join ` + infoChangeName + " b on b.SupplierId = a.Id"
+	sqlCount := `select count(*) from ` + infoChangeName + ` b `
+	sqlCount += ` left join ` + supplierTableName + ` a  on b.SupplierId = a.Id `
 	sqlCount += ` where ` + where
 
 	var sql string
 	sql = `select a.*, `
-	sql += ` b.Step, `
+	sql += ` b.Step, b.Id InfoId, `
 	sql += ` b.Status, b.CreateOn ConmmitTime, `
 	sql += ` b.WorkflowId `
-	sql += ` from ` + supplierTableName + ` a `
-	sql += ` left join ` + infoChangeName + " b on b.SupplierId = a.Id"
+	sql += ` from ` + infoChangeName + ` b `
+	sql += ` left join ` + supplierTableName + ` a on b.SupplierId = a.Id `
 	sql += ` where ` + where
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
@@ -413,6 +414,14 @@ func (this *InfoChangeController) GetEntityList() {
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
 	certIdList := actisvc.GetMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
+	appendIdarr := strings.Split(certIdList, ",")
+	for i, item := range appendIdarr {
+		idx := strings.Index(item,"-")
+		if (idx >= 0 ) {
+			appendIdarr[i] = strings.Split(item, "-")[0]
+		}
+	}
+	certIdList = strings.Join(appendIdarr, ",")
 	where += " and Id in (" + certIdList + ")"
 
 	svc := infochange.GetInfoChangeService(utils.DBE)
@@ -610,6 +619,36 @@ func (this *InfoChangeController) GetAuditer() {
 	this.ServeJSON()
 }
 
+// @Title 添加
+// @Description 新增年审
+// @Success	200	{object} controllers.Request
+// @router /addinfomain [post]
+func (this *InfoChangeController) AddInfoMain() {
+	SupplierId := this.GetString("SupplierId")
+	Remark := this.GetString("Remark")
+	var infochmain infochange.OilInfoChange
+	var errinfo ErrorDataInfo
+	infochmain.SupplierId ,_ = strconv.Atoi(SupplierId)
+	infochmain.Remark = Remark
+	infochmain.CreateOn = time.Now()
+	infochmain.CreateBy = this.User.Realname
+	infochmain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	_, err := svc.InsertEntityBytbl(OilInfoChangeName, &infochmain)
+	if err == nil{
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = infochmain.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}else {
+		errinfo.Message = "添加失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 提交审批
 // @Description 提交审批
 // @Success	200	{object} controllers.Request
@@ -618,13 +657,15 @@ func (this *InfoChangeController) AuditEntity() {
 	suppId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("auditer")
 	Remark := this.GetString("Remark")
-
+	InfoId := this.GetString("MInfoId")
 	//取出审批列表
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var infoitems []infochange.OilInfoChangeItem
 	where := " SupplierId = " + suppId
 	svc.GetEntities(&infoitems, where)
 	var infochangeentity infochange.OilInfoChange
+	infwhere := " Id = " + InfoId
+	svc.GetEntity(&infochangeentity, infwhere)
 	var infomodel infochange.OilInfoChangeItem
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
@@ -646,26 +687,27 @@ func (this *InfoChangeController) AuditEntity() {
 		items = fmt.Sprintf("%s %s %s %s", items, infoitems[i].SelectItem, ","+infoitems[i].BeChangeInfo, ","+infoitems[i].ChangeInfo+";")
 	}
 	items = strings.Trim(items, ";")
-	infoid, _ := svc.Insertentityinfo(OilInfoChangeName, items)
-	var infoupda infochange.OilInfoChange
-	infoupda.SupplierId,_ = strconv.Atoi(suppId)
-	svc.UpdateEntityBytbl(OilInfoChangeName, infoid, &infoupda, []string{"SupplierId"})
+	infowhere := " Id = " + InfoId
+	svc.Updateentityinfo(OilInfoChangeName, items, infowhere)
+	//修改从表infoid
 	for i := 0; i < len(infoitems); i++ {
-		infomodel.InfoId, _ = strconv.Atoi(strconv.FormatInt(infoid, 10))
+		infomodel.InfoId, _ = strconv.Atoi(InfoId)
 		err := svc.UpdateEntityBytbl(OilInfoChangeItemName, infoitems[i].Id, &infomodel, []string{"InfoId"})
 		fmt.Println(err)
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	processInstanceId := ""
+	businessKey := ""
 	if infochangeentity.WorkFlowId == "0" || len(infochangeentity.WorkFlowId) <= 0 {
 		//启动工作流
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_INFO_CHANGE, utils.ToStr(infoid), this.User.Id)
+		businessKey = InfoId + "-" +  strconv.Itoa(infochangeentity.AuditIndex)
+		processInstanceId = svcActiviti.StartProcess(workflow.OIL_INFO_CHANGE, businessKey, this.User.Id)
 	}
 
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
-	ActiComplete.BusinessKey = utils.ToStr(infoid)
+	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
@@ -686,9 +728,10 @@ func (this *InfoChangeController) AuditEntity() {
 		return
 	}
 	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
-
 	infochangeentity.WorkFlowId = processInstanceId
 	infochangeentity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	infochangeentity.AuditIndex = infochangeentity.AuditIndex + 1
+	infochangeentity.BusinessKey = ActiComplete.BusinessKey
 	infochangeentity.CreateOn = time.Now()
 	infochangeentity.CreateBy = this.User.Realname
 	infochangeentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -698,11 +741,13 @@ func (this *InfoChangeController) AuditEntity() {
 		"Status",
 		"Step",
 		"FirstAudit",
+		"AuditIndex",
+		"BusinessKey",
 		"CreateOn",
 		"CreateBy",
 		"CreateUserId",
 	}
-	svc.UpdateEntityByIdCols(infoid, infochangeentity, cols)
+	svc.UpdateEntityByIdCols(InfoId, infochangeentity, cols)
 }
 
 // @Title 审批
@@ -750,7 +795,7 @@ func (this *InfoChangeController) InfoAudit() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
-	ActiComplete.BusinessKey = utils.ToStr(infoid)
+	ActiComplete.BusinessKey = infomodel.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Remarks = dataother.AuditorRemark
@@ -771,6 +816,12 @@ func (this *InfoChangeController) InfoAudit() {
 				"Step",
 			}
 			_, err := svc.UpdateEntityByIdCols(infoid, infochanentity, cols)
+			if infochanentity.Status == "3" {
+				var infochangeitemmodel infochange.OilInfoChangeItem
+				infochangeitemmodel.ChangeStatus = 1
+				itemswhere := "InfoId = " + utils.ToStr(infoid)
+				svc.UpdateEntityBywheretbl(OilInfoChangeItemName, &infochangeitemmodel,  []string{"ChangeStatus"}, itemswhere)
+			}
 			if err == nil{
 				//原信息表更新
 				if infomodel.Status == "2" {
@@ -802,6 +853,30 @@ func (this *InfoChangeController) InfoAudit() {
 			infochanentity.Status = "-3" //企业法规处审批
 		}
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
+		if infochanentity.Status == "-2" {
+			// 审批历史
+			var audithistoryentity audithistory.Base_AuditHistory
+			audithistoryentity.EntityId = infoid
+			audithistoryentity.WorkflowId = infomodel.WorkFlowId
+			audithistoryentity.Process = ActiComplete.ProcessKey
+			audithistoryentity.BusinessKey = ActiComplete.BusinessKey
+			audithistoryentity.Type = "04"
+			audithistoryentity.BackStep = infomodel.Status
+			audithistoryentity.Index = infomodel.AuditIndex
+			audithistoryentity.CreateOn = time.Now()
+			audithistoryentity.CreateBy = this.User.Realname
+			audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			certSrv.InsertEntity(audithistoryentity)
+			var updateinfo infochange.OilInfoChange
+			updateinfo.Step = 1
+			updateinfo.WorkFlowId = ""
+			cols := []string{
+				"Id",
+				"WorkFlowId",
+				"Step",
+			}
+			svc.UpdateEntityByIdCols(infoid, updateinfo, cols)
+		}
 		if receiveVal == "true" {
 			infochanentity.Step = step
 			cols := []string{

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

@@ -58,6 +58,13 @@ export default {
       params: params
     })
   },
+  addInfoChMain (formData, myAxios) {
+    return myAxios({
+      url: '/infochange/addinfomain' ,
+      method: 'post',
+      params: formData
+    })
+  },
   getAuditer(myAxios) {
     return myAxios({
       url: '/infochange/getauditer',

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

@@ -11,8 +11,10 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="historychange">历史变更</el-button> -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" @click="submitInfoChange"
-            v-if="(InfoStatus == 0 || InfoStatus == '') && !butnab">提交申请</el-button>
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -2 || InfoStatus == 3) && !butnab">提交申请</el-button>
           <router-link :to="'/oilsupplier/infochange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -104,7 +106,9 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
-
+      <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    </el-dialog>
   </div>
 </template>
 
@@ -114,9 +118,11 @@
   } from 'vuex'
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/infochange';
+  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   export default {
     components: {
+      WfBackHistory,
       ChooseAuditor
     },
     computed: {
@@ -128,6 +134,12 @@
 
     data() {
       return {
+        audithistoryshow: false,
+        backhistroy: {
+          certId: '',
+          classId: '04',
+          workflowId: ''
+        },
         infoitemsoptions: [{
           value: 'SupplierName',
           label: '企业名称'
@@ -185,19 +197,24 @@
           SupplierTypeName: '',
           FirstAudit: '',
           auditer: '',
+          MInfoId:'',
           Remark: ''
         },
         InfoStatus: '',
         butnab: false,
+        MInfoId:'',
       }
     },
     created() {
       this.serviceId = this.$route.params.opera
       this.supplierId = this.serviceId
       this.InfoStatus = this.$route.query.InfoStatus
-      if (this.QualStatus > 0) {
-        this.butnab = true
-      }
+      this.MInfoId = this.$route.query.infoId
+      this.backhistroy.certId = this.MInfoId
+      // if (this.QualStatus > 0) {
+      //   this.butnab = true
+      // }
+      console.log("----this.InfoStatus---",this.InfoStatus)
       this.initDatas()
     },
     methods: {
@@ -246,6 +263,10 @@
           console.log(e)
         }
       },
+      //审批历史
+      auhistory() {
+        this.audithistoryshow = true
+      },
       //添加变更项目
       additems() {
         console.log(this.$refs.infochangeCorp.selectedLabel)
@@ -314,7 +335,8 @@
       },
       addInfoChangeAudit() {
         this.entityForm.auditer = this.auditer
-        console.log("==this.supplierId====", this.supplierId)
+        this.entityForm.MInfoId = this.MInfoId + ""
+        console.log("==this.entityForm====", this.entityForm)
         api.auditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/index.vue

@@ -9,10 +9,10 @@
         <span>
           <i class="icon icon-table2"></i> 企业信息表
         </span>
-        <!-- <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+        <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addinfochange">添加变更
           </el-button>
-        </span> -->
+        </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="年审日期">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -39,8 +39,8 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="90" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status">
-              <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
+            <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation?InfoStatus='+ scope.row.Status +'&infoId='+scope.row.InfoId">
+              <el-button type="primary" plain title="信息变更" size="mini">变更</el-button>
             </router-link>
           </template>
         </el-table-column>
@@ -129,6 +129,34 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
+     <el-dialog title="信息变更添加" :visible.sync="addshow" width="360px">
+      <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业名称" prop="SupplierId" required>
+              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId" required
+                placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="entityForm.Remark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span style="float: right;margin-top:-10px;">
+        <el-button size="small" @click="addshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="addInfoChange()">确 定</el-button>
+      </span>
+      <br>
+    </el-dialog>
    
   </div>
 </template>
@@ -138,6 +166,7 @@
   } from 'vuex';
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/infochange';
+  import annapi from '@/api/oilsupplier/annualaudit'
 
   export default {
     computed: {
@@ -170,9 +199,7 @@
         searchFormReset: {},
         entityForm: {
           Id: '',
-          SupplierName: '',
           SupplierId: '',
-          SupplierTypeName: '',
         },
         searchForm: {
           Id: '',
@@ -286,6 +313,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
+      this.getselectsupplier()
       //this.getDictOptions()
     },
     methods: {
@@ -317,7 +345,53 @@
           console.error(err)
         })
       },
+      getselectsupplier() {
+        annapi.getSupList(this.$axios).then(res => {
+          if (res.data.items.length != 0) {
+            for (var i = 0; i < res.data.items.length; i++) {
+              this.selectsupplierlist.push({
+                Id: res.data.items[i].Id,
+                Realname: res.data.items[i].SupplierName
+              })
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      addinfochange() {
+        this.addshow = true
+      },
+      addInfoChange() {
+        this.$refs['EntityFormref'].validate((valid) => {
+          if (valid) {
+            console.log("---this.entityForm--",this.entityForm)
+            this.entityForm.SupplierId = this.entityForm.SupplierId + ""
+            api.addInfoChMain(this.entityForm, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                console.log("--------res.data----", res.data)
+                //保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item;
+                this.initDatas();
+                this.addshow = false
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                });
 
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                });
+              }
+            }).catch(err => {
+              console.error(err)
+            });
+          }
+        })
+        
+      },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']