Jelajahi Sumber

企业修改bug

lining 6 tahun lalu
induk
melakukan
75a4a80ec6

+ 7 - 7
src/dashoo.cn/backend/api/controllers/oilsupplier/qualchange.go

@@ -188,8 +188,8 @@ func (this *QualChangeController) FileList() {
 	var list []qualchange.OilQualChangeDetail
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	where := " 1=1"
-	orderby := "a.Id"
-	asc := false
+	orderby := "a.SupplierTypeCode"
+	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
@@ -198,13 +198,13 @@ func (this *QualChangeController) FileList() {
 			asc = true
 		}
 	}
-	//SupplierId := this.GetString("SupplierId")
-	//if SupplierId != "" {
-	//	where = where + " and a.SupplierId = '" + SupplierId + "'"
-	//}
+	SupplierId := this.GetString("SupplierId")
+	if SupplierId != "" {
+		where = where + " and a.SupplierId = '" + SupplierId + "'"
+	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode = '000', '01','02','03'"
+		where = where + " and a.SupplierTypeCode in ( '000', " + SupplierTypeCode + ")"
 	}
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo

+ 8 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -1263,12 +1263,12 @@
       this.formData.Id = this.serviceId
       this.initDatas()
       this.getDictOptions()
-      this.getbusList1()
+      // this.getbusList1()
       this.getsubfile1()
-      this.getbusList2()
-      this.getsubfile2()
-      this.getbusList3()
-      this.getsubfile3()
+      // this.getbusList2()
+      // this.getsubfile2()
+      // this.getbusList3()
+      // this.getsubfile3()
       this.getFileDictOptions()
       // this.getAccessCardNo()
     },
@@ -1383,7 +1383,7 @@
         let _this = this
         const params = {
           SupplierId: this.supplierId,
-          SupplierTypeCode: '01,02,03,000',
+          SupplierTypeCode: '\'01\',\'02\',\'03\'',
           _currentPage: 1,
           _size: 1000
         }
@@ -1781,8 +1781,8 @@
               })
               this.visible = false
               this.getsubfile1()
-              this.getsubfile2()
-              this.getsubfile3()
+              // this.getsubfile2()
+              // this.getsubfile3()
               this.$refs.refuploadattach.uploadFiles = []
             } else {
               _this.$message({