From 54830604377cd13341b9236b968a9ab283dcf26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Mon, 30 Jan 2023 15:06:10 +0800 Subject: [PATCH 1/6] 2023-01-30 --- .../src/views/system/Depart3List.vue | 12 +++++++----- ant-design-vue-jeecg/src/views/system/DepartList.vue | 2 +- .../src/views/system/modules/DepartModal.vue | 4 ++-- .../views/zyWorkorderManagement/ZyWorkOrderList.vue | 4 ++-- .../jeecg/modules/workorder/entity/WorkOrder.java | 1 + .../workorder/service/impl/WorkOrderServiceImpl.java | 5 ++++- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index 5848e24d..a3144667 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -104,7 +104,7 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" label="缩写"> - + @@ -114,7 +114,7 @@ label="部门编码"> - + - 编辑 + 排序 + + 编辑 - - 详情 - - - - 删除 - - + 详情 + + + 删除 + + @@ -137,13 +131,15 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CustomerInvoiceModal from './modules/CustomerInvoiceModal' + import CustomerInvoiceModal1 from './modules/CustomerInvoiceModal1' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CustomerInvoiceList', mixins:[JeecgListMixin, mixinDevice], components: { - CustomerInvoiceModal + CustomerInvoiceModal, + CustomerInvoiceModal1 }, data () { return { @@ -248,6 +244,11 @@ }, }, methods: { + paixu: function (record) { + this.$refs.modalFormpaixu.edit(record.userId); + this.$refs.modalFormpaixu.title = record.userId_dictText+"测体管理"; + this.$refs.modalFormpaixu.disableSubmit = false; + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue index a969c57a..f60e0c98 100644 --- a/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue +++ b/ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentList1.vue @@ -123,7 +123,7 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - + import { getAction } from '@/api/manage' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { @@ -202,6 +202,7 @@ exportXlsUrl: "/customerpayment/customerPayment/exportXls", importExcelUrl: "customerpayment/customerPayment/importExcel", + }, dictOptions:{}, superFieldList:[], diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java index 4d479e21..7e731d06 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java @@ -74,6 +74,29 @@ public class CustomerInvoiceController extends JeecgController queryPageList1(CustomerInvoice customerInvoice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap()); + queryWrapper.eq("user_id",customerInvoice.getUserId()); + Page page = new Page(pageNo, pageSize); + IPage pageList = customerInvoiceService.page(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * @@ -243,7 +266,27 @@ public class CustomerInvoiceController extends JeecgController shang(@RequestParam(name="id",required=true) String id) { + System.out.println(id); + customerInvoiceService.up(id); + return Result.ok("升序成功"); + } + + + @AutoLog(value = "排序") + @ApiOperation(value="排序", notes="排序") + @GetMapping(value = "/down") + public Result xia(@RequestParam(name="id",required=true) String id) { + int a=customerInvoiceService.findSort(id); + if(a==0){ + return Result.error("当前已经是最低级别！！！");}else { + customerInvoiceService.down(id); + return Result.ok("降序成功"); + } + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java index 56b2e273..ee8d8130 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java @@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerinvoice.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface CustomerInvoiceMapper extends BaseMapper { + + @Select("select sort from customer_invoice where id=#{id} ") + Integer upfindsort(String id); + + @Select("select id from customer_invoice where sort=#{i} ") + String findproid(int i); + + @Update("update customer_invoice set sort =#{i} where id = #{id} ") + void innew(String id, int i); + + @Update("update customer_invoice set sort =#{sort} where id = #{proid} ") + void innewpro(String proid, Integer sort); + + @Select("select sort from customer_invoice where id=#{id} ") + int findSort(String id); + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java index c8ac60f7..5988b99a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java @@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ICustomerInvoiceService extends IService { + void down(String id); + + int findSort(String id); + + void up(String id); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java index 47804111..9cade0cc 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerinvoice.service.impl; import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice; import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper; import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class CustomerInvoiceServiceImpl extends ServiceImpl implements ICustomerInvoiceService { + @Autowired + CustomerInvoiceMapper customerInvoiceMapper; + + @Override + public void up(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + //升序前找到后一个排序 + String proid = customerInvoiceMapper.findproid(sort + 1); + if (proid!="") { + //调换排序 + customerInvoiceMapper.innew(id,sort+1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } + + @Override + public int findSort(String id) { + return customerInvoiceMapper.findSort(id); + } + + @Override + public void down(String id) { + Integer sort = customerInvoiceMapper.upfindsort(id); + if (sort>0) { + String proid = customerInvoiceMapper.findproid(sort - 1); + if (proid!="") { + customerInvoiceMapper.innew(id,sort-1); + customerInvoiceMapper.innewpro(proid,sort); + } + } + } } From 3be5a51fefdc1218b96a91d3c037a7a0e237a3b0 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Wed, 1 Feb 2023 10:40:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E9=80=81=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=202.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ZyPlanProcessServiceImpl.java | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 63b0afe0..bd81fbe7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -515,51 +515,52 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() - .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4Fabric = new LinkedList<>(); - Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery = new Delivery(); - delivery.setDeliveryReason("0"); - delivery.setDeliveryTime(new Date()); - delivery.setItemType("0"); - delivery.setAmount(e.getAmount().doubleValue()); - delivery.setCarrierId("admin"); - delivery.setAdminId("admin"); - delivery.setStorehouseId("TODO"); - ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); - if (!ObjectUtils.isEmpty(zyFabric)) { - delivery.setItemCode(zyFabric.getFabricNumber()); - } - deliveryList4Fabric.add(delivery); - }); - iDeliveryService.saveBatch(deliveryList4Fabric); - - List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() - .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4accessories = new LinkedList<>(); - Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery2 = new Delivery(); - delivery2.setDeliveryReason("0"); - delivery2.setDeliveryTime(new Date()); - delivery2.setItemType("1"); - delivery2.setAmount(e.getAmount().doubleValue()); - delivery2.setCarrierId("admin"); - delivery2.setAdminId("admin"); - delivery2.setStorehouseId("TODO"); - ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); - if (!ObjectUtils.isEmpty(zyAccessories)) { - delivery2.setItemCode(zyAccessories.getNums()); - } - deliveryList4accessories.add(delivery2); - }); - iDeliveryService.saveBatch(deliveryList4accessories); +// String planId = zyPlanProcess.getPlanId(); +// ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); +// if (ObjectUtils.isEmpty(zyProductPlan)) { +// throw new JeecgBootException("生产计划不存在!"); +// } + +// List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() +// .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4Fabric = new LinkedList<>(); +// Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery = new Delivery(); +// delivery.setDeliveryReason("0"); +// delivery.setDeliveryTime(new Date()); +// delivery.setItemType("0"); +// delivery.setAmount(e.getAmount().doubleValue()); +// delivery.setCarrierId("admin"); +// delivery.setAdminId("admin"); +// delivery.setStorehouseId("TODO"); +// ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); +// if (!ObjectUtils.isEmpty(zyFabric)) { +// delivery.setItemCode(zyFabric.getFabricNumber()); +// } +// deliveryList4Fabric.add(delivery); +// }); +// iDeliveryService.saveBatch(deliveryList4Fabric); +// +// List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() +// .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4accessories = new LinkedList<>(); +// Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery2 = new Delivery(); +// delivery2.setDeliveryReason("0"); +// delivery2.setDeliveryTime(new Date()); +// delivery2.setItemType("1"); +// delivery2.setAmount(e.getAmount().doubleValue()); +// delivery2.setCarrierId("admin"); +// delivery2.setAdminId("admin"); +// delivery2.setStorehouseId("TODO"); +// ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); +// if (!ObjectUtils.isEmpty(zyAccessories)) { +// delivery2.setItemCode(zyAccessories.getNums()); +// } +// deliveryList4accessories.add(delivery2); +// }); +// iDeliveryService.saveBatch(deliveryList4accessories); + iDeliveryService.sendToRepository(zyPlanProcess.getPlanId()); } From 9abbea76a752bc034b56fbb01cda8168a71733d1 Mon Sep 17 00:00:00 2001 From: wangjiadong <1654135867@qq.com> Date: Wed, 1 Feb 2023 10:40:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/modules/CustomerInvoiceList1.vue | 300 ++++++++++++++++++ .../admin/modules/CustomerInvoiceModal1.vue | 60 ++++ 2 files changed, 360 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue new file mode 100644 index 00000000..8e29d941 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceList1.vue @@ -0,0 +1,300 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue new file mode 100644 index 00000000..1510631e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceModal1.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file From c6e6b25d476b3e4e1d2c612ed15a28b3d881831f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com> Date: Wed, 1 Feb 2023 11:01:00 +0800 Subject: [PATCH 6/6] 2023 --- .../src/config/router.config.js | 51 +++++++++----- ant-design-vue-jeecg/src/permission.js | 2 +- .../src/views/system/Depart3List.vue | 54 ++++++++++----- .../src/views/system/RoleUserList.vue | 10 +-- .../src/views/system/User2List.vue | 4 +- .../src/views/system/modules/DepartModal.vue | 15 ++-- .../src/views/system/modules/UserModal.vue | 69 ++++++++++--------- .../system/modules/UserRecycleBinModal.vue | 65 +++++++++++------ .../service/impl/SysDepartServiceImpl.java | 2 +- 9 files changed, 171 insertions(+), 101 deletions(-) diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js index 9031de02..a7f09faf 100644 --- a/ant-design-vue-jeecg/src/config/router.config.js +++ b/ant-design-vue-jeecg/src/config/router.config.js @@ -621,29 +621,42 @@ export const constantRouterMap = [ path: '/404', component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404') }, - { path: '/atlas', component: () => import(/* webpackChunkName: "fail" */ '@/views/seknowgroup/SeKnowAtlasList') }, { - path: '/shopping/shopHome',//这里是你需要设置新窗口打开的页面的路径s - component: () => import('@/views/shopping/shopHome'), - }, - { - path: '/shopping/views/clothType',//这里是你需要设置新窗口打开的页面的路径s - component: () => import('@/views/shopping/pages/clothType'), - }, - { - path: '/shopping/views/sirendingzhi',//这里是你需要设置新窗口打开的页面的路径s - component: () => import('@/views/shopping/pages/sirendingzhi'), - }, - { - path: '/shopping/views/ClothDetail',//这里是你需要设置新窗口打开的页面的路径s - component: () => import('@/views/shopping/pages/clothDetail'), - }, - { - path: '/shopping/views/person',//这里是你需要设置新窗口打开的页面的路径s - component: () => import('@/views/shopping/pages/gerenzhongxin'), + path: '/shopping',//这里是你需要设置新窗口打开的页面的路径s + component: () => import('@views/shopping/shopHome'), + redirect: '/shopping/shopHome', + hidden: true, + children: [ + { + path: 'shopHome', + name: 'shopHome', + component: () => import('@views/shopping/shopHome'), + }, + { + path: 'clothType',//这里是你需要设置新窗口打开的页面的路径s + name: 'clothType', + component: () => import('@/views/shopping/pages/clothType'), + }, + { + path: 'sirendingzhi',//这里是你需要设置新窗口打开的页面的路径s + name: 'sirendingzhi', + component: () => import('@/views/shopping/pages/sirendingzhi'), + }, + { + path: 'ClothDetail',//这里是你需要设置新窗口打开的页面的路径s + name: 'ClothDetail', + component: () => import('@/views/shopping/pages/clothDetail'), + }, + { + path: 'person',//这里是你需要设置新窗口打开的页面的路径s + name: 'person', + component: () => import('@/views/shopping/pages/gerenzhongxin'), + }, + ] + }, ] diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js index 255bc2dd..6ddfcb42 100644 --- a/ant-design-vue-jeecg/src/permission.js +++ b/ant-design-vue-jeecg/src/permission.js @@ -18,7 +18,7 @@ const whiteList = ['/user/login','/userequip/loginequip','/user/sgin', '/gygl/gyglzxt','/sykesjk/sykcsjkzxt','/scrysjk/scrysjkzxt','/jxrysjk/jxrysjkzxt','/jxzz/jxzzglsjkzxt','/scys/scyssjkzxt', '/sckz/sckzzxt','/sbjm/sbjmsjkzxt','/jxgl/jxglsjkzxt','/szls/szlssjkzxt','/jxdsj/jxdsjzszxt', '/ybgl/ybglsjkzxt','/mflgl/mflglsjkzxt','/ddcl/ddclzxt','/ddgl/ddglzxt','/dyhsc/dyhsczxt','/znyy/znyysczhgkzzrj', - '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt'] // no redirect whitelist + '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi','/shopping/ClothDetail','/shopping/person'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index a3144667..1a7bb904 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -104,7 +104,7 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" label="缩写"> - + @@ -126,7 +126,7 @@ :wrapperCol="wrapperCol" label="部门类型"> - + 管理机构 @@ -277,6 +277,7 @@ departTree: [], rightClickSelectedKey: '', rightClickSelectedOrgCode: '', + rightClickSelectedorgCategory: '', hiding: true, model: {}, dropTrigger: '', @@ -309,7 +310,8 @@ orgCode: {rules: [{required: true, message: '请输入部门编码!'}]}, orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]}, mobile: {rules: [{validator: this.validateMobile}]}, - departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]} + departNameAbbr: {rules: [{required: true, message: '请输入部门编码!'}]}, + //departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]} }, url: { delete: '/sys/sysDepart/delete', @@ -367,12 +369,13 @@ // 右键操作方法 rightHandle(node) { this.dropTrigger = 'contextmenu' - console.log(node.node.eventKey) + //console.log(node.node.eventKey) this.rightClickSelectedKey = node.node.eventKey this.rightClickSelectedOrgCode = node.node.dataRef.orgCode + this.rightClickSelectedorgCategory = node.node.dataRef.orgCategory }, onExpand(expandedKeys) { - console.log('onExpand', expandedKeys) + //console.log('onExpand', expandedKeys) // if not set autoExpandParent to false, if children expanded, parent can not collapse. // or, you can remove all expanded children keys. this.iExpandedKeys = expandedKeys @@ -395,7 +398,7 @@ this.$refs.nodeModal.add(this.currFlowId, '') }, batchDel: function () { - console.log(this.checkedKeys) + //console.log(this.checkedKeys) if (this.checkedKeys.length <= 0) { this.$message.warning('请选择一条记录！') } else { @@ -449,11 +452,11 @@ nodeModalClose() { }, hide() { - console.log(111) + //console.log(111) this.visible = false }, onCheck(checkedKeys, info) { - console.log('onCheck', checkedKeys, info) + //console.log('onCheck', checkedKeys, info) this.hiding = false //this.checkedKeys = checkedKeys.checked // @@ -465,10 +468,10 @@ // }, onSelect(selectedKeys, e) { - console.log('selected', selectedKeys, e) + //console.log('selected', selectedKeys, e) this.hiding = false let record = e.node.dataRef - console.log('onSelect-record-3', record) + //console.log('onSelect-record-3', record) this.currSelected = Object.assign({}, record) this.model = this.currSelected this.selectedKeys = [record.key] @@ -491,7 +494,16 @@ } this.$nextTick(() => { - //this.form.getFieldDecorator('departNameAbbr', {initialValue: ''}) + + this.form.getFieldDecorator('departName', {initialValue: ''}) + this.form.getFieldDecorator('departNameEn', {initialValue: ''}) + this.form.getFieldDecorator('orgCode', {initialValue: ''}) + this.form.getFieldDecorator('departNameAbbr', {initialValue: ''}) + this.form.getFieldDecorator('orgCategory', {initialValue: 1}) + this.form.getFieldDecorator('mobile', {initialValue: ''}) + this.form.getFieldDecorator('departOrder', {initialValue: ''}) + this.form.getFieldDecorator('address', {initialValue: ''}) + this.form.getFieldDecorator('memo', {initialValue: ''}) // this.form.getFieldDecorator('fax', {initialValue: ''}) // this.form.getFieldDecorator('fax', {initialValue: ''}) this.form.setFieldsValue(pick(record, 'departName','departNameEn','departNameAbbr','orgCategory', 'orgCode', 'departOrder', 'mobile', 'address', 'memo')) @@ -526,7 +538,7 @@ } let formData = Object.assign(this.currSelected, values) - console.log('Received values of form: ', formData) + //console.log('Received values of form: ', formData) httpAction(this.url.edit, formData, 'put').then((res) => { if (res.success) { this.$message.success('保存成功!') @@ -544,7 +556,7 @@ nodeSettingFormSubmit() { this.form.validateFields((err, values) => { if (!err) { - console.log('Received values of form: ', values) + //console.log('Received values of form: ', values) } }) }, @@ -556,15 +568,25 @@ this.$refs.departModal.add() this.$refs.departModal.title = '新增' } else if (num == 2) { + if(this.currSelected.orgCategory==3||this.currSelected.orgCategory==4||this.currSelected.orgCategory==5||this.currSelected.orgCategory==6||this.currSelected.orgCategory==7) + { + this.$message.warning('该部门不允许添加子部门！') + return false + } let key = this.currSelected.key if (!key) { this.$message.warning('请先点击选中上级部门！') return false } - this.$refs.departModal.add(this.selectedKeys) + this.$refs.departModal.add(this.selectedKeys,this.currSelected.orgCategory) this.$refs.departModal.title = '新增' } else { - this.$refs.departModal.add(this.rightClickSelectedKey) + if(this.rightClickSelectedorgCategory==3||this.rightClickSelectedorgCategory==4||this.rightClickSelectedorgCategory==5||this.rightClickSelectedorgCategory==6||this.rightClickSelectedorgCategory==7) + { + this.$message.warning('该部门不允许添加子部门！') + return false + } + this.$refs.departModal.add(this.rightClickSelectedKey,this.rightClickSelectedorgCategory) this.$refs.departModal.title = '新增' } }, @@ -618,7 +640,7 @@ }, selectDirectiveOk(record) { - console.log('选中指令数据', record) + //console.log('选中指令数据', record) this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode}) this.currSelected.sysCode = record.sysCode }, diff --git a/ant-design-vue-jeecg/src/views/system/RoleUserList.vue b/ant-design-vue-jeecg/src/views/system/RoleUserList.vue index e87b9915..df475c72 100644 --- a/ant-design-vue-jeecg/src/views/system/RoleUserList.vue +++ b/ant-design-vue-jeecg/src/views/system/RoleUserList.vue @@ -40,11 +40,11 @@ 导出 -
- - 已选择 {{ selectedRowKeys1.length }}项 - 清空 -
+ + + + +
- + + @@ -156,6 +158,7 @@ validatedepartNameAbbrUrl: "sys/sysDepart/validatedepartNameAbbr", }, dictDisabled: true, + orgCategoryDisabled: true, } }, created() { @@ -174,7 +177,7 @@ }) }, - add(depart) { + add(depart,orgCategory) { if (depart) { this.seen = false; this.dictDisabled = false; @@ -182,6 +185,10 @@ this.seen = true; this.dictDisabled = true; } + if(orgCategory==2) + { + this.orgCategoryDisabled=false; + } this.edit(depart); }, edit(record) { diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue index 83aed35e..f3458012 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue @@ -40,13 +40,13 @@ - - - + + + - + - - - - + + + + + + + + - - - 普通用户 - 上级 - 员工 - - - - - - +