src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -198,7 +198,7 @@ } @RequestMapping(value = "/cstmr/add/auth") @ManagerAuth(memo = "添加甲方单位信息公海") @ManagerAuth(memo = "添加客户信息公海") public R add(Cstmr cstmr) { if (getUser().getRoleId()!=1){ if (!getUser().getNickname().equals("陈燕")){ @@ -232,7 +232,7 @@ } @RequestMapping(value = "/cstmr/add2/auth") @ManagerAuth(memo = "添加甲方单位信息公海") @ManagerAuth(memo = "添加客户信息公海") public R add22(Cstmr cstmr) { Long hostId = getHostId(); if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) { @@ -261,11 +261,11 @@ } @RequestMapping(value = "/cstmr2/add/auth") @ManagerAuth(memo = "接取甲方单位") @ManagerAuth(memo = "接取客户信息") public R add2(Cstmr cstmr) { Cstmr cstmr1 = cstmrService.selectByName(getHostId(),cstmr.getName()); if (Cools.isEmpty(cstmr1) || cstmr1.getDirector()!=null){ return R.error("你无法接取此甲方单位!"); return R.error("你无法接取此客户信息!"); } cstmr1.setDirector(getUserId()); cstmr1.setDeptId(getDeptId()); // 所属部门 @@ -277,7 +277,7 @@ } @RequestMapping(value = "/cstmr/update/auth") @ManagerAuth(memo = "更新甲方单位") @ManagerAuth(memo = "更新客户信息") public R update(Cstmr cstmr){ if (Cools.isEmpty(cstmr) || null==cstmr.getId()){ return R.error(); @@ -294,7 +294,7 @@ } @RequestMapping(value = "/cstmr/delete/auth") @ManagerAuth(memo = "删除甲方单位") @ManagerAuth(memo = "删除客户信息") public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ int order = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id)); @@ -307,7 +307,7 @@ } @RequestMapping(value = "/cstmr/delete/one/{id}") @ManagerAuth(memo = "删除甲方单位") @ManagerAuth(memo = "删除客户信息") public R deleteOne(@PathVariable Long id) { int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id)); if (cstmr_id!=0){ @@ -357,7 +357,7 @@ * excel导入 */ @PostMapping(value = "/cstmr/excel/import/auth") @ManagerAuth(memo = "甲方单位Excel导入") @ManagerAuth(memo = "客户信息Excel导入") // @Transactional public R cstmrExcelImport(MultipartFile file) throws IOException { InputStream inStream = file.getInputStream(); src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -387,7 +387,7 @@ * excel导入 */ @PostMapping(value = "/order/excel/import/auth") @ManagerAuth(memo = "甲方单位Excel导入") @ManagerAuth(memo = "客户信息Excel导入") // @Transactional public R orderExcelImport(MultipartFile file) throws IOException { InputStream inStream = file.getInputStream(); src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -905,7 +905,7 @@ * excel导入 */ @PostMapping(value = "/plan/excel/import/auth") @ManagerAuth(memo = "甲方单位Excel导入") @ManagerAuth(memo = "客户信息Excel导入") // @Transactional public R planExcelImport(MultipartFile file) throws IOException { InputStream inStream = file.getInputStream(); src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -274,7 +274,7 @@ priOnline2.setMemberId(getUserId()); Cstmr cstmr = cstmrService.selectById(plan.getCstmrId()); priOnline2.setTemplateName(cstmr.getName()); //甲方单位名称 priOnline2.setTemplateName(cstmr.getName()); //客户信息名称 priOnline2.setSettle(0);
@@ -29,9 +29,9 @@ private Long id; /** * 甲方单位 * 客户信息 */ @ApiModelProperty(value= "甲方单位") @ApiModelProperty(value= "客户信息") @TableField("cstmr_id") private Long cstmrId; @@ -50,7 +50,7 @@ } // CstmrFoll cstmrFoll = new CstmrFoll( // null, // 甲方单位[非空] // null, // 客户信息[非空] // null // 跟进人[非空] // );
@@ -60,9 +60,9 @@ private Long userId; /** * 甲方单位 * 客户信息 */ @ApiModelProperty(value= "甲方单位") @ApiModelProperty(value= "客户信息") @TableField("cstmr_id") private Long cstmrId; @@ -240,7 +240,7 @@ // null, // 所属商户 // null, // 所属部门 // null, // 所属人员 // null, // 甲方单位 // null, // 客户信息 // null, // 客户代号[非空] // null, // 客户名称[非空] // null, // 总金额 src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -73,9 +73,9 @@ private Long orderId; /** * 甲方单位 * 客户信息 */ @ApiModelProperty(value = "甲方单位") @ApiModelProperty(value = "客户信息") @TableField("cstmr_id") private Long cstmrId;
@@ -59,7 +59,7 @@ case 1: // 模板下载 layer.load(1, {shade: [0.1,'#fff']}); location.href = baseUrl + "/mould/甲方单位导入模板.xls"; location.href = baseUrl + "/mould/客户信息导入模板.xls"; layer.closeAll('loading'); break case 2: @@ -264,7 +264,7 @@ admin.open({ type: 1, area: '1500px', title: (mData ? '修改' : '添加') + '甲方单位', title: (mData ? '修改' : '添加') + '客户信息', content: $('#editDialog').html(), success: function (layero, dIndex) { let loadNameXml = loadNameXmlSel() src/main/webapp/static/js/cstmr/cstmr2.js
@@ -59,7 +59,7 @@ case 1: // 模板下载 layer.load(1, {shade: [0.1,'#fff']}); location.href = baseUrl + "/mould/甲方单位导入模板.xls"; location.href = baseUrl + "/mould/客户信息导入模板.xls"; layer.closeAll('loading'); break case 2: @@ -286,7 +286,7 @@ admin.open({ type: 1, area: '1500px', title: (mData ? '修改' : '添加') + '甲方单位', title: (mData ? '修改' : '添加') + '客户信息', content: $('#editDialog').html(), success: function (layero, dIndex) { let loadNameXml = loadNameXmlSel() @@ -362,7 +362,7 @@ admin.open({ type: 1, area: '1500px', title: (mData ? '修改' : '添加') + '甲方单位', title: (mData ? '修改' : '添加') + '客户信息', content: $('#editDialog2').html(), success: function (layero, dIndex) { let loadNameXml = loadNameXmlSel2() src/main/webapp/static/js/item/item.js
@@ -56,7 +56,7 @@ case 1: // 模板下载 layer.load(1, {shade: [0.1,'#fff']}); location.href = baseUrl + "/mould/甲方单位导入模板.xls"; location.href = baseUrl + "/mould/客户信息导入模板.xls"; layer.closeAll('loading'); break case 2: src/main/webapp/static/js/order/order.js
@@ -155,7 +155,7 @@ { field: 'cstmrId$', align: 'left', title: '甲方单位', title: '客户信息', style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore', templet:function(d){ @@ -513,7 +513,7 @@ return false; } if (!data.field.cstmrId) { layer.msg("甲方单位不能为空", {icon: 2}); layer.msg("客户信息不能为空", {icon: 2}); return false; } if (!data.field.transactionRate) { src/main/webapp/views/contract/contract.html
@@ -124,7 +124,7 @@ <!-- </div>--> <!-- </div>--> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">甲方单位: </label> <label class="layui-form-label layui-form-required">客户信息: </label> <div class="layui-input-block"> <div id="nameXmlSel" name="nameXmlSel"> </div> src/main/webapp/views/cstmr/cstmr.html
@@ -189,6 +189,8 @@ <option value="阁楼货架/钢平台">阁楼货架/钢平台</option> <option value="周转容器">周转容器</option> <option value="平库">平库</option> <option value="增补">增补</option> <option value="其它">其它</option> </select> </div> </div> src/main/webapp/views/cstmr/cstmr2.html
@@ -137,7 +137,7 @@ <div class="layui-row"> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">甲方单位: </label> <label class="layui-form-label layui-form-required">客户信息: </label> <div class="layui-input-block"> <div id="nameXmlSel" name="nameXmlSel"> </div> src/main/webapp/views/cstmr/cstmr_more.html
@@ -46,7 +46,7 @@ <div> <i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold"></i> <span id="form-name" style="margin: 0 6px;font-size: 18px;font-weight: bold;letter-spacing: 1px"></span> <span style="opacity: .5;font-size: small;margin-left: 5px">甲方单位</span> <span style="opacity: .5;font-size: small;margin-left: 5px">客户信息</span> </div> </div> <div class="layui-card-body"> src/main/webapp/views/order/order.html
@@ -191,7 +191,7 @@ </div> <div class="layui-col-md6"> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">甲方单位: </label> <label class="layui-form-label layui-form-required">客户信息: </label> <div class="layui-input-block"> <div id="cstmrXmlSel" name="cstmrXmlSel"> </div> src/main/webapp/views/order/order_more.html
@@ -68,7 +68,7 @@ </div> </div> <div class="layui-inline layui-col-md6"> <label class="layui-form-label">甲方单位:</label> <label class="layui-form-label">客户信息:</label> <div class="layui-input-block"> <input name="cstmrId$" class="layui-input" disabled /> </div>
