bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

漏洞以及bug问题修复

This commit is contained in:
BianLzhaoMin 2024-10-09 18:03:44 +08:00
parent e12b62d13e
commit 368aaa4c75
14 changed files with 839 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

336
src/api/store/tools.js
View File

@ -1,288 +1,288 @@
import request from "@/utils/request";
import request from '@/utils/request'
//机具类型管理
export function getMaTypeList(query) {
return request({
url: "/material/base/type/getMaTypeList",
method: "get",
params: query,
});
return request({
url: '/material/base/type/getMaTypeList',
method: 'get',
params: query,
})
}
//获取机具类型列表
export function getListByMaType(query) {
return request({
url: "/material/base/type/getListByMaType",
method: "get",
params: query,
});
return request({
url: '/material/base/type/getListByMaType',
method: 'get',
params: query,
})
}
//获取机具类型树2
export function equipmentTypeTree(query) {
return request({
url: "/material/base/type/equipmentType",
method: "get",
params: query,
});
return request({
url: '/material/base/type/equipmentType',
method: 'get',
params: query,
})
}
//机具类型-详情
export function getMaType(typeId) {
return request({
url: "/material/base/type/" + typeId,
method: "get",
});
return request({
url: '/material/base/type/' + typeId,
method: 'get',
})
}
//获取基层单位
export function getunitInfoAll(query) {
return request({
url: "/material/base/bmUnitInfo/unitInfoAll",
method: "get",
params: query,
});
return request({
url: '/material/base/bmUnitInfo/unitInfoAll',
method: 'get',
params: query,
})
}
//机具类型--新增
export function addMaType(data) {
return request({
url: "/material/base/type",
method: "post",
data: data,
});
return request({
url: '/material/base/type',
method: 'post',
data: data,
})
}
// 机具类型--修改
export function updateMaType(data) {
return request({
url: "/material/base/type",
method: "put",
data: data,
});
return request({
url: '/material/base/type',
method: 'put',
data: data,
})
}
//供应商管理--删除
export function delMaType(typeId) {
return request({
url: "/material/base/type/" + typeId,
method: "delete",
});
return request({
url: '/material/base/type/' + typeId,
method: 'delete',
})
}
//供应商管理-列表
export function listSupplierInfo(query) {
return request({
url: "/material/base/supplierInfo/list",
method: "get",
params: query,
});
return request({
url: '/material/base/supplierInfo/list',
method: 'get',
params: query,
})
}
//供应商管理-详情
export function getSupplierInfo(supplierId) {
return request({
url: "/material/base/supplierInfo/" + supplierId,
method: "get",
});
return request({
url: '/material/base/supplierInfo/' + supplierId,
method: 'get',
})
}
//供应商管理--新增
export function addSupplier(data) {
return request({
url: "/material/base/supplierInfo",
method: "post",
data: data,
});
return request({
url: '/material/base/supplierInfo',
method: 'post',
data: data,
})
}
// 供应商管理--修改
export function updateSupplier(data) {
return request({
url: "/material/base/supplierInfo",
method: "put",
data: data,
});
return request({
url: '/material/base/supplierInfo',
method: 'put',
data: data,
})
}
//供应商管理--删除
export function delSupplier(supplierIds) {
return request({
url: "/material/base/supplierInfo/" + supplierIds,
method: "delete",
});
return request({
url: '/material/base/supplierInfo/' + supplierIds,
method: 'delete',
})
}
//供应商管理-下拉数据
export function supplierInfoList(query) {
return request({
url: "/material/base/supplierInfo/supplierInfoList",
method: "get",
params: query,
});
return request({
url: '/material/base/supplierInfo/supplierInfoList',
method: 'get',
params: query,
})
}
//机具设备管理-列表
export function listMachine(query) {
return request({
url: "/material/base/machine/getMachine",
method: "get",
params: query,
});
return request({
url: '/material/base/machine/getMachine',
method: 'get',
params: query,
})
}
//机具设备管理-详情
export function getMachine(maId) {
return request({
url: "/material/base/machine/" + maId,
method: "get",
});
return request({
url: '/material/base/machine/' + maId,
method: 'get',
})
}
//机具设备管理--新增
export function addMachine(data) {
return request({
url: "/material/base/machine",
method: "post",
data: data,
});
return request({
url: '/material/base/machine',
method: 'post',
data: data,
})
}
// 机具设备管理--修改
export function updateMachine(data) {
return request({
url: "/material/base/machine",
method: "put",
data: data,
});
return request({
url: '/material/base/machine',
method: 'put',
data: data,
})
}
//机具设备管理--删除
export function delMachine(maIds) {
return request({
url: "/material/base/machine/" + maIds,
method: "delete",
});
return request({
url: '/material/base/machine/' + maIds,
method: 'delete',
})
}
//
// //配件管理-列表
export function listPartType(query) {
return request({
url: "/material/base/maPartType/list",
method: "get",
params: query,
});
return request({
url: '/material/base/maPartType/list',
method: 'get',
params: query,
})
}
//配件管理--新增
export function addPartType(data) {
return request({
url: "/material/base/maPartType",
method: "post",
data: data,
});
return request({
url: '/material/base/maPartType',
method: 'post',
data: data,
})
}
//配件管理--新增
export function addMaPartType(data) {
return request({
url: "/material/base/maPartType",
method: "post",
data: data,
});
return request({
url: '/material/base/maPartType',
method: 'post',
data: data,
})
}
// 配件管理--修改
export function updatePartType(data) {
return request({
url: "/material/base/maPartType",
method: "put",
data: data,
});
return request({
url: '/material/base/maPartType',
method: 'put',
data: data,
})
}
// 配件管理--修改
export function updatePartTypeById(data) {
return request({
url: "/material/base/maPartType/updateById",
method: "post",
data: data,
});
return request({
url: '/material/base/maPartType/updateById',
method: 'post',
data: data,
})
}
//配件管理--删除
export function delPartType(maIds) {
return request({
url: "/material/base/maPartType/" + maIds,
method: "delete",
});
return request({
url: '/material/base/maPartType/' + maIds,
method: 'delete',
})
}
//配件管理--查询
export function getPartType(maIds) {
return request({
url: "/material/base/maPartType/" + maIds,
method: "get",
});
return request({
url: '/material/base/maPartType/' + maIds,
method: 'get',
})
}
// 获取库管员配置列表
export function warehouseKeeperInfoAll(query) {
return request({
url: "/material/base/maWarehouseKeeper/warehouseKeeperInfoAll",
method: "get",
params: query,
});
return request({
url: '/material/base/maWarehouseKeeper/warehouseKeeperInfoAll',
method: 'get',
params: query,
})
}
//库管员配置-根据人员名称查询左侧列表
export function getMaUserList(query) {
return request({
url: "/material/base/maWarehouseKeeper/getMaUserList",
method: "get",
params: query,
});
return request({
url: '/material/base/maWarehouseKeeper/getMaUserList',
method: 'get',
params: query,
})
}
//库管员配置-保存
export function addHouseKeeper(data) {
return request({
url: "/material/base/maWarehouseKeeper/addList",
method: "post",
data: data,
});
return request({
url: '/material/base/maWarehouseKeeper/addList',
method: 'post',
data: data,
})
}
//库管员配置-删除
export function delHouseKeeper(data) {
return request({
url: "/material/base/maWarehouseKeeper/remove",
method: "post",
data: data,
});
return request({
url: '/material/base/maWarehouseKeeper/remove',
method: 'post',
data: data,
})
}
// 获取维修班配置列表
export function wareRepairerInfoAll(query) {
return request({
url: "/material/base/maintenanceGang/maintenanceGangInfoAll",
method: "get",
params: query,
});
return request({
url: '/material/base/maintenanceGang/maintenanceGangInfoAll',
method: 'get',
params: query,
})
}
//维修班配置-根据人员名称查询左侧列表
export function getRepairerList(query) {
return request({
url: "/material/base/maintenanceGang/getMaUserList",
method: "get",
params: query,
});
return request({
url: '/material/base/maintenanceGang/getMaUserList',
method: 'get',
params: query,
})
}
//维修班配置-保存
export function addRepairer(data) {
return request({
url: "/material/base/maintenanceGang/addList",
method: "post",
data: data,
});
return request({
url: '/material/base/maintenanceGang/addList',
method: 'post',
data: data,
})
}
//维修班配置-删除
export function delRepairer(data) {
return request({
url: "/material/base/maintenanceGang/remove",
method: "post",
data: data,
});
return request({
url: '/material/base/maintenanceGang/remove',
method: 'post',
data: data,
})
}
//机具厂家-下拉数据
export function getDeviceFactoryCbx(data) {
return request({
url: "/material/base/select/getDeviceFactoryCbx",
method: "post",
data: data,
});
return request({
url: '/material/base/select/getDeviceFactoryCbx',
method: 'post',
data: data,
})
}

1
src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -870,7 +870,6 @@ export default {
}
let canSave = true
if (this.leaseApplyDetails.length > 0) {
this.queryParams.leaseApplyDetails =
this.leaseApplyDetails

6
src/views/cost/csotSettlement/component/finishAndDetails.vue
View File

@ -7,7 +7,11 @@
<div>工程名称：{{ currRowInfo.projectName }}</div>
<div>总合计：{{ totalAmount }}元</div>
<div>
<el-button size="mini" type="primary" @click="handleExportAll()"
<el-button
size="mini"
type="primary"
@click="handleExportAll()"
v-hasPermi="['cost:settlement:export']"
>导出全部明细表</el-button
>
</div>

1
src/views/cost/csotSettlement/component/finishTable.vue
View File

@ -34,6 +34,7 @@
type="warning"
v-if="!isEdit"
@click="handleExport"
v-hasPermi="['cost:settlement:export']"
>导出</el-button
>
<el-button

6
src/views/cost/csotSettlement/component/monthRecord.vue
View File

@ -50,6 +50,7 @@
plain
size="mini"
@click="handelExport(null)"
v-hasPermi="['cost:settlement:export']"
>批量导出</el-button
>
</el-form-item>
@ -83,7 +84,10 @@
<el-button type="text" @click="previewDetails(row)"
>明细</el-button
>
<el-button type="text" @click="handelExport(row)"
<el-button
type="text"
@click="handelExport(row)"
v-hasPermi="['cost:settlement:export']"
>导出明细表</el-button
>
</template>

2
src/views/cost/csotSettlement/costApplyList.vue
View File

@ -143,6 +143,7 @@
type="primary"
style="padding: 5px 10px"
@click="handleMonthRecord(row)"
v-hasPermi="['month:record:query']"
>月结记录</el-button
>
<el-button
@ -150,6 +151,7 @@
:type="row.isSlt == 1 ? 'success' : 'primary'"
style="padding: 5px 10px"
@click="handleFinishCostAndDetails(row, row.isSlt)"
v-hasPermi="['finis:record:details']"
>{{
row.isSlt == 1 ? '结算明细' : '完工结算'
}}</el-button

4
src/views/store/label/labelBinding.vue
View File

@ -645,8 +645,8 @@ export default {
//选择设备类型
selectDevice(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},

1101
src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

File diff suppressed because it is too large Load Diff

8
src/views/store/tools/devices.vue
View File

@ -640,15 +640,15 @@ export default {
//选择物品种类
selectItem(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.typeList = response.data
getListByMaType({ typeId: id, level: '3' }).then((response) => {
this.typeList = response.data.rows
})
},
//选择设备类型
selectDevice(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},
/** 查询资产属性下拉 */

6
src/views/system/notice/index.vue
View File

@ -115,7 +115,11 @@
align="center"
prop="noticeTitle"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<div v-dompurify-html="row.noticeTitle"></div>
</template>
</el-table-column>
<el-table-column
label="公告内容"
align="center"

8
src/views/warehouseManage/machinery/coding-nw/index.vue
View File

@ -688,15 +688,15 @@ export default {
//选择物品种类
selectItem(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.typeList = response.data
getListByMaType({ typeId: id, level: '3' }).then((response) => {
this.typeList = response.data.rows
})
},
//选择设备类型
selectDevice(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},
/** 查询资产属性下拉 */

8
src/views/warehouseManage/machinery/coding/index.vue
View File

@ -637,15 +637,15 @@ export default {
//选择物品种类
selectItem(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.typeList = response.data
getListByMaType({ typeId: id, level: '3' }).then((response) => {
this.typeList = response.data.rows
})
},
//选择设备类型
selectDevice(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},
/** 查询资产属性下拉 */

4
src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
View File

@ -485,8 +485,8 @@ export default {
},
selectType(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},
/** 查询列表 */

4
src/views/warehouseManage/tagBind/bind/index.vue
View File

@ -642,8 +642,8 @@ export default {
//选择设备类型
selectDevice(id) {
console.log(id)
getListByMaType({ typeId: id }).then((response) => {
this.modelList = response.data
getListByMaType({ typeId: id, level: '0' }).then((response) => {
this.modelList = response.data.rows
})
},