fenban

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -108,7 +108,9 @@ const (
 	OIL_SECOND_APPEND_APPLY string = "oil_second_append_apply"
 
 	// 分办
-	SUB_OFFICE string = "SUB_OFFICE"
+	SUB_OFFICE_WZ string = "SUB_OFFICE_WZ"
+	SUB_OFFICE_JF string = "SUB_OFFICE_JF"
+	SUB_OFFICE_JS string = "SUB_OFFICE_JS"
 
 	//业务步骤编码 初审
 	FIRST_TRIAL string = "FIRST_TRIAL"

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

@@ -577,12 +577,21 @@ func (this *OilSupplierCertController) AuditEntity() {
 	AuditRemark := this.GetString("AuditRemark")
 	secondAudit := this.GetString("SecondAudit")
 	thirdAudit := this.GetString("ThirdAudit")
+	typeCode := this.GetString("TypeCode")
 
 	var setting auditsetting.Base_OilAuditSetting
 	var userlist []userRole.Base_User
 	usvc := userRole.GetUserService(utils.DBE)
+	where := ""
 	if this.User.IsCompanyUser == 1 {
-		where := "AuditStepCode='" + workflow.SUB_OFFICE + "'"
+		if typeCode == "01" {
+			where = "AuditStepCode='" + workflow.SUB_OFFICE_WZ + "'"
+		} else if typeCode == "02" {
+			where = "AuditStepCode='" + workflow.SUB_OFFICE_JS + "'"
+
+		} else if typeCode == "03" {
+			where = "AuditStepCode='" + workflow.SUB_OFFICE_JF + "'"
+		}
 		usvc.GetEntity(&setting, where)
 		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
 		tempstr := strings.Join(ids, ",")

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

@@ -448,7 +448,8 @@ export default {
           SecondAudit: '',
           ThirdAudit: '',
           CertId: '',
-          AuditRemark: ''
+          AuditRemark: "",
+          TypeCode: '02'
         },
         orgtreeprops: {
           value: 'id',
@@ -784,7 +785,7 @@ export default {
       },
       orgunitChange (val) {
         let deptid = val
-        let auditstepcode = 'SUB_OFFICE'
+        let auditstepcode = 'SUB_OFFICE_JS'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.orgauditOptions = res.data.item
         }).catch(err => {

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

@@ -451,7 +451,8 @@
           SecondAudit: '',
           ThirdAudit: '',
           CertId: '',
-          AuditRemark: ''
+          AuditRemark: "",
+          TypeCode: '01'
         },
         orgtreeprops: {
           value: 'id',
@@ -726,7 +727,7 @@
       },
       orgunitChange (val) {
         let deptid = val
-        let auditstepcode = 'SUB_OFFICE'
+        let auditstepcode = 'SUB_OFFICE_JS'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.orgauditOptions = res.data.item
         }).catch(err => {

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

@@ -443,7 +443,8 @@
           SecondAudit: '',
           ThirdAudit: '',
           CertId: '',
-          AuditRemark: ''
+          AuditRemark: "",
+          TypeCode: '03'
         },
         orgtreeprops: {
           value: 'id',
@@ -779,7 +780,7 @@
       },
       orgunitChange (val) {
         let deptid = val
-        let auditstepcode = 'SUB_OFFICE'
+        let auditstepcode = 'SUB_OFFICE_JF'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.orgauditOptions = res.data.item
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -22,11 +22,15 @@
         <!--</el-checkbox-group>-->
         <el-row>
           <el-col :span="8">
-            <el-select v-model="selectedrole" placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in rolelist" :key="item.Id" :label="item.Realname" :value="item.Id">
-              </el-option>
-            </el-select>
+            <el-form label-width="80px">
+              <el-form-item label="审核角色">
+                <el-select v-model="selectedrole" placeholder="请选择"
+                           style="width: 100%;">
+                  <el-option v-for="item in rolelist" :key="item.Id" :label="item.Realname" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
           </el-col>
         </el-row>
       </div>
@@ -163,6 +167,15 @@
         } else if (val.query.step == 8) {
           // 注册公司审核
           this.ACode = 'COMPONY_AUDIT'
+        } else if (val.query.step == 9) {
+          // 分办-物资类
+          this.ACode = 'SUB_OFFICE_WZ'
+        } else if (val.query.step == 10) {
+          // 分办-技术服务类
+          this.ACode = 'SUB_OFFICE_JF'
+        } else if (val.query.step == 11) {
+          // 分办-基建类
+          this.ACode = 'SUB_OFFICE_JS'
         }
         this.initData()
       }
@@ -202,6 +215,15 @@
       } else if (this.$route.query.step == 8) {
         // 注册公司审核
         this.ACode = 'COMPONY_AUDIT'
+      } else if (this.$route.query.step == 9) {
+        // 分办-物资类
+        this.ACode = 'SUB_OFFICE_WZ'
+      } else if (this.$route.query.step == 10) {
+        // 分办-技术服务类
+        this.ACode = 'SUB_OFFICE_JF'
+      } else if (this.$route.query.step == 11) {
+        // 分办-基建类
+        this.ACode = 'SUB_OFFICE_JS'
       }
       this.initData()
       // this.getAllRole()

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

@@ -569,7 +569,6 @@
         let useridlist = this.userselectOptions.join(',');
         let useridliststring = useridlist.toString()
 
-        debugger
         // request
         this.$axios.put('role/setuserrole/' + useridliststring + '_' + this.selectRoleId, {})
           .then(res => {