前后:入库列表和准入范围列表按照编码查询

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -65,6 +65,54 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 
 	return total
 }
+func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl2(supplierTableName, supplierCertTableName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+	var resultsSlice []map[string][]byte
+
+	//获取总记录数
+	sqlCount := `select count(*) from ` + supplierTableName + ` a `
+	sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sqlCount += ` where ` + where
+
+	var sql string
+	sql = `select DISTINCT a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime, `
+	sql += ` b.WorkerTotal, `
+	sql += ` b.ContractNum, `
+	sql += ` b.UniversityNum, `
+	sql += ` b.TechnicalNum, `
+	sql += ` b.AboveProfNum, `
+	sql += ` b.MiddleProfNum, `
+	sql += ` b.NationalRegNum, `
+	sql += ` b.NationalCertTotal, `
+	sql += ` b.DesignerTotal, `
+	sql += ` b.SkillerTotal, `
+	sql += ` b.Status, `
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict`
+	sql += ` from ` + supplierTableName + ` a `
+	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sql += ` left join ` + "OilSupplierCert2File c on c.SupplierId = a.Id and c.SupplierCertId = b.Id"
+	sql += ` where ` + where
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	if (pageIndex != 0 && itemsPerPage !=0) {
+		sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+	}
+	s.DBE.SQL(sql).Find(entitiesPtr)
+
+	resultsSlice, _ = s.DBE.Query(sqlCount)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, _ = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+	}
+
+	return total
+}
 
 func (s *OilSupplierService) CheckRepeatApplyInfo(supplierTableName, supplierCertTableName, typeCode, SupplierName, CommercialNo, OrganCode, BankAccount, CompanyUrl string, entitiesPtr interface{}) {
 

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

@@ -769,6 +769,7 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	RegCapital1 := this.GetString("RegCapital1")
 	RegCapital2 := this.GetString("RegCapital2")
 	BusinessScope := this.GetString("BusinessScope")
+	Code := this.GetString("Code")
 
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
@@ -859,6 +860,9 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	if status != "" {
 		where = where + " and b.Status='" + status + "'"
 	}
+	if Code != "" {
+		where = where + " and c.Code like '" + Code + "%'"
+	}
 
 	//企业用户只看自己的数据记录
 	/*parameterSvc := baseparameter.GetBaseparameterService(utils.DBE) //取出外部门ID
@@ -875,7 +879,7 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	var list []supplier.OilSupplierView
 
-	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetMyPagingEntitiesWithOrderBytbl2(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 
 	var datainfo DataInfo
 	datainfo.Items = list

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

@@ -78,7 +78,7 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 	}
 
 	if Code != "" {
-		where = where + " and Code like '%" + Code + "%'"
+		where = where + " and Code like '" + Code + "%'"
 	}
 
 	if Name != "" {

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -3,6 +3,12 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
+        <span>
+          准入编码:&nbsp;
+          <el-input size="mini" v-model="Code" style="width:10%" placeholder="请输入"></el-input>
+          &nbsp;
+          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        </span>
         <span style="float: right;">
            <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
           <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加
@@ -153,6 +159,7 @@
         }
       }
       return {
+        Code: '',
         IsCompanyUser: '',
         loading: false,
         Ids: [],
@@ -217,6 +224,10 @@
       }
     },
     methods: {
+      handleSearch () {
+        this.currentPage = 1
+        this.initData()
+      },
       changeCertSubStatus (row, column, cell, event) {
         if (this.newcanadd && column.property === 'CertSubStatus') {
           this.$confirm('确定更改此准入范围状态吗?', '提示', {
@@ -257,6 +268,7 @@
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
+          Code: this.Code,
           _currentPage: this.currentPage,
           _size: this.size
         }

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -711,7 +711,7 @@
              style="margin-top: 35px;">
       <div slot="header"
            class="clearfix">
-        <span style="padding:3px 20px">现场考察报告</span>
+        <span style="padding:3px 20px">现场考察报告1</span>
         <el-button :disabled="!certId || checkStatus.includes(formData.Status)" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
         </el-button>
       </div>
@@ -1292,6 +1292,7 @@ export default {
     //   }
     // },
     imgFormat (fileurl) {
+      console.log(fileurl, 'fileurl')
       let url = fileurl.split('|')
       if (url[1] != null && url[1] != undefined && url[1] != '') {
         let Format = url[1].split('.')

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -4,6 +4,12 @@
       <div slot="header"
            class="clearfix">
         <span style="font-weight: bold">准入范围</span>
+        <span>
+          准入编码:&nbsp;
+          <el-input size="mini" v-model="Code" style="width:10%" placeholder="请输入"></el-input>
+          &nbsp;
+          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        </span>
         <span style="float: right;">
           <el-button style="float: right; padding: 3px 0px;"
                      type="text"
@@ -319,6 +325,7 @@
     },
     data () {
       return {
+        Code: '',
         IsCompanyUser: '',
         loading: false,
         tableloading: false,
@@ -370,6 +377,10 @@
       }
     },
     methods: {
+      handleSearch () {
+        this.currentPage = 1
+        this.initData()
+      },
       isDisabledBtn () {
         if (this.operType !== '制造商') {
           return true
@@ -520,6 +531,7 @@
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
+          Code: this.Code,
           _currentPage: this.currentPage,
           _size: this.size
         }

src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -3,6 +3,12 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
+        <span>
+          准入编码:&nbsp;
+          <el-input size="mini" v-model="Code" style="width:10%" placeholder="请输入"></el-input>
+          &nbsp;
+          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        </span>
         <span style="float: right;">
           <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
           <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
@@ -138,6 +144,7 @@
     }, */
     data () {
       return {
+        Code: '',
         loading: false,
         IsCompanyUser: '',
         Ids: [],
@@ -167,6 +174,10 @@
       }
     },
     methods: {
+      handleSearch () {
+        this.currentPage = 1
+        this.initData()
+      },
       changeCertSubStatus (row, column, cell, event) {
         if (this.newcanadd && column.property === 'CertSubStatus') {
           this.$confirm('确定更改此准入范围状态吗?', '提示', {
@@ -207,6 +218,7 @@
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
+          Code: this.Code,
           _currentPage: this.currentPage,
           _size: this.size
         }

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 基建类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="准入编码">
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="企业名称">
             <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
@@ -338,6 +341,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
         // 查询项
         searchFormReset: {},
         searchForm: {
+          Code: '',
           Id: '',
           SupplierName: '',
           OperType: '',

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 物资类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="准入编码">
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="企业名称">
             <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
@@ -363,6 +366,7 @@
         // 查询项
         searchFormReset: {},
         searchForm: {
+          Code: '',
           Id: '',
           SupplierName: '',
           OperType: '',
@@ -647,6 +651,7 @@
         }
         // 查询条件
         Object.assign(params, this.searchForm)
+        console.log(params, 'params')
         // 访问接口
         api.getStoreList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 服务类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="准入编码">
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="企业名称">
             <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
@@ -342,7 +345,8 @@
           SupplierId: '',
           CertId: '',
         },
-          searchForm: {
+        searchForm: {
+          Code: '',
           Id: '',
           SupplierName: '',
           OperType:'',