流程查询

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

@@ -1,9 +1,12 @@
 package oilsupplier
 
 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/suppliercertappend"
 	"encoding/json"
 	"fmt"
-
 	// "fmt"
 
 	"dashoo.cn/backend/api/business/oilsupplier/selectbusiness"
@@ -237,3 +240,70 @@ func (this *SelectController) GetNFTOptions() {
 	this.ServeJSON()
 
 }
+
+// @Title 流程查询准入
+// @Description
+// @Success 200 {object}
+// @router /getprocessauditlist [get]
+func (this *SelectController) GetProcessAuditList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	tabinx := this.GetString("tabinx")
+	supplierTypeCode := this.GetString("SupplierTypeCode")
+	supplierName := this.GetString("SupplierName")
+
+	if (supplierTypeCode != "") {
+		where = where + " and SupplierTypeCode like '%" + supplierTypeCode + "%'"
+	}
+	if (supplierName != "") {
+		where = where + " and SupplierName like '%" + supplierName + "%'"
+	}
+
+	var total int64 = 0
+	var datainfo DataInfo
+	if tabinx == "0" {
+		var list []supplier.OilSupplierView
+		svc := supplier.GetOilSupplierService(utils.DBE)
+		total = svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+		datainfo.Items = list
+	} else if tabinx == "1" {
+		var list []suppliercertappend.OilSupplierCertAppend
+		svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		datainfo.Items = list
+	} else if tabinx == "2" {
+		var list []annualaudit.OilAnnualAudit
+		svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		datainfo.Items = list
+	} else if tabinx == "3" {
+		var list []infochange.OilInfoChange
+		svc := infochange.GetInfoChangeService(utils.DBE)
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		datainfo.Items = list
+	} else if tabinx == "4" {
+		svc := qualchange.GetQualChangeService(utils.DBE)
+		var list []qualchange.OilQualChangeMain
+		total = svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+		datainfo.Items = list
+	}
+
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}

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

@@ -7,6 +7,13 @@ export default {
       data: formdata
     })
   },
+  getProcessAuditList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/select/getprocessauditlist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
   up (params, formdata, myAxios) {
     return myAxios({
       url: '/select/up',

src/dashoo.cn/frontend_web/src/components/workflow/wfmultihistory.vue

@@ -155,9 +155,7 @@
           .then(res => {
             // response
             this.userlist = res.data.items
-            console.log(this.userlist, 'this.userlist')
             this.historyTask = this.tmp_historyTask
-            console.log(this.historyTask, 'this.historyTask')
           })
           .catch(err => {
             // handle error

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -384,7 +384,7 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        auditer: "",
+        inStyle: '',
         auditerName: "",
         fushenauditer: '', //复审人员
         majorDept: [100000000, 100000128, 100000151],
@@ -545,8 +545,22 @@
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.inStyle == '1') {
+            this.shenheForm.AuditorRemark = '集中评审通过'
+          } else if (this.inStyle == '2') {
+            this.shenheForm.AuditorRemark = '一级物资备案准入'
+          } else if (this.inStyle == '3') {
+            this.shenheForm.AuditorRemark = '二级物资备案准入'
+          } else if (this.inStyle == '4') {
+            this.shenheForm.AuditorRemark = '战略合作准入'
+          }
         } else {
-          this.textplaceholder = '退回意见不能少于5个字'
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
         }
       },
       equipmentdialog() {
@@ -586,6 +600,7 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             this.entrydetail.process = this.formData.ProcessKey
+            this.inStyle = this.formData.InStyle
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'
@@ -605,6 +620,15 @@
             } else if (this.formData.Status === '10') {
               this.auditTitle = '分办'
               this.auditstepcode = 'FEN_TRIAL'
+              if (this.inStyle == '1') {
+                this.shenheForm.AuditorRemark = '集中评审通过'
+              } else if (this.inStyle == '2') {
+                this.shenheForm.AuditorRemark = '一级物资备案准入'
+              } else if (this.inStyle == '3') {
+                this.shenheForm.AuditorRemark = '二级物资备案准入'
+              } else if (this.inStyle == '4') {
+                this.shenheForm.AuditorRemark = '战略合作准入'
+              }
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -840,7 +864,7 @@
       // 审核通过
       makeSure() {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -862,7 +886,7 @@
           //   return
           // }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -424,6 +424,7 @@
         auditTitle: '审批',
         auditBtn: false,
         companyid: '',
+        inStyle: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
@@ -561,8 +562,22 @@
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.inStyle == '1') {
+            this.shenheForm.AuditorRemark = '集中评审通过'
+          } else if (this.inStyle == '2') {
+            this.shenheForm.AuditorRemark = '一级物资备案准入'
+          } else if (this.inStyle == '3') {
+            this.shenheForm.AuditorRemark = '二级物资备案准入'
+          } else if (this.inStyle == '4') {
+            this.shenheForm.AuditorRemark = '战略合作准入'
+          }
         } else {
-          this.textplaceholder = '退回意见不能少于5个字'
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
         }
       },
       orgtreeChange(val) {
@@ -636,6 +651,7 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             this.entrydetail.process = this.formData.ProcessKey
+            this.inStyle = this.formData.InStyle
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'
@@ -652,6 +668,15 @@
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
               this.auditstepcode = 'PROF_REGULATION'
+              if (this.inStyle == '1') {
+                this.shenheForm.AuditorRemark = '集中评审通过'
+              } else if (this.inStyle == '2') {
+                this.shenheForm.AuditorRemark = '一级物资备案准入'
+              } else if (this.inStyle == '3') {
+                this.shenheForm.AuditorRemark = '二级物资备案准入'
+              } else if (this.inStyle == '4') {
+                this.shenheForm.AuditorRemark = '战略合作准入'
+              }
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -863,7 +888,7 @@
       // 审核通过
       makeSure() {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -885,7 +910,7 @@
           //   return
           // }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -404,7 +404,7 @@
         classId: '03',
         dictData: null,
         companyid: '',
-
+        inStyle: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
@@ -541,8 +541,22 @@
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.inStyle == '1') {
+            this.shenheForm.AuditorRemark = '集中评审通过'
+          } else if (this.inStyle == '2') {
+            this.shenheForm.AuditorRemark = '一级物资备案准入'
+          } else if (this.inStyle == '3') {
+            this.shenheForm.AuditorRemark = '二级物资备案准入'
+          } else if (this.inStyle == '4') {
+            this.shenheForm.AuditorRemark = '战略合作准入'
+          }
         } else {
-          this.textplaceholder = '退回意见不能少于5个字'
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
         }
       },
       equipmentdialog() {
@@ -582,6 +596,7 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             this.entrydetail.process = this.formData.ProcessKey
+            this.inStyle = this.formData.InStyle
             if (this.formData.Status === '1') {
               this.aduitlabel = '复审人员'
               this.auditTitle = '初审'
@@ -598,6 +613,16 @@
             } else if (this.formData.Status === '5') {
               this.auditTitle = '集中审批'
               this.auditstepcode = 'PROF_REGULATION'
+              if (this.inStyle == '1') {
+                this.shenheForm.AuditorRemark = '集中评审通过'
+              } else if (this.inStyle == '2') {
+                this.shenheForm.AuditorRemark = '一级物资备案准入'
+              } else if (this.inStyle == '3') {
+                this.shenheForm.AuditorRemark = '二级物资备案准入'
+              } else if (this.inStyle == '4') {
+                this.shenheForm.AuditorRemark = '战略合作准入'
+              }
+
             }
 
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -837,7 +862,7 @@
       // 审核通过
       makeSure() {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -859,7 +884,7 @@
           //   return
           // }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

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

@@ -7,206 +7,429 @@
     </el-breadcrumb>
 
     <!--内框顶部显示-->
-    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+    <el-card class="box-card" style="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-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
           </el-form-item>
+          <el-form-item label="类型">
+            <el-select size="mini" style="width:100px" 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" @click="initDatas($event)" @command="searchCommand">
+            <el-dropdown split-button type="primary" size="mini" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary" size="mini" @click="exportExcel">导出</el-button>
-          </el-form-item>
         </el-form>
       </div>
-
-      <!--内框表格显示-->
-      <!-- <el-table id="rebateSetTable" :data="entityList" size="small" border height="calc(100vh - 243px)"
-        style="width: 100%" @sort-change="orderby" @cell-click="handle" @cell-mouse-enter="changeClor"
-        @cell-mouse-leave="backClor">
-        <el-table-column label="企业名称" prop="SupplierName" sortable align="center"></el-table-column>
-        <el-table-column label="曾用名" prop="OldSupplierName" align="center"></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-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane label="准入" name="first">
+          <el-table :data="entityList" 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="SupplierTypeCode">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.SupplierTypeCode)}}
+              </template>
+            </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-column align="center" label="操作">
+              <template slot-scope="scope">
+              <el-button type="text" title="查看流程"  icon="el-icon-edit" size="mini" @click="openwfhistory(scope.row)">查看流程</el-button>
+              </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"  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="SupplierTypeCode">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.AppendType)}}
+              </template>
+            </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-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" title="查看流程"  icon="el-icon-edit" size="mini" @click="openwfhistory(scope.row)">查看流程</el-button>
+              </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" 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="SupplierTypeName">
+              <template slot-scope="scope">
+                {{transferStr(scope.row.SupplierTypeName)}}
+              </template>
+            </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-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" title="查看流程"  icon="el-icon-edit" size="mini" @click="openwfhistory(scope.row)">查看流程</el-button>
+              </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" 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-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" title="查看流程"  icon="el-icon-edit" size="mini" @click="openwfhistory(scope.row)">查看流程</el-button>
+              </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" 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-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" title="查看流程"  icon="el-icon-edit" size="mini" @click="openwfhistory(scope.row)">查看流程</el-button>
+              </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>
+    <el-dialog title="审批流程" :visible.sync="dialogVisible" width="1024px">
+      <el-card class="box-card" style="margin-top: 20px">
+        <div slot="header" class="clearfix">
+          <span>审批流程</span>
+        </div>
+        <wf-multi-history :entryinfo="entrydetail"></wf-multi-history>
+      </el-card>
+    </el-dialog>
+    <el-dialog title="审批流程" :visible.sync="dialogVisible1" width="1024px">
+      <el-card class="box-card" style="margin-top: 20px">
+        <div slot="header" class="clearfix">
+          <span>审批流程</span>
+        </div>
+        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+      </el-card>
+    </el-dialog>
   </div>
 </template>
 
 
 <script>
-  import api from "@/api/oilsupplier/usednameselect";
-  import FileSaver from "file-saver";
-  import XLSX from "xlsx";
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/select'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+
   export default {
-    created() {
-      // 执行初始化方法
-      this.initDatas();
+    components: {
+      WfMultiHistory,
+      WfHistory
+    },
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
     },
-    data() {
+    data () {
       return {
-        show: false,
-        // 定义列表数据
+        activeName: 'first',
+        dialogVisible: false,
+        dialogVisible1: false,
+        // 列表数据
         entityList: [],
+        entitySumList: [],
         // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //查询时间
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
         searchForm: {
-          SupplierName: "",
-          SupplierTypeName: ""
+          Id: '',
+          SupplierTypeCode: '',
+          SupplierName: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
         },
-        //列表排序
-        Column: {
-          Order: "",
-          Prop: ""
-        }
-      };
+        entrydetail: {
+          process: '',
+          business: '',
+          instance: '',
+          status: ''
+        },
+        tabinx: '0'
+      }
+    },
+    created () {
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.initDatas('0')
+      // this.getDictOptions()
     },
-
     methods: {
-      //初始化列表方法
-      initDatas(event) {
-        console.log(event);
-        if (event != null) {
-          this.currentPage = 1;
+      handleClick (tab) {
+        console.log(tab)
+        this.tabinx = tab.index
+        this.initDatas(tab.index)
+      },
+      openwfhistory (val) {
+        console.log(this.tabinx)
+        if (this.tabinx == '0') { // 准入
+          this.entrydetail.business = val.BusinessKey
+          this.entrydetail.instance = val.WorkflowId
+          this.entrydetail.status = val.Status
+          this.entrydetail.process = val.ProcessKey
+          this.dialogVisible = true
+        } else if (this.tabinx == '1') { //  增项
+          this.entrydetail.business = val.Id
+          this.entrydetail.instance = val.WorkFlowId
+          this.dialogVisible = true
+        } else if (this.tabinx == '2') { // 年审
+          this.entrydetail.business = val.Id
+          this.entrydetail.instance = val.WorkflowId
+          this.dialogVisible1 = true
+        } else if (this.tabinx == '3') { // 信息变更
+          this.entrydetail.business = val.Id
+          this.entrydetail.instance = val.WorkFlowId
+          this.dialogVisible1 = true
+        } else if (this.tabinx == '4') { // 资质变更
+          this.entrydetail.business = val.Id
+          this.entrydetail.instance = val.WorkFlowId
+          this.dialogVisible1 = true
         }
+
+      },
+      initDatas (val) {
+        // 分页及列表条件
         let params = {
-          _size: this.size,
           _currentPage: this.currentPage,
+          _size: this.size,
           Order: this.Column.Order,
-          Prop: this.Column.Prop
-        };
+          Prop: this.Column.Prop,
+          tabinx: val
+        }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn.length === 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        api.getNameList(myCreateOn,params, this.$axios)
-          .then(res => {
-            console.log(res.data.items);
-            this.entityList = res.data.items;
-            this.currentItemCount = res.data.currentItemCount;
-          })
-          .catch(err => {
-            console.error(err);
-          });
+        // 访问接口
+        console.log(params)
+        api.getProcessAuditList(myCreateOn.join(','), params, this.$axios).then(res => {
+          console.log(res.data.items, 'res.data.items')
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
       },
-      exportExcel() {
-        /* generate workbook object from table */
-        let wb = XLSX.utils.table_to_book(
-          document.querySelector("#rebateSetTable")
-        );
-        /* get binary string as output */
-        let wbout = XLSX.write(wb, {
-          bookType: "xlsx",
-          bookSST: true,
-          type: "array"
-        });
-        try {
-          FileSaver.saveAs(
-            new Blob([wbout], {
-              type: "application/octet-stream"
-            }),
-            "SupplierSituation.xlsx"
-          );
-        } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout);
+
+      searchCommand (command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
         }
-        return wbout;
       },
-      backClor(row, column, event, cell) {
-        if (column.property === "SupplierName") {
-          event.style.background = "";
+      // 列表排序功能
+      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()
       },
-      changeClor(row, column, event, cell) {
-        if (column.property === "SupplierName") {
-          event.style.background = "#d3dce6";
-        }
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
       },
 
-      //列表排序功能
-      orderby(column) {
-        if (column.order == "ascending") {
-          this.Column.Order = "asc";
-        } else if (column.order == "descending") {
-          this.Column.Order = "desc";
+      transferStr (val) {
+        if (val === '01') {
+          return '物资类'
+        } else if (val === '02') {
+          return '基建类'
+        } else if (val === '03') {
+          return '技术服务类'
+        } else {
+          return val
         }
-        this.Column.Prop = column.prop;
-        this.initDatas();
       },
-      jstimehandle(val) {
-        if (val === "") {
-          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 {
-          val = val.replace("T", " ");
-          return val.substring(0, 10);
+      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
         }
       },
-
-      //分页方法
-      handleCurrentChange(value) {
-        this.currentPage = value;
-        this.initDatas();
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
       },
-      handleSizeChange(value) {
-        this.size = value;
-        this.currentPage = 1;
-        this.initDatas();
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas()
       },
-      searchCommand(command) {
-        if (command == "clear") {
-          this.clearSearch();
-        }
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
       },
-      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;
+
+      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)
+        }
       },
-      clearSearch() {
-        this.searchForm.SupplierTypeName = "";
-        this.searchForm.SupplierName = "";
-        this.currentPage = 1;
-        this.initDatas();
+
+      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>
 
 <style>