git commit -a -m '前后:年审按照年度查询;供方信息查询'

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

@@ -79,6 +79,7 @@ func (this *PaymentSelectController) GetEntitySumList() {
 	orderby := "c.SupplierTypeName"
 	where := " where 1=1 "
 	asc := " DESC"
+	CreateOn := this.GetString("CreateOn")
 	svc := paymentselect.GetPaymentSelectService(utils.DBE)
 	var registerUser register.OilCorporateInfo
 	sql := " UserName='" + this.User.Username + "'"
@@ -86,10 +87,16 @@ func (this *PaymentSelectController) GetEntitySumList() {
 	if this.User.IsCompanyUser == 1 {
 		where= where +" and s.CommercialNo='"+registerUser.CommercialNo+"' "
 	}
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and p.PayDate>='" + minDate + "' and p.PayDate<='" + maxDate + "'"
+		}
+	}
 
 	var list []paymentselect.PaymentselectList
-
-
 	svc.GetPaymentselectSumList(orderby, asc, &list, where)
 
 	var datainfo DataInfo

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

@@ -242,9 +242,9 @@ func (this *SelectController) GetTList() {
 		where1 := ""
 		for key, value := range CerSubName {
 			if key == 0 {
-				where1 += " (Name like '%" + value + "%' "
+				where1 += " (Name like '%" + value + "%' or Code like '" + value + "%' "
 			} else {
-				where1 += "or Name like '%" + value + "%' "
+				where1 += "or Name like '%" + value + "%'  or Code like '" + value + "%' "
 			}
 		}
 		where1 += ") "

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -19,17 +19,20 @@
           :inline="true"
           style="float: right;position:absolute;right:15px;top:10.5px"
         >
+          <el-form-item label="准入证号">
+            <el-input size="mini"  style="width:110px" v-model="searchForm.AccessCardNo" clearable placeholder="准入证号"></el-input>
+          </el-form-item>
           <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.AccessCardNo" clearable placeholder="请输入内容"></el-input>
+            <el-input size="mini"  style="width:122px" v-model="searchForm.CerSubName" clearable placeholder="准入范围/编码"></el-input>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable placeholder="请输入内容"></el-input>
+            <el-input size="mini"  style="width:110px" v-model="searchForm.SupplierName" clearable placeholder="企业名称"></el-input>
           </el-form-item>
 
           <el-form-item label="准入类别">
             <el-select
               size="mini"
-              style="width:150px"
+              style="width:80px"
               v-model="searchForm.SupplierTypeCode"
               placeholder="请选择"
             >
@@ -40,7 +43,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="准入状态">
-            <el-select size="mini" style="width:150px" v-model="InFlag" placeholder="准入状态">
+            <el-select size="mini" style="width:80px" v-model="InFlag" placeholder="准入状态">
               <el-option label="全部" value=""></el-option>
               <el-option label="准入" value="1"></el-option>
               <el-option label="暂停" value="2"></el-option>
@@ -132,7 +135,7 @@
             ></el-alert>
           </template>
         </el-table-column>
-        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
+        <el-table-column label="准入证号" width="100px" prop="AccessCardNo" sortable align="center">
            <template slot-scope="scope" >
              <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
           </template>
@@ -465,7 +468,7 @@
       <el-form label-width="135px" size="mini">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="准入编码">
+            <el-form-item label="准入证号">
               <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
@@ -754,8 +757,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="准入范围">
-              <el-input size="mini" v-model="searchForm.CerSubName" placeholder="请输入内容,多个用逗号隔开"></el-input>
+            <el-form-item label="准入编码">
+              <el-input size="mini" v-model="searchForm.CerSubName" placeholder="请输入准入范围/编码,多个用逗号隔开"></el-input>
             </el-form-item>
           </el-col>
         </el-row>