前后:查询列表

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

@@ -275,8 +275,18 @@ func (this *OilGoodsAptitudeController) GetCompareList() {
 		// 2变1
 		where += " and a.GoodsLevel > tmpa.GoodsLevel"
 	} else if Conditions == "4" {
-		//
-		where += " and a.GoodsLevel != tmpa.GoodsLevel"
+		// 旧表有新表没
+		where += " and tmpb.Code is null"
+	} else if Conditions == "5" {
+		// 新表有,旧表没
+		where += " and tmpb.Code is null"
+	} else if Conditions == "6" {
+		// code+资质+级别匹配
+		where += " and a.GoodsLevel = tmpa.GoodsLevel and (a.F01 = tmpa.F01 or (tmpa.F01 = '' && a.F01 is null)) and (a.F02 = tmpa.F02 or (tmpa.F02 = '' && a.F02 is null)) and (a.F03 = tmpa.F03 or (tmpa.F03 = '' && a.F03 is null)) and (a.F04 = tmpa.F04 or (tmpa.F04 = '' && a.F04 is null)) and (a.F05 = tmpa.F05 or (tmpa.F05 = '' && a.F05 is null)) and (a.F06 = tmpa.F06 or (tmpa.F06 = '' && a.F06 is null)) and (a.F07 = tmpa.F07 or (tmpa.F07 = '' && a.F07 is null)) and (a.F08 = tmpa.F08 or (tmpa.F08 = '' && a.F08 is null)) and (a.F09 = tmpa.F09 or (tmpa.F09 = '' && a.F09 is null)) and (a.F10 = tmpa.F10 or (tmpa.F10 = '' && a.F10 is null))" +
+			" and (a.F11 = tmpa.F11 or (tmpa.F11 = '' && a.F11 is null)) and (a.F12 = tmpa.F12 or (tmpa.F12 = '' && a.F12 is null)) and (a.F13 = tmpa.F13 or (tmpa.F13 = '' && a.F13 is null)) and (a.F14 = tmpa.F14 or (tmpa.F14 = '' && a.F14 is null)) and (a.F15 = tmpa.F15 or (tmpa.F15 = '' && a.F15 is null)) and (a.F16 = tmpa.F16 or (tmpa.F16 = '' && a.F16 is null)) and (a.F17 = tmpa.F17 or (tmpa.F17 = '' && a.F17 is null)) and (a.F18 = tmpa.F18 or (tmpa.F18 = '' && a.F18 is null)) and (a.F19 = tmpa.F19 or (tmpa.F19 = '' && a.F19 is null)) and (a.F20 = tmpa.F20 or (tmpa.F20 = '' && a.F20 is null))" +
+			" and (a.F21 = tmpa.F21 or (tmpa.F21 = '' && a.F21 is null)) and (a.F22 = tmpa.F22 or (tmpa.F22 = '' && a.F22 is null)) and (a.F23 = tmpa.F23 or (tmpa.F23 = '' && a.F23 is null)) and (a.F24 = tmpa.F24 or (tmpa.F24 = '' && a.F24 is null)) and (a.F25 = tmpa.F25 or (tmpa.F25 = '' && a.F25 is null)) and (a.F26 = tmpa.F26 or (tmpa.F26 = '' && a.F26 is null)) and (a.F27 = tmpa.F27 or (tmpa.F27 = '' && a.F27 is null)) and (a.F28 = tmpa.F28 or (tmpa.F28 = '' && a.F28 is null)) and (a.F29 = tmpa.F29 or (tmpa.F29 = '' && a.F29 is null)) and (a.F30 = tmpa.F30 or (tmpa.F30 = '' && a.F30 is null))" +
+			" and (a.F31 = tmpa.F31 or (tmpa.F31 = '' && a.F31 is null)) and (a.F32 = tmpa.F32 or (tmpa.F32 = '' && a.F32 is null)) and (a.F33 = tmpa.F33 or (tmpa.F33 = '' && a.F33 is null)) and (a.F34 = tmpa.F34 or (tmpa.F34 = '' && a.F34 is null)) and (a.F35 = tmpa.F35 or (tmpa.F35 = '' && a.F35 is null)) and (a.F36 = tmpa.F36 or (tmpa.F36 = '' && a.F36 is null)) and (a.F37 = tmpa.F37 or (tmpa.F37 = '' && a.F37 is null)) and (a.F38 = tmpa.F38 or (tmpa.F38 = '' && a.F38 is null)) and (a.F39 = tmpa.F39 or (tmpa.F39 = '' && a.F39 is null)) and (a.F40 = tmpa.F40 or (tmpa.F40 = '' && a.F40 is null))" +
+			" and (a.F41 = tmpa.F41 or (tmpa.F41 = '' && a.F41 is null)) and (a.F42 = tmpa.F42 or (tmpa.F42 = '' && a.F42 is null)) and (a.F43 = tmpa.F43 or (tmpa.F43 = '' && a.F43 is null)) and (a.F44 = tmpa.F44 or (tmpa.F44 = '' && a.F44 is null)) and (a.F45 = tmpa.F45 or (tmpa.F45 = '' && a.F45 is null)) and (a.F46 = tmpa.F46 or (tmpa.F46 = '' && a.F46 is null))"
 	}
 	if Order != "" && Prop != "" {
 		orderby = Prop

src/dashoo.cn/frontend_web/src/api/oilsupplier/goodsaptitude.js

@@ -107,6 +107,13 @@ export default {
       params: params
     })
   },
+  deleteList (params, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/deletelist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
   insertGoodsAptitude (myAxios) {
     return myAxios({
       url: '/goodsaptitude/insertgoodsaptitude',

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

@@ -303,9 +303,9 @@
           <span style="float: right;">
             <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="importExcel">导入
           </el-button>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="contrastList()">查看对比列表
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="contrastList()">查看企业对比
             </el-button>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="qualificaList()">查看资质对比列表
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="qualificaList()">查看资质对比
             </el-button>
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" @click="truncateimport()">清空所有导入
             </el-button>

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

@@ -11,20 +11,30 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="筛选条件">
             <el-select placeholder="请选择" v-model="conditions" style="width: 100%" size="mini">
-              <el-option :key="1" label="匹配正确" :value="1"></el-option>
+              <el-option :key="1" label="编码和级别匹配正确" :value="1"></el-option>
               <el-option :key="2" label="1级降2级" :value="2"></el-option>
               <el-option :key="3" label="2级升1级" :value="3"></el-option>
-<!--              <el-option :key="4" label="差异" :value="4"></el-option>-->
+              <el-option :key="4" label="旧表有导入无" :value="4"></el-option>
+              <el-option :key="5" label="导入有旧表无" :value="5"></el-option>
+              <el-option :key="6" label="完全匹配正确" :value="6"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" size="mini" @click="importhandleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="deleteList" :disabled="isDisable">删除</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <el-table stripe highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
                 style="width: 100%" @sort-change="orderby" v-loading="loading" >
-
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-checkbox :label="scope.row['Id']" :key="scope.row['Id']" style="margin-left:15px;" @change="handleCheckedCitiesChange($event, scope.row['Id'])">
+            </el-checkbox>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :prop="column.prop" sortable :width="column.width"
                          :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -183,6 +193,8 @@
         ],
         dynamicTableColumns: [],
         CreateOn: [],
+        deleteArr: [],
+        isDisable: true
       }
     },
 
@@ -238,6 +250,30 @@
         // this.importDialogVisible = false
         this.initDatas()
       },
+      handleCheckedCitiesChange(val, value) {
+        if (val) {
+          this.deleteArr.push(value)
+        } else {
+          let a = this.deleteArr.findIndex(item => item === val)
+          this.deleteArr.splice(a, 1)
+        }
+        console.log(val, this.deleteArr.length, 'value')
+        if (this.deleteArr.length > 0) {
+          this.isDisable = false
+        }
+      },
+      deleteList () {
+        let params = {
+          deleteArr: this.deleteArr.toString()
+        }
+        api.deleteList(params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas () {
         this.loading = true
         // 分页及列表条件