审批人下拉修改

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

@@ -597,10 +597,13 @@ func (this *InfoChangeController) GetAuditerByDept() {
 // @Description 获取企业法规处人员
 // @router /getauditer [get]
 func (this *InfoChangeController) GetAuditer() {
-	svc := infochange.GetInfoChangeService(utils.DBE)
-	var users []suppliercert.UserList
-	where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
-	svc.GetEntitysByWhere(OilAuditSettingName, where, &users)
+	//svc := infochange.GetInfoChangeService(utils.DBE)
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var users []userRole.Base_RoleList
+	certSrv.GetAuditUser("100000178", workflow.PROF_REGULATION, &users)
+	//var users []suppliercert.UserList
+	// where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
+	//svc.GetEntitysByWhere(OilAuditSettingName, where, &users)
 	var datainfo ErrorDataInfo
 	datainfo.Item = users
 	this.Data["json"] = &datainfo

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

@@ -146,7 +146,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

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

@@ -153,7 +153,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

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

@@ -152,7 +152,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -191,9 +191,9 @@
                          style="width: 100%" filterable allow-create default-first-option>
                 <el-option
                   v-for="item in auditerOption"
-                  :key="item.userid"
-                  :label="item.username"
-                  :value="item.userid">
+                  :key="item.id"
+                  :label="item.realname"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -39,7 +39,7 @@
             <el-form-item label="提交审批人" v-if="InfoStatus == '1'" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 filterable allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
+                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -532,7 +532,7 @@
             <el-form-item label="审批人" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 filterable allow-create default-first-option>
-               <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
+               <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -158,7 +158,7 @@
             <el-form-item label="审批人">
               <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
+                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -136,7 +136,7 @@
             <el-form-item label="审批人">
               <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
+                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -136,7 +136,7 @@
             <el-form-item label="审批人">
               <el-select ref="selectAuditer" v-model="FirstAudit" placeholder="请选择" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
+                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>