已入库检查资质只检查流程通过的;已入库检查资质逻辑删除不认

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

@@ -81,5 +81,5 @@ type CheckFile struct {
 	SubName       	  string
 	CurrentPage       int64
 	Size        	  int64
-	Table        	  int 	"1准入,2增项,3年审,4信息变更"
+	Table        	  int 	"1准入,2增项,3年审,4信息变更,5已入库"
 }

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

@@ -3296,6 +3296,13 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 	var cert suppliercert.OilSupplierCert
 	supplierService.GetEntityByWhere("OilSupplierCert", "Id = "+file.CertId, &cert)
 
+	whereInfoFile := ""
+	if file.Table == 5 {
+		whereInfoFile = " and SupType in (0,1,3,5)"
+	} else {
+		whereInfoFile = " and IsDelete = 0"
+	}
+
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
 	where := ""
@@ -3307,7 +3314,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 			where = " and SupplierTypeCode in ( '000', '" + certInfo.SupplierTypeCode + "')"
 		}
 	}
-	fileSql := "SELECT * from OilSupplierFile WHERE IsDelete = 0 and SupplierId = " + strconv.Itoa(file.SupplierId) + where
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + where + whereInfoFile
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
@@ -3662,7 +3669,12 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	//whereInfoFile := ""
+	whereInfoFile := ""
+	if file.Table == 5 {
+		whereInfoFile = " and SupType in (0,1,3,5)"
+	} else {
+		whereInfoFile = " and IsDelete = 0"
+	}
 	//if file.CertId == "0" {
 	//	// 信息变更 不获取 增项和年审审核中的数据
 	//	whereInfoFile = " and SupType in (0,1,3,4,5)"
@@ -3678,7 +3690,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 			where = " and SupplierTypeCode in ( '000', '" + certInfo.SupplierTypeCode + "')"
 		}
 	}
-	fileSql := "SELECT * from OilSupplierFile WHERE IsDelete = 0 and SupplierId = " + strconv.Itoa(file.SupplierId) + where
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + where + whereInfoFile
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string

src/dashoo.cn/frontend_web/src/components/oilsupplier/checkFile.vue

@@ -73,6 +73,7 @@ export default {
       currentPage: 1,
       currentItemCount: 0,
       type: 0,
+      table: 0,
       fileName: '',
       subName: '',
       tableLoading: false,
@@ -84,10 +85,11 @@ export default {
     this.initData()
   },
   methods: {
-    getValue (supplierId, certId, operType) {
+    getValue (supplierId, certId, operType, table = 0) {
       this.currentPage = 1
       this.fileName = ''
       this.subName = ''
+      this.table = table
       this.size = 10
       this.certId = certId
       this.operType = operType
@@ -104,6 +106,7 @@ export default {
           SupplierId: this.supplierId,
           FileName: this.fileName,
           SubName: this.subName,
+          Table: this.table,
           CertId: this.certId.toString()
         }
         api.checkSupplierFileList(fileType, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -579,7 +579,7 @@
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
-        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2)
+        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2, 5)
       },
       updateInFlag () {
         this.dialogInFlag = true
@@ -946,6 +946,7 @@
             Type: this.formData.OperType === '制造商' ? 1 : 2,
             SupplierId: this.formData.Id,
             CertId: this.certId,
+            Table: 5,
             Grade: this.formData.Grade
           }
           api.checkSupplierFileNew(fileType, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -533,7 +533,7 @@
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
-        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2)
+        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2, 5)
       },
       editIsRestrict (val) {
         let params = {
@@ -908,6 +908,7 @@
             Type: this.formData.OperType === '制造商' ? 1 : 2,
             SupplierId: this.formData.Id,
             CertId: this.certId,
+            Table: 5,
             Grade: this.formData.Grade
           }
           api.checkSupplierFileNew(fileType, this.$axios).then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -598,7 +598,7 @@
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
-        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2)
+        this.$refs.checkFile.getValue(this.formData.Id, this.certId, this.formData.OperType === '制造商' ? 1 : 2, 5)
       },
       updateInFlag () {
         this.dialogInFlag = true
@@ -955,6 +955,7 @@
             Type: this.formData.OperType === '制造商' ? 1 : 2,
             SupplierId: this.formData.Id,
             CertId: this.certId,
+            Table: 5,
             Grade: this.formData.Grade
           }
           api.checkSupplierFileNew(fileType, this.$axios).then(res => {