前后:已入库列表筛选

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

@@ -769,6 +769,7 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	RegCapital2 := this.GetString("RegCapital2")
 	BusinessScope := this.GetString("BusinessScope")
 	Code := this.GetString("Code")
+	InFlag := this.GetString("InFlag")
 
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
@@ -859,6 +860,10 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	if status != "" {
 		where = where + " and b.Status='" + status + "'"
 	}
+
+	if InFlag != "" {
+		where = where + " and b.InFlag='" + InFlag + "'"
+	}
 	if Code != "" {
 		where = where + " and c.Code like '" + Code + "%'"
 	}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -20,6 +20,14 @@
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
+          <el-form-item label="准入标识">
+            <el-select size="mini" style="width:100px" v-model="InFlag" placeholder="准入标识">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="准入" value="1"></el-option>
+              <el-option label="暂停" value="2"></el-option>
+              <el-option label="取消" value="3"></el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -332,6 +340,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
+        InFlag: '',
         // 列表排序
         Column: {
           Order: '',
@@ -763,6 +772,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '02',
+          InFlag: this.InFlag,
           Status: '8'
         }
         let myCreateOn = []

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -20,7 +20,14 @@
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
-
+          <el-form-item label="准入标识">
+            <el-select size="mini" style="width:100px" v-model="InFlag" placeholder="准入标识">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="准入" value="1"></el-option>
+              <el-option label="暂停" value="2"></el-option>
+              <el-option label="取消" value="3"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -361,6 +368,7 @@
           Order: '',
           Prop: ''
         },
+        InFlag: '',
         // 查询时间
         CreateOn: [],
         // 查询项
@@ -638,6 +646,7 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '01',
+          InFlag: this.InFlag,
           Status: '8'
         }
         let myCreateOn = []

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -20,6 +20,14 @@
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
+          <el-form-item label="准入标识">
+            <el-select size="mini" style="width:100px" v-model="InFlag" placeholder="准入标识">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="准入" value="1"></el-option>
+              <el-option label="暂停" value="2"></el-option>
+              <el-option label="取消" value="3"></el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -338,6 +346,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           Order: '',
           Prop: ''
         },
+        InFlag: '',
         // 查询时间
         CreateOn: [],
         // 查询项
@@ -765,6 +774,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '03',
+          InFlag: this.InFlag,
           Status: '8'
         }
         let myCreateOn = []