2
3
dubch 5 жил өмнө
parent
commit
3f51308430

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilcontract/contractEvaluationOrder.go

@@ -28,7 +28,7 @@ func (this *OilContractEvaluationOrderController) GetEntityList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " UnitId = " + strconv.Itoa(this.User.UnitId)  + " "
-	if this.User.Unit == "企管法规处(内控与风险管理处)" {
+	if this.User.UnitId == 100000517 {
 		where = " 1=1 "
 	}
 	orderby := "Id"

+ 2 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1310,7 +1310,8 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	dictList["ProOrgList"] = preorglist
 
 	var unitorglist []organize.Base_Organize
-	where := "Category='Unit'and Id not in (100000004,100000003,100000002) "
+	//where := "Category='Unit'and Id not in (100000004,100000003,100000002) "
+	where := "Category='Unit'and Id not in (100000880,100000201) "
 	orgsvc.GetEntities(&unitorglist, where)
 	dictList["UnitOrgList"] = unitorglist
 

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -538,7 +538,7 @@ func (this *OilSupplierCertSubController) AddGoodsByFilter() {
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			unitsvc := organize.GetOrganizeService(utils.DBE)
 			unitid := unitsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
-			if unitid == "100000095" { // 100000095 企管法规处(内控与风险管理处)
+			if unitid == "100000517" { // 100000517 企管法规处(内控与风险管理处)
 				datamain.CertSubStatus = "1"
 			}
 			//插入准入范围表
@@ -696,7 +696,7 @@ func (this *OilSupplierCertSubController) AddTechBus() {
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			unitsvc := organize.GetOrganizeService(utils.DBE)
 			unitid := unitsvc.GetMyUnitDepartmentId(this.User.DepartmentId)
-			if unitid == "100000095" {
+			if unitid == "100000517" {
 				datamain.CertSubStatus = "1"
 			}
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &datamain)

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -176,7 +176,7 @@ export default {
       auditerName: '',
       firOptions: [],
       fushenauditer: '', // 复审人员
-      selectDept: this.selectDeptBoolean2 ? 100000522 : (this.selectDeptBoolean ? 100000071 : ''),
+      selectDept: this.selectDeptBoolean2 ? 100000522 : (this.selectDeptBoolean ? 100000561 : ''),
 
       allorgunitOptions: [],
       auditform: {

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -887,11 +887,11 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [100000000, 100000001, 100000071], // 专业可是
+        majorDept: [100000000, 100000067, 100000074, 100000561], // 专业可是
         auditbusList: [], // 待审核业务
         allorgunitOptions: [],
         userOptions: [],
-        selectDept: 100000071,
+        selectDept: 100000561,
         ProfessionalAudit: '',
         dialogMakeSure: false,
         dialogAllocation: false,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -786,7 +786,7 @@
         auditerOption: [], // 审批人
         secorgtreelist: [],
         ProfessionalAudit: '',
-        majorDept: [100000000, 100000001, 100000071],
+        majorDept: [100000000, 100000067, 100000074, 100000561],
         auditbusList: [], // 待审核业务
         allorgunitOptions: [],
         userOptions: [],

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

@@ -1253,7 +1253,7 @@ export default {
         dialogSecUnitSeparateVisible: false,
         userOptions: [],
         subfileList: [],
-        majorDept: [100000000, 100000001, 100000071],
+        majorDept: [100000000, 100000067, 100000074, 100000561],
         auditbusList: [], // 待审核业务
         secauditerOptions: [], // 专业审批人
         secorgtreelist: [], // 专业审核人部门

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -1132,7 +1132,7 @@
         applyLoading: false,
         userOptions: [],
         subfileList: [],
-        majorDept: [100000000, 100000001, 100000071],
+        majorDept: [100000000, 100000067, 100000074, 100000561],
         auditbusList: [], // 待审核业务
         secauditerOptions: [], // 专业审批人
         secorgtreelist: [], // 专业审核人部门

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

@@ -1330,7 +1330,7 @@
         fushenauditer: '', // 复审人员
         orgauditOptions: [],
         UnitOrgOptions: [],
-        majorDept: [100000000, 100000001, 100000071], // 专业可是
+        majorDept: [100000000, 100000067, 100000074, 100000561], // 专业可是
         secauditerOptions: [],
         GradeOptions: [{
           value: '1',

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -1069,7 +1069,7 @@
         applyLoading: false,
         userOptions: [],
         subfileList: [],
-        majorDept: [100000000, 100000001, 100000071],
+        majorDept: [100000000, 100000067, 100000074, 100000561],
         auditbusList: [], // 待审核业务
         secauditerOptions: [], // 专业审批人
         secorgtreelist: [], // 专业审核人部门

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

@@ -622,14 +622,14 @@ export default {
       createBtn: false,
       activeName: '0',
       fushenauditer: '', // 复审人员
-      majorDept: [100000000, 100000001, 100000071], // 专业科室
+      majorDept: [100000000, 100000067, 100000074, 100000561], // 专业科室
       userOptions: [],
       firOptions: [],
       UnitOrgOptions: [],
       orgauditOptions: [],
       UnitOrg: '',
       allorgunitOptions: [],
-      selectDept: 100000071,
+      selectDept: 100000561,
       dialogVisibleCom: false,
       showReturn: 1,
       IsCompanyUser: 0,

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1276,7 +1276,7 @@
         myitemsshow: false,
         disabled: false,
         activeName: '0',
-        selectDept: 100000071,
+        selectDept: 100000561,
         Grade: '',
         OperType: '',
         cardloading: '',
@@ -1308,7 +1308,7 @@
         preorgtreelist: [],
         secauditerOptions: [],
         fushenauditer: '', // 复审人员
-        majorDept: [100000000, 100000001, 100000071], // 专业可是
+        majorDept: [100000000, 100000067, 100000074, 100000561], // 专业可是
         dialogSeparateUnitAuditVisible: false, // 二级单位分办提交审核弹框
         dialogComSubmitToSeparateUnitVisible: false,
         organizeOption: [], // 审批部门

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

@@ -433,8 +433,8 @@
         secorgtreelist: [],
         userOptions: [],
         fushenauditer: '', // 复审人员
-        majorDept: [100000000, 100000001, 100000071],
-        selectDept: 100000071,
+        majorDept: [100000000, 100000067, 100000074, 100000561],
+        selectDept: 100000561,
         orgauditOptions: [],
         auditform: {
           FirstAuditName: '',