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

Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-09-30 11:59:16 +08:00
parent a160f15625 14c3c6d61c
commit c0768ded92
7 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/index.vue
View File

@ -78,7 +78,7 @@ export default {
] ]
}, },
socket: null, socket: null,
wsUrl: JSON.parse(localStorage.getItem('systemConfig')).webSocketurl,//'ws://localhost:18082/ws', // WebSocket 端点 wsUrl: '',//'ws://localhost:18082/ws', // WebSocket 端点
isConnected: false, // 连接状态 isConnected: false, // 连接状态
reconnectInterval: 5000 // 自动重连时间间隔（毫秒 reconnectInterval: 5000 // 自动重连时间间隔（毫秒
@ -117,6 +117,8 @@ export default {
}, },
created() { created() {
// this.checkPasswordStatus() // this.checkPasswordStatus()
const systemConfig = localStorage.getItem('systemConfig')
this.wsUrl = systemConfig ? JSON.parse(systemConfig).webSocketurl : ''
if (this.roles.includes("audit") || this.roles.includes("systemAdmin")) { if (this.roles.includes("audit") || this.roles.includes("systemAdmin")) {
this.connectWebSocket(); this.connectWebSocket();
} }

30
src/views/business/businessHandling/directApply.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="100px" :disabled="isDetail"> <el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="80px" :disabled="isDetail">
<el-row :gutter="20" class="cont-center" style="margin-bottom: 20px"> <el-row :gutter="20" class="cont-center" style="margin-bottom: 20px">
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转出单位" prop="backUnitId"> <el-form-item label="转出单位" prop="backUnitId">
@ -12,7 +12,7 @@
:options="uniteList" :options="uniteList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -28,7 +28,7 @@
:options="projectList" :options="projectList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -43,7 +43,7 @@
placeholder="请输入转出人" placeholder="请输入转出人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -53,7 +53,7 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -68,7 +68,7 @@
></el-image> ></el-image>
</div> </div>
</el-col> </el-col>
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转入单位" prop="leaseUnitId"> <el-form-item label="转入单位" prop="leaseUnitId">
@ -78,7 +78,7 @@
:options="lessUniteList" :options="lessUniteList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -94,7 +94,7 @@
:options="leaseProjectList" :options="leaseProjectList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -109,7 +109,7 @@
placeholder="请输入转入人" placeholder="请输入转入人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -119,14 +119,14 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="8" :offset="0"> <el-col :span="6" :offset="0">
<el-form-item label="" prop="dirUrls"> <el-form-item label="" prop="dirUrls">
<el-upload <el-upload
:action="uploadUrl" :action="uploadUrl"
@ -191,7 +191,7 @@
:options="materialTypeOpts" :options="materialTypeOpts"
:normalizer="normalizer2" :normalizer="normalizer2"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -1475,4 +1475,8 @@ export default {
font-size: 16px; font-size: 16px;
} }
} }
::v-deep .vue-treeselect__single-value {
position: inherit !important;
white-space: pre-wrap !important;
}
</style> </style>

30
src/views/business/businessHandling/groundDirect.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="100px" :disabled="isDetail"> <el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="80px" :disabled="isDetail">
<el-row :gutter="20" class="cont-center" style="margin-bottom: 20px"> <el-row :gutter="20" class="cont-center" style="margin-bottom: 20px">
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转出单位" prop="backUnitId"> <el-form-item label="转出单位" prop="backUnitId">
@ -12,7 +12,7 @@
:options="uniteList" :options="uniteList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -28,7 +28,7 @@
:options="projectList" :options="projectList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -43,7 +43,7 @@
placeholder="请输入转出人" placeholder="请输入转出人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -53,7 +53,7 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -68,7 +68,7 @@
></el-image> ></el-image>
</div> </div>
</el-col> </el-col>
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转入单位" prop="leaseUnitId"> <el-form-item label="转入单位" prop="leaseUnitId">
@ -78,7 +78,7 @@
:options="lessUniteList" :options="lessUniteList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -94,7 +94,7 @@
:options="leaseProjectList" :options="leaseProjectList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -109,7 +109,7 @@
placeholder="请输入转入人" placeholder="请输入转入人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -119,14 +119,14 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="8" :offset="0"> <el-col :span="6" :offset="0">
<el-form-item label="" prop="dirUrls"> <el-form-item label="" prop="dirUrls">
<el-upload <el-upload
:action="uploadUrl" :action="uploadUrl"
@ -191,7 +191,7 @@
:options="materialTypeOpts" :options="materialTypeOpts"
:normalizer="normalizer2" :normalizer="normalizer2"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -1461,4 +1461,8 @@ export default {
font-size: 16px; font-size: 16px;
} }
} }
::v-deep .vue-treeselect__single-value {
position: inherit !important;
white-space: pre-wrap !important;
}
</style> </style>

22
src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue
View File

@ -122,7 +122,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-for="(column, index) in tableColumns" v-for="(column, index) in tableColumns"
:show-overflow-tooltip="!column.showTooltip" :show-overflow-tooltip="!column.unShowTooltip"
:key="index" :key="index"
:label="column.label" :label="column.label"
:prop="column.prop" :prop="column.prop"
@ -287,14 +287,14 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
tableColumns: [ tableColumns: [
{ label: '工程名称', prop: 'proName', showTooltip: false }, { label: '工程名称', prop: 'proName', unShowTooltip: true },
{ label: '物资名称', prop: 'typeName' }, { label: '物资名称', prop: 'typeName', width: 180 },
{ label: '规格型号', prop: 'typeModelName' }, { label: '规格型号', prop: 'typeModelName', width: 160 },
{ label: '计量单位', prop: 'unit' }, { label: '计量单位', prop: 'unit', width: 100 },
{ label: '业务需求数量', prop: 'businessNum' }, { label: '业务需求数量', prop: 'businessNum',width: 130 },
{ label: '实际供应数量', prop: 'supplyNum' }, { label: '实际供应数量', prop: 'supplyNum',width: 130 },
{ label: '在库数量', prop: 'storeNum' }, { label: '在库数量', prop: 'storeNum',width: 130 },
{ label: '在用数量', prop: 'useNum' } { label: '在用数量', prop: 'useNum', width: 130 }
], ],
// 主表格数据 // 主表格数据
tableList: [], tableList: [],
@ -328,7 +328,8 @@ export default {
dialogQuery: { dialogQuery: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
keyWord: undefined keyWord: undefined,
agreementIds: undefined,
}, },
dialogTotal: 0, dialogTotal: 0,
//在用弹窗 //在用弹窗
@ -598,6 +599,7 @@ export default {
this.dialogQuery.keyWord = '' this.dialogQuery.keyWord = ''
this.dialogQuery.typeId = row.typeId this.dialogQuery.typeId = row.typeId
this.dialogQuery.proId = row.proId this.dialogQuery.proId = row.proId
this.dialogQuery.agreementIds = row.agreementIds
this.getStoreCodeList() this.getStoreCodeList()
}, },
/** 查询在库编码列表 */ /** 查询在库编码列表 */

30
src/views/materialsStation/straight/straightTransfer/index.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="100px" :disabled="isDetail"> <el-form :model="maForm" ref="maForm" size="small" :rules="rules" label-width="" :disabled="isDetail">
<el-row :gutter="20" class="cont-center" style="margin-bottom: 20px"> <el-row :gutter="20" class="cont-center" style="margin-bottom: 20px">
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转出工程" prop="backProId"> <el-form-item label="转出工程" prop="backProId">
@ -12,7 +12,7 @@
:options="projectList" :options="projectList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -27,7 +27,7 @@
clearable clearable
filterable filterable
@change="projectChange" @change="projectChange"
style="width: 240px" style="width: 100%"
> >
<el-option v-for="item in projectList" :key="item.proId" :label="item.proName" :value="item.proId" /> <el-option v-for="item in projectList" :key="item.proId" :label="item.proName" :value="item.proId" />
</el-select> </el-select>
@ -39,7 +39,7 @@
:options="uniteList" :options="uniteList"
:normalizer="normalizer" :normalizer="normalizer"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"
@ -53,7 +53,7 @@
clearable clearable
filterable filterable
@change="uniteChange" @change="uniteChange"
style="width: 240px" style="width: 100%"
> >
<el-option v-for="item in uniteList" :key="item.id" :label="item.teamName" :value="item.id" /> <el-option v-for="item in uniteList" :key="item.id" :label="item.teamName" :value="item.id" />
</el-select> </el-select>
@ -64,7 +64,7 @@
placeholder="请输入转出人" placeholder="请输入转出人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -74,7 +74,7 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -89,7 +89,7 @@
></el-image> ></el-image>
</div> </div>
</el-col> </el-col>
<el-col :span="7" :offset="0"> <el-col :span="8" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px; overflow-y: auto">
<!-- card body --> <!-- card body -->
<el-form-item label="转入工程" prop="leaseProId"> <el-form-item label="转入工程" prop="leaseProId">
@ -99,7 +99,7 @@
clearable clearable
filterable filterable
@change="leaseProjectChange" @change="leaseProjectChange"
style="width: 240px" style="width: 100%"
> >
<el-option <el-option
v-for="item in leaseProjectList" v-for="item in leaseProjectList"
@ -116,7 +116,7 @@
clearable clearable
filterable filterable
@change="leaseUniteChange" @change="leaseUniteChange"
style="width: 240px" style="width: 100%"
> >
<el-option v-for="item in lessUniteList" :key="item.id" :label="item.teamName" :value="item.teamName" /> <el-option v-for="item in lessUniteList" :key="item.id" :label="item.teamName" :value="item.teamName" />
</el-select> </el-select>
@ -128,7 +128,7 @@
placeholder="请输入转入人" placeholder="请输入转入人"
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -138,14 +138,14 @@
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
style="width: 240px" style="width: 100%"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="8" :offset="0"> <el-col :span="6" :offset="0">
<el-form-item label="" prop="dirUrls"> <el-form-item label="" prop="dirUrls">
<el-upload <el-upload
:action="uploadUrl" :action="uploadUrl"
@ -196,7 +196,7 @@
:options="materialTypeOpts" :options="materialTypeOpts"
:normalizer="normalizer2" :normalizer="normalizer2"
:show-count="true" :show-count="true"
style="width: 240px" style="width: 100%"
:disable-branch-nodes="true" :disable-branch-nodes="true"
noChildrenText="没有数据了" noChildrenText="没有数据了"
noOptionsText="没有数据" noOptionsText="没有数据"

2
src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
View File

@ -470,6 +470,8 @@ export default {
console.log('🚀 ~ changePro ~ e:', e) console.log('🚀 ~ changePro ~ e:', e)
this.maForm.proId = e this.maForm.proId = e
this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId
this.maForm.teamId = ''
this.maForm.leasePerson = ''
await this.getBmTeam() await this.getBmTeam()
if(this.maForm.proId){ if(this.maForm.proId){
this.equipmentList = [] this.equipmentList = []

2
src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
View File

@ -696,6 +696,8 @@ export default {
console.log('🚀 ~ changePro ~ e:', e) console.log('🚀 ~ changePro ~ e:', e)
this.maForm.proId = e this.maForm.proId = e
this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId
this.maForm.teamId = ''
this.maForm.leasePerson = ''
this.equipmentList = [] this.equipmentList = []
if (this.maForm.pickType == 0) { if (this.maForm.pickType == 0) {
await this.getBmTeam() await this.getBmTeam()