Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

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

@@ -292,16 +292,15 @@ type OilSupplierView struct {
 }
 
 type CompanyList struct {
-	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
-	SupplierTypeCode  string
-	SupplierTypeName  string
-	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
-	InStyle           string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
-	SupplierStatus    string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
-	Type              string    `xorm:"comment('供应商类型') VARCHAR(255)"`
-	ApplyTime         time.Time `xorm:"comment('年审日期') DATETIME"`
-	BusinessScope     string    `xorm:"comment('营业范围') TEXT"`
-
+	SupplierName     string `xorm:"comment('企业名称') VARCHAR(255)"`
+	SupplierTypeCode string
+	SupplierTypeName string
+	InFlag           string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	InStyle          string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
+	SupplierStatus   string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
+	Type             string    `xorm:"comment('供应商类型') VARCHAR(255)"`
+	ApplyTime        time.Time `xorm:"comment('年审日期') DATETIME"`
+	BusinessScope    string    `xorm:"comment('营业范围') TEXT"`
 }
 
 type OilSupplierView1 struct {
@@ -347,7 +346,7 @@ type OilSupplierView1 struct {
 	InternalFlag      string    `xorm:"comment('国内采购') VARCHAR(255)"`
 	ImportFlag        string    `xorm:"comment('进口采购') VARCHAR(255)"`
 	OutsideFlog       string    `xorm:"comment('境外项目') VARCHAR(255)"`
-	ThirdAudit        string    `xorm:"comment('备注') VARCHAR(500)"`
+	ThirdAudit        string    `xorm:"comment('专业处室部门id') VARCHAR(500)"`
 	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	IsRestrict        int       `xorm:"INT(11)"`
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`

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

@@ -159,7 +159,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl3(supplierTableNam
 	//获取总记录数
 	sqlCount := `select count(DISTINCT b.Id) from ` + supplierTableName + ` a `
 	sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
-	sqlCount += ` left join OilSupplierCertSub c on c.SupplierCertId = b.Id`
+	//sqlCount += ` left join OilSupplierCertSub c on c.SupplierCertId = b.Id`
 	sqlCount += ` where ` + where
 
 	var sql string
@@ -176,11 +176,12 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl3(supplierTableNam
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
 	sql += ` b.RecUnitName, `
-	sql += ` GROUP_CONCAT(CONCAT(c.Code, ':', c.Name)) as CodeName, `
+	sql += ` b.ThirdAudit, `
+	//sql += ` GROUP_CONCAT(CONCAT(c.Code, ':', c.Name)) as CodeName, `
 	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict,b.Remark`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
-	sql += ` left join OilSupplierCertSub c on c.SupplierCertId = b.Id`
+	//sql += ` left join OilSupplierCertSub c on c.SupplierCertId = b.Id`
 	sql += ` where ` + where
 	sql += ` GROUP BY a.Id,b.Id`
 	if asc {
@@ -438,7 +439,7 @@ func (s *OilSupplierService) GetCertIds(entitiesPtr interface{}, where string) {
 func (s *OilSupplierService) ConverseSupplierTypeToInt(typeCode string) (typeInt int) {
 	if typeCode == "01" {
 		typeInt = 1
-	}else if typeCode == "02" {
+	} else if typeCode == "02" {
 		typeInt = 2
 	} else if typeCode == "03" {
 		typeInt = 3
@@ -462,7 +463,7 @@ func (s *OilSupplierService) ConverseSupplierTypeToInt(typeCode string) (typeInt
 	return typeInt
 }
 
-func (s *OilSupplierService) GetDeleteSub(TableName, where string , entitiesPtr interface{}) {
+func (s *OilSupplierService) GetDeleteSub(TableName, where string, entitiesPtr interface{}) {
 	//var resultsSlice []map[string][]byte
 
 	//获取总记录数
@@ -496,7 +497,7 @@ func (s *OilSupplierService) GetDeleteSub(TableName, where string , entitiesPtr
 	//return total
 }
 
-func (s *OilSupplierService) GetDeleteSub2(TableName, where string , entitiesPtr interface{}, name string) {
+func (s *OilSupplierService) GetDeleteSub2(TableName, where string, entitiesPtr interface{}, name string) {
 
 	sql := `update OilSupplierCertSub a `
 	if TableName == "OilBasisBuild" {

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

@@ -591,6 +591,7 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 	BusinessScope := this.GetString("BusinessScope")
 	RecUnitName := this.GetString("RecUnitName")
 	RecUnitId := this.GetString("RecUnitId")
+	ThirdAudit := this.GetString("ThirdAudit")
 
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
@@ -685,6 +686,10 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 		where = where + " and b.RecUnitId = '" + RecUnitId + "' "
 	}
 
+	if ThirdAudit != "" {
+		where = where + " and b.ThirdAudit = '" + ThirdAudit + "' "
+	}
+
 	status := this.GetString("Status")
 	if status != "" {
 		where = where + " and b.Status='" + status + "'"
@@ -1297,6 +1302,15 @@ func (this *OilSupplierController) GetDictList() {
 	users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
 	dictList["Auditer"] = users
 
+	// 所有专业处室
+	var allBusDeptList []organize.Base_Organize
+	//where = "Category='Unit' and ParentId in (100000001, 100000128)"
+	//00097005 直属机构 00265300 公司机关 00097004 机关附属机构
+	//where = "Category='Unit' and OuterPhone in (00097005,00265300,00097004)"
+	whereBus := "(Category='Unit' and ParentId in (100000009, 100000004))"
+	orgsvc.GetEntities(&allBusDeptList, whereBus)
+	dictList["AllBusDeptList"] = allBusDeptList
+
 	var datainfo DataInfo
 	datainfo.Items = dictList
 	this.Data["json"] = &datainfo
@@ -2656,7 +2670,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 
 		idString := ""
 		idString1 := ""
-		for i := 0; i < len(certSubList); i = i+1000 {
+		for i := 0; i < len(certSubList); i = i + 1000 {
 			var ids suppliercertsub.Ids
 			certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 3, strconv.Itoa(i))
 			if ids.Id != "" {
@@ -2675,7 +2689,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 			if file.Type == 1 { //制造商
 				idString = ""
 				//如果是制造商,准入范围按照各项准入范围的类型判断
-				for i := 0; i < len(certSubList); i = i+1000 {
+				for i := 0; i < len(certSubList); i = i + 1000 {
 					var ids suppliercertsub.Ids
 					certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1, strconv.Itoa(i))
 
@@ -2685,7 +2699,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 						break
 					}
 				}
-				for i := 0; i < len(certSubList); i = i+1000 {
+				for i := 0; i < len(certSubList); i = i + 1000 {
 					var ids1 suppliercertsub.Ids
 					certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2, strconv.Itoa(i))
 					if ids1.Id != "" {
@@ -2799,7 +2813,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 	certsubService.GetListByCertId(strconv.Itoa(cert.Id), &certSubList)
 	idString := ""
 	idString1 := ""
-	for i := 0; i < len(certSubList); i = i+1000 {
+	for i := 0; i < len(certSubList); i = i + 1000 {
 		var ids suppliercertsub.Ids
 		certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 3, strconv.Itoa(i))
 		if ids.Id != "" {
@@ -2836,7 +2850,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 		needList = filesvc.GetGoodsNeedFileListNew(idString, "2")
 		if file.Type == 1 { //制造商
 			idString = ""
-			for i := 0; i < len(certSubList); i = i+1000 {
+			for i := 0; i < len(certSubList); i = i + 1000 {
 				var ids suppliercertsub.Ids
 				certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1, strconv.Itoa(i))
 				if ids.Id != "" {
@@ -2845,7 +2859,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 					break
 				}
 			}
-			for i := 0; i < len(certSubList); i = i+1000 {
+			for i := 0; i < len(certSubList); i = i + 1000 {
 				var ids1 suppliercertsub.Ids
 				certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2, strconv.Itoa(i))
 				if ids1.Id != "" {
@@ -2976,7 +2990,7 @@ func (this *OilSupplierController) CheckSupplierFileDelete() {
 
 			idString := ""
 			idString1 := ""
-			for i := 0; i < len(certSubList); i = i+1000 {
+			for i := 0; i < len(certSubList); i = i + 1000 {
 				var ids suppliercertsub.Ids
 				certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 3, strconv.Itoa(i))
 				if ids.Id != "" {
@@ -2995,7 +3009,7 @@ func (this *OilSupplierController) CheckSupplierFileDelete() {
 					//如果是制造商,准入范围按照各项准入范围的类型判断
 					// 制造
 					idString = ""
-					for i := 0; i < len(certSubList); i = i+1000 {
+					for i := 0; i < len(certSubList); i = i + 1000 {
 						var ids suppliercertsub.Ids
 						certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1, strconv.Itoa(i))
 						if ids.Id != "" {
@@ -3005,7 +3019,7 @@ func (this *OilSupplierController) CheckSupplierFileDelete() {
 						}
 					}
 					// 非制造
-					for i := 0; i < len(certSubList); i = i+1000 {
+					for i := 0; i < len(certSubList); i = i + 1000 {
 						var ids1 suppliercertsub.Ids
 						certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2, strconv.Itoa(i))
 						if ids1.Id != "" {
@@ -3111,7 +3125,7 @@ func (this *OilSupplierController) CheckSupplierFileDelete() {
 			var supplierCert suppliercert.OilSupplierCert
 			supplierCert.BackRemark = needName
 			cols := []string{"BackRemark"}
-			supplierService.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "Id = " + strconv.Itoa(cert.Id))
+			supplierService.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "Id = "+strconv.Itoa(cert.Id))
 		}
 	}
 	errinfo.Code = 1
@@ -3151,7 +3165,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 	var certSubList2 suppliercertsub.OilSupplierCertSub
 	certSubList2.LackFile = ""
 	certSubList2.IsQuestion = 0
-	svcHeader.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSubList2, []string{"LackFile", "IsQuestion"}, "IsQuestion = 2 and SupplierId = " + strconv.Itoa(supplierEntity.Id) + " and SupplierCertId = " + file.CertId)
+	svcHeader.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSubList2, []string{"LackFile", "IsQuestion"}, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)+" and SupplierCertId = "+file.CertId)
 
 	//对准入范围的判断
 	var certSubList []suppliercertsub.OilSupplierCertSub
@@ -3159,7 +3173,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 	certsubService.GetListByCertId(strconv.Itoa(cert.Id), &certSubList)
 	idString := ""
 	idString1 := ""
-	for i := 0; i < len(certSubList); i = i+1000 {
+	for i := 0; i < len(certSubList); i = i + 1000 {
 		var ids suppliercertsub.Ids
 		certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 3, strconv.Itoa(i))
 		if ids.Id != "" {
@@ -3178,7 +3192,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 			//如果是制造商,准入范围按照各项准入范围的类型判断
 			// 制造
 			idString = ""
-			for i := 0; i < len(certSubList); i = i+1000 {
+			for i := 0; i < len(certSubList); i = i + 1000 {
 				var ids suppliercertsub.Ids
 				certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids, 1, strconv.Itoa(i))
 				if ids.Id != "" {
@@ -3188,7 +3202,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 				}
 			}
 			// 非制造
-			for i := 0; i < len(certSubList); i = i+1000 {
+			for i := 0; i < len(certSubList); i = i + 1000 {
 				var ids1 suppliercertsub.Ids
 				certsubService.GetIds(strconv.Itoa(cert.Id), cert.SupplierTypeCode, &ids1, 2, strconv.Itoa(i))
 				if ids1.Id != "" {
@@ -3268,7 +3282,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 	}
 
 	var certSubList1 []suppliercertsub.OilSupplierCertSub
-	total := certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size,"Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = " + strconv.Itoa(supplierEntity.Id) + " and SupplierCertId = " + file.CertId)
+	total := certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size, "Id", true, &certSubList1, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)+" and SupplierCertId = "+file.CertId)
 
 	var datainfo DataInfo
 	datainfo.CurrentItemCount = total
@@ -3286,8 +3300,8 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 func (this *OilSupplierController) GetSupplierList() {
 
 	//获取分页信息
-	CurrentPage, _ := this.GetInt64("pageIndex",1)
-	Size, _ := this.GetInt64("pageSize",10)
+	CurrentPage, _ := this.GetInt64("pageIndex", 1)
+	Size, _ := this.GetInt64("pageSize", 10)
 	where := " b.InFlag = 1 "
 	orderby := "Id"
 	asc := false
@@ -3336,11 +3350,11 @@ func (this *OilSupplierController) GetSupplierCertId() {
 	Id := this.Ctx.Input.Param(":Id")
 	var certList []suppliercert.OilSupplierCert
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	svc.GetEntitysByWhere(OilSupplierCertName, "SupplierId = " + Id, &certList)
+	svc.GetEntitysByWhere(OilSupplierCertName, "SupplierId = "+Id, &certList)
 
 	var datainfo DataInfo
 	datainfo.Items = certList
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 
-}
+}

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

@@ -600,7 +600,6 @@
             if (res.data === 'true') {
               let contractNum = 0
               contractApi.getNeedEvaList(this.$axios).then(res => {
-                console.log('未评价数量', res.data.items)
                 if (res.status === 200 && res.data.items !== null) {
                   contractNum = res.data.currentItemCount
                   this.$notify({
@@ -694,7 +693,6 @@
       rowClick (val) {
         // alert(JSON.stringify(val))
         // return
-        console.log('待办-分流路由',val)
         let SupplierType = ''
 
         if (val.Type == '1') { // 准入
@@ -821,7 +819,6 @@
         }
       },
       rowFinishedClick (val) {
-        console.log('已办-分流路由')
         let SupplierType = ''
 
         if (val.Type == '1') { // 准入

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

@@ -12,11 +12,18 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" clearable placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:150px" placeholder="请输入企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="审核处室">
+            <el-select filterable ref="issueFromSelect"  v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                       placeholder="请选择审核处室" style="width: 150px;" clearable>
+              <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                         style="width: 100%;"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="推荐单位">
             <el-select filterable ref="issueFromSelect" v-model="searchForm.RecUnitId" class="select_form" size="mini"
-                       placeholder="请选择推荐单位" style="width: 100%;">
+                       placeholder="请选择推荐单位" style="width: 150px;">
               <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%;"></el-option>
             </el-select>
@@ -73,6 +80,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ThirdAudit'">{{ getBusinessDeptNameById(scope.row.ThirdAudit) }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -88,17 +96,15 @@
       </el-pagination>
     </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-     <el-form ref="advancedsearchForm" label-width="130px">
+    <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
-
           <el-col :span="12">
             <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
@@ -113,75 +119,67 @@
               </el-select>
             </el-form-item>
           </el-col>
-         <!-- <el-col :span="12">
-          <el-form-item label="供应商类型">
-            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-
-        <el-col :span="12">
-          <el-form-item label="单位关系">
-            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-       <el-col :span="12">
-          <el-form-item label="国家">
-            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in countryListOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value">
-                <span style="float: left">{{ item.value }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
           <el-col :span="12">
-          <el-form-item label="准入方式">
-            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
-              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="管理单位" >
-            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
-            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="中石油准入证编号" >
-            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-
-        <el-col :span="12">
-          <el-form-item label="统一社会信用代码">
-            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
+            <el-form-item label="审核处室">
+              <el-select filterable ref="issueFromSelect" v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                         placeholder="请选择审核处室" style="width: 100%;">
+                <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位关系">
+              <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                           :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="准入方式">
+              <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+                <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                            :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" >
+              <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+                <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                            :value="item.Key">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中石油准入证编号" >
+              <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码">
+              <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="国家">
+              <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in countryListOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="注册地址">
               <el-row>
                 <el-col :span="10">
@@ -210,8 +208,7 @@
               </el-row>
             </el-form-item>
           </el-col>
-
-         <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="通信地址">
               <el-row>
                 <el-col :span="10">
@@ -240,7 +237,6 @@
               </el-row>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="法人">
               <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
@@ -251,7 +247,6 @@
               <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
-
           <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%;">
@@ -261,7 +256,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="成立时间">
               <el-date-picker
@@ -275,29 +269,25 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-
-        <el-col>
-          <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-col>
-
-        <el-col :span="24">
+          <el-col>
+            <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-col>
+          <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-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -310,7 +300,6 @@
 <script>
   import { mapGetters } from 'vuex'
 import api from '@/api/oilsupplier/supplier'
-import certApi from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -324,6 +313,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
       return {
         tableLoading: false,
         dialogVisible: false,
+        AllBusDeptList: [], // 业务处室部门列表
         countryoptions: [],
         CityAry: [],
         orgOptions: [],
@@ -381,23 +371,22 @@ import certApi from '@/api/oilsupplier/suppliercert'
           SetupTime: '',
           RegCapital1: '',
           RegCapital2: '',
+          ThirdAudit: '',
           BusinessScope: ''
         },
         tableColumns: [
-
-          /* {
-           prop: "Id",
-           label: '',
-           width: 100,
-           sort: true
-           }, */
           {
-            prop: 'AccessCardNo',
-            label: '准入证编号',
+            prop: 'ThirdAudit',
+            label: '审核处室',
             width: 120,
             sort: true
           },
-
+          {
+            prop: 'RecUnitName',
+            label: '推荐单位',
+            width: 200,
+            sort: true
+          },
           {
             prop: 'SupplierTypeName',
             label: '准入类别',
@@ -408,240 +397,33 @@ import certApi from '@/api/oilsupplier/suppliercert'
           {
             prop: 'SupplierName',
             label: '企业名称',
-            width: 200,
+            width: 300,
             sort: true
           },
-
           {
-            prop: 'RecUnitName',
-            label: '推荐单位',
-            width: 200,
+            prop: 'LegalPerson',
+            label: '法人',
+            width: 100,
             sort: true
           },
-          /* {
-           prop: "OilCertificateNo",
-           label: '中石油供应商证书号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "Grade",
-           label: '级别',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "MgrUnit",
-           label: '管理单位',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "OperType",
-           label: '经营方式',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "Country",
-           label: '国家',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "MaunAgent",
-           label: '所代理制造商名称',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "ConstructTeam",
-           label: '施工队伍名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'CommercialNo',
             label: '工商注册号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-           prop: "OrganCode",
-           label: '组织机构代码',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-           prop: "LocalTaxNo",
-           label: '税务登记证地税编号',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Address',
-            label: '单位地址',
-            width: 180,
+            width: 200,
             sort: true
           },
-
-          /* {
-           prop: "Province",
-           label: '省直辖市',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "City",
-           label: '地市区县',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "Street",
-           label: '街道',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "HouseNo",
-           label: '门牌号',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "ZipCode",
-           label: '邮编',
-           width: 200,
-           sort: true
-           }, */
-
-          /* {
-           prop: "QualitySystemCert",
-           label: '质量管理体系认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "ProductQualityCert",
-           label: '产品质量认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "MaunLicense",
-           label: '生产制造许可证获证情况及编号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "QualifCert",
-           label: '企业资质证书编号',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "QualifCertLevel",
-           label: '企业资质证书级别',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "SafetyLicense",
-           label: '安全生产许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TechServiceLic",
-           label: '服务类准入许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TJInNotify",
-           label: '外地企业进津备案通知书',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecIndustryCert",
-           label: '行业特殊要求的认证证书',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "LegalPerson",
-           label: '法定代表人姓名',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryCode",
-           label: '行业类别代码',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryName",
-           label: '行业类别名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'RegCapital',
             label: '注册资本',
             width: 100,
             sort: true
           },
-
           {
             prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
-
-          {
-            prop: 'ContactName',
-            label: '联系人姓名',
-            width: 120,
-            sort: true
-          },
-
           {
             prop: 'CompanyType',
             label: '公司类型',
@@ -654,106 +436,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
             label: '成立时间',
             width: 110,
             sort: true
-          },
-
-          {
-            prop: 'DepositBank',
-            label: '开户银行',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankAccount',
-            label: '银行账号',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'EMail',
-            label: '电子邮箱',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankCreditRating',
-            label: '银行信用等级',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Mobile',
-            label: '移动电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Telphone',
-            label: '固定电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Fax',
-            label: '传真',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyTel',
-            label: '公司电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
-
-          /* {
-           prop: "SpecSupplier",
-           label: '是否特殊业务供应商(可不招标)',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeCode",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeName",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 220,
-            sort: true
           }
-
         ]
       }
     },
@@ -814,7 +497,6 @@ import certApi from '@/api/oilsupplier/suppliercert'
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          console.log(this.dictData)
           this.OperTypeOptions = this.dictData['OperType']
           this.UnitRelationOptions = this.dictData['UnitRelation']
           this.InOptions = this.dictData['InOptions']
@@ -822,6 +504,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           this.getCountryList(this.dictData['CountryList'])
           this.ManagementUnitOptions = this.dictData['ManagementUnit']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.AllBusDeptList = this.dictData['AllBusDeptList'] // 所有专业处室部门
         }).catch(err => {
           console.error(err)
         })
@@ -912,7 +595,15 @@ import certApi from '@/api/oilsupplier/suppliercert'
           console.error(err)
         })
       },
-
+      getBusinessDeptNameById (busId) {
+        let deptName = ''
+        this.AllBusDeptList.forEach((item) => {
+          if (item.Id == busId) {
+            deptName = item.Fullname
+          }
+        })
+        return deptName
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -12,11 +12,18 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:150px" placeholder="请输入企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="审核处室">
+            <el-select filterable ref="issueFromSelect"  v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                       placeholder="请选择审核处室" style="width: 150px;" clearable>
+              <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                         style="width: 100%;"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="推荐单位">
             <el-select filterable ref="issueFromSelect" v-model="searchForm.RecUnitId" class="select_form" size="mini"
-                       placeholder="请选择推荐单位" style="width: 100%;">
+                       placeholder="请选择推荐单位" style="width: 150px;">
               <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%;"></el-option>
             </el-select>
@@ -72,6 +79,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ThirdAudit'">{{ getBusinessDeptNameById(scope.row.ThirdAudit) }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -87,17 +95,15 @@
       </el-pagination>
     </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-          <el-form ref="advancedsearchForm" label-width="130px">
+    <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
-
           <el-col :span="12">
             <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
@@ -112,75 +118,67 @@
               </el-select>
             </el-form-item>
           </el-col>
-         <el-col :span="12">
-          <el-form-item label="供应商类型">
-            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="单位关系">
-            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-       <el-col :span="12">
-          <el-form-item label="国家">
-            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in countryListOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value">
-                <span style="float: left">{{ item.value }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
           <el-col :span="12">
-          <el-form-item label="准入方式">
-            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
-              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="管理单位" >
-            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
-            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="中石油准入证编号" >
-            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-
-        <el-col :span="12">
-          <el-form-item label="统一社会信用代码">
-            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
+            <el-form-item label="审核处室">
+              <el-select filterable ref="issueFromSelect" v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                         placeholder="请选择审核处室" style="width: 100%;">
+                <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位关系">
+              <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                           :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="准入方式">
+              <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+                <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                            :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" >
+              <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+                <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                            :value="item.Key">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中石油准入证编号" >
+              <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码">
+              <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="国家">
+              <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in countryListOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="注册地址">
               <el-row>
                 <el-col :span="10">
@@ -209,8 +207,7 @@
               </el-row>
             </el-form-item>
           </el-col>
-
-         <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="通信地址">
               <el-row>
                 <el-col :span="10">
@@ -239,7 +236,6 @@
               </el-row>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="法人">
               <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
@@ -250,7 +246,6 @@
               <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
-
           <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%;">
@@ -260,7 +255,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="成立时间">
               <el-date-picker
@@ -274,29 +268,25 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-
-        <el-col>
-          <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-col>
-
-        <el-col :span="24">
+          <el-col>
+            <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-col>
+          <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-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -323,6 +313,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
       return {
         tableLoading: false,
         dialogVisible: false,
+        AllBusDeptList: [],
         // 列表数据
         countryoptions: [],
         CityAry: [],
@@ -381,24 +372,22 @@ import certApi from '@/api/oilsupplier/suppliercert'
           SetupTime: '',
           RegCapital1: '',
           RegCapital2: '',
+          ThirdAudit: '',
           BusinessScope: ''
         },
         tableColumns: [
-
-          /* {
-           prop: "Id",
-           label: '',
-           width: 100,
-           sort: true
-           }, */
-
           {
-            prop: 'AccessCardNo',
-            label: '准入证编号',
+            prop: 'ThirdAudit',
+            label: '审核处室',
             width: 120,
             sort: true
           },
-
+          {
+            prop: 'RecUnitName',
+            label: '推荐单位',
+            width: 200,
+            sort: true
+          },
           {
             prop: 'SupplierTypeName',
             label: '准入类别',
@@ -409,240 +398,33 @@ import certApi from '@/api/oilsupplier/suppliercert'
           {
             prop: 'SupplierName',
             label: '企业名称',
-            width: 200,
+            width: 300,
             sort: true
           },
-
           {
-            prop: 'RecUnitName',
-            label: '推荐单位',
-            width: 200,
+            prop: 'LegalPerson',
+            label: '法人',
+            width: 100,
             sort: true
           },
-          /* {
-           prop: "OilCertificateNo",
-           label: '中石油供应商证书号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "Grade",
-           label: '级别',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "MgrUnit",
-           label: '管理单位',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "OperType",
-           label: '经营方式',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "Country",
-           label: '国家',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "MaunAgent",
-           label: '所代理制造商名称',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "ConstructTeam",
-           label: '施工队伍名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'CommercialNo',
             label: '工商注册号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-           prop: "OrganCode",
-           label: '组织机构代码',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
+            width: 200,
             sort: true
           },
-
-          /* {
-           prop: "LocalTaxNo",
-           label: '税务登记证地税编号',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Address',
-            label: '单位地址',
-            width: 180,
-            sort: true
-          },
-
-          /* {
-           prop: "Province",
-           label: '省直辖市',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "City",
-           label: '地市区县',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "Street",
-           label: '街道',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "HouseNo",
-           label: '门牌号',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "ZipCode",
-           label: '邮编',
-           width: 200,
-           sort: true
-           }, */
-
-          /* {
-           prop: "QualitySystemCert",
-           label: '质量管理体系认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "ProductQualityCert",
-           label: '产品质量认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "MaunLicense",
-           label: '生产制造许可证获证情况及编号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "QualifCert",
-           label: '企业资质证书编号',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "QualifCertLevel",
-           label: '企业资质证书级别',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "SafetyLicense",
-           label: '安全生产许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TechServiceLic",
-           label: '服务类准入许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TJInNotify",
-           label: '外地企业进津备案通知书',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecIndustryCert",
-           label: '行业特殊要求的认证证书',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "LegalPerson",
-           label: '法定代表人姓名',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryCode",
-           label: '行业类别代码',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryName",
-           label: '行业类别名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'RegCapital',
             label: '注册资本',
             width: 100,
             sort: true
           },
-
           {
             prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
-
-          {
-            prop: 'ContactName',
-            label: '联系人姓名',
-            width: 120,
-            sort: true
-          },
-
           {
             prop: 'CompanyType',
             label: '公司类型',
@@ -655,106 +437,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
             label: '成立时间',
             width: 110,
             sort: true
-          },
-
-          {
-            prop: 'DepositBank',
-            label: '开户银行',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankAccount',
-            label: '银行账号',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'EMail',
-            label: '电子邮箱',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankCreditRating',
-            label: '银行信用等级',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Mobile',
-            label: '移动电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Telphone',
-            label: '固定电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Fax',
-            label: '传真',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyTel',
-            label: '公司电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
-
-          /* {
-           prop: "SpecSupplier",
-           label: '是否特殊业务供应商(可不招标)',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeCode",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeName",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 220,
-            sort: true
           }
-
         ]
       }
     },
@@ -829,6 +512,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           this.getCountryList(this.dictData['CountryList'])
           this.ManagementUnitOptions = this.dictData['ManagementUnit']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.AllBusDeptList = this.dictData['AllBusDeptList'] // 所有专业处室部门
         }).catch(err => {
           console.error(err)
         })
@@ -911,7 +595,15 @@ import certApi from '@/api/oilsupplier/suppliercert'
           console.error(err)
         })
       },
-
+      getBusinessDeptNameById (busId) {
+        let deptName = ''
+        this.AllBusDeptList.forEach((item) => {
+          if (item.Id == busId) {
+            deptName = item.Fullname
+          }
+        })
+        return deptName
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -12,11 +12,18 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:150px" placeholder="请输入企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="审核处室">
+            <el-select filterable ref="issueFromSelect"  v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                       placeholder="请选择审核处室" style="width: 150px;" clearable>
+              <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                         style="width: 100%;"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="推荐单位">
             <el-select filterable ref="issueFromSelect" v-model="searchForm.RecUnitId" class="select_form" size="mini"
-                       placeholder="请选择推荐单位" style="width: 100%;">
+                       placeholder="请选择推荐单位" style="width: 150px;">
               <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%;"></el-option>
             </el-select>
@@ -89,7 +96,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
-            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+            <span v-else-if="column.prop == 'ThirdAudit'">{{ getBusinessDeptNameById(scope.row.ThirdAudit) }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -100,16 +107,14 @@
     </el-card>
 
     <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
-          <el-form ref="advancedsearchForm" label-width="130px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
-
           <el-col :span="12">
             <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
@@ -124,7 +129,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-         <el-col :span="12">
+          <el-col :span="12">
+            <el-form-item label="审核处室">
+              <el-select filterable ref="issueFromSelect" v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                         placeholder="请选择审核处室" style="width: 100%;">
+                <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
               <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
@@ -133,8 +147,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="12">
+          <el-col :span="12">
           <el-form-item label="单位关系">
             <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
@@ -143,22 +156,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-       <el-col :span="12">
-          <el-form-item label="国家">
-            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in countryListOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value">
-                <span style="float: left">{{ item.value }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
           <el-col :span="12">
           <el-form-item label="准入方式">
             <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
@@ -168,8 +165,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="12">
+          <el-col :span="12">
           <el-form-item label="管理单位" >
             <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
             <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
@@ -178,21 +174,17 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="12">
+          <el-col :span="12">
           <el-form-item label="中石油准入证编号" >
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-
-
-        <el-col :span="12">
+          <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-
-        <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="注册地址">
               <el-row>
                 <el-col :span="10">
@@ -221,8 +213,7 @@
               </el-row>
             </el-form-item>
           </el-col>
-
-         <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="通信地址">
               <el-row>
                 <el-col :span="10">
@@ -251,7 +242,6 @@
               </el-row>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="法人">
               <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
@@ -262,7 +252,6 @@
               <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
-
           <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%;">
@@ -272,7 +261,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="成立时间">
               <el-date-picker
@@ -286,29 +274,39 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-
-        <el-col>
-          <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-col>
-
-        <el-col :span="24">
-            <el-form-item label="营业范围">
-              <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
+          <el-col>
+            <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-col>
-
-       </el-row>
-
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="国家">
+              <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in countryListOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <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>
@@ -336,6 +334,7 @@
       return {
         tableLoading: false,
         dialogVisible: false,
+        AllBusDeptList: [],
         // 列表数据
         entityList: [],
         countryoptions: [],
@@ -393,81 +392,22 @@
           SetupTime: '',
           RegCapital1: '',
           RegCapital2: '',
+          ThirdAudit: '',
           BusinessScope: ''
-          // Id: '',
-          // SupplierName: '',
-          // OilCertificateNo: '',
-          // Grade: '',
-          // MgrUnit: '',
-          // OperType: '',
-          // Country: '',
-          // MaunAgent: '',
-          // ConstructTeam: '',
-          // CommercialNo: '',
-          // OrganCode: '',
-          // CountryTaxNo: '',
-          // LocalTaxNo: '',
-          // Address: '',
-          // Province: '',
-          // City: '',
-          // Street: '',
-          // HouseNo: '',
-          // ZipCode: '',
-          // QualitySystemCert: '',
-          // ProductQualityCert: '',
-          // MaunLicense: '',
-          // QualifCert: '',
-          // QualifCertLevel: '',
-          // SafetyLicense: '',
-          // TechServiceLic: '',
-          // TJInNotify: '',
-          // SpecIndustryCert: '',
-          // LegalPerson: '',
-          // CategoryCode: '',
-          // CategoryName: '',
-          // RegCapital: '',
-          // Currency: '',
-          // ContactName: '',
-          // CompanyType: '',
-          // SetupTime: '',
-          // DepositBank: '',
-          // BankAccount: '',
-          // EMail: '',
-          // BankCreditRating: '',
-          // Mobile: '',
-          // Telphone: '',
-          // Fax: '',
-          // CompanyTel: '',
-          // QQ: '',
-          // CompanyUrl: '',
-          // SpecSupplier: '',
-          // SpecTypeCode: '',
-          // SpecTypeName: '',
-          // Remark: '',
-          // IsDelete: '',
-          // CreateOn: '',
-          // CreateUserId: '',
-          // CreateBy: '',
-          // ModifiedOn: '',
-          // ModifiedUserId: '',
-          // ModifiedBy: '',
         },
         tableColumns: [
-
-          /* {
-           prop: "Id",
-           label: '',
-           width: 100,
-           sort: true
-           }, */
-
           {
-            prop: 'AccessCardNo',
-            label: '准入证编号',
+            prop: 'ThirdAudit',
+            label: '审核处室',
             width: 120,
             sort: true
           },
-
+          {
+            prop: 'RecUnitName',
+            label: '推荐单位',
+            width: 200,
+            sort: true
+          },
           {
             prop: 'SupplierTypeName',
             label: '准入类别',
@@ -478,240 +418,33 @@
           {
             prop: 'SupplierName',
             label: '企业名称',
-            width: 200,
+            width: 300,
             sort: true
           },
-
           {
-            prop: 'RecUnitName',
-            label: '推荐单位',
-            width: 200,
+            prop: 'LegalPerson',
+            label: '法人',
+            width: 100,
             sort: true
           },
-          /* {
-           prop: "OilCertificateNo",
-           label: '中石油供应商证书号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "Grade",
-           label: '级别',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "MgrUnit",
-           label: '管理单位',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "OperType",
-           label: '经营方式',
-           width: 100,
-           sort: true
-           }, */
-
-          /* {
-           prop: "Country",
-           label: '国家',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "MaunAgent",
-           label: '所代理制造商名称',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "ConstructTeam",
-           label: '施工队伍名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'CommercialNo',
             label: '工商注册号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-           prop: "OrganCode",
-           label: '组织机构代码',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
+            width: 200,
             sort: true
           },
-
-          /* {
-           prop: "LocalTaxNo",
-           label: '税务登记证地税编号',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Address',
-            label: '单位地址',
-            width: 180,
-            sort: true
-          },
-
-          /* {
-           prop: "Province",
-           label: '省直辖市',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "City",
-           label: '地市区县',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "Street",
-           label: '街道',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "HouseNo",
-           label: '门牌号',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "ZipCode",
-           label: '邮编',
-           width: 200,
-           sort: true
-           }, */
-
-          /* {
-           prop: "QualitySystemCert",
-           label: '质量管理体系认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "ProductQualityCert",
-           label: '产品质量认证情况及认证机构',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "MaunLicense",
-           label: '生产制造许可证获证情况及编号',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "QualifCert",
-           label: '企业资质证书编号',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "QualifCertLevel",
-           label: '企业资质证书级别',
-           width: 300,
-           sort: true
-           },
-
-           {
-           prop: "SafetyLicense",
-           label: '安全生产许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TechServiceLic",
-           label: '服务类准入许可证',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "TJInNotify",
-           label: '外地企业进津备案通知书',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecIndustryCert",
-           label: '行业特殊要求的认证证书',
-           width: 200,
-           sort: true
-           },
-
-           {
-           prop: "LegalPerson",
-           label: '法定代表人姓名',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryCode",
-           label: '行业类别代码',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "CategoryName",
-           label: '行业类别名称',
-           width: 100,
-           sort: true
-           }, */
-
           {
             prop: 'RegCapital',
             label: '注册资本',
             width: 100,
             sort: true
           },
-
           {
             prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
-
-          {
-            prop: 'ContactName',
-            label: '联系人姓名',
-            width: 110,
-            sort: true
-          },
-
           {
             prop: 'CompanyType',
             label: '公司类型',
@@ -724,111 +457,7 @@
             label: '成立时间',
             width: 110,
             sort: true
-          },
-
-          {
-            prop: 'DepositBank',
-            label: '开户银行',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankAccount',
-            label: '银行账号',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'EMail',
-            label: '电子邮箱',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'BankCreditRating',
-            label: '银行信用等级',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Mobile',
-            label: '移动电话',
-            width: 110,
-            sort: true
-          },
-
-          {
-            prop: 'Telphone',
-            label: '固定电话',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Fax',
-            label: '传真',
-            width: 120,
-            sort: true
-          },
-          {
-            prop: 'CompanyTel',
-            label: '公司电话',
-            width: 110,
-            sort: true
-          },
-
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
-
-          /* {
-           prop: "SpecSupplier",
-           label: '是否特殊业务供应商(可不招标)',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeCode",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           },
-
-           {
-           prop: "SpecTypeName",
-           label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-           width: 100,
-           sort: true
-           }, */
-
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 220,
-            sort: true
-          },
-          {
-            prop: 'CodeName',
-            label: '准入范围',
-            width: 220,
-            sort: true
           }
-
         ]
       }
     },
@@ -839,7 +468,7 @@
       // 查询列表
       this.initDatas()
       this.getDictOptions()
-  },
+    },
 
     methods: {
       initDatas () {
@@ -893,6 +522,7 @@
           this.getCountryList(this.dictData['CountryList'])
           this.ManagementUnitOptions = this.dictData['ManagementUnit']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.AllBusDeptList = this.dictData['AllBusDeptList'] // 所有专业处室部门
         }).catch(err => {
           console.error(err)
         })
@@ -1011,7 +641,15 @@
           console.error(err)
         })
       },
-
+      getBusinessDeptNameById (busId) {
+        let deptName = ''
+        this.AllBusDeptList.forEach((item) => {
+          if (item.Id == busId) {
+            deptName = item.Fullname
+          }
+        })
+        return deptName
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

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

@@ -12,11 +12,18 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:150px" placeholder="请输入企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="审核处室">
+            <el-select filterable ref="issueFromSelect"  v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                       placeholder="请选择审核处室" style="width: 150px;" clearable>
+              <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                         style="width: 100%;"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="推荐单位">
             <el-select filterable ref="issueFromSelect" v-model="searchForm.RecUnitId" class="select_form" size="mini"
-                       placeholder="请选择推荐单位" style="width: 100%;">
+                       placeholder="请选择推荐单位" style="width: 150px;">
               <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%;"></el-option>
             </el-select>
@@ -74,15 +81,10 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ThirdAudit'">{{ getBusinessDeptNameById(scope.row.ThirdAudit) }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
-
-        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                      :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -90,22 +92,19 @@
     </el-card>
 
     <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
-       <el-form ref="advancedsearchForm" label-width="130px">
+      <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
-
           <el-col :span="12">
             <el-form-item label="时间">
               <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
                               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="推荐单位">
               <el-select filterable ref="issueFromSelect" v-model="searchForm.RecUnitId" class="select_form" size="mini"
@@ -115,75 +114,67 @@
               </el-select>
             </el-form-item>
           </el-col>
-         <!-- <el-col :span="12">
-          <el-form-item label="供应商类型">
-            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-
-        <el-col :span="12">
-          <el-form-item label="单位关系">
-            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-       <el-col :span="12">
-          <el-form-item label="国家">
-            <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in countryListOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value">
-                <span style="float: left">{{ item.value }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
           <el-col :span="12">
-          <el-form-item label="准入方式">
-            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
-              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="管理单位" >
-            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
-            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                         :value="item.Key">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="中石油准入证编号" >
-            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-
-        <el-col :span="12">
-          <el-form-item label="统一社会信用代码">
-            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
+            <el-form-item label="审核处室">
+              <el-select filterable ref="issueFromSelect" v-model="searchForm.ThirdAudit" class="select_form" size="mini"
+                         placeholder="请选择审核处室" style="width: 100%;">
+                <el-option v-for="item in AllBusDeptList" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位关系">
+              <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                           :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="准入方式">
+              <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+                <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                            :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" >
+              <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+                <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                            :value="item.Key">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中石油准入证编号" >
+              <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码">
+              <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="国家">
+              <el-select  size="mini" v-model="searchForm.Country" filterable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in countryListOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="注册地址">
               <el-row>
                 <el-col :span="10">
@@ -212,8 +203,7 @@
               </el-row>
             </el-form-item>
           </el-col>
-
-         <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="通信地址">
               <el-row>
                 <el-col :span="10">
@@ -242,7 +232,6 @@
               </el-row>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="法人">
               <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
@@ -253,7 +242,6 @@
               <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
-
           <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%;">
@@ -263,7 +251,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="成立时间">
               <el-date-picker
@@ -277,29 +264,25 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-
-        <el-col>
-          <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-col>
-
-        <el-col :span="24">
+          <el-col>
+            <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-col>
+          <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-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -311,8 +294,7 @@
 </template>
 <script>
   import { mapGetters } from 'vuex'
-import api from '@/api/oilsupplier/supplier'
-import certApi from '@/api/oilsupplier/suppliercert'
+  import api from '@/api/oilsupplier/supplier'
 
   export default {
     computed: {
@@ -326,6 +308,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
       return {
         tableLoading: false,
         dialogVisible: false,
+        AllBusDeptList: [], // 业务处室部门列表
         // 列表数据
         countryoptions: [],
         CityAry: [],
@@ -391,265 +374,55 @@ import certApi from '@/api/oilsupplier/suppliercert'
           BusinessScope: ''
         },
         tableColumns: [
-
-          /* {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          }, */
-
           {
-            prop: 'AccessCardNo',
-            label: '准入证编号',
+            prop: 'ThirdAudit',
+            label: '审核处室',
             width: 120,
             sort: true
           },
-
-          {
-            prop: 'SupplierTypeName',
-            label: '准入类别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: 'SupplierName',
-            label: '企业名称',
-            width: 200,
-            sort: true
-          },
-
           {
             prop: 'RecUnitName',
             label: '推荐单位',
             width: 200,
             sort: true
           },
-          /* {
-            prop: "OilCertificateNo",
-            label: '中石油供应商证书号',
-            width: 100,
-            sort: true
-          },
-
           {
-            prop: "Grade",
-            label: '级别',
-            width: 100,
-            sort: true
-          }, */
-
-          /* {
-            prop: "MgrUnit",
-            label: '管理单位',
-            width: 100,
-            sort: true
-          }, */
-
-          /* {
-            prop: "OperType",
-            label: '经营方式',
-            width: 100,
-            sort: true
-          }, */
-
-          /* {
-            prop: "Country",
-            label: '国家',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "MaunAgent",
-            label: '所代理制造商名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructTeam",
-            label: '施工队伍名称',
-            width: 100,
-            sort: true
-          }, */
-
-          {
-            prop: 'CommercialNo',
-            label: '工商注册号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-            prop: "OrganCode",
-            label: '组织机构代码',
-            width: 100,
-            sort: true
-          }, */
-
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
-            sort: true
-          },
-
-          /* {
-            prop: "LocalTaxNo",
-            label: '税务登记证地税编号',
-            width: 100,
-            sort: true
-          }, */
-
-          {
-            prop: 'Address',
-            label: '单位地址',
-            width: 180,
-            sort: true
-          },
-
-          /* {
-            prop: "Province",
-            label: '省直辖市',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: "City",
-            label: '地市区县',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: "Street",
-            label: '街道',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: "HouseNo",
-            label: '门牌号',
-            width: 200,
-            sort: true
-          },
-
-          {
-            prop: "ZipCode",
-            label: '邮编',
-            width: 200,
-            sort: true
-          }, */
-
-          /* {
-            prop: "QualitySystemCert",
-            label: '质量管理体系认证情况及认证机构',
-            width: 300,
-            sort: true
-          },
-
-          {
-            prop: "ProductQualityCert",
-            label: '产品质量认证情况及认证机构',
-            width: 300,
-            sort: true
-          },
-
-          {
-            prop: "MaunLicense",
-            label: '生产制造许可证获证情况及编号',
+            prop: 'SupplierTypeName',
+            label: '准入类别',
             width: 100,
             sort: true
           },
 
           {
-            prop: "QualifCert",
-            label: '企业资质证书编号',
-            width: 300,
-            sort: true
-          },
-
-          {
-            prop: "QualifCertLevel",
-            label: '企业资质证书级别',
+            prop: 'SupplierName',
+            label: '企业名称',
             width: 300,
             sort: true
           },
-
           {
-            prop: "SafetyLicense",
-            label: '安全生产许可证',
+            prop: 'LegalPerson',
+            label: '法人',
             width: 100,
             sort: true
           },
-
           {
-            prop: "TechServiceLic",
-            label: '服务类准入许可证',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "TJInNotify",
-            label: '外地企业进津备案通知书',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SpecIndustryCert",
-            label: '行业特殊要求的认证证书',
+            prop: 'CommercialNo',
+            label: '工商注册号',
             width: 200,
             sort: true
           },
-
-          {
-            prop: "LegalPerson",
-            label: '法定代表人姓名',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryCode",
-            label: '行业类别代码',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "CategoryName",
-            label: '行业类别名称',
-            width: 100,
-            sort: true
-          }, */
-
           {
             prop: 'RegCapital',
             label: '注册资本',
             width: 100,
             sort: true
           },
-
           {
             prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
-
-          {
-            prop: 'ContactName',
-            label: '联系人姓名',
-            width: 120,
-            sort: true
-          },
-
           {
             prop: 'CompanyType',
             label: '公司类型',
@@ -662,106 +435,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
             label: '成立时间',
             width: 110,
             sort: true
-          },
-
-          {
-            prop: 'DepositBank',
-            label: '开户银行',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankAccount',
-            label: '银行账号',
-            width: 160,
-            sort: true
-          },
-
-          {
-            prop: 'EMail',
-            label: '电子邮箱',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'BankCreditRating',
-            label: '银行信用等级',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Mobile',
-            label: '移动电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Telphone',
-            label: '固定电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'Fax',
-            label: '传真',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyTel',
-            label: '公司电话',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
-
-          /* {
-            prop: "SpecSupplier",
-            label: '是否特殊业务供应商(可不招标)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SpecTypeCode",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SpecTypeName",
-            label: '业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）',
-            width: 100,
-            sort: true
-          }, */
-
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 220,
-            sort: true
           }
-
         ]
       }
     },
@@ -826,6 +500,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
           this.getCountryList(this.dictData['CountryList'])
           this.ManagementUnitOptions = this.dictData['ManagementUnit']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          this.AllBusDeptList = this.dictData['AllBusDeptList'] // 所有专业处室部门
         }).catch(err => {
           console.error(err)
         })
@@ -917,7 +592,15 @@ import certApi from '@/api/oilsupplier/suppliercert'
           console.error(err)
         })
       },
-
+      getBusinessDeptNameById (busId) {
+        let deptName = ''
+        this.AllBusDeptList.forEach((item) => {
+          if (item.Id == busId) {
+            deptName = item.Fullname
+          }
+        })
+        return deptName
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'