2
3
Преглед на файлове

非制造商和制造商

yuedefeng преди 5 години
родител
ревизия
f8ede35fff

+ 13 - 26
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -1095,27 +1095,15 @@ func (this *OilSupplierCertSubController) UpdateManufacturers() {
 	json.Unmarshal(jsonblob, &manufacturerChangeDTO)
 
 	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
-	var CertSublListAll []suppliercertsub.OilSupplierCertSub
-	where := "SupplierCertId=" + certId
-	svc.GetEntities(&CertSublListAll, where)
-	certSubIdList := []int{}
-	for _, certSub := range CertSublListAll {
-		certSubIdList = append(certSubIdList, certSub.Id)
-	}
-	manufacturerChangeDTO.CertSubIdList = certSubIdList
-	invalidCertMsg := setManufacturerHandler(manufacturerChangeDTO)
+	strIsManufacturer := strconv.Itoa(manufacturerChangeDTO.IsManufacturer)
+	sqlStr := "update OilSupplierCertSub set IsManufacturer='" + strIsManufacturer + "' where SupplierCertId='" + certId + "'"
+	svc.DBE.Exec(sqlStr)
+
 	var errinfo ErrorDataInfo
-	if invalidCertMsg == "" {
-		errinfo.Message = "修改成功!"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		errinfo.Message = invalidCertMsg
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	}
+	errinfo.Message = "修改成功!"
+	errinfo.Code = 0
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
 }
 
 func setManufacturerHandler(manufacturerChangeDTO suppliercertsub.ManufacturerChangeDTO) (invalidCertMsg string) {
@@ -1136,15 +1124,14 @@ func setManufacturerHandler(manufacturerChangeDTO suppliercertsub.ManufacturerCh
 	svcCert.GetEntityById(SupplierCertId, &certEntity)
 
 	//------ 查询出企业已有哪些资质 Start------------
-	var tableheaderList []tableheader.BaseTableheader
-	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')"
-	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
+	var tableheaderList []supplierfile.OilSupplierFile
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId='" + strconv.Itoa(SupplierId) + "'"
+	fileSql += " AND (SupplierTypeCode='" + SupplierTypeCode + "' or SupplierTypeCode='000')"
+	svcHeader := supplierfile.GetSupplierfileService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
 	for _, tableheader := range tableheaderList {
-		companyHasHeaders += tableheader.Name + ","
+		companyHasHeaders += tableheader.NeedFileType + ","
 	}
 	//------ 查询出企业已有哪些资质 End--------------
 

+ 3 - 4
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -52,9 +52,9 @@
         <el-table-column align="right" width="245">
           <template slot="header" slot-scope="scope">
           <!-- <el-input v-model="search" size="mini" placeholder="输入关键字搜索"/> -->
-            <el-button-group>
-            <el-button type="primary" size="small" @click="setManufacturer(2)">制造商</el-button>
-            <el-button type="primary" size="small" @click="setManufacturer(1)">非制造商<i class="el-icon--right"></i></el-button>
+            <el-button-group :disabled="isDisabledBtn()">
+              <el-button type="primary" size="mini" @click="setManufacturer(1)">制造商</el-button>
+              <el-button type="primary" size="mini" @click="setManufacturer(2)">非制造商</el-button>
             </el-button-group>
           </template>
 
@@ -650,7 +650,6 @@ export default {
         })
     },
     setManufacturer(index){
-      console.log(index)
        if (this.Ids.length == 0) {
         this.$message({
           type: 'warning',

+ 3 - 3
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -55,9 +55,9 @@
 
         <el-table-column align="center" width="200">
           <template slot="header" slot-scope="scope">
-            <el-button-group>
-              <el-button type="plain"  size="mini" @click="setManufacturer(2)">制造商</el-button>
-              <el-button type="plain"  size="mini" @click="setManufacturer(1)">非制造商</el-button>
+            <el-button-group >
+              <el-button type="plain" :disabled="isDisabledBtn()" size="mini" @click="setManufacturer(1)">制造商</el-button>
+              <el-button type="plain" :disabled="isDisabledBtn()" size="mini" @click="setManufacturer(2)">非制造商</el-button>
             </el-button-group>
           </template>
           <template slot-scope="scope">