年审工作流刷新，角色选用户列表修改

src/dashoo.cn/backend/api/controllers/casbin/role.go

@@ -134,16 +134,15 @@ func (this *RoleController) GetAuditerByDept() {
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	organsvc := organize.GetOrganizeService(utils.DBE)
 	where := "1=1"
-	//判断超级管理员和有查看所有数据权限的用户
-	svcPerm := permission.GetPermissionService(utils.DBE)
-	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
-	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+	//svcPerm := permission.GetPermissionService(utils.DBE)
+	//isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+	//if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 		depids := organsvc.GetAllChildById(Id)
 		where += " and DepartmentId in (" + depids + ")"
-	} else {
-		depids := organsvc.GetAllChildById("100000000")
-		where += " and DepartmentId in (" + depids + ")"
-	}
+	//} else {
+	//	depids := organsvc.GetAllChildById("100000000")
+	//	where += " and DepartmentId in (" + depids + ")"
+	//}
 	where += " and IsCompanyUser = 0"
 	rsvc.GetEntitysByWhere(BaseUserName, where, &users)
 	var datainfo ErrorDataInfo

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -235,9 +235,6 @@
         <el-button size="mini" type="primary" @click="checkstatus()">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-    </el-dialog>
   </div>
 </template>
 
@@ -390,11 +387,6 @@
           Step: 0,
           HseTraining: 0,
         },
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
-        },
         AnnualStatus: '',
         dialogMakeSure: false,
         shenheForm: {
@@ -425,7 +417,7 @@
           process: 'oil_audit_apply',
           business: '',
           instance: '',
-          AnnualStatus: ''
+          Status: ''
         },
         anndata: [],
         auditstepcode: '',
@@ -724,6 +716,7 @@
                 type: 'success',
                 message: res.data.message,
               })
+              this.getannualdata()
               this.dialogMakeSure = false
               this.dialogProfAudit = false
             } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -246,9 +246,6 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-    </el-dialog>
   </div>
 </template>
 
@@ -271,7 +268,6 @@
   import BasisInfo from '@/components/oilsupplier/basisinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
@@ -283,7 +279,6 @@
     },
     components: {
       SupplierFileTable,
-      WfHistory,
       SupplierCertEdit,
       SubfileList, // 选择企业资质
       EquipmentList, //企业主要装备情况
@@ -316,11 +311,6 @@
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
-        },
         auditform: {
           FirstAuditName: "",
           SecondAudit: "",
@@ -480,8 +470,6 @@
       this.getDictOptions()
       this.formData.Id = this.serviceId
       this.initDatas()
-      this.backhistroy.certId = this.annualId
-      this.backhistroy.workflowId = this.WorkflowId
       if (this.Status <=1 ) {
         this.savebtn = false
         this.canUpdateSupplier = true
@@ -644,9 +632,6 @@
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            if (this.certId && this.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
-            }
 
           }).catch(err => {
             console.error(err)
@@ -866,6 +851,7 @@
               if (res.data.code === 0) {
                 //保存成功后，初始化数据，变成修改
                 this.entityForm.Id = res.data.item;
+                this.getstatus(this.annualId)
                 //this.initDatas();
                 this.addshow = false
                 this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -249,10 +249,7 @@
       <br>
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-    </el-dialog>
+      :visible="chooseAuditorVisible"></choose-auditor>>
   </div>
 </template>
 
@@ -276,7 +273,6 @@
   import GoodsInfo from "@/components/oilsupplier/goodsinfo";
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
@@ -299,7 +295,6 @@
       BusinessList, //选择准入范围
       AuditbusList, // 待审核业务
       GoodsInfo,
-      WfBackHistory,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',
@@ -321,11 +316,6 @@
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
-        },
         auditform: {
           FirstAuditName: "",
           SecondAudit: "",
@@ -874,6 +864,7 @@
                 this.Status = res.data.item;
                 this.entityForm.Status = this.Status
                 //this.initDatas();
+                this.getstatus(this.annualId)
                 this.addshow = false
                 this.$message({
                   type: 'success',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -251,9 +251,6 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
-    </el-dialog>
   </div>
 </template>
 
@@ -276,7 +273,6 @@
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfmultihistory.vue'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
 
@@ -298,7 +294,6 @@
       BusinessList, //选择准入范围
       AuditbusList, // 待审核业务
       TechInfo,
-      WfBackHistory,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',
@@ -326,11 +321,6 @@
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
-        },
         Step: '',
         subfileList: [], // 资质
         auditbusList: [], // 待审核业务
@@ -484,8 +474,6 @@
       this.getDictOptions()
       this.formData.Id = this.serviceId
       this.initDatas()
-      this.backhistroy.certId = this.annualId
-      this.backhistroy.workflowId = this.WorkflowId
       if (this.Status <= 0) {
         this.savebtn = false
         this.canUpdateSupplier = true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -712,11 +712,6 @@
           infoId: '',
           Remark: ''
         },
-        backhistroy: {
-          certId: '',
-          classId: '04',
-          workflowId: ''
-        },
         infoitemsoptions: [{
           value: 'SupplierName',
           label: '企业名称'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -604,7 +604,7 @@
         <el-button type="primary" @click="makesure()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="变更项查看" :visible.sync="myitemsshow" width="500px">
+    <el-dialog title="变更项查看" :visible.sync="myitemsshow" width="780px">
       <el-table :data="InfoData" border style="width: 100%">
         <el-table-column align="center" prop="SelectItemName" label="变更项目">
         </el-table-column>