前后:建设单位筛选下拉

src/dashoo.cn/backend/api/business/oilcontract/contract/contract.go

@@ -116,7 +116,7 @@ type HandOnStatisticsQuery struct {
 	Order        string
 	Prop         string
 	Asc          string
-	SecondUnit   string
+	SecondUnit   int
 	YearNum      int
 	SupplierType string
 }

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -44,10 +44,11 @@ func (s *OilContractService) GetHandOnStatisticsList(queryParam HandOnStatistics
 		sql += " AND a.ContractClass='" + queryParam.SupplierType + "'"
 	}
 
-	sql += " GROUP BY a.SecondUnit "
-	if queryParam.SecondUnit != "" {
-		sql += " HAVING c.FullName like '%" + queryParam.SecondUnit + "%'"
+	if queryParam.SecondUnit > 0 {
+		//sql += " HAVING c.FullName like '%" + queryParam.SecondUnit + "%'"
+		sql += " AND c.Id = " + strconv.Itoa(queryParam.SecondUnit)
 	}
+	sql += " GROUP BY a.SecondUnit "
 
 	if queryParam.Order != "" {
 		sql += " ORDER BY " + queryParam.Prop + " " + queryParam.Order

src/dashoo.cn/frontend_web/src/pages/oilcontract/report/handon-statistics.vue

@@ -15,7 +15,12 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="项目建设单位名称">
-            <el-input size="mini" clearable v-model="searchForm.SecondUnit" placeholder="项目建设单位名称"></el-input>
+<!--            <el-input size="mini" clearable v-model="searchForm.SecondUnit" placeholder="项目建设单位名称"></el-input>-->
+            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择" style="width: 100%" clearable>
+              <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                         style="width: 100%">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="类型" style="width: 170px">
             <el-select size="mini" v-model="searchForm.SupplierType" placeholder="请选择" style="width: 100px">
@@ -65,6 +70,7 @@
     data () {
       return {
         yearList: [],
+        secondUnitOptions: [],
         tableLoading: false,
         dialogVisible: false,
         // 列表数据
@@ -95,8 +101,18 @@
       this.getYearList()
       // 查询列表
       this.initDatas()
+      this.GetSecondUnitOptions()
     },
     methods: {
+      // 二级单位列表
+      GetSecondUnitOptions () {
+        let _this = this
+        this.$axios.get('/register/orgList').then(res => {
+          _this.secondUnitOptions = res.data.items
+        }).catch(err => {
+          console.log(err)
+        })
+      },
       getYearList () {
         let now = new Date()
         let nowYear = now.getFullYear()