基建类准入范围

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

@@ -571,6 +571,17 @@ func (this *OilSupplierCertSubController) AddGoodsByFilter() {
 					certsValid = false
 					break
 				}
+				//加入对应表OilSupplierCert2File, 保存准入项所需的资质关系
+				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
+				cert2File.SupplierId = dataother.SupplierId
+				cert2File.SupplierCertId = dataother.SupplierCertId
+				cert2File.SupplierTypeCode = dataother.SupplierTypeCode
+				cert2File.IsManuf = strconv.Itoa(datamain.IsManufacturer)
+				cert2File.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
+				cert2File.Code = dataother.CheckList[n].Code
+				cert2File.Name = dataother.CheckList[n].Name
+				cert2File.NeedFileType = needHeader.FileName
+				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
 			}
 			if !certsValid {
 				//缺少资质，不会保存
@@ -595,13 +606,15 @@ func (this *OilSupplierCertSubController) AddGoodsByFilter() {
 	}
 	var errinfo ErrorDataInfo
 	if invalidCertMsg == "" {
+		errinfo.Code = 0
 		errinfo.Message = "操作成功！"
 	} else if vaildCnt > 0 {
+		errinfo.Code = -1
 		errinfo.Message = "部分成功！" + invalidCertMsg
 	} else {
 		errinfo.Message = invalidCertMsg
 	}
-	errinfo.Code = 0
+
 	this.Data["json"] = &errinfo
 	this.ServeJSON()
 }

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

@@ -480,7 +480,7 @@
               _this.loading = false
               _this.$message({
                 type: 'warning',
-                message: '操作失败！'
+                message: res.data.message
               })
             }
           })

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

@@ -120,10 +120,10 @@
         type: String,
         default: ''
       },
-      InStyle: {
+      /*InStyle: {
         type: String,
         default: ''
-      },
+      },*/
       OperType: {
         type: String,
         default: ''
@@ -158,6 +158,7 @@
         size: 10,
         currentPage: 1,
         currentItem_Count: 0,
+        InStyle: '0',
         yasuoname: '',
         SupplierId: 0,
         SupplierTypeCode: '',

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

@@ -296,16 +296,6 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围"
-                     :disabled="(!certId) || (WorkerTotal == 0)">
-          <business-list ref="businessList"
-                         :data.sync="businessList"
-                         @close="getbuslist"
-                         :canadd="add_flat"
-                         :candelete="delete_flat"
-                         height="360px"
-                         style="margin-top: 20px"></business-list>
-        </el-tab-pane>
         <el-tab-pane label="企业资质"
                      :disabled="(!certId) || (WorkerTotal == 0)">
           <subfile-list ref="subfileList"
@@ -317,6 +307,17 @@
                         style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
+        <el-tab-pane label="准入范围"
+                     :disabled="(!certId) || (WorkerTotal == 0)">
+          <business-list ref="businessList"
+                         :data.sync="businessList"
+                         @close="getbuslist"
+                         :canadd="add_flat"
+                         :candelete="delete_flat"
+                         height="360px"
+                         style="margin-top: 20px"></business-list>
+        </el-tab-pane>
+
         <el-tab-pane label="审批流程"
                      v-if="formDataCert.Status != 0">
           <el-card class="box-card">
@@ -532,7 +533,7 @@ import PerformanceList from '@/components/oilsupplier/performancelist'
 import PatentList from '@/components/oilsupplier/patentlist'
 import WinningList from '@/components/oilsupplier/winninglist'
 import BusinessList from '@/components/oilsupplier/businesslist'
-import SubfileList from '@/components/oilsupplier/subfilelist'
+import SubfileList from '@/components/oilsupplier/subfilelist2'
 import BasisInfo from '@/components/oilsupplier/basisinfo'
 
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'

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

@@ -295,16 +295,6 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="准入范围"
-                     :disabled="(!certId) || (WorkerTotal == 0)">
-          <tech-list ref="techList"
-                     :data.sync="techList"
-                     @close="getbuslist"
-                     :canadd="add_flat"
-                     :candelete="delete_flat"
-                     height="360px"
-                     style="margin-top: 20px"></tech-list>
-        </el-tab-pane>
         <el-tab-pane label="企业资质"
                      :disabled="(!certId) || (WorkerTotal == 0)">
           <subfile-list ref="subfileList"
@@ -315,6 +305,16 @@
                         height="360px"
                         style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
+        <el-tab-pane label="准入范围"
+                     :disabled="(!certId) || (WorkerTotal == 0)">
+          <tech-list ref="techList"
+                     :data.sync="techList"
+                     @close="getbuslist"
+                     :canadd="add_flat"
+                     :candelete="delete_flat"
+                     height="360px"
+                     style="margin-top: 20px"></tech-list>
+        </el-tab-pane>
 
         <el-tab-pane label="审批流程"
                      v-if="formDataCert.Status != 0">
@@ -529,7 +529,7 @@ import PerformanceList from '@/components/oilsupplier/performancelist'
 import PatentList from '@/components/oilsupplier/patentlist'
 import WinningList from '@/components/oilsupplier/winninglist'
 import TechList from '@/components/oilsupplier/techlist'
-import SubfileList from '@/components/oilsupplier/subfilelist'
+import SubfileList from '@/components/oilsupplier/subfilelist2'
 import TechInfo from '@/components/oilsupplier/techinfo'
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 import ChooseAuditor from '@/components/oilsupplier/chooseauditor'