审验对比修改

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

@@ -2089,6 +2089,8 @@ func (this *OilGoodsAptitudeController) FindInconformity() {
 func (this *OilGoodsAptitudeController) OilCompare() {
 
 	url := this.GetString("ExcelUrl")
+	inputcode := this.GetString("Code")
+	inputname := this.GetString("CompanyName")
 	session := utils.DBE.NewSession()
 	err := session.Begin()
 	svc := goodsaptitude.GetOilGoodsAptitudeSession(session)
@@ -2108,14 +2110,25 @@ func (this *OilGoodsAptitudeController) OilCompare() {
 		session.Close()
 	}()
 
-	var List []supplier.OilSupplier
+
 	var Comparelist []suppliercertsub.OilCompare
+	var Comparelistnow []suppliercertsub.OilCompare
 	var Compare suppliercertsub.OilCompare
-	var CompanyName = sheet.Rows[2].Cells[4].Value
-	where := "SupplierName = '" + CompanyName + "'"
-	svc.GetEntitysByWhere(OilSupplierName, where, &List)
+	var CompanyName string
+
 
 	for i := 2; i < len(sheet.Rows); i++ {
+		if inputcode != "" && inputcode != sheet.Rows[i].Cells[0].Value{
+			continue
+		}
+		if inputname !="" && inputname != sheet.Rows[i].Cells[4].Value {
+			continue
+		}
+		var List []supplier.OilSupplier
+		CompanyName = sheet.Rows[i].Cells[4].Value
+		where := "SupplierName = '" + CompanyName + "'"
+		svc.GetEntitysByWhere(OilSupplierName, where, &List)
+
 		Compare.SortCoding = sheet.Rows[i].Cells[0].Value
 		Compare.SortName = sheet.Rows[i].Cells[1].Value
 		Compare.Level = sheet.Rows[i].Cells[2].Value
@@ -2143,16 +2156,23 @@ func (this *OilGoodsAptitudeController) OilCompare() {
 		Compare.Diff = "0"
 		if len(List) < 1 {
 			Compare.Diff = "1"
+			Comparelist = append(Comparelist, Compare)
 		}
 		if len(List) > 0 {
 			var certsublist2 []suppliercertsub.OilSupplierCertSub
-			namewhere := "SupplierId = '" + strconv.Itoa(List[0].Id) + "' and Code ='" + Compare.SortCoding + "'"
+			namewhere := "SupplierId = '" + strconv.Itoa(List[0].Id) + "' and Code ='" + Compare.SortCoding + "' and SupplierTypeCode ='01'"
 			svc.GetEntitysByWhere(OilSupplierCertSubName, namewhere, &certsublist2)
 			if len(certsublist2) < 1 {
 				Compare.Diff = "1"
+				Comparelist = append(Comparelist, Compare)
 			}
 		}
-		Comparelist = append(Comparelist, Compare)
+		if Compare.Diff == "0" {
+			Comparelistnow = append(Comparelistnow,Compare)
+		}
+	}
+	for _,nowlist := range Comparelistnow {
+		Comparelist = append(Comparelist,nowlist)
 	}
 
 	os.Remove(filePath)

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

@@ -42,8 +42,8 @@
         </el-table-column>
         <el-table-column label="是否为制造商" width="100">
           <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'">非制造商</el-button>
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'">制造商</el-button>
+            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'|| !canadd || !newcanadd">非制造商</el-button>
+            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'|| !canadd || !newcanadd">制造商</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="CertSubStatus"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcompare/index.vue

@@ -4,28 +4,37 @@
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/goodsaptitude' }">审验对比</el-breadcrumb-item>
     </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);" v-loading="loading">
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="el-icon-document-copy"></i> 审验对比
+          <i class="el-icon-document-copy"></i> 物资类审验对比
         </span>
         <span style="float: right;">
-            <el-row>
-                <el-col :span="12">
-                    <el-upload multiple action="" ref="refuploadattach"
-                                :http-request="uploadrequest" :before-upload="beforeAvatarUpload">
-                        <el-button style="margin-left:10px; margin-top: -4px;" size="small" type="primary">点击上传</el-button>
-                    </el-upload>
-                </el-col>
-                <el-col :span="12">
-                    <el-button size="small" style="margin-left:10px; margin-top: -4px;" type="primary" @click="uploadExcel()">审验对比</el-button>
-                </el-col>
-            </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-upload multiple action="" ref="refuploadattach"
+                          :http-request="uploadrequest" :before-upload="beforeAvatarUpload">
+                  <el-button style="margin-left:10px; margin-top: -4px;" size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-col>
+            <el-col :span="12">
+              <el-button size="small" style="margin-left:10px; margin-top: -4px;" type="primary" @click="uploadExcel()">审验对比</el-button>
+            </el-col>
+          </el-row>
         </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+
+          <el-form-item label="分类编码">
+            <el-input size="mini" v-model="formData.Code" style="width:180px" placeholder="请输入分类编码"></el-input>
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-input size="mini" v-model="formData.CompanyName" style="width:180px" placeholder="请输入供应商名称"></el-input>
+          </el-form-item>
+        </el-form>
       </div>
-      <el-table id="rebateSetTable" :data="entityList" size="mini" v-loading="loading" border height="calc(100vh - 243px)"
-        style="width: 100%"  :v-loading="importloading" :row-class-name="compareline">
-        <el-table-column label="分类编码"  prop="SortCoding" align="center"></el-table-column>
+      <el-table v-loading="importloading" id="rebateSetTable" :data="entityList" size="mini" border height="calc(100vh - 243px)"
+        style="width: 100%" :row-class-name="compareline">
+        <el-table-column label="分类编码" sortable  prop="SortCoding" align="center"></el-table-column>
         <el-table-column label="分类名称"  prop="SortName" align="center"></el-table-column>
         <el-table-column label="级别"  prop="Level" align="center"></el-table-column>
         <el-table-column label="供应商名称"  prop="SupplierName" align="center"></el-table-column>
@@ -59,6 +68,10 @@
           loading: false,
           entityList:[],
           Excelurl: '',
+          formData: {
+            Code:'',
+            CompanyName:''
+          }
       }
     },
     created () {
@@ -66,15 +79,24 @@
     },
     methods: {
       uploadExcel () {
-        this.importloading = true
+        
         let params = {
-          ExcelUrl: this.Excelurl
+          ExcelUrl: this.Excelurl,
+          Code:this.formData.Code,
+          CompanyName:this.formData.CompanyName
         }
         if(this.Excelurl != ''){
+          this.importloading = true
           api.oilcompare(params, this.$axios).then(res => {
               if (res.data.items) {
                   this.entityList = res.data.items
                   this.importloading = false
+                }else{
+                  this.$message({
+                  type: 'warning',
+                  message: '查无数据！'
+                  })
+                  this.importloading = false
                 }
           })
         }else if (this.Excelurl == '') {
@@ -82,6 +104,7 @@
                 type: 'warning',
                 message: '获取文件地址错误！'
                 })
+              this.importloading = false
             }
       },
       uploadrequest (option) {
@@ -124,6 +147,9 @@
         if (row.Diff == "1") {
           return 'warning-row'
         }
+        if(row.Diff == "0"){
+          return 'correct-row'
+        }
       }
     }
   }
@@ -137,4 +163,13 @@
   .el-table .warning-row {
   background: #FFCCCC;
   }
+  .el-table .el-table__body .warning-row:hover>td {
+  background: #FFCCCC !important;
+  }
+  .el-table .correct-row {
+  background: #CCFFCC;
+  }
+  .el-table .el-table__body .correct-row:hover>td {
+  background: #CCFFCC !important;
+  }
 </style>