流程查询

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

@@ -127,6 +127,7 @@ type OilSupplierView struct {
 	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
 	BusinessKey       string    `xorm:"VARCHAR(255)"`
 	AuditIndex        int       `xorm:"INT(10)"`
+	ProcessKey        string    `xorm:"VARCHAR(255)"`
 }
 
 type OilSupplierSelect struct {

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

@@ -39,7 +39,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
-	sql += ` b.WorkflowId, b.CreateOn `
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sql += ` where ` + where

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

@@ -1438,7 +1438,7 @@ func (this *OilSupplierController) GetEntityAndCert() {
 
 	var sql string
 	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.Step, b.WorkerTotal, b.ContractNum, b.UniversityNum, b.TechnicalNum, b.AboveProfNum, 
-         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.InStyle, b.WorkflowId, b.Status, b.ThirdAudit, b.BusinessKey, b.AuditIndex from ` + OilSupplierName + ` a `
+         b.MiddleProfNum, b.NationalRegNum, b.NationalCertTotal, b.DesignerTotal, b.SkillerTotal, b.InStyle, b.WorkflowId, b.Status, b.ThirdAudit, b.BusinessKey, b.AuditIndex ,b.ProcessKey from ` + OilSupplierName + ` a `
 	sql += ` left join ` + OilSupplierCertName + " b on b.SupplierId = a.Id"
 	sql += ` where b.Id ='` + Id + `'`
 	utils.DBE.SQL(sql).Get(&model)

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

@@ -306,7 +306,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.Id = item.Id
 				todo.Type = todolist.INFOCHANGE
 				todo.SupplierId = strconv.Itoa(item.SupplierId)
-				todo.SupplierName = item.OldSupplierName
+				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.SupplierTypeName
 				todo.Status = item.Status

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

@@ -984,6 +984,7 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            this.entrydetail.process = this.formData.ProcessKey
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {

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

@@ -538,7 +538,8 @@
           HseTraining: '0',
           AuditIndex: 0,
           PACNumber: "",
-          SupplierCertificate: ""
+          SupplierCertificate: "",
+          ProcessKey: ''
         },
 
         formDataCert: {
@@ -558,7 +559,7 @@
         add_flat: true,
         delete_flat: true,
         entrydetail: {
-          process: "oil_supplier_apply_1",
+          process: "",
           business: "",
           instance: ""
         },
@@ -1005,9 +1006,9 @@
               if (this.formData.SpecTypeCode.length > 0) {
                 this.$refs['GoodsInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
               } */
-
               this.entrydetail.business = this.certId;
               this.entrydetail.instance = this.formDataCert.WorkflowId;
+              this.entrydetail.process = this.formData.ProcessKey
               this.backhistroy.certId = this.certId;
               this.backhistroy.workflowId = this.formDataCert.WorkflowId;
               if (this.certId && this.formDataCert.WorkflowId) {

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

@@ -981,6 +981,7 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            this.entrydetail.process = this.formData.ProcessKey
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /*if (this.certId && this.formDataCert.WorkflowId) {

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

@@ -63,7 +63,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">
-          <el-table :data="entityList" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList1" id="rebateSetTable1" 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="SupplierTypeCode">
               <template slot-scope="scope">
@@ -86,7 +86,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
-          <el-table :data="entityList" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList2" id="rebateSetTable2" 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="SupplierTypeName">
               <template slot-scope="scope">
@@ -116,8 +116,8 @@
                          :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-tab-pane label="变更申请" name="fourth">
+          <el-table :data="entityList3" id="rebateSetTable3" 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">
@@ -139,29 +139,29 @@
                          :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-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" 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-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">
@@ -172,14 +172,14 @@
         <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">
-        <div slot="header" class="clearfix">
-          <span>审批流程</span>
-        </div>
-        <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
-      </el-card>
-    </el-dialog>
+    <!--<el-dialog title="审批流程" :visible.sync="dialogVisible1" width="1024px">-->
+      <!--<el-card class="box-card">-->
+        <!--<div slot="header" class="clearfix">-->
+          <!--<span>审批流程</span>-->
+        <!--</div>-->
+        <!--<wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>-->
+      <!--</el-card>-->
+    <!--</el-dialog>-->
   </div>
 </template>
 
@@ -211,6 +211,9 @@
         dialogVisible1: false,
         // 列表数据
         entityList: [],
+        entityList1: [],
+        entityList2: [],
+        entityList3: [],
         entitySumList: [],
         // 分页参数
         size: 10,
@@ -260,28 +263,31 @@
         this.initDatas(tab.index)
       },
       openwfhistory (val) {
-        if (this.tabinx === '0') { // 准入
-          this.entrydetail.business = val.BusinessKey
+        if (this.tabinx == '0') { // 准入
+          this.entrydetail.business = val.CertId
           this.entrydetail.instance = val.WorkflowId
           this.entrydetail.status = val.Status
           this.entrydetail.process = val.ProcessKey
           this.dialogVisible = true
-        } else if (this.tabinx === '1') { //  增项
+        } else if (this.tabinx == '1') { //  增项
           this.entrydetail.business = val.Id
           this.entrydetail.instance = val.WorkflowId
+          this.entrydetail.process = val.ProcessKey
           this.dialogVisible = true
-        } else if (this.tabinx === '2') { // 年审
+        } 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.process = 'oil_audit_apply'
+          this.dialogVisible = 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.process = 'oil_info_change'
+          this.dialogVisible = true
+        } else if (this.tabinx == '4') { // 资质变更
           this.entrydetail.business = val.Id
           this.entrydetail.instance = val.WorkflowId
-          this.dialogVisible1 = true
+          this.dialogVisible = true
         }
       },
 
@@ -310,9 +316,16 @@
         // 查询条件
         Object.assign(params, this.searchForm)
         // 访问接口
-        console.log(params)
         api.getProcessAuditList(myCreateOn.join(','), params, this.$axios).then(res => {
-          this.entityList = res.data.items
+          if (val == '0') {
+            this.entityList = res.data.items
+          } else if (val == '1') {
+            this.entityList1 = res.data.items
+          } else if (val == '2') {
+            this.entityList2 = res.data.items
+          } else if (val == '3') {
+            this.entityList3 = res.data.items
+          }
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)

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

@@ -82,6 +82,7 @@
     },
     methods: {
       getHistoryTask () {
+        console.log(this.entryinfo, 'this.entryinfo')
         let _this = this
         this.$axios.get('/audithistory/list?id=' + this.entryinfo.business)
           .then(res => {
@@ -109,7 +110,6 @@
         })
           .then(res => {
             // _this.historyTask = res.data.items
-            console.log(res.data.items)
             this.tmp_historyTask = res.data.items
             let useridstr = ''
             for (let i = 0; i < this.tmp_historyTask.length; i++) {