前后:部门的id修改

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.UnitId == 100000517 {
+	if this.User.UnitId == 100000650 {
 		where = " 1=1 "
 	}
 	orderby := "Id"

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

@@ -1311,7 +1311,8 @@ func (this *OilSupplierController) GetDictListByStatus() {
 
 	var unitorglist []organize.Base_Organize
 	//where := "Category='Unit'and Id not in (100000004,100000003,100000002) "
-	where := "Category='Unit'and Id not in (100000880,100000201) "
+	//where := "Category='Unit'and Id not in (100000880,100000201) "
+	where := "Category='Unit'"
 	orgsvc.GetEntities(&unitorglist, where)
 	dictList["UnitOrgList"] = unitorglist
 
@@ -1371,7 +1372,8 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	var allunitorglist []organize.Base_Organize
 	//where = "Category='Unit' and ParentId in (100000001, 100000128)"
 	//00097005 直属机构 00265300 公司机关 00097004 机关附属机构
-	where = "Category='Unit' and OuterPhone in (00097005,00265300,00097004)"
+	//where = "Category='Unit' and OuterPhone in (00097005,00265300,00097004)"
+	where = "Category='Unit' and ParentId in (100000009, 100000004)"
 	orgsvc.GetEntities(&allunitorglist, where)
 	dictList["Allunitorglist"] = allunitorglist
 
@@ -1977,7 +1979,7 @@ func (this *OilSupplierController) GetFirAuditerByDept() {
 	userIds = strings.Trim(userIds, ",")
 	if userIds != "" {
 		// 企管法规处
-		if unitId == "100000517" {
+		if unitId == "100000650" {
 			where := "Id in (" + userIds + ")"
 			svc.GetEntities(&userlist, where)
 		} else {

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

@@ -553,7 +553,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 == "100000517" { // 100000517 企管法规处(内控与风险管理处)
+			if unitid == "100000650" { // 100000650 企管法规处(内控与风险管理处)
 				datamain.CertSubStatus = "1"
 			}
 
@@ -728,7 +728,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 == "100000517" {
+			if unitid == "100000650" {
 				datamain.CertSubStatus = "1"
 			}
 			datamain.Id = 0

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -660,7 +660,8 @@ func (this *OilCorporateInfoController) OrgLoginList() {
 	//where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000166)"
 	//00097005,00097006 直属机构 二级单位
 	//00265439,50081902,50073840 土地公路管理部 矿区服务事业部 矿区服务事业部
-	where := "Category='unit' and OuterPhone in (00097005,00097006) and Code not in (00265439,50081902,50073840)"
+	//where := "Category='unit' and OuterPhone in (00097005,00097006) and Code not in (00265439,50081902,50073840)"
+	where := "Category='unit' and ParentId in (100000004,100000005) and Id not in (100000660,100003971)"
 	svc.GetEntities(&org, where)
 	var datainfo DataInfo
 	datainfo.Items = org

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 ? 100000561 : ''),
+      selectDept: this.selectDeptBoolean2 ? 100000662 : (this.selectDeptBoolean ? 100000653 : ''),
 
       allorgunitOptions: [],
       auditform: {
@@ -187,7 +187,7 @@ export default {
         AuditRemark: '',
         TypeCode: '02'
       },
-      majorDept: [100000000, 100000060, 100000522],
+      majorDept: [100000000, 100000004, 100000662],
 
       // 复审的变量
       shenheForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -802,11 +802,11 @@
         orgtreelist: [],
         secorgtreelist: [],
         ProfessionalAudit: '',
-        majorDept: [100000000, 100000060, 100000522],
+        majorDept: [100000000, 100000004, 100000662],
         auditbusList: [], // 待审核业务
         allorgunitOptions: [],
         userOptions: [],
-        selectDept: 100000522,
+        selectDept: 100000662,
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,

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

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

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

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

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

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

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

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

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

@@ -1221,7 +1221,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         fushenauditer: '', // 复审人员
         orgauditOptions: [],
         UnitOrgOptions: [],
-        majorDept: [100000000, 100000060, 100000522],
+        majorDept: [100000000, 100000004, 100000662],
         userOptions: [],
         secauditerOptions: [],
         audithistoryshow: false,

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

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

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

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

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

@@ -583,12 +583,12 @@ export default {
       showReturn: 1,
       IsCompanyUser: 0,
       fushenauditer: '', // 复审人员
-      majorDept: [100000000, 100000060, 100000522],
+      majorDept: [100000000, 100000004, 100000662],
       orgauditOptions: [],
       UnitOrgOptions: [],
       UnitOrg: '',
       allorgunitOptions: [],
-      selectDept: 100000522,
+      selectDept: 100000662,
       userOptions: [],
       dialogVisible: false,
       dialogVisibleCom: false,

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, 100000067, 100000074, 100000561], // 专业科室
+      majorDept: [100000000, 100000067, 100000074, 100000653], // 专业科室
       userOptions: [],
       firOptions: [],
       UnitOrgOptions: [],
       orgauditOptions: [],
       UnitOrg: '',
       allorgunitOptions: [],
-      selectDept: 100000561,
+      selectDept: 100000653,
       dialogVisibleCom: false,
       showReturn: 1,
       IsCompanyUser: 0,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1013,7 +1013,7 @@
         btnloading: false,
         fileList: [],
         myitemsshow: false,
-        selectDept: 100000522,
+        selectDept: 100000662,
         disabled: false,
         activeName: '0',
         UnitOrg: '',
@@ -1108,7 +1108,7 @@
         auditer: '',
         auditerName: '',
         fushenauditer: '', // 复审人员
-        majorDept: [100000000, 100000060, 100000522],
+        majorDept: [100000000, 100000004, 100000662],
         FirstAudit: '',
         supplierList: [], // 供应方公司列表
         supplierOptions: '', // 已选择的供应方公司列表

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

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

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

@@ -494,9 +494,9 @@
         inStyle: '',
         auditerName: '',
         fushenauditer: '', // 复审人员
-        majorDept: [100000000, 100000060, 100000522],
+        majorDept: [100000000, 100000004, 100000662],
         allorgunitOptions: [],
-        selectDept: 100000522,
+        selectDept: 100000662,
         auditform: {
           FirstAuditName: '',
           SecondAudit: '',

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

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

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -956,6 +956,7 @@
                   message: res.data.message
                 })
               }
+              _this.roleloading = false
             })
             .catch(() => {})
         }