前后:资质对比列表

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -483,11 +483,11 @@ func (s *OilGoodsAptitudeService) GetPClassEntities(pageIndex, itemsPerPage int6
 		 tmpa.F29 AS tmpF29,tmpa.F30 AS tmpF30,tmpa.F31 AS tmpF31,tmpa.F32 AS tmpF32,tmpa.F33 AS tmpF33,tmpa.F34 AS tmpF34,tmpa.F35 AS tmpF35,
 		 tmpa.F36 AS tmpF36,tmpa.F37 AS tmpF37,tmpa.F38 AS tmpF38,tmpa.F39 AS tmpF39,tmpa.F40 AS tmpF40,tmpa.F41 AS tmpF41,tmpa.F42 AS tmpF42,
   		 tmpa.F42 AS tmpF42,tmpa.F43 AS tmpF43,tmpa.F44 AS tmpF44,tmpa.F45 AS tmpF45,tmpa.F46 AS tmpF46,tmpa.GoodsLevel AS tmpGoodsLevel,
-		if( ((a.F01 != tmpa.F01 && a.F01 is not null) or (tmpa.F01 = 1 && a.F01 is null)) or ((a.F02 != tmpa.F02 && a.F02 is not null) or (tmpa.F02 = 1 && a.F02 is null)) or ((a.F01 != tmpa.F03 && a.F03 is not null) or (tmpa.F03 = 1 && a.F03 is null)) or ((a.F04 != tmpa.F04 && a.F04 is not null) or (tmpa.F04 = 1 && a.F04 is null)) or ((a.F05 != tmpa.F05 && a.F05 is not null) or (tmpa.F05 = 1 && a.F05 is null)) or ((a.F06 != tmpa.F06 && a.F06 is not null) or (tmpa.F06 = 1 && a.F06 is null)) or ((a.F07 != tmpa.F07 && a.F07 is not null) or (tmpa.F07 = 1 && a.F07 is null)) or ((a.F08 != tmpa.F08 && a.F08 is not null) or (tmpa.F08 = 1 && a.F08 is null)) or ((a.F09 != tmpa.F09 && a.F09 is not null) or (tmpa.F09 = 1 && a.F09 is null)) or ((a.F10 != tmpa.F10 && a.F10 is not null) or (tmpa.F10 = 1 && a.F10 is null))
-		    or ((a.F11 != tmpa.F11 && a.F11 is not null) or (tmpa.F11 = 1 && a.F11 is null)) or ((a.F12 != tmpa.F12 && a.F12 is not null) or (tmpa.F12 = 1 && a.F12 is null)) or ((a.F13 != tmpa.F13 && a.F13 is not null) or (tmpa.F13 = 1 && a.F13 is null)) or ((a.F14 != tmpa.F14 && a.F14 is not null) or (tmpa.F14 = 1 && a.F14 is null)) or ((a.F15 != tmpa.F15 && a.F15 is not null) or (tmpa.F15 = 1 && a.F15 is null)) or ((a.F16 != tmpa.F16 && a.F16 is not null) or (tmpa.F16 = 1 && a.F16 is null)) or ((a.F17 != tmpa.F17 && a.F17 is not null) or (tmpa.F17 = 1 && a.F17 is null)) or ((a.F18 != tmpa.F18 && a.F18 is not null) or (tmpa.F18 = 1 && a.F18 is null)) or ((a.F19 != tmpa.F19 && a.F19 is not null) or (tmpa.F19 = 1 && a.F19 is null)) or ((a.F20 != tmpa.F20 && a.F20 is not null) or (tmpa.F20 = 1 && a.F20 is null))
-			or ((a.F21 != tmpa.F21 && a.F21 is not null) or (tmpa.F21 = 1 && a.F21 is null)) or ((a.F22 != tmpa.F22 && a.F22 is not null) or (tmpa.F22 = 1 && a.F22 is null)) or ((a.F23 != tmpa.F23 && a.F23 is not null) or (tmpa.F23 = 1 && a.F23 is null)) or ((a.F24 != tmpa.F24 && a.F24 is not null) or (tmpa.F24 = 1 && a.F24 is null)) or ((a.F25 != tmpa.F25 && a.F25 is not null) or (tmpa.F25 = 1 && a.F25 is null)) or ((a.F26 != tmpa.F26 && a.F26 is not null) or (tmpa.F26 = 1 && a.F26 is null)) or ((a.F27 != tmpa.F27 && a.F27 is not null) or (tmpa.F27 = 1 && a.F27 is null)) or ((a.F28 != tmpa.F28 && a.F28 is not null) or (tmpa.F28 = 1 && a.F28 is null)) or ((a.F29 != tmpa.F29 && a.F29 is not null) or (tmpa.F29 = 1 && a.F29 is null)) or ((a.F30 != tmpa.F30 && a.F30 is not null) or (tmpa.F30 = 1 && a.F30 is null))
-			or ((a.F31 != tmpa.F31 && a.F31 is not null) or (tmpa.F31 = 1 && a.F31 is null)) or ((a.F32 != tmpa.F32 && a.F32 is not null) or (tmpa.F32 = 1 && a.F32 is null)) or ((a.F33 != tmpa.F33 && a.F33 is not null) or (tmpa.F33 = 1 && a.F33 is null)) or ((a.F34 != tmpa.F34 && a.F34 is not null) or (tmpa.F34 = 1 && a.F34 is null)) or ((a.F35 != tmpa.F35 && a.F35 is not null) or (tmpa.F35 = 1 && a.F35 is null)) or ((a.F36 != tmpa.F36 && a.F36 is not null) or (tmpa.F36 = 1 && a.F36 is null)) or ((a.F37 != tmpa.F37 && a.F37 is not null) or (tmpa.F37 = 1 && a.F37 is null)) or ((a.F38 != tmpa.F38 && a.F38 is not null) or (tmpa.F38 = 1 && a.F38 is null)) or ((a.F39 != tmpa.F39 && a.F39 is not null) or (tmpa.F39 = 1 && a.F39 is null)) or ((a.F40 != tmpa.F40 && a.F40 is not null) or (tmpa.F40 = 1 && a.F40 is null))
-			or ((a.F41 != tmpa.F41 && a.F41 is not null) or (tmpa.F41 = 1 && a.F41 is null)) or ((a.F42 != tmpa.F42 && a.F42 is not null) or (tmpa.F42 = 1 && a.F42 is null)) or ((a.F43 != tmpa.F43 && a.F43 is not null) or (tmpa.F43 = 1 && a.F43 is null)) or ((a.F44 != tmpa.F44 && a.F44 is not null) or (tmpa.F44 = 1 && a.F44 is null)) or ((a.F45 != tmpa.F45 && a.F45 is not null) or (tmpa.F45 = 1 && a.F45 is null)) or ((a.F46 != tmpa.F46 && a.F46 is not null) or (tmpa.F46 = 1 && a.F46 is null))
+		if( ((tmpa.F01 is null && a.F01 = 1) or (tmpa.F01 = 1 && (a.F01 is null or a.F01 = 0))) or ((tmpa.F02 is null && a.F02 = 1) or (tmpa.F02 = 1 && (a.F02 is null or a.F02 = 0))) or ((tmpa.F03 is null && a.F03 = 1) or (tmpa.F03 = 1 && (a.F03 is null or a.F03 = 0))) or ((tmpa.F04 is null && a.F04 = 1) or (tmpa.F04 = 1 && (a.F04 is null or a.F04 = 0))) or ((tmpa.F05 is null && a.F05 = 1) or (tmpa.F05 = 1 && (a.F05 is null or a.F05 = 0))) or ((tmpa.F06 is null && a.F06 = 1) or (tmpa.F06 = 1 && (a.F06 is null or a.F06 = 0))) or ((tmpa.F07 is null && a.F07 = 1) or (tmpa.F07 = 1 && (a.F07 is null or a.F07 = 0))) or ((tmpa.F08 is null && a.F08 = 1) or (tmpa.F08 = 1 && (a.F08 is null or a.F08 = 0))) or ((tmpa.F09 is null && a.F09 = 1) or (tmpa.F09 = 1 && (a.F09 is null or a.F09 = 0))) or ((tmpa.F10 is null && a.F10 = 1) or (tmpa.F10 = 1 && (a.F10 is null or a.F10 = 0)))
+			or ((tmpa.F11 is null && a.F11 = 1) or (tmpa.F11 = 1 && (a.F11 is null or a.F11 = 0))) or ((tmpa.F12 is null && a.F12 = 1) or (tmpa.F12 = 1 && (a.F12 is null or a.F12 = 0))) or ((tmpa.F13 is null && a.F13 = 1) or (tmpa.F13 = 1 && (a.F13 is null or a.F13 = 0))) or ((tmpa.F14 is null && a.F14 = 1) or (tmpa.F14 = 1 && (a.F14 is null or a.F14 = 0))) or ((tmpa.F15 is null && a.F15 = 1) or (tmpa.F15 = 1 && (a.F15 is null or a.F15 = 0))) or ((tmpa.F16 is null && a.F16 = 1) or (tmpa.F16 = 1 && (a.F16 is null or a.F16 = 0))) or ((tmpa.F17 is null && a.F17 = 1) or (tmpa.F17 = 1 && (a.F17 is null or a.F17 = 0))) or ((tmpa.F18 is null && a.F18 = 1) or (tmpa.F18 = 1 && (a.F18 is null or a.F18 = 0))) or ((tmpa.F19 is null && a.F19 = 1) or (tmpa.F19 = 1 && (a.F19 is null or a.F19 = 0))) or ((tmpa.F20 is null && a.F20 = 1) or (tmpa.F20 = 1 && (a.F20 is null or a.F20 = 0)))
+			or ((tmpa.F21 is null && a.F21 = 1) or (tmpa.F21 = 1 && (a.F21 is null or a.F21 = 0))) or ((tmpa.F22 is null && a.F22 = 1) or (tmpa.F22 = 1 && (a.F22 is null or a.F22 = 0))) or ((tmpa.F23 is null && a.F23 = 1) or (tmpa.F23 = 1 && (a.F23 is null or a.F23 = 0))) or ((tmpa.F24 is null && a.F24 = 1) or (tmpa.F24 = 1 && (a.F24 is null or a.F24 = 0))) or ((tmpa.F25 is null && a.F25 = 1) or (tmpa.F25 = 1 && (a.F25 is null or a.F25 = 0))) or ((tmpa.F26 is null && a.F26 = 1) or (tmpa.F26 = 1 && (a.F26 is null or a.F26 = 0))) or ((tmpa.F27 is null && a.F27 = 1) or (tmpa.F27 = 1 && (a.F27 is null or a.F27 = 0))) or ((tmpa.F28 is null && a.F28 = 1) or (tmpa.F28 = 1 && (a.F28 is null or a.F28 = 0))) or ((tmpa.F29 is null && a.F29 = 1) or (tmpa.F29 = 1 && (a.F29 is null or a.F29 = 0))) or ((tmpa.F30 is null && a.F30 = 1) or (tmpa.F30 = 1 && (a.F30 is null or a.F30 = 0)))
+			or ((tmpa.F31 is null && a.F31 = 1) or (tmpa.F31 = 1 && (a.F31 is null or a.F31 = 0))) or ((tmpa.F32 is null && a.F32 = 1) or (tmpa.F32 = 1 && (a.F32 is null or a.F32 = 0))) or ((tmpa.F33 is null && a.F33 = 1) or (tmpa.F33 = 1 && (a.F33 is null or a.F33 = 0))) or ((tmpa.F34 is null && a.F34 = 1) or (tmpa.F34 = 1 && (a.F34 is null or a.F34 = 0))) or ((tmpa.F35 is null && a.F35 = 1) or (tmpa.F35 = 1 && (a.F35 is null or a.F35 = 0))) or ((tmpa.F36 is null && a.F36 = 1) or (tmpa.F36 = 1 && (a.F36 is null or a.F36 = 0))) or ((tmpa.F37 is null && a.F37 = 1) or (tmpa.F37 = 1 && (a.F37 is null or a.F37 = 0))) or ((tmpa.F38 is null && a.F38 = 1) or (tmpa.F38 = 1 && (a.F38 is null or a.F38 = 0))) or ((tmpa.F39 is null && a.F39 = 1) or (tmpa.F39 = 1 && (a.F39 is null or a.F39 = 0))) or ((tmpa.F40 is null && a.F40 = 1) or (tmpa.F40 = 1 && (a.F40 is null or a.F40 = 0)))
+			or ((tmpa.F41 is null && a.F41 = 1) or (tmpa.F41 = 1 && (a.F41 is null or a.F41 = 0))) or ((tmpa.F42 is null && a.F42 = 1) or (tmpa.F42 = 1 && (a.F42 is null or a.F42 = 0))) or ((tmpa.F43 is null && a.F43 = 1) or (tmpa.F43 = 1 && (a.F43 is null or a.F43 = 0))) or ((tmpa.F44 is null && a.F44 = 1) or (tmpa.F44 = 1 && (a.F44 is null or a.F44 = 0))) or ((tmpa.F45 is null && a.F45 = 1) or (tmpa.F45 = 1 && (a.F45 is null or a.F45 = 0))) or ((tmpa.F46 is null && a.F46 = 1) or (tmpa.F46 = 1 && (a.F46 is null or a.F46 = 0)))  
 		,true, false) as checked`
 
 	if Conditions == "5" {

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

@@ -384,10 +384,10 @@
         </el-pagination>
       </el-card>
     </el-dialog>
-    <el-dialog title="对比列表"  width="95%" top="5vh" :visible.sync="contrastListvisible">
+    <el-dialog title="企业对比列表"  width="95%" top="5vh" :visible.sync="contrastListvisible">
       <tmp-supplier-check v-if="contrastListvisible"></tmp-supplier-check>
     </el-dialog>
-    <el-dialog title="准入范围对比列表"  width="95%" top="5vh" :visible.sync="qualificaListvisible">
+    <el-dialog title="资质对比列表"  width="95%" top="5vh" :visible.sync="qualificaListvisible">
       <tmp-class-check v-if="qualificaListvisible"></tmp-class-check>
     </el-dialog>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/tmpclasscheck.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card" shadow="never" style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 准入范围对比表
+            <i class="icon icon-table2"></i> 资质对比表
           </span>
         <span style="float: right;">
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/tmpsuppliercheck.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card" shadow="never" style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 对比列表
+          <i class="icon icon-table2"></i> 企业对比表
         </span>
         <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
           <el-form-item label="准入编码">