工作流显示

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

@@ -259,22 +259,13 @@ func (s *OilSupplierService) GetProcessInfoWithOrderBytbl(supplierTableName, sup
 	sql = `select a.SupplierName, b.Id, b.AccessCardNo, b.CreateOn, b.ModifiedOn As AddinTime, a.Mobile, `
 	sql += ` b.Status, b.SupplierTypeCode, `
 	sql += ` b.WorkflowId, b.ProcessKey, '1' as Type, b.CreateOn,`
-	sql += ` case when u.IsCompanyUser = 1 then c.CheckUnitName
-				when u.IsCompanyUser = 0 then u.Unit
-				else ''
-			end As RecUnitName,`
-	sql += ` case when u.IsCompanyUser = 1 then c.CreateBy
- 				when u.IsCompanyUser = 0 then u.Realname
- 				else ''
- 				end As ContactName,`
-	sql += ` case when u.IsCompanyUser = 1 then c.UserTelephone
- 				when u.IsCompanyUser = 0 then u.Telephone
- 				else ''
-				end As Mobile`
+	sql += ` org.FullName As RecUnitName,`
+	sql += ` u.Realname as ContactName,`
+	sql += ` u.Telephone as Mobile`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + ` b on b.SupplierId = a.Id`
 	sql += ` Left join Base_User u on a.CreateUserId = u.Id `
-	sql += ` left join OilCorporateInfo c on a.CreateUserId = c.UserId`
+	sql += ` LEFT JOIN Base_Organize org ON b.CommitComId = org.Id`
 	sql += ` where ` + where
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `

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

@@ -610,6 +610,7 @@ func (this *OilSupplierCertController) DeleteEntity() {
 func (this *OilSupplierCertController) AuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("FirstAuditName")
+	unitId := this.GetString("FirstAuditName")
 	AuditRemark := this.GetString("AuditRemark")
 	secondAudit := this.GetString("SecondAudit")
 	thirdAudit := this.GetString("ThirdAudit")
@@ -652,8 +653,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 	var supplierEntity supplier.OilSupplier
 	supplierSvc.GetEntityById(supplierCertEntity.SupplierId, &supplierEntity)
 
-	svc := organize.GetOrganizeService(utils.DBE)
-	unitId := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	// svc := organize.GetOrganizeService(utils.DBE)
+	// unitId := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
 
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常

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

@@ -1,6 +1,6 @@
 <template>
   <div style="overflow: auto">
-    <el-table :data="historyTask" border size="mini">
+    <el-table highlight-current-row :data="historyTask" border size="mini">
       <el-table-column prop="taskName" sortable min-width="130" label="当前状态" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remarks" sortable min-width="130" label="审批意见" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -15,7 +15,7 @@
             {{ assigneeToAssignee(scope.row.assignee) }}
           </span>
           <el-tooltip class="item" v-if="!scope.row.assignee" content="当前步骤有审批权限的人员" placement="top-start">
-            <span style="font-style: italic; color:#00F">
+            <span style="color:#00F">
               {{ assigneeToUsers(scope.row.users) }}
             </span>
           </el-tooltip>
@@ -32,9 +32,9 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="margin-top:-1px; text-align: center;">
+    <el-card style="text-align: center; overflow-x: auto">
       <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance +'?t='+(new Date()).getTime() " v-if="entryinfo.instance">
-    </div>
+    </el-card>
   </div>
 </template>
 

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

@@ -49,7 +49,7 @@
       </div>
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="全部" name="all">
-          <el-table :data="entityListAll" id="rebateSetTableAll" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+          <el-table highlight-current-row :data="entityListAll" id="rebateSetTableAll" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
@@ -68,8 +68,8 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
-            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
-            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
+            <el-table-column align="center" label="申报人员" show-tooltip-when-overflow prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话"  width="100"prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类别" prop="Type">
               <template slot-scope="scope">
                 {{typeStr(scope.row.Type)}}
@@ -96,7 +96,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="准入" name="first">
-          <el-table :data="entityList" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+          <el-table highlight-current-row :data="entityList" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
@@ -115,8 +115,8 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
-            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
-            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
+            <el-table-column align="center" label="申报人员"  show-tooltip-when-overflow prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话"  width="100"prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -138,7 +138,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">
-          <el-table :data="entityList1" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+          <el-table highlight-current-row :data="entityList1" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
@@ -157,8 +157,8 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
-            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
-            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
+            <el-table-column align="center" label="申报人员"  show-tooltip-when-overflow prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话"  width="100"prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -180,7 +180,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
-          <el-table :data="entityList2" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+          <el-table highlight-current-row :data="entityList2" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
@@ -199,8 +199,8 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
-            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
-            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
+            <el-table-column align="center" label="申报人员"  show-tooltip-when-overflow prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话"  width="100"prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -230,7 +230,7 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="变更申请" name="fourth">
-          <el-table :data="entityList3" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+          <el-table highlight-current-row :data="entityList3" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
             <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
             <el-table-column label="准入编码" prop="AccessCardNo" align="center">
               <template slot-scope="scope" >
@@ -249,8 +249,8 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
-            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
-            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
+            <el-table-column align="center" label="申报人员"  show-tooltip-when-overflow prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话"  width="100" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="当前状态" prop="Status">
               <template slot-scope="scope">
                 <span v-if="scope.row.Status=='0'">待提交</span>
@@ -297,12 +297,7 @@
       </el-tabs>
     </el-card>
     <el-dialog title="审批流程" :visible.sync="dialogVisible" width="1024px">
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <span>审批流程</span>
-        </div>
-        <wf-multi-history :entryinfo="entrydetail"></wf-multi-history>
-      </el-card>
+      <wf-multi-history :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
     <!--<el-dialog title="审批流程" :visible.sync="dialogVisible1" width="1024px">-->
       <!--<el-card class="box-card">-->

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

@@ -1,6 +1,6 @@
 <template>
   <div style="overflow: auto">
-    <el-table :data="historyTask" border>
+    <el-table highlight-current-row :data="historyTask" border>
       <el-table-column prop="taskName" sortable min-width="130" label="当前状态" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remarks" sortable min-width="130" label="审批意见" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -15,7 +15,7 @@
             {{ assigneeToAssignee(scope.row.assignee) }}
           </span>
           <el-tooltip class="item" v-if="!scope.row.assignee" content="当前步骤有审批权限的人员" placement="top-start">
-            <span style="font-style: italic; color:#00F">
+            <span style="color:#00F">
               {{ assigneeToUsers(scope.row.users) }}
             </span>
           </el-tooltip>