增项申请物资准入

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

@@ -364,17 +364,16 @@ func (this *OilSupplierCertSubController) CheckCertSubLost () {
 	// 查询出已有哪些资质
 	supplierId := dataother.SupplierId
 	supplierTypeCode := dataother.SupplierTypeCode
-	var tableheaderList []tableheader.BaseTableheader
+	var tableheaderList []supplierfile.OilSupplierFile
 
-	fileSql := "SELECT b.* from OilSupplierFile a LEFT JOIN Base_TableHeader b on a.NeedFileType=b.Name AND "
-	fileSql += " a.SupplierTypeCode=b.CategoryCode WHERE a.SupplierId='" + strconv.Itoa(supplierId) + "'"
-	fileSql += " AND (a.SupplierTypeCode='" + supplierTypeCode + "' or a.SupplierTypeCode='000')"
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId='" + strconv.Itoa(supplierId) + "'"
+	fileSql += " AND (SupplierTypeCode='" + supplierTypeCode + "' or SupplierTypeCode='000')"
 
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
 	for _, tableheader := range tableheaderList {
-		companyHasHeaders += tableheader.Name + ","
+		companyHasHeaders += tableheader.NeedFileType + ","
 	}
 	var supplierModel supplier.OilSupplier
 	svcSupplier := supplier.GetOilSupplierService(utils.DBE)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -2749,11 +2749,7 @@
           type: 'warning'
         })
           .then(() => {
-            let params = {
-              SupplierId: parseInt(_this.SupplierId),
-              SupplierTypeCode: '02'
-            }
-            _this.$axios.delete('suppliercertsub/businessdelete/' + Id, {params})
+            _this.$axios.delete('suppliercertsub/businessdelete/' + Id, Id)
               .then(function (response) {
                 if (response.data.code === 0) {
                   _this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1148,7 +1148,7 @@
   import setapi from '@/api/oilsupplier/oilclassorgset'
 
   // v-viewer
-  import Vue from 'vue';
+  import Vue from 'vue'
   import Viewer from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   Vue.use(Viewer)
@@ -1156,7 +1156,6 @@
     Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
   })
 
-
   export default {
     components: {
       WfMultiHistory,
@@ -2111,8 +2110,8 @@
       checkLostCert () {
         let _this = this
         let params = {
-          SupplierId: parseInt(_this.SupplierId),
-          SupplierCertId: parseInt(_this.SupplierCertId),
+          SupplierId: parseInt(_this.formData.SupplierId),
+          SupplierCertId: parseInt(_this.formData.SupplierCertId),
           SupplierTypeCode: '01',
           Type: '1',
           IsManufacturer: 2,
@@ -3560,10 +3559,8 @@
           this.checkList[i].Id = this.checkList[i].Id + ''
         }
         this.loading = true
-        console.log('新增', params)
         this.$axios.post('/suppliercertappendsub/addgoodsbus', params)
           .then(res => {
-            console.log('结果', res)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',