diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index e5d35b3..7e72a5d 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -629,7 +629,7 @@ public class ExpertController extends JeecgController { public Result handleupupfirm(@RequestParam(name="id",required=true) String id) { String str =""; Expert expert =expertService.getById(id); - if (expert.getCompopen().equals("1")) { + if (expert.getCompopen().equals("1") ||expert.getCompopen().equals("3")) { //修改提交审核状态 expertService.handleupupfirm(id); str ="通过审核"; @@ -659,11 +659,11 @@ public class ExpertController extends JeecgController { //这个是专家的上级管理员审核 @AutoLog(value = "专家管理-这个是上级管理员的通过审核") @ApiOperation(value="专家管理-这个是上级管理员的通过审核", notes="专家管理-这个是上级管理员的通过审核") - @GetMapping(value = "handleupcount") + @GetMapping(value = "/handleupcount") public Result handleupcount(@RequestParam(name="id",required=true) String id) { String str =""; Expert expert =expertService.getById(id); - if (expert.getCompopen().equals("2") && expert.getAdminopen().equals("1")) { + if ((expert.getCompopen().equals("2") && expert.getAdminopen().equals("1")) || (expert.getCompopen().equals("2") && expert.getAdminopen().equals("3"))) { //修改提交审核状态 expertService.handleupcount(id); str ="审核通过"; @@ -935,4 +935,24 @@ public class ExpertController extends JeecgController { } + @AutoLog(value = "专家管理-市局/县区管理员驳回") + @ApiOperation(value="专家管理-市局/县区管理员驳回", notes="专家管理-市局/县区管理员驳回") + @RequestMapping(value = "/saveOrUpdateadminbh", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result saveOrUpdateadminbh(@RequestBody Expert expert) { + expert.setAdminopen("3"); + expert.setCompopen("3"); + expert.setIsdone("N"); + expertService.updateById(expert); + return Result.OK("驳回成功,已责令专家重新编辑!"); + } + @AutoLog(value = "专家管理-公司驳回") + @ApiOperation(value="专家管理-公司驳回", notes="专家管理-公司驳回") + @RequestMapping(value = "/saveOrUpdatefimebh", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result saveOrUpdatefimebh(@RequestBody Expert expert) { + expert.setCompopen("3"); + + expertService.updateById(expert); + return Result.OK("编辑成功!"); + } + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java index 0391aa9..30f5e4c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java @@ -102,6 +102,7 @@ public class Expert implements Serializable { private String phone; @TableField(exist = false) private String emails; + @Dict(dicCode = "sex") @TableField(exist = false) private Integer sex; @TableField(exist = false) @@ -140,4 +141,9 @@ public class Expert implements Serializable { @ApiModelProperty(value = "职称") private java.lang.String zc; + /**驳回原因*/ + @Excel(name = "驳回原因", width = 15) + @ApiModelProperty(value = "驳回原因") + private java.lang.String backinfo; + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java index d605ea3..9416b57 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java @@ -44,7 +44,7 @@ public interface ExpertMapper extends BaseMapper { @Select("SELECT user_id FROM sys_user_role WHERE role_id =#{number}") List userbyrole(String number); - @Update("UPDATE expert SET isdone = 'Y' WHERE id = #{id}") + @Update("UPDATE expert SET isdone = 'Y' , backinfo = '' WHERE id = #{id}") void updatetj(String id); @Update("UPDATE expert SET compopen = '2' WHERE id = #{id}") diff --git a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts index 354bae9..91924e6 100644 --- a/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts +++ b/jeecgboot-vue3/src/views/expert/admin/Expert.api.ts @@ -13,6 +13,7 @@ enum Api { exportXls = '/expert/expert/exportXls', handleadminback = '/expert/expert/handleadminback', handleadminup = '/expert/expert/handleadminup', + saveOrUpdateadminbhapi= '/expert/expert/saveOrUpdateadminbh', } /** @@ -89,3 +90,7 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } +export const saveOrUpdateadminbh = (params, isUpdate) => { + let url = isUpdate ? Api.saveOrUpdateadminbhapi : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue index 8975cb8..72d4814 100644 --- a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue @@ -79,6 +79,7 @@ + @@ -90,6 +91,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,handleadminup,handleadminback } from './Expert.api'; import { downloadFile } from '/src/utils/common/renderUtils'; import ExpertModal from './components/ExpertModal.vue' + import ExpertModal1 from './components/ExpertModal1.vue' import { useUserStore } from '/src/store/modules/user'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; @@ -99,6 +101,7 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const registerModal1zbc = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -166,6 +169,13 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } + function handleEdit1zbc(record: Recordable) { + registerModal1zbc.value.disableSubmit = false; + console.log(registerModal1zbc.value,'registerForm.value') + + registerModal1zbc.value.edit(record); + } + /** * 详情 @@ -237,14 +247,10 @@ confirm: handleupadmin.bind(null, record), placement: 'topLeft', }, - }, { - label: '驳回审核', - popConfirm: { - title: '是否驳回', - confirm: handlebackadmin.bind(null, record), - placement: 'topLeft', - }, - } + }, { + label: '驳回', + onClick: handleEdit1zbc.bind(null, record), + }, ]; } @@ -271,13 +277,9 @@ placement: 'topLeft', }, }, { - label: '驳回审核', - popConfirm: { - title: '是否驳回', - confirm: handlebackadmin.bind(null, record), - placement: 'topLeft', - }, - } + label: '驳回', + onClick: handleEdit1zbc.bind(null, record), + }, ] } diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue new file mode 100644 index 0000000..5e6a335 --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm1.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue new file mode 100644 index 0000000..28fc94e --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertModal1.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts index 7222793..634f747 100644 --- a/jeecgboot-vue3/src/views/expert/county/Expert.api.ts +++ b/jeecgboot-vue3/src/views/expert/county/Expert.api.ts @@ -13,6 +13,7 @@ enum Api { exportXls = '/expert/expert/exportXls', handleupcount = '/expert/expert/handleupcount', handlebackcoount = '/expert/expert/handlebackcoount', + saveOrUpdateadminbhapi= '/expert/expert/saveOrUpdateadminbh', } /** @@ -88,3 +89,9 @@ export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); } + + +export const saveOrUpdateadminbh = (params, isUpdate) => { + let url = isUpdate ? Api.saveOrUpdateadminbhapi : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue index 954748e..5de33c8 100644 --- a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue @@ -69,6 +69,7 @@ + @@ -80,6 +81,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,handleupcount,handlebackco } from './Expert.api'; import { downloadFile } from '/src/utils/common/renderUtils'; import ExpertModal from './components/ExpertModal.vue' + import ExpertModal1 from './components/ExpertModal1.vue' import { useUserStore } from '/src/store/modules/user'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; @@ -90,6 +92,7 @@ const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const registerModal1 = ref(); const userStore = useUserStore(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -158,6 +161,14 @@ registerModal.value.edit(record); } + /** + * 编辑事件 + */ + function handleEdit1(record: Recordable) { + registerModal1.value.disableSubmit = false; + registerModal1.value.edit(record); + } + /** * 详情 */ @@ -229,12 +240,8 @@ }, }, { label: '驳回', - popConfirm: { - title: '是否确认通过审核', - confirm: handlebackcount.bind(null, record), - placement: 'topLeft', - }, - } + onClick: handleEdit1.bind(null, record), + }, ]; } diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue new file mode 100644 index 0000000..e0a615b --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm1.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue new file mode 100644 index 0000000..32f8ad5 --- /dev/null +++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertModal1.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue index 7abd887..e13d20b 100644 --- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue @@ -98,7 +98,7 @@ - + diff --git a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue index a9e378d..fd0abe8 100644 --- a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue @@ -94,8 +94,8 @@ - - + +