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 diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 9faebd60..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:21624/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/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" >