From 7b2d465d722297987e3b580c38d0121cc668dcfb Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Tue, 23 Jan 2024 10:15:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claimAndRefund/receive/agreement.vue | 2 +- .../receive/receiveApplyAdd.vue | 20 +++++++++---------- .../claimAndRefund/receive/receiveExamine.vue | 2 +- .../claimAndRefund/receive/receiveManage.vue | 2 +- .../claimAndRefund/return/returnExamine.vue | 2 +- .../views/repairTest/repair/dialogOneForm.vue | 2 +- .../newBuy/newDevices/newDevicesAccept.vue | 2 +- .../src/views/store/tools/toolsSupplier.vue | 2 +- sgzb-ui/src/views/store/tools/toolsType.vue | 4 ++-- .../warehousing/accessoryWarehousing.vue | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 9faebd60..959b082e 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -273,7 +273,7 @@ export default { dialogVisible: false, //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system + uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system // 表单校验 rules: { diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue index dfb2fae5..278ee3b5 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue @@ -287,16 +287,16 @@ export default { required:true,message:'请选择工程',trigger:'change',type:'number' } ], - leasePerson: [ - { - required: true, message: '请输入领料人', trigger: 'blur', - } - ], - phone: [ - {required: true, message: '请输入领料人手机号', trigger: 'change'}, - { validator: validatePhone, trigger: "blur" }, - { min: 11, message: "手机号不足11位", trigger: "blur" }, - ], + // leasePerson: [ + // { + // required: true, message: '请输入领料人', trigger: 'blur', + // } + // ], + // phone: [ + // {required: true, message: '请输入领料人手机号', trigger: 'change'}, + // { validator: validatePhone, trigger: "blur" }, + // { min: 11, message: "手机号不足11位", trigger: "blur" }, + // ], }, unitList:[], //单位 集合 proList:[], // 工程 集合 diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue index 894388e8..7802c9c0 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue @@ -267,7 +267,7 @@ export default { //审核 同意 async subAuditLeaseByCompany(){ const params = JSON.parse(JSON.stringify(this.queryParams)) - params.taskStatus ++ + params.taskStatus = params.taskStatus+1 params.leaseApplyInfoList.forEach(v => { this.$set(v,'companyAuditRemark',params.companyAuditRemarks) this.$set(v,'companyAuditBy',this.user.id) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue index 9f5ddfe4..fa6fd9f5 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue @@ -210,7 +210,7 @@ import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/ import { getInfo } from '@/api/login' import vueEasyPrint from 'vue-easy-print'; export default { - name: "ReceiveManage", + // name: "ReceiveManage", data() { return { // 遮罩层 diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue index ed00b598..77ceb972 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue @@ -266,7 +266,7 @@ size="mini" type="primary" icon="el-icon-edit" - :disabled="scope.row.taskStatus == '38'" + v-if="scope.row.taskStatus == '37'" @click="handleUpdate(scope.row, 'update')" >审核 diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue index 80999fc9..c4876198 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue @@ -140,7 +140,7 @@ ref="dynamicValidateFormTwo" :model="dynamicValidateFormTwo" class="demo-dynamic" - label-width="90px" + label-width="100px" >
Date: Tue, 23 Jan 2024 13:40:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/claimAndRefund/receive/agreement.vue | 4 ++-- .../src/views/store/newBuy/newDevices/newDevicesAccept.vue | 3 ++- sgzb-ui/src/views/store/tools/toolsSupplier.vue | 4 ++-- sgzb-ui/src/views/store/tools/toolsType.vue | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 959b082e..ab8a9af3 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -273,8 +273,8 @@ export default { dialogVisible: false, //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system - + // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system + uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址 // 表单校验 rules: { contractCode: [ diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index 642e76fa..b4f015bb 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -309,7 +309,8 @@ export default { field101fileList:[], //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system + // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system + uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址 // uploadUrl:'http://10.40.92.102:9201',//本地测试 dialogImageUrl: '', dialogVisible: false, diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue index 3847be0a..dcfd4c40 100644 --- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue +++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue @@ -215,8 +215,8 @@ export default { field101fileList:[], //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system - // uploadUrl:'http://192.168.5.12:9201',//本地测试 + // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system + uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址 // 表单校验 rules: { dictName: [ diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue index 6c5c33db..1eef6ab0 100644 --- a/sgzb-ui/src/views/store/tools/toolsType.vue +++ b/sgzb-ui/src/views/store/tools/toolsType.vue @@ -458,8 +458,8 @@ export default { field101fileList:[], //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system - // uploadUrl:'http://192.168.5.21:9201',//本地测试 + // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system + uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址 defaultProps: { children: "children", label: "label" From be37865f2de455eaa9f02e9e992ccdf42691539d Mon Sep 17 00:00:00 2001 From: "1539530615@qq.com" <1539530615@qq.com> Date: Tue, 23 Jan 2024 13:47:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bonus/sgzb/base/api/domain/MaType.java | 2 +- .../java/com/bonus/sgzb/base/controller/MaTypeController.java | 3 ++- .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index b28b7447..12922c3d 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -141,7 +141,7 @@ public class MaType extends BaseEntity { /** 图片路径 */ @ApiModelProperty(value = "图片路径") - private String photoUrl = "https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/zhcc/405D4B1F-0942-424e-B45A-C66FDDA74EEA.png"; + private String photoUrl; /** 文档名称 */ @ApiModelProperty(value = "文档名称") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 3db2f38a..883f9581 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -103,7 +103,8 @@ public class MaTypeController extends BaseController { if (level == 2) { // 查询二级 if (parentId == 0){ - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null,keyword)); + List maTypes = maTypeMapper.selectMaTypeListByLevelNotFour(null, keyword); + return AjaxResult.success(maTypes); }else { return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 233b8059..74513653 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -361,8 +361,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type, m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time, - m.remark, m.company_id + m.remark, m.company_id,mtf.file_url photoUrl from ma_type m + left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id m.level != 4