供方查询补充

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -27,7 +27,7 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, `
+	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.AuditDate,`
 	sql += ` b.WorkerTotal, `
 	sql += ` b.ContractNum, `
 	sql += ` b.UniversityNum, `

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

@@ -1,9 +1,11 @@
 package oilsupplier
 
 import (
-	//"encoding/json"
+	"encoding/json"
 	"fmt"
 
+	// "fmt"
+
 	"dashoo.cn/backend/api/business/oilsupplier/selectbusiness"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	. "dashoo.cn/backend/api/controllers"
@@ -14,17 +16,23 @@ type SelectController struct {
 	BaseController
 }
 
+type RegCapitalRange struct {
+	RegCapital1 string
+	RegCapital2 string
+}
+
 // @Title 获取所有
 // @Description
 // @Success 200 {object}
 // @router /getcompanylist [post]
 func (this *SelectController) GetTList() {
 
-	fmt.Print("进入")
-	// var model BadRecord.Badrecord
-	// var jsonBlob = this.Ctx.Input.RequestBody
-	// json.Unmarshal(jsonBlob, &model)
-
+	var model supplier.OilSupplierView
+	var model1 RegCapitalRange
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &model1)
+	fmt.Println(model)
 	// //获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1"
@@ -39,12 +47,82 @@ func (this *SelectController) GetTList() {
 		}
 	}
 
-	// if model.Companyname != "" {
-	// 	where = where + " and CompanyName like '%" + model.Companyname + "%'"
-	// }
-	// if model.Categorycode != "" {
-	// 	where = where + " and Categorycode = '" + model.Categorycode + "'"
-	// }
+	if model.BusinessScope != "" {
+		where = where + " and BusinessScope like '%" + model.BusinessScope + "%'"
+	}
+
+	if model.AccessCardNo != "" {
+		where = where + " and AccessCardNo like '%" + model.AccessCardNo + "%'"
+	}
+	if model.SupplierName != "" {
+		where = where + " and SupplierName like '%" + model.SupplierName + "%'"
+	}
+	if model.SupplierTypeCode != "" {
+		where = where + " and SupplierTypeCode = '" + model.SupplierTypeCode + "'"
+	}
+	if model.InFlag != "" {
+		where = where + " and InFlag = '" + model.InFlag + "'"
+	}
+	if model.LegalPerson != "" {
+		where = where + " and LegalPerson like '%" + model.LegalPerson + "%'"
+	}
+	if model.ContactName != "" {
+		where = where + " and ContactName like '%" + model.ContactName + "%'"
+	}
+	if model.CommercialNo != "" {
+		where = where + " and CommercialNo like '%" + model.CommercialNo + "%'"
+	}
+
+	if model.CompanyType != "" {
+		where = where + " and CompanyType like '%" + model.CompanyType + "%'"
+	}
+	Province := this.GetString("Province")
+	if Province != "" {
+		where = where + " and Province = '" + Province + "'"
+	}
+	City := this.GetString("City")
+	if City != "" {
+		where = where + " and City = '" + City + "'"
+	}
+	Street := this.GetString("Street")
+	if Street != "" {
+		where = where + " and Street = '" + Street + "'"
+	}
+	Address := this.GetString("Address")
+	if Address != "" {
+		where = where + " and Address like '%" + Address + "%'"
+	}
+
+	LinkProvince := this.GetString("LinkProvince")
+	if LinkProvince != "" {
+		where = where + " and LinkProvince = '" + LinkProvince + "'"
+	}
+	LinkCity := this.GetString("LinkCity")
+	if LinkCity != "" {
+		where = where + " and LinkCity = '" + LinkCity + "'"
+	}
+	LinkStreet := this.GetString("LinkStreet")
+	if LinkStreet != "" {
+		where = where + " and LinkStreet = '" + LinkStreet + "'"
+	}
+	LinkAddress := this.GetString("LinkAddress")
+	if LinkAddress != "" {
+		where = where + " and LinkAddress like '%" + LinkAddress + "%'"
+	}
+	DepositBank := this.GetString("DepositBank")
+	if DepositBank != "" {
+		where = where + " and DepositBank like '%" + DepositBank + "%'"
+	}
+	SetupTime := this.GetString("SetupTime")
+	if SetupTime != "" {
+		where = where + " and SetupTime ='" + SetupTime + "'"
+	}
+	if model1.RegCapital1 != "" {
+		where = where + " and RegCapital >= '" + model1.RegCapital1 + "'"
+	}
+	if model1.RegCapital2 != "" {
+		where = where + " and RegCapital <= '" + model1.RegCapital2 + "'"
+	}
 
 	svc := selectbusiness.GetSelectService(utils.DBE)
 	var list []supplier.OilSupplierView

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

@@ -19,6 +19,9 @@
           :inline="true"
           style="float: right;position:absolute;right:15px;top:10.5px"
         >
+          <el-form-item label="准入证号">
+            <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
+          </el-form-item>
           <el-form-item label="企业名称">
             <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
           </el-form-item>
@@ -27,7 +30,7 @@
             <el-select
               size="mini"
               style="width:150px"
-              v-model="searchForm.SupplierTypeName"
+              v-model="searchForm.SupplierTypeCode"
               placeholder="请选择"
             >
               <el-option label="全部" value></el-option>
@@ -47,6 +50,7 @@
             >
               查询
               <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -66,18 +70,18 @@
         height="calc(100vh - 243px)"
         style="width: 100%"
         @sort-change="orderby"
-        @cell-click="handle"
-        @cell-mouse-enter="changeClor"
-        @cell-mouse-leave="backClor"
+        @row-click="handle"
       >
         <!--内框表格剩余栏显示-->
         <el-table-column label="准入证号" prop="AccessCardNo" sortable align="center"></el-table-column>
         <el-table-column label="企业名称" prop="SupplierName" sortable align="center"></el-table-column>
         <el-table-column label="准入类别" prop="SupplierTypeName" align="center"></el-table-column>
         <el-table-column label="法人代表" prop="LegalPerson" align="center"></el-table-column>
-        <el-table-column label="注册资金（万元）" prop="RegCapital" sortable align="center"></el-table-column>
+        <el-table-column label="注册资金（万元）" prop="RegCapital" width="170px" sortable align="center"></el-table-column>
         <el-table-column label="移动电话" prop="Mobile" align="center"></el-table-column>
-        <el-table-column label="最后一次年审" prop align="center"></el-table-column>
+        <el-table-column label="最后一次年审" prop="AuditDate" align="center">
+          <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
+        </el-table-column>
         <el-table-column label="有效期至" prop="ApplyTime" align="center">
           <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
         </el-table-column>
@@ -130,7 +134,7 @@
     >
       <el-form :inline="true" style="float: right;position:absolute;right:60px;top:10.5px">
         <el-form-item>
-          <el-button type="primary" size="mini" @click="print">打印</el-button>
+          <!-- <el-button type="primary" size="mini" @click="print">打印</el-button> -->
         </el-form-item>
       </el-form>
       <!--打印内容开始-->
@@ -141,7 +145,7 @@
               <el-input v-model="formData.SupplierName" style="width: 100%" readonly></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="准入证号 :" prop="AccessCardNo">
               <el-input v-model="formData.AccessCardNo" style="width: 100%" readonly></el-input>
             </el-form-item>
@@ -402,6 +406,196 @@
         </el-row>
       </el-form>
     </el-dialog>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form label-width="135px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入类别">
+              <el-select
+                size="mini"
+                style="width:100%"
+                v-model="searchForm.SupplierTypeCode"
+                placeholder="请选择"
+              >
+                <el-option label="全部" value></el-option>
+                <el-option label="物资类" value="01"></el-option>
+                <el-option label="基建类" value="02"></el-option>
+                <el-option label="技术服务类" value="03"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="准入标识">
+              <el-select
+                size="mini"
+                style="width:100%"
+                v-model="searchForm.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-col>
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码">
+              <el-input size="mini" v-model="searchForm.CommercialNo" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开户银行">
+              <el-input size="mini" v-model="searchForm.DepositBank" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType">
+              <el-select
+                size="mini"
+                v-model="searchForm.CompanyType"
+                maxlength="50"
+                filterable
+                placeholder="请选择"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in CompanyTypeOptions"
+                  :key="item.Id"
+                  :label="item.Key"
+                  :value="item.Value"
+                  style="width: 100%"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成立时间">
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="initDatas($event)">查 询</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -413,13 +607,27 @@
 import api from "@/api/oilsupplier/select";
 import FileSaver from "file-saver";
 import XLSX from "xlsx";
+import oapi from "@/api/oilsupplier/supplier";
 export default {
   created() {
+    Object.assign(this.searchFormReset, this.searchForm);
     // 执行初始化方法
+    this.getDictOptions();
     this.initDatas();
   },
   data() {
     return {
+      CityAry: [],
+      LinkCityAry: [],
+      countryprops: {
+        value: "adcode",
+        label: "name",
+        children: "districts"
+      },
+      CompanyTypeOptions: [],
+      dictData: null,
+      searchFormReset: {},
+      dialogVisible: false,
       formData: {
         SupplierName: "",
         AccessCardNo: "",
@@ -467,19 +675,69 @@ export default {
       size: 10,
       currentPage: 1,
       currentItemCount: 0,
+      SetupTime: "",
       searchForm: {
+        AccessCardNo: "",
         SupplierName: "",
-        SupplierTypeName: ""
+        SupplierTypeCode: "",
+        InFlag: "",
+        LegalPerson: "",
+        ContactName: "",
+        CommercialNo: "",
+        RegCapital1: "",
+        RegCapital2: "",
+        CompanyType: "",
+        SetupTime: "",
+        Province: "",
+        City: "",
+        Street: "",
+        Address: "",
+        LinkProvince: "",
+        LinkCity: "",
+        LinkStreet: "",
+        LinkAddress: "",
+        DepositBank: "",
+        BusinessScope: ""
       },
       //列表排序
       Column: {
         Order: "",
         Prop: ""
-      }
+      },
+      countryoptions: []
     };
   },
 
   methods: {
+    handleLinkAreaChange(value) {
+      this.searchForm.LinkProvince = value[0];
+      this.searchForm.LinkCity = value[1];
+      this.searchForm.LinkStreet = value[2];
+    },
+    handleAreaChange(value) {
+      console.log(value);
+      this.searchForm.Province = value[0];
+      this.searchForm.City = value[1];
+      this.searchForm.Street = value[2];
+    },
+    getDictOptions() {
+      oapi
+        .getDictList(this.$axios)
+        .then(res => {
+          this.dictData = res.data.items;
+          this.CompanyTypeOptions = this.dictData["CompanyType"];
+          this.getCityList(this.dictData["GaodeMapChinaAreas"]);
+        })
+        .catch(err => {
+          console.error(err);
+        });
+    },
+    getCityList(val) {
+      let resultData = JSON.parse(val);
+      let countstr = JSON.stringify(resultData.districts[0].districts);
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, "");
+      this.countryoptions = JSON.parse(countstr);
+    },
     exportExcel() {
       /* generate workbook object from table */
       let wb = XLSX.utils.table_to_book(
@@ -501,60 +759,48 @@ export default {
       }
       return wbout;
     },
-    backClor(row, column, event, cell) {
-      if (column.property === "SupplierName") {
-        event.style.background = "";
-      }
-    },
-    changeClor(row, column, event, cell) {
-      if (column.property === "SupplierName") {
-        event.style.background = "#d3dce6";
-      }
-    },
     handle(row, column, event, cell) {
-      if (column.property === "SupplierName") {
-        console.log(row);
-        this.formData.SupplierName = row.SupplierName;
-        this.formData.AccessCardNo = row.AccessCardNo;
-        this.formData.SpecTypeCode = row.SpecTypeCode;
-        this.formData.Country = row.Country;
-        this.formData.InStyle = row.InStyle;
-        this.formData.ManagementUnit = row.ManagementUnit;
-        this.formData.CredentialFlag = row.CredentialFlag;
-        this.formData.CommercialNo = row.CommercialNo;
-        this.formData.CountryTaxNo = row.CountryTaxNo;
-        this.formData.OrganCode = row.OrganCode;
-        this.formData.Address = row.Address;
-        this.formData.ZipCode = row.ZipCode;
-        this.formData.LinkAddress = row.LinkAddress;
-        this.formData.LinkZipCode = row.LinkZipCode;
-        this.formData.LegalPerson = row.LegalPerson;
-        this.formData.CompanyType = row.CompanyType;
-        this.formData.RegCapital = row.RegCapital;
-        this.formData.SetupTime = row.SetupTime;
-        this.formData.DepositBank = row.DepositBank;
-        this.formData.BankAccount = row.BankAccount;
-        this.formData.ContactName = row.ContactName;
-        this.formData.Mobile = row.Mobile;
-        this.formData.Telphone = row.Telphone;
-        this.formData.Fax = row.Fax;
-        this.formData.CompanyTel = row.CompanyTel;
-        this.formData.EMail = row.EMail;
-        this.formData.BankCreditRating = row.BankCreditRating;
-        this.formData.Level = row.Level;
-        this.formData.HseTraining = row.HseTraining;
-        this.formData.QualitySystemCert = row.QualitySystemCert;
-        this.formData.ProductQualityCert = row.ProductQualityCert;
-        this.formData.MaunLicense = row.MaunLicense;
-        this.formData.AgentManufacturer = row.AgentManufacturer;
-        this.formData.SupplierCertificate = row.SupplierCertificate;
-        this.formData.SafetyLicense = row.SafetyLicense;
-        this.formData.SpecIndustryCert = row.SpecIndustryCert;
-        this.formData.BusinessScope = row.BusinessScope;
-        this.formData.Remark = row.Remark;
-
-        this.show = true;
-      }
+      console.log(row);
+      this.formData.SupplierName = row.SupplierName;
+      this.formData.AccessCardNo = row.AccessCardNo;
+      this.formData.SpecTypeCode = row.SpecTypeCode;
+      this.formData.Country = row.Country;
+      this.formData.InStyle = row.InStyle;
+      this.formData.ManagementUnit = row.ManagementUnit;
+      this.formData.CredentialFlag = row.CredentialFlag;
+      this.formData.CommercialNo = row.CommercialNo;
+      this.formData.CountryTaxNo = row.CountryTaxNo;
+      this.formData.OrganCode = row.OrganCode;
+      this.formData.Address = row.Address;
+      this.formData.ZipCode = row.ZipCode;
+      this.formData.LinkAddress = row.LinkAddress;
+      this.formData.LinkZipCode = row.LinkZipCode;
+      this.formData.LegalPerson = row.LegalPerson;
+      this.formData.CompanyType = row.CompanyType;
+      this.formData.RegCapital = row.RegCapital;
+      this.formData.SetupTime = row.SetupTime;
+      this.formData.DepositBank = row.DepositBank;
+      this.formData.BankAccount = row.BankAccount;
+      this.formData.ContactName = row.ContactName;
+      this.formData.Mobile = row.Mobile;
+      this.formData.Telphone = row.Telphone;
+      this.formData.Fax = row.Fax;
+      this.formData.CompanyTel = row.CompanyTel;
+      this.formData.EMail = row.EMail;
+      this.formData.BankCreditRating = row.BankCreditRating;
+      this.formData.Level = row.Level;
+      this.formData.HseTraining = row.HseTraining;
+      this.formData.QualitySystemCert = row.QualitySystemCert;
+      this.formData.ProductQualityCert = row.ProductQualityCert;
+      this.formData.MaunLicense = row.MaunLicense;
+      this.formData.AgentManufacturer = row.AgentManufacturer;
+      this.formData.SupplierCertificate = row.SupplierCertificate;
+      this.formData.SafetyLicense = row.SafetyLicense;
+      this.formData.SpecIndustryCert = row.SpecIndustryCert;
+      this.formData.BusinessScope = row.BusinessScope;
+      this.formData.Remark = row.Remark;
+
+      this.show = true;
     },
 
     //列表排序功能
@@ -583,21 +829,31 @@ export default {
     },
     //初始化列表方法
     initDatas(event) {
-      console.log(event);
+      console.log(this.searchForm);
       if (event != null) {
         this.currentPage = 1;
+        this.dialogVisible = false;
       }
       let params = {
         _size: this.size,
         _currentPage: this.currentPage,
         Order: this.Column.Order,
-        Prop: this.Column.Prop
+        Prop: this.Column.Prop,
+        SetupTime: this.searchForm.SetupTime,
+        Province: this.searchForm.Province,
+        City: this.searchForm.City,
+        Street: this.searchForm.Street,
+        Address: this.searchForm.Address,
+        LinkProvince: this.searchForm.LinkProvince,
+        LinkCity: this.searchForm.LinkCity,
+        LinkStreet: this.searchForm.LinkStreet,
+        LinkAddress: this.searchForm.LinkAddress,
+        DepositBank: this.searchForm.DepositBank
       };
 
       api
         .getCompanyList(params, this.searchForm, this.$axios)
         .then(res => {
-          console.log(res.data.items);
           this.entityList = res.data.items;
           this.currentItemCount = res.data.currentItemCount;
         })
@@ -616,14 +872,16 @@ export default {
       this.initDatas();
     },
     searchCommand(command) {
-      if (command == "clear") {
+      if (command == "search") {
+        this.dialogVisible = true;
+      } else if (command == "clear") {
         this.clearSearch();
       }
     },
     clearSearch() {
-      this.searchForm.SupplierTypeName = "";
-      this.searchForm.SupplierName = "";
-      this.currentPage = 1;
+      Object.assign(this.searchForm, this.searchFormReset);
+      this.CityAry = [];
+      (this.LinkCityAry = []), (this.currentPage = 1);
       this.initDatas();
     }
   }