前后:曾用名套娃;目录,资质,曾用名导入;提交审核加制造商判断

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -657,6 +657,12 @@ func (s *TmpzcgtSession) UpdateSupplierFileSId() error {
 	return err
 }
 
+func (s *TmpzcgtSession) UpdateSupplierFile() error {
+	sql := "update OilSupplierFile set SupplierTypeCode = '000',IsManuf = '0' where NeedFileType in ('银行开户许可证或基本存款账户信息','营业执照','诚信合规承诺书','企业信用信息截屏','税务登记证','组织机构代码证') "
+	_, err := s.DBE.Query(sql)
+	return err
+}
+
 // 导入目录
 func (s *TmpzcgtSession) InsertOilCatalog() error {
 	s.DBE.Query("SET unique_checks=0;")
@@ -666,6 +672,9 @@ func (s *TmpzcgtSession) InsertOilCatalog() error {
 		"from `T_可不招标供方名录` b order by b.ID"
 	_, err := s.DBE.Query(sql)
 
+	sql1 := "update OilCatalog set `Status` = 2 WHERE CatalogType = 6"
+	_, err = s.DBE.Query(sql1)
+
 	// s.DBE.Query("commit;")
 	s.DBE.Query("SET unique_checks=1;")
 	// s.DBE.Query("SET autocommit=1;")
@@ -697,7 +706,7 @@ func (s *TmpzcgtSession) UpdateOilCatalog() error {
 func (s *TmpzcgtSession) InsertOldName() error {
 	s.DBE.Query("SET unique_checks=0;")
 	// s.DBE.Query("SET autocommit=0;")
-	sql := "insert into OilSupplierOldName(Name, OldName) select `企业名称`, `曾用名` from `T_资格预审表` where 曾用名 is not null group by 曾用名"
+	sql := "insert into OilSupplierOldName(Name, OldName, GfId) SELECT `企业名称`, `曾用名`, min(ID) from `T_资格预审表` where 曾用名 is not NULL GROUP BY `企业名称`, `曾用名`  ORDER BY min(ID) ASC"
 	_, err := s.DBE.Query(sql)
 
 	// s.DBE.Query("commit;")
@@ -721,14 +730,7 @@ func (s *TmpzcgtSession) InsertOldCardNo() error {
 
 // 修改曾用名
 func (s *TmpzcgtSession) UpdatetOldName() error {
-	sql := "update OilSupplierOldName a,(select ID,曾用名 from `T_资格预审表`) c set a.GfId = c.ID where a.OldName = c.曾用名"
-	_, err := s.DBE.Query(sql)
-	return err
-}
-
-// 修改曾用名
-func (s *TmpzcgtSession) UpdatetOldName2() error {
-	sql := "update OilSupplierOldName a,(select SupplierId,GfId from OilSupplierCert) c set a.SupplierId = c.SupplierId where a.GfId = c.GfId"
+	sql := "UPDATE OilSupplierOldName a SET a.SupplierId=(SELECT b.SupplierId FROM OilSupplierCert b WHERE b.GfId=a.GfId) WHERE a.SupplierId IS null"
 	_, err := s.DBE.Query(sql)
 	return err
 }

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

@@ -1320,7 +1320,7 @@ func (this *OilSupplierCertSubController) UpdateStatusWithLog() {
 	}
 }
 
-// @Title 物资类准入提交审核检查资质
+// @Title 物资类准入提交审核检查资质 2021-01-08
 // @Description 物资类准入提交审核检查资质
 // @Success 200 {object} business.device.DeviceChannels
 // @router /checkSubFile [post]
@@ -1362,6 +1362,14 @@ func (this *OilSupplierCertSubController) CheckSubFile () {
 			datamain.IsManufacturer = 1
 		} else {
 			datamain.IsManufacturer = 2
+			if sub.IsManufacturer == 1 {
+				var tmpLostCert LostCertFiles
+				tmpLostCert.Code = "0"
+				tmpLostCert.Name = ""
+				tmpLostCert.CertFileName = "非制造商准入范围不能为制造商,请手动修改"
+				lostCertList = append(lostCertList, tmpLostCert)
+				break
+			}
 		}
 		//检查是否资质全面
 		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -742,6 +742,12 @@ func (this *TmpzcgfController) InsertFileName() {
 		// session.Rollback()
 		fmt.Println(err)
 	}
+
+	err = svc.UpdateSupplierFile()
+	if err != nil {
+		// session.Rollback()
+		fmt.Println(err)
+	}
 	// err = session.Commit()
 	// fmt.Println(err)
 	elapsed := time.Since(t)
@@ -817,12 +823,6 @@ func (this *TmpzcgfController) InsertUpdateOldName() {
 		fmt.Println(err)
 	}
 
-	err = svc.UpdatetOldName2()
-	if err != nil {
-		// session.Rollback()
-		fmt.Println(err)
-	}
-
 	err = svc.UpdateOldCardNo()
 	if err != nil {
 		// session.Rollback()

src/dashoo.cn/frontend_web/src/components/usednameselect/index.vue

@@ -1,10 +1,7 @@
 <template>
   <div>
     <!--内框顶部显示-->
-    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
-      <div slot="header">
-      </div>
-
+<!--    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">-->
       <!--内框表格显示-->
       <el-table id="rebateSetTable" size="mini" :data="entityList" border height="calc(100vh - 243px)"
         style="width: 100%" @sort-change="orderby">
@@ -12,7 +9,7 @@
         <el-table-column label="企业名称" prop="SupplierName" sortable align="center"></el-table-column>
         <el-table-column label="曾用名" prop="OldSupplierName" align="center"></el-table-column>
       </el-table>
-      </el-card>
+<!--      </el-card>-->
   </div>
 </template>
 

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

@@ -1912,11 +1912,20 @@ export default {
       subApi.checkSubFile(params, this.$axios).then(res => {
         console.log(res.data, 888)
         if (res.data) {
-          this.$notify({
-            title: '提示',
-            message: '请上传'+ res.data[0].CertFileName +'！',
-            type: 'warning'
-          })
+          if (res.data[0].Code === '0') {
+            this.$notify({
+              title: '提示',
+              message: res.data[0].CertFileName +'！',
+              type: 'warning'
+            })
+          } else {
+            this.$notify({
+              title: '提示',
+              message: '请上传'+ res.data[0].CertFileName +'！',
+              type: 'warning'
+            })
+          }
+
           this.dialogVisible = false
         } else {
           this.saveEntity(1)