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

bug修复

This commit is contained in:
jjLv 2024-12-09 16:36:51 +08:00
parent 1ba032ebe2
commit df0b11a8ce
5 changed files with 676 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sgzb-ui/src/views/claimAndreturn/return/query/index.vue
View File

@ -145,17 +145,11 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="机具规格"
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="设备编码"
align="center"
@ -168,6 +162,36 @@
prop="backNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="未接收数量"
align="center"
prop="num1"
:show-overflow-tooltip="true"
/>
<el-table-column
label="接收数量"
align="center"
prop="num2"
:show-overflow-tooltip="true"
/>
<el-table-column
label="合格数量"
align="center"
prop="num3"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修数量"
align="center"
prop="num4"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废数量"
align="center"
prop="num5"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人"
align="center"
@ -182,10 +206,22 @@
sortable
/>
<el-table-column
label="退料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="退料单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="往来单位"
align="center"
prop="num5"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料工程"

21
sgzb-ui/src/views/newLogin.vue
View File

@ -216,6 +216,9 @@
</el-form>
</el-tab-pane>
</el-tabs>
<div class="phoneType">
{{"客服电话：055162573713"}}
</div>
</div>
</div>
<!-- 底部 -->
@ -271,6 +274,7 @@
</span>
</el-dialog>
</div>
</template>
<script>
@ -366,6 +370,7 @@ export default {
count: '',
timer: null,
dialogCodeVisible: false, // 图形验证码弹框
phoneNumber:'',
}
},
watch: {
@ -404,6 +409,13 @@ export default {
}
})
},
// getPhoneNumber() {
// getPhone().then((res) => {
// console.log('res',res)
// })
// },
//防止手机号自动充填
handleInputClick() {
this.readonlyFlag = false
@ -599,8 +611,17 @@ export default {
.form-bar {
//height: 500px;
background: #fff;
.phoneType {
position: absolute;
top: 500px; /* 距离页面顶部100像素的位置 */
text-align: left;
font-weight: bold;
color:blueviolet;
text-decoration: underline;
}
}
.login-form {
//border-radius: 6px;
//height: 100%;

390
sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
View File

@ -68,6 +68,23 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库管员" prop="userId">
<el-select
v-model="queryParams.userId"
filterable
clearable
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in keepIdList"
:key="item.userId"
:label="item.userName"
:value="item.userId"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -146,13 +163,35 @@
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="scope">
<!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
<span
v-if="scope.row.manageType === '编码'"
class="clickText"
@click="openRecords(scope.row)"
>
{{ scope.row.num }}
</span>
<!-- 否则，直接显示数字 -->
<span v-else>
{{ scope.row.num }}
</span>
</template>
</el-table-column>
<el-table-column
label="在用数量"
align="center"
prop="usNum"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="scope">
<span
class="clickText"
@click="openUserRecords(scope.row)"
>{{ scope.row.usNum }}</span>
</template>
</el-table-column>
<el-table-column
label="在修数量"
align="center"
@ -176,6 +215,27 @@
align="center"
prop="allNum"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
<span
v-if="scope.row.manageType === '编码'"
class="clickText"
@click="openAllRecords(scope.row)"
>
{{ scope.row.allNum }}
</span>
<!-- 否则，直接显示数字 -->
<span v-else>
{{ scope.row.allNum }}
</span>
</template>
</el-table-column>
<el-table-column
label="库管员"
align="center"
prop="typeKeepName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="总保有量资产（万元）" align="center" prop="proName" :show-overflow-tooltip="true" /> -->
<el-table-column
@ -194,6 +254,239 @@
:page-sizes="[5, 10, 15, 20, 30]"
@pagination="getList"
/>
<!-- 在库编码设备弹窗-->
<el-dialog
:title="title"
:visible.sync="openRecord"
width="1200px"
append-to-body
>
<el-form
:model="dialogQuery"
ref="dialogQuery"
size="small"
:inline="true"
label-width="80px"
>
<el-form-item label="机具编码" prop="maCode">
<el-input
v-model="dialogQuery.maCode"
placeholder="请输入机具编码"
clearable
:maxlength="30"
style="width: 240px"
@keyup.enter.native="handleDialogQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogQuery"
>查询</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dialogList">
<el-table-column
label="序号"
align="center"
width="80"
type="index"
:index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
>
</el-table-column>
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="modelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@pagination="getUseMaCodeList"
/>
</el-dialog>
<!-- 总保有量编码设备弹窗-->
<el-dialog
:title="title"
:visible.sync="openAllRecord"
width="1200px"
append-to-body
>
<el-form
:model="dialogQuery"
ref="dialogQuery"
size="small"
:inline="true"
label-width="80px"
>
<el-form-item label="机具编码" prop="maCode">
<el-input
v-model="dialogQuery.maCode"
placeholder="请输入机具编码"
clearable
:maxlength="30"
style="width: 240px"
@keyup.enter.native="handleDialogAllQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogAllQuery"
>查询</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="AllRecords">
<el-table-column
label="序号"
align="center"
width="80"
type="index"
:index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
>
</el-table-column>
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="modelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@pagination="getAllRecords"
/>
</el-dialog>
<!-- 在用编码设备弹窗-->
<el-dialog
:title="title"
:visible.sync="openUseRecord"
width="1200px"
append-to-body
>
<!-- <el-form
:model="dialogQuery"
ref="dialogQuery"
size="small"
:inline="true"
label-width="80px"
>
<el-form-item label="机具编码" prop="maCode">
<el-input
v-model="dialogQuery.maCode"
placeholder="请输入机具编码"
clearable
:maxlength="20"
style="width: 240px"
@keyup.enter.native="handleDialogQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogQuery"
>查询</el-button>
</el-form-item>
</el-form>-->
<el-table v-loading="loading" :data="UserRecords">
<el-table-column
label="序号"
align="center"
width="80"
type="index"
:index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
>
</el-table-column>
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="modelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="数量"
align="center"
prop="num"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所在工程"
align="center"
prop="proName"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQuery.pageNum"
:limit.sync="dialogQuery.pageSize"
@pagination="getUserRecords"
/>
</el-dialog>
</div>
</template>
@ -203,6 +496,10 @@ import {
exportList,
getUnitData,
getProData,
getTypeKeeper,
getUseMaCode,
getUserRecords,
getAllRecords,
} from '@/api/stquery/deviceStatusRecord'
export default {
@ -212,6 +509,8 @@ export default {
return {
// 遮罩层
loading: true,
// 弹出层标题
title: '',
// 选中数组
ids: [],
// 非单个禁用
@ -243,10 +542,27 @@ export default {
},
unitList: [], //来往单位集合
proList: [], //工程集合
keepIdList: [], //库管员id集合
//记录弹窗
openRecord: false,
openUseRecord: false,
openAllRecord: false,
dialogQuery: {
pageNum: 1,
pageSize: 10,
typeId: undefined,
maCode: undefined,
},
dialogList: [], //在库编码设备列表
UserRecords: [], //在用设备列表
AllRecords: [], //总保有量设备列表
dialogTotal: 0,
}
},
created() {
this.getList()
this.getKeepIdList()
/* this.getUnitList();
this.getProList(); */
},
@ -276,6 +592,17 @@ export default {
this.total = res.data.total
},
// 获取 库管员列表
async getKeepIdList() {
this.loading = true
const params = {
}
const res = await getTypeKeeper(params)
console.log('机具状态', res)
this.loading = false
this.keepIdList = res.data
},
// 获取 来往单位 列表数据
async getUnitList() {
const params = {
@ -329,6 +656,60 @@ export default {
)
},
//查看编码在库数据
openRecords(row) {
this.openRecord = true
this.dialogQuery.maCode = ""
this.dialogQuery.typeId= row.typeId
this.getUseMaCodeList()
},
//查看在用设备
openUserRecords(row) {
this.openUseRecord = true
this.dialogQuery.typeId= row.typeId
this.getUserRecords()
},
//查看总保有量编码设备
openAllRecords(row) {
this.openAllRecord = true
this.dialogQuery.maCode = ""
this.dialogQuery.typeId= row.typeId
this.getAllRecords()
},
/** 搜索在用编码按钮操作 */
handleDialogQuery() {
this.queryParams.pageNum = 1
this.getUseMaCodeList()
},
handleDialogAllQuery() {
this.queryParams.pageNum = 1
this.getAllRecords()
},
/** 查询编码机具列表 */
getUseMaCodeList() {
getUseMaCode(this.dialogQuery).then((response) => {
this.dialogList = response.data.rows
this.dialogTotal = response.data.total
})
},
/** 查询在用设备列表 */
getUserRecords() {
getUserRecords(this.dialogQuery).then((response) => {
this.UserRecords = response.data.rows
this.dialogTotal = response.data.total
})
},
/** 查看总保有量编码设备 */
getAllRecords() {
getAllRecords(this.dialogQuery).then((response) => {
this.AllRecords = response.data.rows
this.dialogTotal = response.data.total
})
},
// 表单合并行
/* mergeRow ({ row, column, rowIndex, columnIndex}) {
if (rowIndex == 0) {
@ -346,4 +727,9 @@ export default {
width: 60px !important;
margin-bottom: 10px;
}
.clickText {
color: #02a7f0;
cursor: pointer;
}
</style>

12
sgzb-ui/src/views/stquery/projUsingRecord.vue
View File

@ -127,6 +127,14 @@
@click="resetQuery"
>重置</el-button
>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-form-item>
</el-form>
@ -680,11 +688,11 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
'material/backRecord/export',
'material/projUsingRecord/export',
{
...this.queryParams,
},
`综合查询_退料记录_${new Date().getTime()}.xlsx`,
`综合查询_工器具使用记录_${new Date().getTime()}.xlsx`,
)
},
// 单位名称选择后 获取对应的工程

219
sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
View File

@ -27,7 +27,54 @@
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
>
<span
class="custom-tree-node"
slot-scope="{ node, data }"
@mousemove="onMousemove(data)"
@mouseleave="onMouseleave()"
>
<span
v-if="
isMousemoveId === data.id &&
node.label.length > 5
"
>{{ node.label.slice(0, 3) + '...' }}</span
>
<span v-else>{{ node.label }}</span>
<span
class="btn-items"
v-if="isMousemoveId === data.id"
>
<el-button
type="text"
size="mini"
icon="el-icon-plus"
@click.stop="() => appendTreeNode(data)"
>
</el-button>
<el-button
type="text"
size="mini"
icon="el-icon-edit-outline"
style="color: #67c23a"
v-if="data.parentId!=0"
@click.stop="() => editTreeNode(data)"
>
</el-button>
<el-button
type="text"
size="mini"
icon="el-icon-delete"
style="color: #f56c6c"
v-if="data.parentId!=0"
@click.stop="() => removeTreeNode(data)"
>
</el-button>
</span>
</span>
</el-tree>
</div>
</el-col>
<!--用户数据-->
@ -67,7 +114,7 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@ -78,7 +125,7 @@
v-hasPermi="['machinery:type:add']"
>新增</el-button
>
</el-col>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -89,11 +136,11 @@
>导出
</el-button>
</el-col>-->
<right-toolbar
<!-- <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
</el-row> -->
<el-table
v-loading="loading"
@ -312,6 +359,7 @@
noResultsText="没有搜索结果"
placeholder="请选择所属上级分类"
@select="treeChange"
disabled
/>
</el-form-item>
</el-col>
@ -617,6 +665,54 @@
</Description>
</template>
</DialogModel>
<!-- 新增弹框 -->
<el-dialog
:title="addTitle"
:visible.sync="addTitleVisible"
v-if="addTitleVisible"
width="50%"
append-to-body
:close-on-click-modal="false"
>
<el-form
label-width="80px"
:model="addFormParams"
:rules="addFormParamsRules"
ref="addFormParamsRef"
>
<el-row :gutter="24">
<el-col :span="12" v-if="addTitle === '新增'">
<el-form-item label="所属上级">
<el-input
style="width: 100%"
disabled
v-model="addFormParams.label"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="名称" prop="typeName">
<el-input
style="width: 100%"
v-model="addFormParams.typeName"
/>
</el-form-item>
</el-col>
</el-row>
<el-row style="text-align: right">
<el-form-item>
<el-button size="small" type="primary" @click="onSubmit"
>确 定</el-button
>
<el-button size="small" @click="onCancel"
>取 消</el-button
>
</el-form-item>
</el-row>
</el-form>
</el-dialog>
</div>
</template>
@ -830,6 +926,27 @@ export default {
{ label: '备注信息', content: 'remark' },
],
descriptionDetailsInfo: {},
/* 新增弹框等数据源定义 */
addTitleVisible: false,
addTitle: '', // 新增弹框标题
addFormParams: {
label: '',
typeName: '',
companyId: 101,
},
addFormParamsRules: {
typeName: [
{
required: true,
message: '名称不能为空',
trigger: 'blur',
},
],
},
isMousemoveId: null,
}
},
watch: {
@ -1126,6 +1243,98 @@ export default {
closeDialogOuter() {
this.dialogConfig.outerVisible = false
},
onMousemove(data) {
this.isMousemoveId = data.id
},
onMouseleave() {
this.isMousemoveId = null
},
/* 树节点增加 */
appendTreeNode(data) {
if (data.level === 3) {
this.reset()
Object.assign(this.form, data)
this.form.parentId = data.id
this.open = true
this.title = '新增'
} else {
Object.assign(this.addFormParams, data)
this.addFormParams.typeName = ''
this.addTitle = '新增'
this.addTitleVisible = true
}
},
/* 树节点删除 */
removeTreeNode(data) {
// this.$message.success('删除--')
console.log(data, '删除时的数据源--')
this.$modal
.confirm('是否确认删除数据项？')
.then(function () {
return delMaType(data.id)
})
.then(() => {
this.$modal.msgSuccess('删除成功')
this.getTreeData()
})
.catch(() => {})
},
/* 树节点修改 */
editTreeNode(data) {
console.log(data, '修改')
Object.assign(this.addFormParams, data)
this.addTitle = '修改'
this.addFormParams.typeName = data.label
this.addTitleVisible = true
},
},
}
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
::v-deep .btn-items .el-button + .el-button {
margin-left: 6px;
}
.btn-items {
margin-left: 4px;
.el-button--text {
font-size: 16px;
}
}
::v-deep .el-tree .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
::v-deep .el-tree .el-icon-caret-right:before {
content: '\e783';
font-size: 16px;
}
::v-deep
.el-tree
.el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
content: '\e781';
font-size: 16px;
color: #1890ff;
}
::v-deep .el-tree-node__content > .el-tree-node__expand-icon {
color: #1890ff !important;
}
::v-deep .el-tree-node__expand-icon.is-leaf {
color: transparent !important;
}
::v-deep
.el-tree--highlight-current
.el-tree-node.is-current
> .el-tree-node__content {
background-color: #8decf1;
}
</style>