From 3894c47452336f7d97022a2cd87b9a406d67c3dd Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Sun, 8 Dec 2024 21:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=98=E8=AE=B0=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/oms/enums/ErrorCodeConstants.java | 1 + .../service/customer/CustomerServiceImpl.java | 11 +- .../admin/auth/vo/AuthMailModifyPwdReqVO.java | 4 + .../admin/auth/vo/AuthMailSendReqVO.java | 3 + .../dal/mysql/user/AdminUserMapper.java | 4 + .../service/auth/AdminAuthServiceImpl.java | 4 +- .../system/service/user/AdminUserService.java | 2 +- .../service/user/AdminUserServiceImpl.java | 4 +- .../src/views/oms/customer/CustomerForm.vue | 3 +- .../src/views/oms/produceorder/template1.js | 1827 +++++++++++------ .../hangtag-ui-front/src/api/login/index.ts | 2 + hangtag-ui/hangtag-ui-front/src/locales/en.ts | 3 + .../hangtag-ui-front/src/locales/zh-CN.ts | 3 + .../Login/components/ForgetPasswordForm.vue | 8 +- 14 files changed, 1259 insertions(+), 620 deletions(-) diff --git a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java index 1f50e36..9e42397 100644 --- a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java +++ b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java @@ -24,5 +24,6 @@ public interface ErrorCodeConstants extends cn.hangtag.module.system.enums.Erro ErrorCode PRODUCE_ORDER_IMPORT_LIST_IS_EMPTY = new ErrorCode(4003, "导入生产制单数据不能为空"); ErrorCode SALE_CONTRACT_NOT_EXISTS = new ErrorCode(5000, "OMS销售合约不存在"); ErrorCode PRODUCT_PRICE_NOT_EXISTS = new ErrorCode(600, "产品单价记录不存在"); + ErrorCode CUSTOMER_EMAIL_EXISTS = new ErrorCode(600, "已存在重复的客户邮箱号"); } diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java index 31f8229..278807e 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java @@ -13,6 +13,7 @@ import cn.hangtag.module.oms.controller.admin.customer.front.vo.AddressInfoVO; import cn.hangtag.module.oms.controller.admin.customer.front.vo.CustomerInfoVO; import cn.hangtag.module.oms.serialnumber.CodingRulesUtils; import cn.hangtag.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import cn.hangtag.module.system.dal.dataobject.user.AdminUserDO; import cn.hangtag.module.system.service.permission.PermissionService; import cn.hangtag.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -74,9 +75,15 @@ public class CustomerServiceImpl implements CustomerService { customer.setNumber(getNewCode()); } + // 判断是否存在重复的邮箱账户 + AdminUserDO user = userService.getUserByMail(createReqVO.getEmail(), 999999); + if(user!=null){ + throw exception(CUSTOMER_EMAIL_EXISTS); + } + //新增用户账号 UserSaveReqVO userSaveReqVO = new UserSaveReqVO(); - userSaveReqVO.setUsername(createReqVO.getPhone()); + userSaveReqVO.setUsername(createReqVO.getEmail()); userSaveReqVO.setNickname(createReqVO.getName()); userSaveReqVO.setMobile(createReqVO.getPhone()); userSaveReqVO.setPassword(userInitPassword); @@ -94,8 +101,6 @@ public class CustomerServiceImpl implements CustomerService { // 插入子表 createCustomerAddressList(customer.getId(), createReqVO.getCustomerAddresss()); - - // 返回 return customer.getId(); } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailModifyPwdReqVO.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailModifyPwdReqVO.java index c634816..ef47e05 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailModifyPwdReqVO.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailModifyPwdReqVO.java @@ -34,4 +34,8 @@ public class AuthMailModifyPwdReqVO { @NotEmpty(message = "验证码不能为空") private String code; + @Schema(description = "账户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotEmpty(message = "账户类型不能为空") + private Integer type; + } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailSendReqVO.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailSendReqVO.java index 853c96c..d2d944f 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailSendReqVO.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailSendReqVO.java @@ -30,4 +30,7 @@ public class AuthMailSendReqVO { @InEnum(MailSceneEnum.class) private Integer scene; + @Schema(description = "账户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "账户类型不能为空") + private Integer type; } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/user/AdminUserMapper.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/user/AdminUserMapper.java index 1a6d0f8..88be2d7 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/user/AdminUserMapper.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/dal/mysql/user/AdminUserMapper.java @@ -25,6 +25,10 @@ public interface AdminUserMapper extends BaseMapperX { return selectOne(AdminUserDO::getEmail, email); } + default AdminUserDO selectByEmail(String email,Integer type) { + return selectOne(AdminUserDO::getEmail, email,AdminUserDO::getDeptId,type); + } + default AdminUserDO selectByMobile(String mobile) { return selectOne(AdminUserDO::getMobile, mobile); } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/auth/AdminAuthServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/auth/AdminAuthServiceImpl.java index 4b38f26..dd92152 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/auth/AdminAuthServiceImpl.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/auth/AdminAuthServiceImpl.java @@ -262,7 +262,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { @Override public void sendMailCode(AuthMailSendReqVO reqVO) { // 登录场景，验证是否存在 - if (userService.getUserByMail(reqVO.getMail()) == null) { + if (userService.getUserByMail(reqVO.getMail(),reqVO.getType()) == null) { throw exception(MAIL_ACCOUNT_NOT_EXISTS); } // 发送验证码 @@ -275,7 +275,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { mailCodeApi.useMailCode(AuthConvert.INSTANCE.convert(reqVO, MailSceneEnum.MEMBER_RESET_PASSWORD.getScene(), getClientIP())); // 获得用户信息 - AdminUserDO user = userService.getUserByMail(reqVO.getMail()); + AdminUserDO user = userService.getUserByMail(reqVO.getMail(),reqVO.getType()); if (user == null) { throw exception(USER_NOT_EXISTS); } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserService.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserService.java index 98105ec..5e8cc85 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserService.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserService.java @@ -209,7 +209,7 @@ public interface AdminUserService { * @param mail 邮箱号 * @return 用户对象信息 */ - AdminUserDO getUserByMail(String mail); + AdminUserDO getUserByMail(String mail,Integer type); } diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java index abba5c1..5b578b3 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java @@ -497,8 +497,8 @@ public class AdminUserServiceImpl implements AdminUserService { } @Override - public AdminUserDO getUserByMail(String mail) { - return userMapper.selectByEmail(mail); + public AdminUserDO getUserByMail(String mail,Integer type) { + return userMapper.selectByEmail(mail,type); } /** diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue index 969fb4e..fbbb6ef 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue @@ -37,7 +37,7 @@ - + @@ -175,6 +175,7 @@ const formRules = reactive({ } ], email: [ + { required: true, message: '邮箱不能为空', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js index 6378c08..a356b1d 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js @@ -6,8 +6,24 @@ export default { "height": 296.6, "width": 210, "paperHeader": 0, - "paperFooter": 840.7559055118112, + "paperFooter": 837, "printElements": [ + { + "options": { + "left": 54, + "top": -4.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, { "options": { "left": 168, @@ -36,23 +52,27 @@ export default { "options": { "left": 258, "top": 54, - "height": 9.75, + "height": 16, "width": 200, - "title": "生产单编号", - "right": 414.74388885498047, - "bottom": 49.49592590332031, - "vCenter": 354.74388885498047, - "hCenter": 44.62092590332031, - "field": "billno", + "field": "clerk", + "testData": "XS888888888", + "fontSize": 7.75, + "fontWeight": "700", + "textAlign": "left", + "textContentVerticalAlign": "middle", + "title": "职员", + "qid": "clerk", + "right": 460.9959259033203, + "bottom": 69.997971534729, + "vCenter": 360.9959259033203, + "hCenter": 61.997971534729004, "coordinateSync": false, "widthHeightSync": false, - "fontSize": 7.5, - "fontWeight": "700", "qrCodeLevel": 0, "fixed": true }, "printElementType": { - "title": "文本", + "title": "订单编号", "type": "text" } }, @@ -61,7 +81,7 @@ export default { "left": 474, "top": 54, "height": 9.75, - "width": 120, + "width": 124, "title": "批次", "right": 587.2480087280273, "bottom": 48.741851806640625, @@ -92,7 +112,7 @@ export default { "fontWeight": "700", "textAlign": "left", "textContentVerticalAlign": "middle", - "title": "主生产单编号", + "title": "生产单编号", "qid": "billno", "coordinateSync": false, "widthHeightSync": false, @@ -156,30 +176,6 @@ export default { "type": "text" } }, - { - "options": { - "left": 258, - "top": 99.66666666666666, - "height": 9.75, - "width": 200, - "title": "生产日期", - "right": 318.74796295166016, - "bottom": 115.49387741088867, - "vCenter": 258.74796295166016, - "hCenter": 110.61887741088867, - "field": "produceDateStr", - "coordinateSync": false, - "widthHeightSync": false, - "fontSize": 7.5, - "fontWeight": "700", - "qrCodeLevel": 0, - "fixed": true - }, - "printElementType": { - "title": "文本", - "type": "text" - } - }, { "options": { "left": 13.5, @@ -204,6 +200,30 @@ export default { "type": "text" } }, + { + "options": { + "left": 258, + "top": 99.66666666666666, + "height": 9.75, + "width": 200, + "title": "生产日期", + "right": 318.74796295166016, + "bottom": 115.49387741088867, + "vCenter": 258.74796295166016, + "hCenter": 110.61887741088867, + "field": "produceDateStr", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, { "options": { "left": 474, @@ -489,38 +509,10 @@ export default { "type": "text" } }, - { - "options": { - "left": 13.5, - "top": 236.66666666666669, - "height": 16, - "width": 200, - "field": "clerk", - "testData": "XS888888888", - "fontSize": 7.75, - "fontWeight": "700", - "textAlign": "left", - "textContentVerticalAlign": "middle", - "title": "职员", - "qid": "clerk", - "right": 132.74185180664062, - "bottom": 264.24796295166016, - "vCenter": 72.74185180664062, - "hCenter": 256.24796295166016, - "coordinateSync": false, - "widthHeightSync": false, - "qrCodeLevel": 0, - "fixed": true - }, - "printElementType": { - "title": "订单编号", - "type": "text" - } - }, { "options": { "left": 258, - "top": 259.5, + "top": 237, "height": 16, "width": 200, "field": "reportTimeStr", @@ -548,7 +540,7 @@ export default { { "options": { "left": 13.5, - "top": 259.5, + "top": 237, "height": 16, "width": 200, "field": "reportDateStr", @@ -575,10 +567,10 @@ export default { }, { "options": { - "left": 13.5, - "top": 297, - "height": 16, - "width": 46.5, + "left": 15, + "top": 260, + "height": 15, + "width": 50, "fontSize": 9, "fontWeight": "700", "textAlign": "left", @@ -600,17 +592,37 @@ export default { "type": "text" } }, + { + "options": { + "left": 60, + "top": 262.5, + "height": 178.5, + "width": 532, + "right": 587.5, + "bottom": 453.7449760437012, + "vCenter": 321.5, + "hCenter": 358.4949760437012, + "field": "details", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "", + "type": "longText" + } + }, { "options": { "left": 15, - "top": 490, - "height": 43.5, - "width": 565.5, + "top": 444, + "height": 50, + "width": 575, "title": "备注", - "right": 582, - "bottom": 444.75, - "vCenter": 297.75, - "hCenter": 426, + "right": 583.5, + "bottom": 487.4950575828552, + "vCenter": 300.75, + "hCenter": 464.9950575828552, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -626,8 +638,8 @@ export default { { "options": { "left": 15, - "top": 538.5, - "height": 17, + "top": 501, + "height": 20, "width": 120, "fontSize": 9, "fontWeight": "700", @@ -652,9 +664,9 @@ export default { }, { "options": { - "left": 27, - "top": 556.5, - "height": 16, + "left": 25, + "top": 520, + "height": 20, "width": 120, "fontSize": 7.5, "fontWeight": "700", @@ -662,10 +674,10 @@ export default { "textContentVerticalAlign": "middle", "title": "设计部A", "qid": "orderId_10", - "right": 162.74388885498047, - "bottom": 564.2459487915039, - "vCenter": 102.74388885498047, - "hCenter": 556.2459487915039, + "right": 149.24574279785156, + "bottom": 481.74146270751953, + "vCenter": 89.24574279785156, + "hCenter": 473.74146270751953, "coordinateSync": false, "widthHeightSync": false, "hideTitle": true, @@ -679,10 +691,10 @@ export default { }, { "options": { - "left": 176, - "top": 573, - "height": 9.75, - "width": 120, + "left": 171, + "top": 540, + "height": 25, + "width": 100, "title": "完成数量", "right": 473.99800872802734, "bottom": 591.0000114440918, @@ -703,15 +715,15 @@ export default { }, { "options": { - "left": 325, - "top": 573, - "height": 9.75, - "width": 120, + "left": 318, + "top": 540, + "height": 25, + "width": 100, "title": "锌板用量", - "right": 505.4959487915039, - "bottom": 577.4959373474121, - "vCenter": 445.4959487915039, - "hCenter": 572.6209373474121, + "right": 416.5, + "bottom": 503.5, + "vCenter": 366.5, + "hCenter": 491, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -727,40 +739,15 @@ export default { }, { "options": { - "left": 27, - "top": 573, - "height": 9.75, - "width": 120, - "title": "生产单编号", - "right": 146.99388885498047, - "bottom": 584.2438888549805, - "vCenter": 86.99388885498047, - "hCenter": 579.3688888549805, - "field": "asdas", - "testData": "asdsa", - "coordinateSync": false, - "widthHeightSync": false, - "fontSize": 7.5, - "fontWeight": "700", - "qrCodeLevel": 0, - "fixed": true - }, - "printElementType": { - "title": "文本", - "type": "text" - } - }, - { - "options": { - "left": 474, - "top": 573, - "height": 9.75, - "width": 120, + "left": 462, + "top": 540, + "height": 25, + "width": 100, "title": "日期时间", - "right": 408.74800872802734, - "bottom": 578.2439002990723, - "vCenter": 348.74800872802734, - "hCenter": 573.3689002990723, + "right": 583.75, + "bottom": 497.75, + "vCenter": 533.75, + "hCenter": 487.75, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -776,9 +763,101 @@ export default { }, { "options": { - "left": 27, - "top": 600, - "height": 16, + "left": 25, + "top": 540, + "height": 25, + "width": 100, + "title": "生产单编号", + "right": 146.24574279785156, + "bottom": 492.99359130859375, + "vCenter": 86.24574279785156, + "hCenter": 487.99359130859375, + "field": " asdas", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 69, + "top": 550.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 354, + "top": 553.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 553.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 587.25, + "bottom": 514.25, + "vCenter": 542.25, + "hCenter": 504.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 555, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 558, + "height": 20, "width": 120, "fontSize": 7.5, "fontWeight": "700", @@ -786,10 +865,10 @@ export default { "textContentVerticalAlign": "middle", "title": "切纸部B", "qid": "orderId_10", - "right": 210, - "bottom": 524.5, - "vCenter": 150, - "hCenter": 516.5, + "right": 146.24507904052734, + "bottom": 580.2401466369629, + "vCenter": 86.24507904052734, + "hCenter": 570.2401466369629, "coordinateSync": false, "widthHeightSync": false, "hideTitle": true, @@ -803,10 +882,10 @@ export default { }, { "options": { - "left": 176, - "top": 617, - "height": 9.75, - "width": 120, + "left": 171, + "top": 575, + "height": 25, + "width": 100, "title": "完成数量", "right": 292.5000228881836, "bottom": 623.9918746948242, @@ -827,10 +906,10 @@ export default { }, { "options": { - "left": 325.5, - "top": 617, - "height": 9.75, - "width": 120, + "left": 318, + "top": 576.5, + "height": 25, + "width": 100, "title": "纸用量", "right": 449.9959487915039, "bottom": 624.7479858398438, @@ -851,10 +930,10 @@ export default { }, { "options": { - "left": 27, - "top": 617, - "height": 9.75, - "width": 120, + "left": 25, + "top": 577, + "height": 25, + "width": 100, "title": "生产单编号", "right": 149.99388885498047, "bottom": 625.5000228881836, @@ -875,22 +954,23 @@ export default { }, { "options": { - "left": 474, - "top": 617, - "height": 9.75, - "width": 120, + "left": 462, + "top": 577.5, + "height": 25, + "width": 100, "title": "日期时间", - "right": 616.4938888549805, - "bottom": 635.2479858398438, - "vCenter": 556.4938888549805, - "hCenter": 630.3729858398438, + "right": 615.7438888549805, + "bottom": 708.7459716796875, + "vCenter": 555.7438888549805, + "hCenter": 703.8709716796875, + "field": "asf", "coordinateSync": false, "widthHeightSync": false, - "qrCodeLevel": 0, - "field": "33", "fontSize": 7.5, "fontWeight": "700", - "fixed": true + "qrCodeLevel": 0, + "fixed": true, + "qid": "asf_2" }, "printElementType": { "title": "文本", @@ -899,9 +979,85 @@ export default { }, { "options": { - "left": 27, - "top": 643.5, - "height": 16, + "left": 69, + "top": 585, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 586.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 314.9901351928711, + "bottom": 547.2426414489746, + "vCenter": 269.9901351928711, + "hCenter": 537.2426414489746 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 354, + "top": 586.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 447.74507904052734, + "bottom": 550.9901695251465, + "vCenter": 402.74507904052734, + "hCenter": 540.9901695251465 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 586.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 705, + "bottom": 540.5, + "vCenter": 660, + "hCenter": 530.5 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 598.5, + "height": 20, "width": 120, "fontSize": 7.5, "fontWeight": "700", @@ -909,10 +1065,10 @@ export default { "textContentVerticalAlign": "middle", "title": "印刷部C", "qid": "orderId_10", - "right": 146.24388885498047, - "bottom": 650.5000228881836, - "vCenter": 86.24388885498047, - "hCenter": 642.5000228881836, + "right": 145.49752807617188, + "bottom": 620.0000114440918, + "vCenter": 85.49752807617188, + "hCenter": 610.0000114440918, "coordinateSync": false, "widthHeightSync": false, "hideTitle": true, @@ -926,34 +1082,10 @@ export default { }, { "options": { - "left": 176, - "top": 660, - "height": 9.75, - "width": 120, - "title": "完成数量", - "right": 287.2500228881836, - "bottom": 671.2439117431641, - "vCenter": 227.2500228881836, - "hCenter": 666.3689117431641, - "field": "gg", - "coordinateSync": false, - "widthHeightSync": false, - "fontSize": 7.5, - "fontWeight": "700", - "qrCodeLevel": 0, - "fixed": true - }, - "printElementType": { - "title": "文本", - "type": "text" - } - }, - { - "options": { - "left": 325, - "top": 660, - "height": 9.75, - "width": 120, + "left": 318, + "top": 611.5, + "height": 25, + "width": 100, "title": "机长", "right": 446.9918746948242, "bottom": 669.7439117431641, @@ -974,22 +1106,23 @@ export default { }, { "options": { - "left": 474, - "top": 660, - "height": 9.75, - "width": 120, + "left": 462, + "top": 613, + "height": 25, + "width": 100, "title": "日期时间", - "right": 603.7500228881836, - "bottom": 669.7500228881836, - "vCenter": 543.7500228881836, - "hCenter": 664.8750228881836, - "field": "cas", + "right": 667.75, + "bottom": 594.5, + "vCenter": 617.75, + "hCenter": 584.5, + "field": "asf", "coordinateSync": false, "widthHeightSync": false, "fontSize": 7.5, "fontWeight": "700", "qrCodeLevel": 0, - "fixed": true + "fixed": true, + "qid": "asf_3" }, "printElementType": { "title": "文本", @@ -998,10 +1131,10 @@ export default { }, { "options": { - "left": 27, - "top": 660, - "height": 9.75, - "width": 120, + "left": 25, + "top": 614.5, + "height": 25, + "width": 100, "title": "生产单编号", "right": 216.7459487915039, "bottom": 675.7459487915039, @@ -1022,15 +1155,111 @@ export default { }, { "options": { - "left": 27, - "top": 687, - "height": 16, + "left": 171, + "top": 616, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 287.2500228881836, + "bottom": 671.2439117431641, + "vCenter": 227.2500228881836, + "hCenter": 666.3689117431641, + "field": "gg", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 69, + "top": 622.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 354, + "top": 625.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "right": 446.2459487915039, + "bottom": 637.4959487915039, + "vCenter": 401.2459487915039, + "hCenter": 632.9959487915039, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 625.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "right": 609, + "bottom": 574.25, + "vCenter": 564, + "hCenter": 564.25, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 627, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 627.75, + "height": 20, "width": 120, "fontSize": 7.5, "fontWeight": "700", "textAlign": "left", "textContentVerticalAlign": "middle", - "title": "包装部", + "title": "丝印部D", "qid": "orderId_10", "right": 174, "bottom": 579.25, @@ -1049,34 +1278,10 @@ export default { }, { "options": { - "left": 176.5, - "top": 703.5, - "height": 9.75, - "width": 120, - "title": "完成数量", - "right": 293.2500228881836, - "bottom": 711.0000457763672, - "vCenter": 233.2500228881836, - "hCenter": 706.1250457763672, - "coordinateSync": false, - "widthHeightSync": false, - "qrCodeLevel": 0, - "field": "hhh", - "fontSize": 7.5, - "fontWeight": "700", - "fixed": true - }, - "printElementType": { - "title": "文本", - "type": "text" - } - }, - { - "options": { - "left": 325.5, - "top": 703.5, - "height": 9.75, - "width": 120, + "left": 318, + "top": 646.5, + "height": 25, + "width": 100, "title": "包装员", "right": 468.0000228881836, "bottom": 767.2479858398438, @@ -1088,6 +1293,81 @@ export default { "fontSize": 7.5, "fontWeight": "700", "qrCodeLevel": 0, + "fixed": true, + "qid": "wwww_1" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 25, + "top": 646.5, + "height": 25, + "width": 100, + "title": "生产单编号", + "right": 147.74388885498047, + "bottom": 714.7418975830078, + "vCenter": 87.74388885498047, + "hCenter": 709.8668975830078, + "field": "asda", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "asda_1" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 171, + "top": 648, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 293.2500228881836, + "bottom": 711.0000457763672, + "vCenter": 233.2500228881836, + "hCenter": 706.1250457763672, + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "hhh", + "fontSize": 7.5, + "fontWeight": "700", + "fixed": true, + "qid": "hhh_1" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 462, + "top": 648, + "height": 25, + "width": 100, + "title": "日期时间", + "right": 687.7421875, + "bottom": 630.5, + "vCenter": 637.7421875, + "hCenter": 620.5, + "field": "asf", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, "fixed": true }, "printElementType": { @@ -1097,10 +1377,562 @@ export default { }, { "options": { - "left": 27.5, - "top": 703.5, - "height": 9.75, + "left": 354, + "top": 657, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "right": 444.0000228881836, + "bottom": 677.9979858398438, + "vCenter": 399.0000228881836, + "hCenter": 673.4979858398438, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 657, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 617.25, + "bottom": 610.25, + "vCenter": 572.25, + "hCenter": 600.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 658.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 69, + "top": 658.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 163.9921875, + "bottom": 605, + "vCenter": 118.9921875, + "hCenter": 595 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 663, + "height": 20, "width": 120, + "fontSize": 7.5, + "fontWeight": "700", + "textAlign": "left", + "textContentVerticalAlign": "middle", + "title": "加工部E", + "qid": "orderId_10", + "right": 174, + "bottom": 579.25, + "vCenter": 114, + "hCenter": 571.25, + "coordinateSync": false, + "widthHeightSync": false, + "hideTitle": true, + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "订单编号", + "type": "text" + } + }, + { + "options": { + "left": 318, + "top": 681.5, + "height": 25, + "width": 100, + "title": "包装员", + "right": 468.0000228881836, + "bottom": 767.2479858398438, + "vCenter": 408.0000228881836, + "hCenter": 762.3729858398438, + "field": "wwww", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "wwww_2" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 25, + "top": 681.5, + "height": 25, + "width": 100, + "title": "生产单编号", + "right": 147.74388885498047, + "bottom": 714.7418975830078, + "vCenter": 87.74388885498047, + "hCenter": 709.8668975830078, + "field": "asda", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "asda_2" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 462, + "top": 682.5, + "height": 25, + "width": 100, + "title": "日期时间", + "right": 584.5, + "bottom": 698, + "vCenter": 534.5, + "hCenter": 688, + "field": "cas", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 171, + "top": 683, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 293.2500228881836, + "bottom": 711.0000457763672, + "vCenter": 233.2500228881836, + "hCenter": 706.1250457763672, + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "hhh", + "fontSize": 7.5, + "fontWeight": "700", + "fixed": true, + "qid": "hhh_2" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 354, + "top": 691.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 691.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 616.5, + "bottom": 643.25, + "vCenter": 571.5, + "hCenter": 633.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 693, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 69, + "top": 693, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 155.25, + "bottom": 643.25, + "vCenter": 110.25, + "hCenter": 633.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 696.75, + "height": 20, + "width": 120, + "fontSize": 7.5, + "fontWeight": "700", + "textAlign": "left", + "textContentVerticalAlign": "middle", + "title": "啤机部G", + "qid": "orderId_10", + "right": 174, + "bottom": 579.25, + "vCenter": 114, + "hCenter": 571.25, + "coordinateSync": false, + "widthHeightSync": false, + "hideTitle": true, + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "订单编号", + "type": "text" + } + }, + { + "options": { + "left": 318, + "top": 716.5, + "height": 25, + "width": 100, + "title": "包装员", + "right": 468.0000228881836, + "bottom": 767.2479858398438, + "vCenter": 408.0000228881836, + "hCenter": 762.3729858398438, + "field": "wwww", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "wwww_3" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 462, + "top": 716.5, + "height": 25, + "width": 100, + "title": "日期时间", + "right": 585.25, + "bottom": 692.75, + "vCenter": 535.25, + "hCenter": 682.75, + "field": "asf", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "asf_1" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 25, + "top": 716.5, + "height": 25, + "width": 100, + "title": "生产单编号", + "right": 147.74388885498047, + "bottom": 714.7418975830078, + "vCenter": 87.74388885498047, + "hCenter": 709.8668975830078, + "field": "asda", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true, + "qid": "asda_3" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 171, + "top": 718, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 293.2500228881836, + "bottom": 711.0000457763672, + "vCenter": 233.2500228881836, + "hCenter": 706.1250457763672, + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "hhh", + "fontSize": 7.5, + "fontWeight": "700", + "fixed": true, + "qid": "hhh_3" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 354, + "top": 726, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 440.25, + "bottom": 673.25, + "vCenter": 395.25, + "hCenter": 663.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 726, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 623.25, + "bottom": 677, + "vCenter": 578.25, + "hCenter": 667 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 727.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 69, + "top": 727.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 162.75, + "bottom": 659.75, + "vCenter": 117.75, + "hCenter": 649.75 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 732, + "height": 20, + "width": 120, + "fontSize": 7.5, + "fontWeight": "700", + "textAlign": "left", + "textContentVerticalAlign": "middle", + "title": "包装部P", + "qid": "orderId_10", + "right": 174, + "bottom": 579.25, + "vCenter": 114, + "hCenter": 571.25, + "coordinateSync": false, + "widthHeightSync": false, + "hideTitle": true, + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "订单编号", + "type": "text" + } + }, + { + "options": { + "left": 318, + "top": 751.5, + "height": 25, + "width": 100, + "title": "包装员", + "right": 468.0000228881836, + "bottom": 767.2479858398438, + "vCenter": 408.0000228881836, + "hCenter": 762.3729858398438, + "field": "wwww", + "coordinateSync": true, + "widthHeightSync": false, + "fontSize": 7.5, + "fontWeight": "700", + "qrCodeLevel": 0, + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 462, + "top": 751.5, + "height": 25, + "width": 100, + "title": "日期时间", + "right": 575.74609375, + "bottom": 724.25, + "vCenter": 525.74609375, + "hCenter": 714.25, + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "33", + "fontSize": 7.5, + "fontWeight": "700", + "fixed": true + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 25, + "top": 751.5, + "height": 25, + "width": 100, "title": "生产单编号", "right": 147.74388885498047, "bottom": 714.7418975830078, @@ -1121,21 +1953,21 @@ export default { }, { "options": { - "left": 474.5, - "top": 703.5, - "height": 9.75, - "width": 120, - "title": "日期时间", - "right": 615.7438888549805, - "bottom": 708.7459716796875, - "vCenter": 555.7438888549805, - "hCenter": 703.8709716796875, - "field": "asf", + "left": 171, + "top": 753, + "height": 25, + "width": 100, + "title": "完成数量", + "right": 293.2500228881836, + "bottom": 711.0000457763672, + "vCenter": 233.2500228881836, + "hCenter": 706.1250457763672, "coordinateSync": false, "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "hhh", "fontSize": 7.5, "fontWeight": "700", - "qrCodeLevel": 0, "fixed": true }, "printElementType": { @@ -1145,9 +1977,81 @@ export default { }, { "options": { - "left": 27, - "top": 730.5, - "height": 9.75, + "left": 354, + "top": 760.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 439.4926071166992, + "bottom": 714.4926414489746, + "vCenter": 394.4926071166992, + "hCenter": 704.4926414489746 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 498, + "top": 760.5, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "right": 605.25, + "bottom": 715.25, + "vCenter": 560.25, + "hCenter": 705.25 + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 205.5, + "top": 762, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 69, + "top": 762, + "height": 20, + "width": 90, + "borderWidth": "0.75", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 25, + "top": 780, + "height": 20, "width": 555, "title": "物料情况", "field": "xxx", @@ -1166,15 +2070,15 @@ export default { }, { "options": { - "left": 67.5, - "top": 741, - "height": 9, - "width": 513, + "left": 61.5, + "top": 792, + "height": 7, + "width": 530, "borderWidth": "0.75", - "right": 158.24796295166016, - "bottom": 751.4918746948242, - "vCenter": 113.24796295166016, - "hCenter": 746.9918746948242, + "right": 578.9926071166992, + "bottom": 802.4975395202637, + "vCenter": 317.9926071166992, + "hCenter": 797.9975395202637, "coordinateSync": false, "widthHeightSync": false, "fixed": true @@ -1186,66 +2090,10 @@ export default { }, { "options": { - "left": 237, - "top": 804, - "height": 9, - "width": 121.5, - "borderWidth": "0.75", - "right": 359.2418746948242, - "bottom": 797.2479629516602, - "vCenter": 299.9918746948242, - "hCenter": 792.7479629516602, - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 451.5, - "top": 804, - "height": 9, - "width": 130.5, - "borderWidth": "0.75", - "right": 569.2418746948242, - "bottom": 798.7459487915039, - "vCenter": 509.9918746948242, - "hCenter": 794.2459487915039, - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 28.5, - "top": 804, - "height": 9, - "width": 126, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 237.5, - "top": 805, - "height": 16, - "width": 120, + "left": 243, + "top": 810, + "height": 15, + "width": 150, "field": "creater", "testData": "李四", "fontSize": 8.25, @@ -1270,10 +2118,10 @@ export default { }, { "options": { - "left": 451.5, - "top": 805, - "height": 16, - "width": 120, + "left": 462, + "top": 810, + "height": 15, + "width": 150, "field": "creater", "testData": "李四", "fontSize": 8.25, @@ -1298,10 +2146,30 @@ export default { }, { "options": { - "left": 30, - "top": 805, - "height": 16, - "width": 120, + "left": 244.5, + "top": 811.5, + "height": 9, + "width": 122, + "borderWidth": "0.75", + "right": 359.2418746948242, + "bottom": 797.2479629516602, + "vCenter": 299.9918746948242, + "hCenter": 792.7479629516602, + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true + }, + "printElementType": { + "title": "横线", + "type": "hline" + } + }, + { + "options": { + "left": 24, + "top": 811.5, + "height": 12, + "width": 150, "field": "creater", "testData": "李四", "fontSize": 8.25, @@ -1310,10 +2178,10 @@ export default { "textContentVerticalAlign": "middle", "title": "制作人", "qid": "creater", - "right": 150, - "bottom": 796, - "vCenter": 90, - "hCenter": 788, + "right": 178.49752807617188, + "bottom": 822.7500114440918, + "vCenter": 103.49752807617188, + "hCenter": 816.7500114440918, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, @@ -1326,11 +2194,15 @@ export default { }, { "options": { - "left": 69, - "top": 585, + "left": 462, + "top": 811.5, "height": 9, - "width": 90, + "width": 122, "borderWidth": "0.75", + "right": 569.2418746948242, + "bottom": 798.7459487915039, + "vCenter": 509.9918746948242, + "hCenter": 794.2459487915039, "coordinateSync": false, "widthHeightSync": false, "fixed": true @@ -1342,10 +2214,10 @@ export default { }, { "options": { - "left": 210, - "top": 585, - "height": 9, - "width": 90, + "left": 24, + "top": 811.5, + "height": 20, + "width": 122, "borderWidth": "0.75", "coordinateSync": false, "widthHeightSync": false, @@ -1355,262 +2227,6 @@ export default { "title": "横线", "type": "hline" } - }, - { - "options": { - "left": 357, - "top": 585, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 510, - "top": 585, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 69, - "top": 628.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 210, - "top": 628.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 355.5, - "top": 627, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "right": 446.2459487915039, - "bottom": 637.4959487915039, - "vCenter": 401.2459487915039, - "hCenter": 632.9959487915039, - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 504, - "top": 627, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "right": 599.2480087280273, - "bottom": 636.7500228881836, - "vCenter": 554.2480087280273, - "hCenter": 632.2500228881836, - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 69, - "top": 669, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 210, - "top": 669, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 355.5, - "top": 670.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "right": 444.0000228881836, - "bottom": 677.9979858398438, - "vCenter": 399.0000228881836, - "hCenter": 673.4979858398438, - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 510, - "top": 669, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 510, - "top": 712.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 354, - "top": 712.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 213, - "top": 712.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 69, - "top": 712.5, - "height": 9, - "width": 90, - "borderWidth": "0.75", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "横线", - "type": "hline" - } - }, - { - "options": { - "left": 58, - "top": 300, - "height": 190.5, - "width": 532, - "right": 586.75, - "bottom": 480.74796867370605, - "vCenter": 320.75, - "hCenter": 390.74796867370605, - "field": "details", - "coordinateSync": false, - "widthHeightSync": false, - "fixed": true - }, - "printElementType": { - "title": "", - "type": "longText" - } } ], "paperNumberLeft": 565, @@ -1622,8 +2238,3 @@ export default { } ] } - - - - - diff --git a/hangtag-ui/hangtag-ui-front/src/api/login/index.ts b/hangtag-ui/hangtag-ui-front/src/api/login/index.ts index 062c31f..6902853 100644 --- a/hangtag-ui/hangtag-ui-front/src/api/login/index.ts +++ b/hangtag-ui/hangtag-ui-front/src/api/login/index.ts @@ -15,6 +15,7 @@ export interface SmsLoginVO { export interface MailCodeVO { mail: string scene: number + type: number } @@ -23,6 +24,7 @@ export interface MailModifyPwdVO { password: string checkpassword: string code: string + type: number } // 登录 diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts index d2e14e2..4760a26 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts @@ -145,6 +145,9 @@ export default { SmsSendMsg: 'code has been sent', pwdResetSuccess: 'password reset success' }, + forgetpassword: { + resetpwd: 'reset pwd', + }, captcha: { verification: 'Please complete security verification', slide: 'Swipe right to complete verification', diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts index 83f53bf..eed7a1e 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts @@ -145,6 +145,9 @@ export default { SmsSendMsg: '验证码已发送', pwdResetSuccess: '密码重置成功' }, + forgetpassword: { + resetpwd: '重置密码', + }, captcha: { verification: '请完成安全验证', slide: '向右滑动完成验证', diff --git a/hangtag-ui/hangtag-ui-front/src/views/Login/components/ForgetPasswordForm.vue b/hangtag-ui/hangtag-ui-front/src/views/Login/components/ForgetPasswordForm.vue index c3a8103..a697f7b 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/Login/components/ForgetPasswordForm.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/Login/components/ForgetPasswordForm.vue @@ -103,7 +103,7 @@