增项-变更信息

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappendsub/oilsuppliercertappendsub.go

@@ -43,3 +43,20 @@ type  OilSub struct {
 	ModifiedUserId       int       `xorm:"INT(10)"`
 	ModifiedBy           string    `xorm:"VARCHAR(50)"`
 }
+
+type OilAppendChangeItem struct {
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	InfoId           int       `xorm:"comment('信息变更主表Id') INT(10)"`
+	SupplierId       int       `xorm:"comment('供方Id') INT(10)"`
+	SelectItem       string    `xorm:"comment('变更字段名') VARCHAR(50)"`
+	SelectItemName   string    `xorm:"comment('变更字段名') VARCHAR(255)"`
+	BeChangeInfo     string    `xorm:"comment('变更前内容') VARCHAR(255)"`
+	ChangeInfo       string    `xorm:"comment('变更后内容') VARCHAR(255)"`
+	ChangeStatus     int       `xorm:"comment('变更状态') INT(10)"`
+	CreateOn         time.Time `xorm:"DATETIME"`
+	CreateUserId     int       `xorm:"INT(10)"`
+	CreateBy         string    `xorm:"VARCHAR(50)"`
+	ModifiedOn       time.Time `xorm:"DATETIME"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
+}

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

@@ -278,6 +278,7 @@ var (
 	TmpOilSupplierCertSubName                string = "tmp_OilSupplierCertSub"
 	OilSupplierSceneFileName                 string = "OilSupplierSceneFile" // 现场考察报告
 	OilCatalogSubName                        string = "OilCatalogSub" // 目录提交审核的主表
+	OilAppendChangeItemName                  string = "OilAppendChangeItem" // 增项信息变更的表
 )
 
 //分页信息及数据

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

@@ -7,6 +7,8 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/business2/parameter"
 	"encoding/json"
+	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -20,6 +22,18 @@ type OilSupplierCertAppendSubController struct {
 	BaseController
 }
 
+type AppendChangeItemsAll struct {
+	InfochangeForm []appenditems
+	SupplierId     string
+	MInfoId        string
+}
+type appenditems struct {
+	SelectItem     string
+	SelectItemName string
+	BeChangeInfo   string
+	ChangeInfo     string
+}
+
 // @Title 获取列表
 // @Description 获取列表
 // @Success 200 {object} []suppliercertappendsub.OilSupplierCertAppendSub
@@ -890,3 +904,120 @@ func (this *OilSupplierCertAppendSubController) UpdateManufacturerAppend() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} supplier.OilSupplier
+// @router /getchangelist/:id [get]
+func (this *OilSupplierCertAppendSubController) GetChangeEntity() {
+	Id := this.Ctx.Input.Param(":id")
+	InfoId := this.GetString("InfomainId")
+	var models [2]supplier.OilSupplier
+	var model supplier.OilSupplier
+	var enumModel supplier.OilSupplier
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	svc.GetEntityByIdBytbl(OilSupplierName, Id, &model)
+	models[0] = model
+
+	var infoitems []suppliercertappendsub.OilAppendChangeItem
+	where := " SupplierId = " + Id +" and InfoId ="+InfoId
+	where = where + " and ChangeStatus = 0"
+	svc.GetEntitysByWhere(OilAppendChangeItemName, where, &infoitems)
+	tmpModel := &model
+	enumModel = *tmpModel
+	immumodel := reflect.ValueOf(&enumModel)
+	elem := immumodel.Elem()
+	if len(infoitems) == 0 {
+		models[1] = enumModel
+		this.Data["json"] = &models
+		this.ServeJSON()
+		return
+	} else {
+		for _, info := range infoitems {
+			fmt.Println(info.SelectItem)
+			fmt.Println(";;;;;;;;;", elem.FieldByName(info.SelectItem).Type().String())
+			if elem.FieldByName(info.SelectItem).Type().String() == "int64" {
+				intchangeinfo, _ := strconv.ParseInt(info.ChangeInfo, 10, 64)
+				elem.FieldByName(info.SelectItem).SetInt(intchangeinfo)
+			} else if elem.FieldByName(info.SelectItem).Type().String() == "float64" {
+				floatchangeinfo, _ := strconv.ParseFloat(info.ChangeInfo, 64)
+				elem.FieldByName(info.SelectItem).SetFloat(floatchangeinfo)
+			} else if elem.FieldByName(info.SelectItem).Type().String() == "time.Time" {
+				t, _ := time.Parse("2006-01-02", info.ChangeInfo[0 : 10])
+				elem.FieldByName(info.SelectItem).Set(reflect.ValueOf(t))
+			} else {
+				elem.FieldByName(info.SelectItem).SetString(info.ChangeInfo)
+			}
+		}
+		models[1] = enumModel
+		this.Data["json"] = &models
+		this.ServeJSON()
+	}
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} annualaudit.OilAnnualAudit
+// @router /auditget/:id [get]
+func (this *OilSupplierCertAppendSubController) GetEntityThen() {
+	InfoId := this.Ctx.Input.Param(":id")
+	var model []suppliercertappendsub.OilAppendChangeItem
+	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
+	where := " InfoId = " + InfoId
+	svc.GetEntitysByWhere(OilAppendChangeItemName, where, &model)
+	var datainfo DataInfo
+	datainfo.Items = model
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Success	200	{object} controllers.Request
+// @router /addinfochangeitemch [post]
+func (this *OilSupplierCertAppendSubController) AddInfoChangeItemCh() {
+	var model AppendChangeItemsAll
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
+	json.Unmarshal(jsonBlob, &model)
+	var err error
+	where := " SupplierId = " + model.SupplierId
+	where = where + " and InfoId = " + model.MInfoId
+
+	var deleteEntity suppliercertappendsub.OilAppendChangeItem
+	delMainId, _ := strconv.Atoi(model.MInfoId)
+	deleteEntity.InfoId = delMainId
+	svc.DBE.Delete(deleteEntity)
+
+	var infoitementitys []suppliercertappendsub.OilAppendChangeItem
+	for i := 0; i < len(model.InfochangeForm); i++ {
+		var infoitementity suppliercertappendsub.OilAppendChangeItem
+		infoitementity.SelectItem = model.InfochangeForm[i].SelectItem
+		infoitementity.SelectItemName = model.InfochangeForm[i].SelectItemName
+		infoitementity.ChangeInfo = model.InfochangeForm[i].ChangeInfo
+		infoitementity.BeChangeInfo = model.InfochangeForm[i].BeChangeInfo
+		infoitementity.ChangeStatus = 0
+		infoitementity.SupplierId, _ = strconv.Atoi(model.SupplierId)
+		infoitementity.InfoId, _ = strconv.Atoi(model.MInfoId)
+		infoitementity.CreateOn = time.Now()
+		infoitementity.CreateBy = this.User.Realname
+		infoitementity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+		infoitementitys = append(infoitementitys, infoitementity)
+	}
+	_, err = svc.InsertEntityBytbl(""+OilAppendChangeItemName, &infoitementitys)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		//errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -169,7 +169,7 @@ module.exports = {
     'pages/oilsupplier/infochange/*.*',
     // 'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',
-    'pages/oilsupplier/supplierappend/*.*',
+    // 'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',

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

@@ -52,5 +52,25 @@ export default {
       url: '/suppliercertappendsub/delete/' + entityId,
       method: 'delete'
     })
+  },
+  GetChangeEntity (entityId, params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/getchangelist/' + entityId,
+      method: 'GET',
+      params: params
+    })
+  },
+  getEntityThen (entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/auditget/' + entityId,
+      method: 'GET'
+    })
+  },
+  addInfoChangeItemCh (formData, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/addinfochangeitemch',
+      method: 'post',
+      data: formData
+    })
   }
 }

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

@@ -983,7 +983,6 @@
         Object.assign(params, this.searchForm)
         // 访问接口
         api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
-          console.log(res.data.items, 'this.entityListthis.entityList')
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -383,7 +383,7 @@
           path: `/oilsupplier/supplierappend/2/basisdataopera`,
           query: {
             Id: row.Id,
-            editFlag: 1 //编辑标记： 1 修改，0 不修改
+            editFlag: 1 // 编辑标记： 1 修改，0 不修改
           }
         })
       },