lining 6 年之前
父节点
当前提交
8f24371ce0

+ 3 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappendsub.go

@@ -99,9 +99,10 @@ func (this *OilSupplierCertAppendSubController) GetListAppend() {
 	//if SupplierCertAppendId != "" {
 	//	where = where + " and SupplierCertAppendId = " + SupplierCertAppendId
 	//}
+	SupplierCertAppendId := this.GetString("SupplierCertAppendId")
 	SupplierCertId := this.GetString("SupCertId")
 	SupplierTypeCode := this.GetString("SupTypeCode")
-	suwhere := " SupplierCertId = "+ SupplierCertId+ " and SupplierTypeCode = "+ SupplierTypeCode +" and Type = 2"
+	suwhere := " SupplierCertId = "+ SupplierCertId+ " and SupplierCertAppendId= "+ SupplierCertAppendId +" and SupplierTypeCode = '"+ SupplierTypeCode +"' and Type in(2,3) "
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
 	var list []suppliercertsub.OilSupplierCertSub
 	//svc.GetEntitysByWhere(OilSupplierCertAppendSubName, where, &list)
@@ -309,6 +310,7 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 				} else {
 					entity.SupplierTypeCode = dataother.SupplierTypeCode
 				}
+				entity.SupplierCertSubId = datamain.SupplierCertAppendId
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
 				entity.EffectDate = time.Now()

+ 4 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/supplierfile.go

@@ -45,8 +45,9 @@ func (this *SupplierfileController) AllFileList() {
 		where = where + " and SupplierId = '" + SupplierId + "'"
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	AppendId := this.GetString("AppendId")
 	if SupplierTypeCode != "" {
-		where = where + " and SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
+		where = where + " and SupplierCertSubId= "+ AppendId +" and SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
 	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
@@ -80,8 +81,9 @@ func (this *SupplierfileController) FileListAppend() {
 		where = where + " and SupplierId = '" + SupplierId + "'"
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	AppendId := this.GetString("AppendId")
 	if SupplierTypeCode != "" {
-		where = where + " and SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
+		where = where + " and SupplierCertSubId= "+ AppendId +" and SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
 	where = where + " and SupType != 1"
 	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -503,6 +503,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -470,6 +470,7 @@
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -486,6 +486,7 @@
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -821,6 +821,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1044,6 +1044,7 @@
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -825,6 +825,7 @@
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
         const params = {
+          AppendId: this.formData.Id,
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,