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

优化测试bug

This commit is contained in:
BianLzhaoMin 2024-04-12 14:56:20 +08:00
parent 02d87beddb
commit 1c89edaa77
5 changed files with 363 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
View File

@ -652,12 +652,12 @@
countCost(list) { countCost(list) {
let arrCost = 0 let arrCost = 0
list.forEach((item) => { list.forEach((item) => {
arrCost += parseInt(item.costs) // arrCost += parseInt(item.costs)
// console.log(item) console.log(item)
// if (item.partType != 0 && item.scrapType != 0) { if (item.partType != 0 && item.scrapType != 0) {
// arrCost = arrCost + Number(item.costs) arrCost = arrCost + Number(item.costs)
// } }
}) })
return arrCost.toFixed(2) return arrCost.toFixed(2)
}, },

389
sgzb-ui/src/views/inventoryLogs/index.vue
View File

@ -1,195 +1,218 @@
<template> <template>
<!-- 库存日志 --> <!-- 库存日志 -->
<div class="app-container"> <div class="app-container">
<el-row> <el-row>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true"> <el-form
<el-form-item label="模块名称" prop="userName"> :model="queryParams"
<el-input ref="queryForm"
placeholder="请输入模块名称" size="small"
clearable :inline="true"
style="width: 200px" >
@keyup.enter.native="handleQuery" <!-- <el-form-item label="模块名称" prop="userName">
/> <el-input
</el-form-item> placeholder="请输入模块名称"
<el-form-item label="请求方式" prop="phonenumber"> clearable
<el-input style="width: 200px"
placeholder="请输入请求方式" @keyup.enter.native="handleQuery"
clearable />
style="width: 200px" </el-form-item>
@keyup.enter.native="handleQuery" <el-form-item label="请求方式" prop="phonenumber">
/> <el-input
</el-form-item> placeholder="请输入请求方式"
<el-form-item label="创建人" prop="status"> clearable
<el-select style="width: 200px"
placeholder="创建人" @keyup.enter.native="handleQuery"
clearable />
filterable </el-form-item>
style="width: 200px" <el-form-item label="创建人" prop="status">
> <el-select
</el-select> placeholder="创建人"
</el-form-item> clearable
<el-form-item label="请求时间"> filterable
<el-date-picker style="width: 200px"
style="width: 200px" >
value-format="yyyy-MM-dd" </el-select>
type="daterange" </el-form-item>
range-separator="-" <el-form-item label="请求时间">
start-placeholder="开始日期" <el-date-picker
end-placeholder="结束日期" style="width: 200px"
></el-date-picker> value-format="yyyy-MM-dd"
</el-form-item> type="daterange"
<el-form-item> range-separator="-"
<el-button start-placeholder="开始日期"
type="primary" end-placeholder="结束日期"
icon="el-icon-search" ></el-date-picker>
size="mini" </el-form-item>
@click="handleQuery" <el-form-item>
>搜索</el-button <el-button
> type="primary"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" icon="el-icon-search"
>重置</el-button size="mini"
> @click="handleQuery"
</el-form-item> >搜索</el-button
</el-form> >
</el-row> <el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item> -->
</el-form>
</el-row>
<el-table :data="tableList" border> <el-table :data="tableList" border>
<el-table-column align="center" label="序号" type="index" width="60" /> <el-table-column
<el-table-column align="center" prop="modelTitle" label="模块名称" /> align="center"
<el-table-column align="center" prop="method" label="请求方式" /> label="序号"
<el-table-column align="center" prop="task" label="实例" /> type="index"
<el-table-column align="center" prop="id" label="机具名称" /> width="60"
<el-table-column align="center" prop="typeId" label="机具规格" /> />
<el-table-column align="center" prop="description" label="描述" /> <el-table-column
<el-table-column align="center" prop="time" label="日期" /> align="center"
<el-table-column align="center" label="状态"> prop="modelTitle"
<template slot-scope="{ row }"> label="模块名称"
<el-tag size="mini" type="success" v-if="row.status == 0" />
>正常</el-tag <el-table-column align="center" prop="method" label="请求方式" />
> <el-table-column align="center" prop="task" label="实例" />
<el-tag size="mini" type="warning" v-else>异常</el-tag> <el-table-column align="center" prop="id" label="机具名称" />
</template> <el-table-column align="center" prop="typeId" label="机具规格" />
</el-table-column> <el-table-column align="center" prop="description" label="描述" />
<el-table-column align="center" prop="creator" label="创建人" /> <el-table-column align="center" prop="time" label="日期" />
<el-table-column align="center" prop="remark" label="备注" /> <el-table-column align="center" label="状态">
<el-table-column align="center" label="操作"> <template slot-scope="{ row }">
<template slot-scope="{ row }"> <el-tag size="mini" type="success" v-if="row.status == 0"
<el-button size="mini" type="text" @click="previewLogsDetails(row.id)" >正常</el-tag
>详情</el-button >
> <el-tag size="mini" type="warning" v-else>异常</el-tag>
</template> </template>
</el-table-column> </el-table-column>
</el-table> <el-table-column align="center" prop="creator" label="创建人" />
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" label="操作">
<template slot-scope="{ row }">
<el-button
size="mini"
type="text"
@click="previewLogsDetails(row.id)"
>详情</el-button
>
</template>
</el-table-column>
</el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 详情弹框 --> <!-- 详情弹框 -->
<el-dialog <el-dialog
title="日志详情" title="日志详情"
:visible.sync="logsDetailsDialogVisible" :visible.sync="logsDetailsDialogVisible"
width="60%" width="60%"
> >
<el-descriptions <el-descriptions
class="margin-top" class="margin-top"
:column="3" :column="3"
size="medium" size="medium"
border border
:labelStyle="commonStyle" :labelStyle="commonStyle"
:contentStyle="commonStyle" :contentStyle="commonStyle"
> >
<el-descriptions-item v-for="(item, v) in detailsLabelList" :key="v"> <el-descriptions-item
<template slot="label"> {{ item.label }} </template> v-for="(item, v) in detailsLabelList"
{{ logsDetailsInfoDemo[item.content] || "" }} :key="v"
</el-descriptions-item> >
</el-descriptions> <template slot="label"> {{ item.label }} </template>
</el-dialog> {{ logsDetailsInfoDemo[item.content] || '' }}
</div> </el-descriptions-item>
</el-descriptions>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { getLogsListApi, getLogsDetailsApi } from "@/api/inventoryLogs"; import { getLogsListApi, getLogsDetailsApi } from '@/api/inventoryLogs'
export default { export default {
name: "myInventoryLogs", name: 'myInventoryLogs',
data() { data() {
return { return {
queryParams: { queryParams: {
pageNum: 5, pageNum: 5,
pageSize: 1, pageSize: 1,
}, },
tableList: [{ id: 1 }, { id: 2 }], tableList: [{ id: 1 }, { id: 2 }],
total: 5, total: 5,
logsDetailsInfo: null /* 日志详情 */, logsDetailsInfo: null /* 日志详情 */,
logsDetailsDialogVisible: false, logsDetailsDialogVisible: false,
commonStyle: { commonStyle: {
"text-align": "center", 'text-align': 'center',
}, },
/* 日志详情label以及内容 */ /* 日志详情label以及内容 */
detailsLabelList: [ detailsLabelList: [
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
{ label: "占位", content: "vdDemo" }, { label: '占位', content: 'vdDemo' },
], ],
logsDetailsInfoDemo: { logsDetailsInfoDemo: {
vdDemo: "123", vdDemo: '123',
}, },
}; }
}, },
methods: { methods: {
/* 查询列表 */ /* 查询列表 */
async getList() { async getList() {
const { data: res } = await getLogsListApi(); const { data: res } = await getLogsListApi()
this.tableList = res.rows; this.tableList = res.rows
this.total = res.total; this.total = res.total
console.log(res, "=======日志列表"); console.log(res, '=======日志列表')
}, },
/* 搜索按钮 */ /* 搜索按钮 */
handleQuery() { handleQuery() {
this.getList(); this.getList()
}, },
/* 重置按钮 */ /* 重置按钮 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm')
this.getList(); this.getList()
}, },
/* 查看详情 */ /* 查看详情 */
async previewLogsDetails(id) { async previewLogsDetails(id) {
// const { data: res } = await getLogsDetailsApi(id) // const { data: res } = await getLogsDetailsApi(id)
// console.log(res, '=======日志详情') // console.log(res, '=======日志详情')
this.logsDetailsDialogVisible = true; this.logsDetailsDialogVisible = true
// this.logsDetailsInfo = res // this.logsDetailsInfo = res
}, },
}, },
created() { created() {
this.getList(); this.getList()
}, },
}; }
</script> </script>
<style scoped> <style scoped>
.el-table :empty::before { .el-table :empty::before {
content: "-"; content: '-';
color: gray; color: gray;
} }
.margin-top { .margin-top {
margin-top: -15px; margin-top: -15px;
} }
</style> </style>

1
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -219,6 +219,7 @@
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['delete:user']"
>删除</el-button >删除</el-button
> >
</template> </template>

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

@ -254,7 +254,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <!-- <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="query.status" v-model="query.status"
placeholder="审核状态" placeholder="审核状态"
@ -298,6 +298,20 @@
:value="model.partId" :value="model.partId"
/> />
</el-select> </el-select>
</el-form-item> -->
<el-form-item label="机具类型" prop="typeId">
<treeselect
v-model="query.typeId"
default-expand-all
:options="equipmentTypeList"
placeholder="请选择规格型号"
:disable-branch-nodes="true"
style="width: 240px"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -595,12 +609,16 @@
checkInputAccessory, checkInputAccessory,
accessoryWarehousingEntry, accessoryWarehousingEntry,
} from '@/api/store/newBuy' } from '@/api/store/newBuy'
import { equipmentTypeTree } from '@/api/store/tools'
import vueEasyPrint from 'vue-easy-print' import vueEasyPrint from 'vue-easy-print'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
// name: "AccessoryWarehousing", // name: "AccessoryWarehousing",
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
components: { vueEasyPrint }, components: { vueEasyPrint, Treeselect },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -667,11 +685,13 @@
}, },
], ],
}, },
equipmentTypeList: [],
} }
}, },
created() { created() {
this.getList() this.getList()
this.getTypeList() this.getTypeList()
this.equipmentType()
}, },
methods: { methods: {
getTypeList() { getTypeList() {
@ -927,6 +947,38 @@
this.$store.dispatch('dict/cleanDict') this.$store.dispatch('dict/cleanDict')
}) })
}, },
//规格型号
equipmentType() {
equipmentTypeTree().then((response) => {
this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => {
if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => {
if (
item2.children &&
item2.children.length > 0
) {
item2.children.forEach((item3) => {
if (
item3.children &&
item3.children.length > 0
) {
item3.children.forEach((item4) => {
item4.machineTypeName =
item3.typeName
item4.specificationType =
item4.typeName
// this.$set(item4, 'purchasePrice', 0);
// this.$set(item4, 'purchaseNum', 1);
})
}
})
}
})
}
})
})
},
}, },
} }
</script> </script>

138
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -228,51 +228,66 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <!-- <el-form-item label="状态" prop="status"> -->
<el-select <!-- <el-select -->
v-model="query.status" <!-- v-model="query.status" -->
placeholder="审核状态" <!-- placeholder="审核状态" -->
clearable <!-- clearable -->
filterable <!-- filterable -->
style="width: 240px" <!-- style="width: 240px" -->
> <!-- > -->
<el-option label="未审核" value="0" /> <!-- <el-option label="未审核" value="0" /> -->
<el-option label="已入库" value="1" /> <!-- <el-option label="已入库" value="1" /> -->
<el-option label="驳回" value="2" /> <!-- <el-option label="驳回" value="2" /> -->
</el-select> <!-- </el-select> -->
</el-form-item> <!-- </el-form-item> -->
<el-form-item label="设备类型" prop="deviceTypeId">
<el-select <el-form-item label="机具类型" prop="typeId">
v-model="query.deviceTypeId" <treeselect
placeholder="请选择设备类型"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="规格型号" prop="typeId">
<el-select
v-model="query.typeId" v-model="query.typeId"
default-expand-all
:options="equipmentTypeList"
placeholder="请选择规格型号" placeholder="请选择规格型号"
clearable :disable-branch-nodes="true"
filterable
style="width: 240px" style="width: 240px"
> noChildrenText="没有数据了"
<el-option noOptionsText="没有数据"
v-for="model in modelList" noResultsText="没有搜索结果"
:key="model.typeId" />
:label="model.typeName"
:value="model.typeId"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="设备类型" prop="deviceTypeId"> -->
<!-- <el-select -->
<!-- v-model="query.deviceTypeId" -->
<!-- placeholder="请选择设备类型" -->
<!-- clearable -->
<!-- filterable -->
<!-- style="width: 240px" -->
<!-- > -->
<!-- <el-option -->
<!-- v-for="typeItem in typeList" -->
<!-- :key="typeItem.typeId" -->
<!-- :label="typeItem.typeName" -->
<!-- :value="typeItem.typeId" -->
<!-- /> -->
<!-- </el-select> -->
<!-- </el-form-item> -->
<!-- <el-form-item label="规格型号" prop="typeId"> -->
<!-- <el-select -->
<!-- v-model="query.typeId" -->
<!-- placeholder="请选择规格型号" -->
<!-- clearable -->
<!-- filterable -->
<!-- style="width: 240px" -->
<!-- > -->
<!-- <el-option -->
<!-- v-for="model in modelList" -->
<!-- :key="model.typeId" -->
<!-- :label="model.typeName" -->
<!-- :value="model.typeId" -->
<!-- /> -->
<!-- </el-select> -->
<!-- </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -434,10 +449,17 @@
inputByType, inputByType,
getTypeList, getTypeList,
} from '@/api/store/warehousing' } from '@/api/store/warehousing'
import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
name: 'RepairWarehousing', name: 'RepairWarehousing',
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
components: {
Treeselect,
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -501,11 +523,13 @@
}, },
], ],
}, },
equipmentTypeList: [],
} }
}, },
created() { created() {
this.getList() this.getList()
this.getTypeList() this.getTypeList()
this.equipmentType()
}, },
methods: { methods: {
getTypeList() { getTypeList() {
@ -742,6 +766,38 @@
this.$store.dispatch('dict/cleanDict') this.$store.dispatch('dict/cleanDict')
}) })
}, },
//规格型号
equipmentType() {
equipmentTypeTree().then((response) => {
this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => {
if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => {
if (
item2.children &&
item2.children.length > 0
) {
item2.children.forEach((item3) => {
if (
item3.children &&
item3.children.length > 0
) {
item3.children.forEach((item4) => {
item4.machineTypeName =
item3.typeName
item4.specificationType =
item4.typeName
// this.$set(item4, 'purchasePrice', 0);
// this.$set(item4, 'purchaseNum', 1);
})
}
})
}
})
}
})
})
},
}, },
} }
</script> </script>