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

代码提交

This commit is contained in:
jiang 2026-01-10 14:53:17 +08:00
parent 880fb425ca
commit b994094e08
5 changed files with 1977 additions and 1925 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/EquipmentLedger/index.vue
View File

@ -127,7 +127,7 @@
<el-cascader <el-cascader
clearable clearable
v-model="queryParams.propertyUnitIds" v-model="queryParams.propertyUnitIds"
placeholder="请选择工序" placeholder="请选择产权单位"
:options="propertyUnitList" :options="propertyUnitList"
:props="{ label: 'label', value: 'id', children: 'children' }" :props="{ label: 'label', value: 'id', children: 'children' }"
style="width: 100%" style="width: 100%"

53
src/views/EquipmentUpOrDown/equipment/index.vue
View File

@ -64,7 +64,8 @@
查询 查询
</el-button> </el-button>
<el-button @click="onReset" icon="el-icon-refresh" size="mini" class="primary-lease" <el-button @click="onReset" icon="el-icon-refresh" size="mini" class="primary-lease"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</div> </div>
@ -96,7 +97,9 @@
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary" class="primary-lease"> <el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary"
class="primary-lease"
>
添加上架装备 添加上架装备
</el-button> </el-button>
</el-col> </el-col>
@ -149,7 +152,13 @@
<el-table-column align="center" prop="feature1" label="特征项1" /> <el-table-column align="center" prop="feature1" label="特征项1" />
<el-table-column align="center" prop="featureValue1" label="特征值1" /> --> <el-table-column align="center" prop="featureValue1" label="特征值1" /> -->
<el-table-column align="center" prop="leasePrice" label="租赁价"/> <el-table-column align="center" prop="leasePrice" label="租赁价"/>
<el-table-column align="center" prop="status" label="是否含机手">
<template slot-scope="scope">
<el-tag v-if="scope.row.isOperator == 1" type="success" size="mini">是</el-tag>
<el-tag v-if="scope.row.isOperator == 0" size="mini">否</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="操作" :width="199" fixed="right"> <el-table-column align="center" label="操作" :width="199" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popconfirm <el-popconfirm
@ -275,6 +284,14 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否含机手" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.isOperator" placeholder="是否含机手" clearable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" prop="status" label="装备状态"> <el-table-column align="center" prop="status" label="装备状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status == 1" type="success" size="mini">在库</el-tag> <el-tag v-if="scope.row.status == 1" type="success" size="mini">在库</el-tag>
@ -310,7 +327,7 @@ import {
listDownEquipment, listDownEquipment,
listEquipment, listEquipment,
downEquipment, downEquipment,
batchUpEquipment, batchUpEquipment
} from '@/api/EquipmentUpOrDown/equipment' } from '@/api/EquipmentUpOrDown/equipment'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -329,7 +346,7 @@ export default {
isAdd: true, isAdd: true,
isView: false, isView: false,
dialogSearchParams: { dialogSearchParams: {
toolCategory: '', toolCategory: ''
}, },
searchParams: { searchParams: {
major: '', major: '',
@ -340,9 +357,9 @@ export default {
status: '', status: '',
code: '', code: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
}, },
projectTypeList: [], projectTypeList: []
} }
}, },
@ -375,7 +392,7 @@ export default {
...e, ...e,
isChangePrice: false, // 是否修改租赁价 isChangePrice: false, // 是否修改租赁价
oldLeasePrice: e.leasePrice, // 原始租赁价 oldLeasePrice: e.leasePrice, // 原始租赁价
priceError: false, // 价格校验错误标识 priceError: false // 价格校验错误标识
} }
}) || [] }) || []
this.downTotal = res.total || 0 this.downTotal = res.total || 0
@ -396,7 +413,7 @@ export default {
status: '', status: '',
code: '', code: '',
pageSize: this.searchParams.pageSize, pageSize: this.searchParams.pageSize,
pageNum: 1, pageNum: 1
} }
this.$refs.searchFormRef?.clearValidate() this.$refs.searchFormRef?.clearValidate()
this.getEquipmentList() this.getEquipmentList()
@ -411,7 +428,7 @@ export default {
status: '', status: '',
code: '', code: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
this.$refs.searchFormRef?.clearValidate() this.$refs.searchFormRef?.clearValidate()
this.getListDownEquipment() this.getListDownEquipment()
@ -454,7 +471,7 @@ export default {
await this.$confirm(`确定下架选中的 ${this.selectedRows.length} 个装备吗？`, '提示', { await this.$confirm(`确定下架选中的 ${this.selectedRows.length} 个装备吗？`, '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消'
}) })
const ids = this.selectedRows.map((row) => row.maId) const ids = this.selectedRows.map((row) => row.maId)
@ -517,7 +534,7 @@ export default {
if (!validation.valid) { if (!validation.valid) {
this.$set(row, 'priceError', true) this.$set(row, 'priceError', true)
this.$modal.msgError( this.$modal.msgError(
`第 ${index + 1} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`, `第 ${index + 1} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`
) )
} else { } else {
this.$set(row, 'oldLeasePrice', validation.value) this.$set(row, 'oldLeasePrice', validation.value)
@ -591,8 +608,8 @@ export default {
if (errorRows.length > 0) { if (errorRows.length > 0) {
this.$modal.msgError( this.$modal.msgError(
`第 ${errorRows.join( `第 ${errorRows.join(
'、', '、'
)} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`, )} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`
) )
return return
} }
@ -601,7 +618,7 @@ export default {
await this.$confirm(`确定上架选中的 ${this.selectedRows.length} 个装备吗？`, '提示', { await this.$confirm(`确定上架选中的 ${this.selectedRows.length} 个装备吗？`, '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消'
}) })
// 组装参数 // 组装参数
@ -610,6 +627,7 @@ export default {
maId: row.maId, maId: row.maId,
leasePrice: row.oldLeasePrice, leasePrice: row.oldLeasePrice,
isChangePrice: row.isChangePrice, isChangePrice: row.isChangePrice,
isOperator: row.isOperator
} }
}) })
@ -652,8 +670,8 @@ export default {
handleDownCurrentChange(val) { handleDownCurrentChange(val) {
this.searchParams.pageNum = val this.searchParams.pageNum = val
this.getListDownEquipment() this.getListDownEquipment()
}, }
}, }
} }
</script> </script>
@ -730,6 +748,7 @@ export default {
::v-deep .el-table__header { ::v-deep .el-table__header {
background: #e9f0ee; background: #e9f0ee;
th { th {
background: #e9f0ee !important; background: #e9f0ee !important;
color: #606266; color: #606266;
@ -796,6 +815,7 @@ export default {
::v-deep .el-dialog__header { ::v-deep .el-dialog__header {
padding: 15px 20px; padding: 15px 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
.el-dialog__title { .el-dialog__title {
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
@ -818,6 +838,7 @@ export default {
transform: translate(-50%, -50%) !important; transform: translate(-50%, -50%) !important;
min-height: 95vh !important; min-height: 95vh !important;
max-height: 95vh !important; max-height: 95vh !important;
.el-dialog__body { .el-dialog__body {
flex: 1 !important; flex: 1 !important;
overflow-y: scroll !important; overflow-y: scroll !important;

85
src/views/EquipmentUpOrDown/tool/index.vue
View File

@ -60,7 +60,8 @@
查询 查询
</el-button> </el-button>
<el-button @click="onReset" icon="el-icon-refresh" size="mini" class="primary-lease" <el-button @click="onReset" icon="el-icon-refresh" size="mini" class="primary-lease"
>重置</el-button >重置
</el-button
> >
</div> </div>
</div> </div>
@ -92,11 +93,16 @@
批量下架 批量下架
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-button size="mini" style="float: right;margin-right: 10px" @click="numberTool" type="primary" class="primary-lease"> <el-button size="mini" style="float: right;margin-right: 10px" @click="numberTool" type="primary"
class="primary-lease"
>
上架数量工具 上架数量工具
</el-button> </el-button>
<el-button size="mini" style="float: right;margin-right: 10px" @click="codeTool" type="primary" class="primary-lease"> 上架编码工具 </el-button> <el-button size="mini" style="float: right;margin-right: 10px" @click="codeTool" type="primary"
class="primary-lease"
> 上架编码工具
</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -119,7 +125,13 @@
<el-table-column align="center" label="规格型号" prop="typeName"/> <el-table-column align="center" label="规格型号" prop="typeName"/>
<el-table-column align="center" label="工具编码" prop="toolCode"/> <el-table-column align="center" label="工具编码" prop="toolCode"/>
<el-table-column align="center" label="数量" prop="totalNum"/> <el-table-column align="center" label="数量" prop="totalNum"/>
<el-table-column align="center" prop="status" label="是否含机手">
<template slot-scope="scope">
<el-tag v-if="scope.row.isOperator == 1" type="success" size="mini">是</el-tag>
<el-tag v-if="scope.row.isOperator == 0" size="mini">否</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="操作" :width="220"> <el-table-column align="center" label="操作" :width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 下架按钮：移除 v-if 条件，直接显示 --> <!-- 下架按钮：移除 v-if 条件，直接显示 -->
@ -264,6 +276,14 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否含机手" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.isOperator" placeholder="是否含机手" clearable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
@ -397,6 +417,14 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否含机手" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.isOperator" placeholder="是否含机手" clearable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="原始编码" prop="originalCode"/> <el-table-column align="center" label="原始编码" prop="originalCode"/>
</el-table> </el-table>
</div> </div>
@ -427,7 +455,7 @@ import {
downTool, downTool,
batchDownTool, batchDownTool,
batchUpTool, batchUpTool,
upToolByCode, upToolByCode
} from '@/api/EquipmentUpOrDown/tool' } from '@/api/EquipmentUpOrDown/tool'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -458,7 +486,7 @@ export default {
// //
dialogSearchParams: { dialogSearchParams: {
toolCategory: '', toolCategory: ''
}, },
// 搜索参数 // 搜索参数
@ -468,7 +496,7 @@ export default {
parentTypeName: '', parentTypeName: '',
typeName: '', typeName: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
}, },
// 数量工具搜索参数 // 数量工具搜索参数
@ -478,7 +506,7 @@ export default {
parentTypeName: '', parentTypeName: '',
typeName: '', typeName: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
}, },
// 编码工具搜索参数 // 编码工具搜索参数
@ -489,8 +517,8 @@ export default {
typeName: '', typeName: '',
toolCode: '', toolCode: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
}, }
} }
}, },
@ -525,7 +553,7 @@ export default {
...e, ...e,
isChangePrice: false, // 是否修改租赁价 isChangePrice: false, // 是否修改租赁价
oldLeasePrice: e.leasePrice, // 原始租赁价 oldLeasePrice: e.leasePrice, // 原始租赁价
priceError: false, // 价格校验错误标识 priceError: false // 价格校验错误标识
} }
}) || [] }) || []
this.numberTotal = res.total || 0 this.numberTotal = res.total || 0
@ -548,7 +576,7 @@ export default {
...e, ...e,
isChangePrice: false, // 是否修改租赁价 isChangePrice: false, // 是否修改租赁价
oldLeasePrice: e.leasePrice, // 原始租赁价 oldLeasePrice: e.leasePrice, // 原始租赁价
priceError: false, // 价格校验错误标识 priceError: false // 价格校验错误标识
} }
}) || [] }) || []
this.codeTotal = res.total || 0 this.codeTotal = res.total || 0
@ -568,7 +596,7 @@ export default {
parentTypeName: '', parentTypeName: '',
typeName: '', typeName: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
this.$refs.searchFormRef?.clearValidate() this.$refs.searchFormRef?.clearValidate()
this.getListTool() this.getListTool()
@ -582,7 +610,7 @@ export default {
parentTypeName: '', parentTypeName: '',
typeName: '', typeName: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
this.getListNumberTool() this.getListNumberTool()
}, },
@ -596,7 +624,7 @@ export default {
typeName: '', typeName: '',
toolCode: '', toolCode: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
this.getListCodeTool() this.getListCodeTool()
}, },
@ -677,7 +705,7 @@ export default {
await this.$confirm(`确定下架选中的 ${this.selectedRows.length} 个工具吗？`, '提示', { await this.$confirm(`确定下架选中的 ${this.selectedRows.length} 个工具吗？`, '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消'
}) })
const ids = this.selectedRows.map((row) => row.id) const ids = this.selectedRows.map((row) => row.id)
@ -762,8 +790,8 @@ export default {
if (errorRows.length > 0) { if (errorRows.length > 0) {
this.$modal.msgError( this.$modal.msgError(
`第 ${errorRows.join( `第 ${errorRows.join(
'、', '、'
)} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`, )} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`
) )
return return
} }
@ -772,7 +800,7 @@ export default {
await this.$confirm(`确定上架选中的 ${this.selectedNumberRows.length} 个工具吗？`, '提示', { await this.$confirm(`确定上架选中的 ${this.selectedNumberRows.length} 个工具吗？`, '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消'
}) })
// 组装参数 // 组装参数
@ -781,6 +809,7 @@ export default {
id: row.id, id: row.id,
leasePrice: row.oldLeasePrice, leasePrice: row.oldLeasePrice,
isChangePrice: row.isChangePrice, isChangePrice: row.isChangePrice,
isOperator: row.isOperator
} }
}) })
@ -842,7 +871,7 @@ export default {
if (!validation.valid) { if (!validation.valid) {
this.$set(row, 'priceError', true) this.$set(row, 'priceError', true)
this.$modal.msgError( this.$modal.msgError(
`第 ${index + 1} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`, `第 ${index + 1} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`
) )
} else { } else {
this.$set(row, 'oldLeasePrice', validation.value) this.$set(row, 'oldLeasePrice', validation.value)
@ -917,8 +946,8 @@ export default {
if (errorRows.length > 0) { if (errorRows.length > 0) {
this.$modal.msgError( this.$modal.msgError(
`第 ${errorRows.join( `第 ${errorRows.join(
'、', '、'
)} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`, )} 行的租赁价格格式不正确，请输入大于等于0且小于99999999.99的数字（最多两位小数）`
) )
return return
} }
@ -927,7 +956,7 @@ export default {
await this.$confirm(`确定上架选中的 ${this.selectedCodeRows.length} 个工具吗？`, '提示', { await this.$confirm(`确定上架选中的 ${this.selectedCodeRows.length} 个工具吗？`, '提示', {
type: 'warning', type: 'warning',
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消'
}) })
// 组装参数 // 组装参数
@ -936,6 +965,8 @@ export default {
id: row.id, id: row.id,
leasePrice: row.oldLeasePrice, leasePrice: row.oldLeasePrice,
isChangePrice: row.isChangePrice, isChangePrice: row.isChangePrice,
isOperator: row.isOperator
} }
}) })
@ -967,7 +998,7 @@ export default {
parentTypeName: '', parentTypeName: '',
typeName: '', typeName: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
}, },
@ -982,7 +1013,7 @@ export default {
typeName: '', typeName: '',
toolCode: '', toolCode: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1
} }
}, },
@ -1020,8 +1051,8 @@ export default {
handleCodeCurrentChange(val) { handleCodeCurrentChange(val) {
this.codeSearchParams.pageNum = val this.codeSearchParams.pageNum = val
this.getListCodeTool() this.getListCodeTool()
}, }
}, }
} }
</script> </script>
@ -1139,7 +1170,6 @@ export default {
} }
.table-container { .table-container {
overflow: hidden; overflow: hidden;
margin-bottom: 0; margin-bottom: 0;
@ -1321,6 +1351,7 @@ export default {
transform: translate(-50%, -50%) !important; transform: translate(-50%, -50%) !important;
min-height: 95vh !important; min-height: 95vh !important;
max-height: 95vh !important; max-height: 95vh !important;
.el-dialog__body { .el-dialog__body {
flex: 1 !important; flex: 1 !important;
overflow-y: scroll !important; overflow-y: scroll !important;

2
src/views/stockManagement/entryApply/apply.vue
View File

@ -46,7 +46,7 @@ export default {
}, },
methods: { methods: {
goBack() { goBack() {
this.$router.push({ path: '/stockManagement/entryApply' }).then(() => { this.$router.push({ path: '/stockManagement/inventoryAudit' }).then(() => {
this.$tab.closePage({ path: '/stockManagement/entryApply/apply' }) this.$tab.closePage({ path: '/stockManagement/entryApply/apply' })
}) })
}, },