q前后:筛选

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

@@ -2458,7 +2458,7 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
-	Remark := this.GetString("Remark")
+	Conditions := this.GetString("Conditions")
 	IsDelete := this.GetString("IsDelete")
 	CreateOn := this.GetString("CreateOn")
 	CreateUserId := this.GetString("CreateUserId")
@@ -2491,8 +2491,12 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 		where = where + " and Name like '%" + Name + "%'"
 	}
 
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
+	if Conditions == "2"{
+		where = where + " and MinClassId = '0'"
+	} else if Conditions == "3"{
+		where = where + " and Checked = '0'"
+	} else if Conditions == "4"{
+		where = where + " and Checked = '1"
 	}
 
 	if IsDelete != "" {

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

@@ -1720,7 +1720,7 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
-	Remark := this.GetString("Remark")
+	Conditions := this.GetString("Conditions")
 	IsDelete := this.GetString("IsDelete")
 	CreateOn := this.GetString("CreateOn")
 	CreateUserId := this.GetString("CreateUserId")
@@ -1753,8 +1753,12 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 		where = where + " and Name like '%" + Name + "%'"
 	}
 
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
+	if Conditions == "2"{
+		where = where + " and MinClassId = '0'"
+	} else if Conditions == "3"{
+		where = where + " and Checked = '0'"
+	} else if Conditions == "4"{
+		where = where + " and Checked = '1"
 	}
 
 	if IsDelete != "" {

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

@@ -6,6 +6,14 @@
           <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="筛选条件">
+            <el-select placeholder="请选择" v-model="conditions" style="width: 100%" size="mini">
+              <el-option :key="1" label="全部" :value="1"></el-option>
+              <el-option :key="2" label="有差异" :value="2"></el-option>
+              <el-option :key="3" label="缺少资质" :value="3"></el-option>
+              <el-option :key="4" label="正常" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="准入编码">
             <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
           </el-form-item>
@@ -162,6 +170,7 @@
         dialogVisibleCertsSub: false,
         certsubListLoading: false,
         loadingExcel: false,
+        conditions: 1,
         searchForm: {
           AccessCardNo: '',
           SupplierName: '',
@@ -372,6 +381,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Conditions: this.conditions,
           Edition: '1'
         }
         let myCreateOn = []

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

@@ -6,6 +6,14 @@
           <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="筛选条件">
+            <el-select placeholder="请选择" v-model="conditions" style="width: 100%" size="mini">
+              <el-option :key="1" label="全部" :value="1"></el-option>
+              <el-option :key="2" label="有差异" :value="2"></el-option>
+              <el-option :key="3" label="缺少资质" :value="3"></el-option>
+              <el-option :key="4" label="正常" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="准入编码">
             <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
           </el-form-item>
@@ -151,6 +159,7 @@
         // 分页参数
         size: 10,
         currentPage: 1,
+        conditions: 1,
         currentItemCount: 0,
         // 列表排序
         Column: {
@@ -366,6 +375,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Conditions: this.conditions,
           Edition: '1'
         }
         let myCreateOn = []