bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

This commit is contained in:
1539530615@qq.com 2024-01-23 13:52:19 +08:00
parent 2c92f4dd3d be37865f2d
commit a008a459cd
13 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
View File

@ -141,7 +141,7 @@ public class MaType extends BaseEntity {
/** 图片路径 */ /** 图片路径 */
@ApiModelProperty(value = "图片路径") @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 = "文档名称") @ApiModelProperty(value = "文档名称")

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -103,7 +103,8 @@ public class MaTypeController extends BaseController {
if (level == 2) { if (level == 2) {
// 查询二级 // 查询二级
if (parentId == 0){ if (parentId == 0){
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null,keyword)); List<MaType> maTypes = maTypeMapper.selectMaTypeListByLevelNotFour(null, keyword);
return AjaxResult.success(maTypes);
}else { }else {
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword));
} }

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -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, 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.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.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 from ma_type m
left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
<where> <where>
m.level != 4 m.level != 4
<if test="parentId!= null and parentId != ''"> <if test="parentId!= null and parentId != ''">

4
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -273,8 +273,8 @@ export default {
dialogVisible: false, dialogVisible: false,
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // 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: { rules: {
contractCode: [ contractCode: [

20
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -287,16 +287,16 @@ export default {
required:true,message:'请选择工程',trigger:'change',type:'number' required:true,message:'请选择工程',trigger:'change',type:'number'
} }
], ],
leasePerson: [ // leasePerson: [
{ // {
required: true, message: '请输入领料人', trigger: 'blur', // required: true, message: '请输入领料人', trigger: 'blur',
} // }
], // ],
phone: [ // phone: [
{required: true, message: '请输入领料人手机号', trigger: 'change'}, // {required: true, message: '请输入领料人手机号', trigger: 'change'},
{ validator: validatePhone, trigger: "blur" }, // { validator: validatePhone, trigger: "blur" },
{ min: 11, message: "手机号不足11位", trigger: "blur" }, // { min: 11, message: "手机号不足11位", trigger: "blur" },
], // ],
}, },
unitList:[], //单位 集合 unitList:[], //单位 集合
proList:[], // 工程 集合 proList:[], // 工程 集合

2
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -267,7 +267,7 @@ export default {
//审核 同意 //审核 同意
async subAuditLeaseByCompany(){ async subAuditLeaseByCompany(){
const params = JSON.parse(JSON.stringify(this.queryParams)) const params = JSON.parse(JSON.stringify(this.queryParams))
params.taskStatus ++ params.taskStatus = params.taskStatus+1
params.leaseApplyInfoList.forEach(v => { params.leaseApplyInfoList.forEach(v => {
this.$set(v,'companyAuditRemark',params.companyAuditRemarks) this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id) this.$set(v,'companyAuditBy',this.user.id)

2
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -210,7 +210,7 @@ import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import vueEasyPrint from 'vue-easy-print'; import vueEasyPrint from 'vue-easy-print';
export default { export default {
name: "ReceiveManage", // name: "ReceiveManage",
data() { data() {
return { return {
// 遮罩层 // 遮罩层

2
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -266,7 +266,7 @@
size="mini" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
:disabled="scope.row.taskStatus == '38'" v-if="scope.row.taskStatus == '37'"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
>审核</el-button >审核</el-button
> >

2
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -140,7 +140,7 @@
ref="dynamicValidateFormTwo" ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo" :model="dynamicValidateFormTwo"
class="demo-dynamic" class="demo-dynamic"
label-width="90px" label-width="100px"
> >
<div <div
v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo" v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"

3
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -309,7 +309,8 @@ export default {
field101fileList:[], field101fileList:[],
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // 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", // 上传的图片服务器地址
// uploadUrl:'http://10.40.92.102:9201',//本地测试 // uploadUrl:'http://10.40.92.102:9201',//本地测试
dialogImageUrl: '', dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,

4
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -215,8 +215,8 @@ export default {
field101fileList:[], field101fileList:[],
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // 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:'http://192.168.5.12:9201',//本地测试 uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
// 表单校验 // 表单校验
rules: { rules: {
dictName: [ dictName: [

4
sgzb-ui/src/views/store/tools/toolsType.vue
View File

@ -458,8 +458,8 @@ export default {
field101fileList:[], field101fileList:[],
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // 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:'http://192.168.5.12:9201',//本地测试 uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label" label: "label"

2
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -449,7 +449,7 @@ export default {
}, },
//查看 //查看
handleView(row) { handleView(row) {
this.query.taskId = row.id this.query.taskId = row.taskId
this.getDialogTable() this.getDialogTable()
this.open = true; this.open = true;
this.showHandle = false this.showHandle = false