From b863e481860b35c2658c1f818493e0be8d35bac8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 6 Sep 2024 21:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zjSqxx/controller/ZjSqxxController.java | 2 +- .../service/impl/ZjSqxxServiceImpl.java | 1 + .../src/main/resources/application-prod.yml | 4 +- .../bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue | 1 + .../bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue | 1 + .../bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue | 1 + .../src/views/bl/zjSqxx/ZjSqxxList.vue | 56 ++++++++++++++++--- .../views/bl/zjSqxx/components/ZjSqxxForm.vue | 21 ++++--- .../src/views/bl/zyHuizong/ZyHuizongList.vue | 1 + .../zyHuizongXiangxi/ZyHuizongXiangxiList.vue | 1 + .../views/bl/zyInfoScjl/ZyInfoScjlList.vue | 1 + .../src/views/system/notice/index.vue | 2 +- .../role/components/UseSelectModalNew.vue | 4 +- .../src/views/system/user/user.api.ts | 2 + 14 files changed, 77 insertions(+), 21 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java index 3546b27..f06673a 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java @@ -99,7 +99,7 @@ public class ZjSqxxController extends JeecgController { @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ZjSqxx zjSqxx) { zjSqxxService.updateById(zjSqxx); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java index f2035d5..e78e9bd 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java @@ -42,6 +42,7 @@ public class ZjSqxxServiceImpl extends ServiceImpl impleme sq.setUserId(userId); sq.setZjName(user.getRealname()); sq.setZjNo(user.getUsername()); + sq.setSqzt("0"); baseMapper.insert(sq); } } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 5186b64..7544bad 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -315,8 +315,8 @@ justauth: sftp: hostname: 210.47.29.99 port: 22 - username: sftp - password: Nenujwc@99 + username: Nenujwc@99 + password: LKdg&^kKf5rw timeout: 1000 uploadpath: kczx fullpath: /data \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue index 4fdf790..599c463 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue @@ -108,6 +108,7 @@ columns, canResize:false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue index e2e603b..d53a98d 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue @@ -65,6 +65,7 @@ columns, canResize:false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue index 73f1819..df0fb79 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue @@ -91,6 +91,7 @@ columns, canResize:false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue index 31179c6..b14ff30 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue @@ -73,6 +73,7 @@ import ZjSqxxEditModal from './components/ZjSqxxEditModal.vue' import { useUserStore } from '/@/store/modules/user'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import { defHttp } from '/@/utils/http/axios'; const formRef = ref(); const queryParam = reactive({}); @@ -89,7 +90,7 @@ canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 220, fixed: 'right', }, beforeFetch: async (params) => { @@ -176,16 +177,57 @@ (selectedRowKeys.value = []) && reload(); } + function handleFabu(record){ + defHttp.post({url:"/zjSqxx/zjSqxx/edit",params:{id:record.id,sqzt:"0"}}).then(res=>{ + reload(); + }) + } + + function handleChehui(record){ + defHttp.post({url:"/zjSqxx/zjSqxx/edit",params:{id:record.id,sqzt:"2"}}).then(res=>{ + reload(); + }) + } /** * 操作栏 */ function getTableAction(record) { - return [ - { - label: '编辑', - onClick: handleEdit.bind(null, record), - }, - ]; + if(record.sqzt=='0'){ + return [ + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + { + label: '撤回', + onClick: handleChehui.bind(null, record), + }, + ]; + }else if(record.sqzt=='1'){ + return [ + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + { + label: '撤回', + onClick: handleChehui.bind(null, record), + }, + ]; + + }else if(record.sqzt=='2'){ + return [ + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + { + label: '发布', + onClick: handleFabu.bind(null, record), + }, + ]; + + } } /** diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue index 2ea011d..39d0cdc 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue @@ -16,7 +16,8 @@ - + + 删除 @@ -54,11 +55,11 @@ - + @@ -154,11 +155,11 @@ - + @@ -201,11 +202,11 @@ - + @@ -240,7 +241,7 @@ import { getValueType } from '/@/utils'; import { saveNew } from '../ZjSqxx.api'; import { Form } from 'ant-design-vue'; import { useModal } from '/src/components/Modal'; -import UseSelectModal from '/@/views/system/role/components/UseSelectModal.vue'; +import UseSelectModal from '/@/views/system/role/components/UseSelectModalNew.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue'; import KcKetangbiaoCheckModal from '/@/views/bl/kcKetangbiao/KcKetangbiaoCheckModal.vue'; @@ -293,6 +294,10 @@ const disabled = computed(() => { return props.formDisabled; }); +function handleSqDel(index){ + sqDataList.value.splice(index, 1); +} + /** * 新增 */ diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue index 93c319a..b6215ca 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue @@ -94,6 +94,7 @@ const emit = defineEmits(['callback']); columns, canResize:false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue index 20d20a5..1d55f43 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue @@ -70,6 +70,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ columns, canResize: false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue index f5cc577..3625efa 100644 --- a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue @@ -111,6 +111,7 @@ columns, canResize:false, useSearchForm: false, + showActionColumn: false, actionColumn: { width: 120, fixed: 'right', diff --git a/jeecgboot-vue3/src/views/system/notice/index.vue b/jeecgboot-vue3/src/views/system/notice/index.vue index d06b3de..dd36947 100644 --- a/jeecgboot-vue3/src/views/system/notice/index.vue +++ b/jeecgboot-vue3/src/views/system/notice/index.vue @@ -24,7 +24,7 @@ {{notice.titile}} - {{notice.sendStatus}}-{{showDictValue(notice.sendStatus, statusData)}} + {{showDictValue(notice.sendStatus, statusData)}} 编辑 diff --git a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue index 18e8721..e731677 100644 --- a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue +++ b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue @@ -8,14 +8,14 @@ import { BasicModal, useModalInner } from '/src/components/Modal'; import { BasicTable, useTable, TableAction } from '/src/components/Table'; import { userColumns, searchUserFormSchema } from '../role.data'; - import { list } from '../../user/user.api'; + import { expertList } from '../../user/user.api'; // 声明Emits const emit = defineEmits(['select', 'register']); const checkedKeys = ref>([]); const [registerModal, { setModalProps, closeModal }] = useModalInner(); //注册table数据 const [registerTable, { reload }] = useTable({ - api: list, + api: expertList, rowKey: 'id', columns: userColumns, formConfig: { diff --git a/jeecgboot-vue3/src/views/system/user/user.api.ts b/jeecgboot-vue3/src/views/system/user/user.api.ts index 662a98f..5802006 100644 --- a/jeecgboot-vue3/src/views/system/user/user.api.ts +++ b/jeecgboot-vue3/src/views/system/user/user.api.ts @@ -30,6 +30,7 @@ enum Api { putCancelQuit = '/sys/user/putCancelQuit', updateUserTenantStatus='/sys/tenant/updateUserTenantStatus', getUserTenantPageList='/sys/tenant/getUserTenantPageList', + expertList = '/sys/user/expertList', } /** * 导出api @@ -45,6 +46,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const expertList = (params) => defHttp.get({ url: Api.expertList, params }); /** * 列表接口(查询全部用户，不通过租户隔离)