业务办理查询

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

@@ -0,0 +1,12 @@
+package selectbusiness
+
+import "time"
+
+type SelectBusiness struct {
+	AccessCardNo string    `xorm:"VARCHAR(40)"`      // 准入编码
+	SupplierName string    `xorm:"VARCHAR(40)"`      // 公司名称
+	TypeCode     string    `xorm:"VARCHAR(40)"`      //  类型  01 物质类 02 基建类 03 技术服务类
+	TypeName     string    `xorm:"VARCHAR(40)"`      //  类型  01 物质类 02 基建类 03 技术服务类
+	Preject      string    `xorm:"VARCHAR(40)"`      //  办理项目  1 准入 2 增项 3 年审 4 变更申请
+	CreateOn     time.Time `xorm:"DATETIME created"` // 申请时间
+}

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -9,6 +9,7 @@ type OilSupplierCertAppend struct {
 	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
 	SupplierName   string    `xorm:"comment('供方名称') VARCHAR(200)"`
 	SupplierCertId int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
+	AccessCardNo   string    `xorm:"comment('准入证号') VARCHAR(20)"`
 	ApplyDate      time.Time `xorm:"comment('申请日期') DATETIME"`
 	RecUnitFlag    string    `xorm:"comment('推荐单位的级联Id标记') VARCHAR(200)"`
 	RecUnitId      string    `xorm:"comment('推荐单位编码') VARCHAR(50)"`
@@ -40,7 +41,7 @@ type OilSupplierCertAppend struct {
 
 type OilSupplierCertAppendTodo struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	SupplierName    string    `xorm:"VARCHAR(100)"`
+	SupplierName   string    `xorm:"VARCHAR(100)"`
 	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
 	SupplierCertId int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
 	ApplyDate      time.Time `xorm:"comment('申请日期') DATETIME"`

src/dashoo.cn/backend/api/business/organize/organizeService.go

@@ -118,6 +118,7 @@ func (s *OrganizeService) QueryEntity(where string) (entity Base_Organize) {
 func (s *OrganizeService) GetAllChildById(topid string) string {
 	mod := new(Id_Str)
 	s.DBE.Sql(`select fun_getOrganizechildlist ('` + topid +  `') as Id`).Get(mod)
+	fmt.Println(mod)
 	return mod.Id
 }
 

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

@@ -921,7 +921,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 			payinfo.USCCode = supplierEntity.CommercialNo
 			payinfo.SupplierName = supplierEntity.SupplierName
 			payinfo.PayType = "2"
-			payinfo.IsPay = "1"
+			payinfo.IsPay = "0"
 			payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
 			payinfo.CreateUserId = list.CreateUserId
 			payinfo.CreateBy = list.CreateBy

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

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/register"
 	"encoding/json"
@@ -428,3 +429,185 @@ func (this *SelectController) ZrfwSelect() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 获取所有
+// @Description
+// @Success 200 {object}
+// @router /getallbusinesslist [post]
+func (this *SelectController) GetAllBusinesList() {
+
+	perject := this.GetString("Perject")
+	accessCardNo := this.GetString("AccessCardNo")
+	supplierTypeCode := this.GetString("SupplierTypeCode")
+	supplierName := this.GetString("SupplierName")
+
+
+	var list []selectbusiness.SelectBusiness
+	// 准入
+	if perject == "1" || perject == "" {
+		where := "1=1 "
+		if accessCardNo != "" {
+			where = where + " and b.AccessCardNo='" + accessCardNo + "'"
+		}
+		if supplierTypeCode != "" {
+			where = where + " and b.SupplierTypeCode='" + supplierTypeCode + "'"
+		}
+		if supplierName != "" {
+			where =where + " and a.SupplierName like '%" + supplierName + "%'"
+		}
+
+		var zrlist []supplier.OilSupplierView
+		zrsvc := supplier.GetOilSupplierService(utils.DBE)
+		if this.User.IsCompanyUser == 1 {
+			var registerUser register.OilCorporateInfo
+			sql := " UserName='" + this.User.Username + "'"
+			zrsvc.GetEntity(&registerUser,sql)
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
+		}
+		zrwhere := where + " and b.Status='" + suppliercert.STORE_STATUS + "'"
+		zrsvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, 1, 100, "b.Id", false , &zrlist, zrwhere)
+
+		for _, item := range zrlist {
+			var sele  selectbusiness.SelectBusiness
+			sele.SupplierName = item.SupplierName
+			sele.CreateOn = item.CreateOn
+			sele.AccessCardNo = item.AccessCardNo
+			sele.TypeCode = item.SupplierTypeCode
+			sele.TypeName = item.SupplierTypeName
+			sele.Preject = "1"
+			list = append(list, sele)
+		}
+
+	}
+	// 增项
+	if perject == "2" || perject == "" {
+		where := "1=1 "
+		if accessCardNo != "" {
+			where = where + " and b.AccessCardNo='" + accessCardNo + "'"
+		}
+		if supplierTypeCode != "" {
+			where = where + " and b.AppendType='" + supplierTypeCode + "'"
+		}
+		if supplierName != "" {
+			where =where + " and a.SupplierName like '%" + supplierName + "%'"
+		}
+		var zxlist []suppliercertappend.OilSupplierCertAppend
+		zxsvc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+
+		if this.User.IsCompanyUser == 1 {
+			var registerUser register.OilCorporateInfo
+			sql := " UserName='" + this.User.Username + "'"
+			zxsvc.GetEntity(&registerUser,sql)
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
+		}
+		zxwhere := where + " and b.Status='" + suppliercert.STORE_STATUS + "'"
+		zxsvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, 1, 100, "b.Id", false, &zxlist, zxwhere)
+
+		for _, item := range zxlist {
+			var sele  selectbusiness.SelectBusiness
+			sele.SupplierName = item.SupplierName
+			sele.CreateOn = item.CreateOn
+			sele.AccessCardNo = item.AccessCardNo
+			sele.TypeCode = item.AppendType
+			sele.TypeName = ""
+			sele.Preject = "2"
+			list = append(list, sele)
+		}
+	}
+
+	// 年审
+	if perject == "3" || perject == "" {
+		where := "1=1 "
+		if accessCardNo != "" {
+			where = where + " and b.AccessCardNo='" + accessCardNo + "'"
+		}
+		if supplierTypeCode != "" {
+			where = where + " and b.SupplierTypeName='" + supplierTypeCode + "'"
+		}
+		if supplierName != "" {
+			where =where + " and a.SupplierName like '%" + supplierName + "%'"
+		}
+		var nslist []annualaudit.OilAnnualAudit
+		nssvc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+		if this.User.IsCompanyUser == 1 {
+			var registerUser register.OilCorporateInfo
+			sql := " UserName='" + this.User.Username + "'"
+			nssvc.GetEntity(&registerUser,sql)
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
+		}
+		zswhere := where + " and b.Status='" + suppliercert.DRAFT_STATUS + "'"
+		nssvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilAnnualAuditName,1, 100, "b.Id", false, &nslist, zswhere)
+
+		for _, item := range nslist {
+			var sele  selectbusiness.SelectBusiness
+			sele.SupplierName = item.SupplierName
+			sele.CreateOn = item.CreateOn
+			sele.AccessCardNo = item.AccessCardNo
+			sele.TypeCode = item.SupplierTypeName
+			sele.TypeName = ""
+			sele.Preject = "3"
+			list = append(list, sele)
+		}
+
+	}
+
+   // 变更申请
+   if perject == "4" || perject == "" {
+	   where := "1=1 "
+	   if accessCardNo != "" {
+		   where = where + " and b.AccessCardNo='" + accessCardNo + "'"
+	   }
+	   if supplierTypeCode != "" {
+		   where = where + " and b.SupplierTypeCode='" + supplierTypeCode + "'"
+	   }
+	   if supplierName != "" {
+		   where =where + " and a.SupplierName like '%" + supplierName + "%'"
+	   }
+	   var bglist []infochange.SuppModelInfo
+	   bgsvc := infochange.GetInfoChangeService(utils.DBE)
+	   if this.User.IsCompanyUser == 1 {
+		   var registerUser register.OilCorporateInfo
+		   sql := " UserName='" + this.User.Username + "'"
+		   bgsvc.GetEntity(&registerUser,sql)
+		   where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
+	   }
+	   bgwhere := where +  " and b.Status='" + suppliercert.DRAFT_STATUS + "'"
+	   bgsvc.GetSuppPagingEntitiesWithOrderBytbl(OilSupplierName, OilInfoChangeName, 1, 100, "b.Id", false, &bglist, bgwhere)
+
+	   for _, item := range bglist {
+		   var sele  selectbusiness.SelectBusiness
+		   sele.SupplierName = item.SupplierName
+		   sele.CreateOn = item.CreateOn
+		   sele.AccessCardNo = ""
+		   sele.TypeCode = item.SupplierTypeCode
+		   sele.TypeName = item.SupplierTypeName
+		   sele.Preject = "4"
+		   list = append(list, sele)
+	   }
+   }
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -991,7 +991,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					payinfo.SupplierName = supplierEntity.SupplierName
 					payinfo.PayType = "1"
 					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
-					payinfo.IsPay = "1"
+					payinfo.IsPay = "0"
 					payinfo.CreateUserId = supplierCertEntity.CreateUserId
 					payinfo.CreateBy = supplierCertEntity.CreateBy
 					payinfo.CreateOn = time.Now()

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

@@ -212,6 +212,7 @@ func (this *OilSupplierCertAppendController) AddAppend() {
 	//	return
 	//}
 	//添加增项信息
+	model.AccessCardNo = cermodel.AccessCardNo
 	model.InStyle = cermodel.InStyle
 	model.ApplyDate = time.Now() //申请日期
 	model.CreateOn = time.Now()
@@ -806,7 +807,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					payinfo.USCCode = supplierEntity.CommercialNo
 					payinfo.SupplierName = supplierEntity.SupplierName
 					payinfo.PayType = "3"
-					payinfo.IsPay = "1"
+					payinfo.IsPay = "0"
 					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
 					payinfo.CreateUserId = supplierCertAppendEntity.CreateUserId
 					payinfo.CreateBy = supplierCertAppendEntity.CreateBy

src/dashoo.cn/frontend_web/src/api/oilsupplier/select.js

@@ -27,5 +27,12 @@ export default {
       url: '/select/getnftoptions',
       method: 'post'
     })
+  },
+  getAllBusinessList (params, myAxios) {
+    return myAxios({
+      url: '/select/getallbusinesslist',
+      method: 'post',
+      params: params
+    })
   }
 }

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

@@ -19,24 +19,18 @@
           :inline="true"
           style="float: right;position:absolute;right:15px;top:10.5px"
         >
-          <el-form-item label="状态标识">
+          <el-form-item label="办理项目">
             <el-select
               size="mini"
               style="width:150px"
-              v-model="searchForm.Status"
+              v-model="searchForm.Perject"
               placeholder="请选择"
             >
               <el-option label="全部" value></el-option>
-              <el-option label="初始" value="0"></el-option>
-              <el-option label="待二级初审" value="1"></el-option>
-              <el-option label="待二级复审" value="2"></el-option>
-              <el-option label="专业科室接收" value="3"></el-option>
-              <el-option label="待专业科室审核" value="4"></el-option>
-              <el-option label="待集中评审" value="5"></el-option>
-              <el-option label="待交费" value="6"></el-option>
-              <el-option label="待入库" value="7"></el-option>
-              <el-option label="完成" value="8"></el-option>
-              <el-option label="审核未通过" value="9"></el-option>
+              <el-option label="准入" value="1"></el-option>
+              <el-option label="增项" value="2"></el-option>
+              <el-option label="年审" value="3"></el-option>
+              <el-option label="变更申请" value="4"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="企业名称">
@@ -59,7 +53,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-dropdown split-button type="primary" size="mini" @command="searchCommand"  @click="initDatas(tabinx,$event)">
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
@@ -69,139 +63,25 @@
         </el-form>
       </div>
 
-      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-        <el-tab-pane label="准入" name="first">
-          <el-table :data="entityList" id="rebateSetTable0" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.ApplyTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
-            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
-            <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
-              <template slot-scope="scope">
-                {{transferStr(scope.row.SupplierTypeCode)}}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" label="办理项目">准入</el-table-column>
-            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
-            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
-            <el-table-column align="center" label="当前状态" prop="Status">
-              <template slot-scope="scope">
-                {{statusStr(scope.row.Status)}}
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
-        </el-tab-pane>
-        <el-tab-pane label="增项" name="second">
-          <el-table :data="entityList" id="rebateSetTable1" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.ApplyTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
-            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
-            <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
-              <template slot-scope="scope">
-                {{transferStr(scope.row.SupplierTypeCode)}}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" label="办理项目">增项</el-table-column>
-            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
-            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
-            <el-table-column align="center" label="当前状态" prop="Status">
-              <template slot-scope="scope">
-                {{statusStr(scope.row.Status)}}
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
-        </el-tab-pane>
-        <el-tab-pane label="年审" name="third">
-          <el-table :data="entityList" id="rebateSetTable2" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.ApplyTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
-            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
-            <el-table-column align="center" label="类型" prop="SupplierTypeName">
-              <template slot-scope="scope">
-                {{transferStr(scope.row.SupplierTypeName)}}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" label="办理项目">年审</el-table-column>
-            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
-            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
-            <el-table-column align="center" label="当前状态" prop="Status">
-              <template slot-scope="scope">
-                <span v-if="scope.row.Status=='0'">待提交</span>
-                <span v-if="scope.row.Status=='1'">待初审</span>
-                <span v-if="scope.row.Status=='-1'">初审未通过</span>
-                <span v-if="scope.row.Status=='2'">待复审</span>
-                <span v-if="scope.row.Status=='-2'">复审未通过</span>
-                <span v-if="scope.row.Status=='3'">待专业处室分办</span>
-                <span v-if="scope.row.Status=='4'">待专业处室审批</span>
-                <span v-if="scope.row.Status=='-4'">专业处室审批未通过</span>
-                <span v-if="scope.row.Status=='5'">审核通过</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
-        </el-tab-pane>
-<!--
-        <el-tab-pane label="信息变更" name="fourth">
-          <el-table :data="entityList" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby">
-            <el-table-column align="center" label="公司名称" prop="OldSupplierName"></el-table-column>
-            <el-table-column align="center" label="当前状态" prop="Status">
-              <template slot-scope="scope">
-                <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-                <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
-                <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">初审未通过</span>
-                <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
-                <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
-                <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
-        </el-tab-pane>
-        <el-tab-pane label="资质变更" name="fifth">
-          <el-table :data="entityList" id="rebateSetTable4" size="mini" border style="width: 100%" @sort-change="orderby">
-            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
-            <el-table-column align="center" label="当前状态" prop="Status">
-              <template slot-scope="scope">
-                <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-                <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
-                <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">初审未通过</span>
-                <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
-                <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
-                <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
--->
-        <!--</el-tab-pane>-->
-      </el-tabs>
-
+      <el-table :data="entityList" id="rebateSetTable0" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+        <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
+        <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
+        <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
+          <template slot-scope="scope">
+            {{transferStr(scope.row.TypeCode)}}
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" prop="CreateOn" label="申请日期">
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn) }}
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" prop="Preject" label="办理项目">
+          <template slot-scope="scope">
+          {{transferStrPer(scope.row.Preject)}}
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
   </div>
 </template>
@@ -248,13 +128,10 @@
         // 查询项
         searchFormReset: {},
         searchForm: {
-          Id: '',
+          Perject: '',
           SupplierTypeCode: '',
           AccessCardNo: '',
-          SupplierName: '',
-          CreateUserId: '',
-          Status: '',
-          CreateBy: ''
+          SupplierName: ''
         },
         tabinx: '0'
       }
@@ -263,43 +140,34 @@
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
-      this.initDatas('0')
+      this.initDatas()
       // this.getDictOptions()
     },
     methods: {
       handleClick (tab) {
         this.currentPage = 1
         this.size = 10
-        this.tabinx = tab.index
-        this.initDatas(tab.index)
+        this.initDatas()
       },
-      initDatas (val, event) {
-        if (event != null) {
-          this.currentPage = 1
-          this.size = 10
-        }
+      initDatas () {
         // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           Order: this.Column.Order,
-          Prop: this.Column.Prop,
-          tabinx: val
+          Prop: this.Column.Prop
         }
         // 访问接口
-        console.log(params)
-        api.getCompanyList(params, this.searchForm, this.$axios).then(res => {
+        Object.assign(params, this.searchForm)
+        api.getAllBusinessList(params, this.$axios).then(res => {
           this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
       },
 
       searchCommand (command) {
-        if (command === 'search') {
-          this.dialogVisible = true
-        } else if (command === 'clear') {
+        if (command === 'clear') {
           this.clearSearch()
         }
       },
@@ -311,15 +179,27 @@
           this.Column.Order = 'desc'
         }
         this.Column.Prop = column.prop
-        this.initDatas(this.tabinx)
+        this.initDatas()
       },
       clearSearch () {
         Object.assign(this.searchForm, this.searchFormReset)
         // this.searchForm = this.searchFormReset;
         this.CreateOn = ''
-        this.initDatas(this.tabinx)
+        this.initDatas()
+      },
+      transferStrPer (val) {
+        if (val === '1') {
+          return '准入'
+        } else if (val === '2') {
+          return '增项'
+        } else if (val === '3') {
+          return '年审'
+        } else if (val === '4') {
+          return '变更申请'
+        } else {
+          return ''
+        }
       },
-
       transferStr (val) {
         if (val === '01') {
           return '物资类'
@@ -368,9 +248,7 @@
         }
       },
       handleSearch () {
-        this.currentPage = 1
-        this.dialogVisible = false
-        this.initDatas(this.tabinx)
+        this.initDatas()
       },
       handleCurrentChange (value) {
         this.currentPage = value
@@ -394,6 +272,8 @@
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
           return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'
         } else {

src/dashoo.cn/frontend_web/src/pages/select/businessfollowup/index_1.vue

@@ -0,0 +1,418 @@
+<template>
+  <div>
+    <!--顶部显示-->
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item>业务办理跟踪</el-breadcrumb-item>
+    </el-breadcrumb>
+
+    <!--内框顶部显示-->
+    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 业务办理情况表
+        </span>
+
+        <el-form
+          :model="searchForm"
+          ref="searchformRef"
+          :inline="true"
+          style="float: right;position:absolute;right:15px;top:10.5px"
+        >
+          <el-form-item label="状态标识">
+            <el-select
+              size="mini"
+              style="width:150px"
+              v-model="searchForm.Status"
+              placeholder="请选择"
+            >
+              <el-option label="全部" value></el-option>
+              <el-option label="初始" value="0"></el-option>
+              <el-option label="待二级初审" value="1"></el-option>
+              <el-option label="待二级复审" value="2"></el-option>
+              <el-option label="专业科室接收" value="3"></el-option>
+              <el-option label="待专业科室审核" value="4"></el-option>
+              <el-option label="待集中评审" value="5"></el-option>
+              <el-option label="待交费" value="6"></el-option>
+              <el-option label="待入库" value="7"></el-option>
+              <el-option label="完成" value="8"></el-option>
+              <el-option label="审核未通过" value="9"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="准入编码">
+            <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select
+              size="mini"
+              style="width:150px"
+              v-model="searchForm.SupplierTypeCode"
+              placeholder="请选择"
+            >
+              <el-option label="全部" value></el-option>
+              <el-option label="物资类" value="01"></el-option>
+              <el-option label="基建类" value="02"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @command="searchCommand"  @click="initDatas(tabinx,$event)">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane label="准入" name="first">
+          <el-table :data="entityList" id="rebateSetTable0" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.SupplierTypeCode)}}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" label="办理项目">准入</el-table-column>
+            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
+            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
+            <el-table-column align="center" label="当前状态" prop="Status">
+              <template slot-scope="scope">
+                {{statusStr(scope.row.Status)}}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          </el-pagination>
+        </el-tab-pane>
+        <el-tab-pane label="增项" name="second">
+          <el-table :data="entityList" id="rebateSetTable1" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.SupplierTypeCode)}}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" label="办理项目">增项</el-table-column>
+            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
+            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
+            <el-table-column align="center" label="当前状态" prop="Status">
+              <template slot-scope="scope">
+                {{statusStr(scope.row.Status)}}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          </el-pagination>
+        </el-tab-pane>
+        <el-tab-pane label="年审" name="third">
+          <el-table :data="entityList" id="rebateSetTable2" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入编码"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="类型" prop="SupplierTypeName">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.SupplierTypeName)}}
+              </template>
+            </el-table-column>
+            <el-table-column sortable min-width="120" align="center" label="办理项目">年审</el-table-column>
+            <!--<el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="申请单位"></el-table-column>-->
+            <el-table-column sortable min-width="120" align="center" prop="CreateBy" label="录入员"></el-table-column>
+            <el-table-column sortable min-width="120" align="center" prop="EnterUserTel" label="电话"></el-table-column>
+            <el-table-column align="center" label="当前状态" prop="Status">
+              <template slot-scope="scope">
+                <span v-if="scope.row.Status=='0'">待提交</span>
+                <span v-if="scope.row.Status=='1'">待初审</span>
+                <span v-if="scope.row.Status=='-1'">初审未通过</span>
+                <span v-if="scope.row.Status=='2'">待复审</span>
+                <span v-if="scope.row.Status=='-2'">复审未通过</span>
+                <span v-if="scope.row.Status=='3'">待专业处室分办</span>
+                <span v-if="scope.row.Status=='4'">待专业处室审批</span>
+                <span v-if="scope.row.Status=='-4'">专业处室审批未通过</span>
+                <span v-if="scope.row.Status=='5'">审核通过</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          </el-pagination>
+        </el-tab-pane>
+<!--
+        <el-tab-pane label="信息变更" name="fourth">
+          <el-table :data="entityList" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby">
+            <el-table-column align="center" label="公司名称" prop="OldSupplierName"></el-table-column>
+            <el-table-column align="center" label="当前状态" prop="Status">
+              <template slot-scope="scope">
+                <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+                <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
+                <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">初审未通过</span>
+                <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
+                <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
+                <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          </el-pagination>
+        </el-tab-pane>
+        <el-tab-pane label="资质变更" name="fifth">
+          <el-table :data="entityList" id="rebateSetTable4" size="mini" border style="width: 100%" @sort-change="orderby">
+            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="当前状态" prop="Status">
+              <template slot-scope="scope">
+                <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+                <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
+                <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">初审未通过</span>
+                <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
+                <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
+                <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          </el-pagination>
+-->
+        <!--</el-tab-pane>-->
+      </el-tabs>
+
+    </el-card>
+  </div>
+</template>
+
+
+
+
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/select'
+  import WfMultiHistory from '@/pages/select/processselect/wfmultihistory.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+
+  export default {
+    components: {
+      WfMultiHistory,
+      WfHistory
+    },
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    data () {
+      return {
+        activeName: 'first',
+        // 列表数据
+        entityList: [],
+        entitySumList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        // 查询时间
+        ApplyTime: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          SupplierTypeCode: '',
+          AccessCardNo: '',
+          SupplierName: '',
+          CreateUserId: '',
+          Status: '',
+          CreateBy: ''
+        },
+        tabinx: '0'
+      }
+    },
+    created () {
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.initDatas('0')
+      // this.getDictOptions()
+    },
+    methods: {
+      handleClick (tab) {
+        this.currentPage = 1
+        this.size = 10
+        this.tabinx = tab.index
+        this.initDatas(tab.index)
+      },
+      initDatas (val, event) {
+        if (event != null) {
+          this.currentPage = 1
+          this.size = 10
+        }
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          tabinx: val
+        }
+        // 访问接口
+        console.log(params)
+        api.getCompanyList(params, this.searchForm, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand (command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby (column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas(this.tabinx)
+      },
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas(this.tabinx)
+      },
+
+      transferStr (val) {
+        if (val === '01') {
+          return '物资类'
+        } else if (val === '02') {
+          return '基建类'
+        } else if (val === '03') {
+          return '技术服务类'
+        } else {
+          return val
+        }
+      },
+      statusStr (val) {
+        switch (val) {
+          case '':
+            return '待提交'
+          case '0':
+            return '待提交'
+          case '1':
+            return '待初审'
+          case '-1':
+            return '初审未通过'
+          case '2':
+            return '待复审'
+          case '-2':
+            return '复审未通过'
+          case '3':
+            return '待专业处室分办'
+          case '4':
+            return '待专业处室审批'
+          case '-4':
+            return '专业处室审批未通过'
+          case '5':
+            return '待集中评审'
+          case '-5':
+            return '集中评审未通过'
+          case '6':
+            return '待缴费'
+          case '7':
+            return '待入库'
+          case '8':
+            return '已入库'
+          case '9':
+            return '未通过'
+          default:
+            return val
+        }
+      },
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas(this.tabinx)
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas(this.tabinx)
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas(this.tabinx)
+      },
+
+      GetCommand (cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
+      jstimehandle (val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+</script>