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

优化

This commit is contained in:
bb_pan 2025-12-01 11:06:52 +08:00
parent 5f008d206a
commit 66a8ae776e
4 changed files with 76 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/EquipmentEntryApply/EquipmentMainList.vue
View File

@ -10,13 +10,13 @@
</el-form-item> </el-form-item>
<el-form-item label="申请时间" prop="createTime"> <el-form-item label="申请时间" prop="createTime">
<el-date-picker type="daterange" style="width: 100%" unlink-panels range-separator="至" <el-date-picker type="daterange" style="width: 240px" unlink-panels range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
v-model="queryParams.createTime" /> v-model="queryParams.createTime" />
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="status"> <el-form-item label="审批状态" prop="status">
<el-select clearable style="width: 100%" placeholder="请选择审批状态" v-model="queryParams.status"> <el-select clearable style="width: 240px" placeholder="请选择审批状态" v-model="queryParams.status">
<el-option label="待审批" value="0" /> <el-option label="待审批" value="0" />
<el-option label="已审批" value="1" /> <el-option label="已审批" value="1" />
<el-option label="草稿" value="3" /> <el-option label="草稿" value="3" />

75
src/views/EquipmentEntryApply/equipmentInput/add.vue
View File

@ -148,36 +148,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="管理模式" prop="manageType">
<el-select
v-model="form.manageType"
placeholder="请选择管理方式"
clearable
@change="deviceTypeChange"
style="width: 100%"
>
<el-option label="编码" value="0" />
<el-option label="数量" value="1" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="装备数量" prop="count">
<el-input-number
v-model="form.count"
placeholder="请输入装备数量"
:min="1"
:max="100"
:precision="0"
:controls="false"
style="width: 100%"
:disabled="form.manageType == 0"
/>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="计数单位" prop="unit"> <el-form-item label="计数单位" prop="unit">
<!-- <el-input v-model="form.unit" placeholder="请输入计数单位" clearable maxlength="11" /> --> <!-- <el-input v-model="form.unit" placeholder="请输入计数单位" clearable maxlength="11" /> -->
@ -191,6 +161,36 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">
<el-form-item label="管理模式" prop="manageType">
<el-select
v-model="form.manageType"
placeholder="请选择管理方式"
clearable
@change="deviceTypeChange"
style="width: 100%"
>
<el-option label="编码" value="0" />
<el-option label="数量" value="1" />
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="24">
<!-- <el-col :span="6">
<el-form-item label="装备数量" prop="count">
<el-input-number
v-model="form.count"
placeholder="请输入装备数量"
:min="1"
:max="100"
:precision="0"
:controls="false"
style="width: 100%"
:disabled="form.manageType == 0"
/>
</el-form-item>
</el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="采购日期" prop="purchaseDate"> <el-form-item label="采购日期" prop="purchaseDate">
<el-date-picker <el-date-picker
@ -340,6 +340,7 @@ export default {
name: 'EquipmentEntryEditDialog', // 明确组件名称 name: 'EquipmentEntryEditDialog', // 明确组件名称
emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件 emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
dicts: ['dev_unit_type'], dicts: ['dev_unit_type'],
components: { ImageUpload, FileUpload },
data() { data() {
return { return {
isSubmit: false, isSubmit: false,
@ -362,7 +363,7 @@ export default {
originalCode: '', // 装备原始编码 originalCode: '', // 装备原始编码
nextMaintenanceDate: '', // 下次维保日期 nextMaintenanceDate: '', // 下次维保日期
maxServiceLifeYears: '', // 装备寿命 maxServiceLifeYears: '', // 装备寿命
manageType: '', // 管理模式 manageType: '0', // 管理模式
count: 1, // 装备数量 count: 1, // 装备数量
unit: '', // 计数单位 unit: '', // 计数单位
purchaseDate: '', purchaseDate: '',
@ -387,7 +388,7 @@ export default {
originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }], originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }],
nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }], nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }],
maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }], maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }],
manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }], // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }], count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }], unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }], purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
@ -402,9 +403,10 @@ export default {
this.firstLevel() this.firstLevel()
this.getManufacturerSelectList() this.getManufacturerSelectList()
this.query = this.$route.query this.query = this.$route.query
console.log('🚀 ~ this.query:', this.query)
this.form.orderId = this.orderId = this.query.orderId || ''
if (this.query && this.query.maId) { if (this.query && this.query.maId) {
this.pageTitle = '编辑装备' this.pageTitle = '编辑装备'
this.orderId = this.query.orderId
this.getInfo() this.getInfo()
} }
}, },
@ -503,8 +505,7 @@ export default {
}, },
// 返回上一页 // 返回上一页
goBack() { goBack() {
this.$router.go(-1) this.$tab.closePage()
// this.$router.push({ path: '/equipment/equipment-input/index' })
}, },
deviceTypeChange(val) { deviceTypeChange(val) {
if (val === 0) { if (val === 0) {
@ -546,7 +547,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const loading = this.$loading() const loading = this.$loading()
try { try {
if (!this.query.maId) { if (!this.query.orderId) {
const result = await getEquipmentAddIdApi() const result = await getEquipmentAddIdApi()
this.orderId = result.data.id this.orderId = result.data.id
this.form.orderId = this.orderId this.form.orderId = this.orderId
@ -653,6 +654,8 @@ export default {
isAddVisible: false, isAddVisible: false,
isApprovalVisible: false, isApprovalVisible: false,
}, },
}).then(() => {
this.$tab.closePage({ path: '/equipment/equipment-input/add' })
}) })
} }
} catch (error) { } catch (error) {

23
src/views/EquipmentEntryApply/equipmentInput/index.vue
View File

@ -93,7 +93,7 @@
v-model="queryParams.manufacturerId" v-model="queryParams.manufacturerId"
placeholder="请选择生产厂家" placeholder="请选择生产厂家"
clearable clearable
style="width: 100%" style="width: 200px"
> >
<el-option <el-option
v-for="item in manufacturerList" v-for="item in manufacturerList"
@ -130,7 +130,7 @@
<el-form-item prop="minBuyPrice" label="资产原值"> <el-form-item prop="minBuyPrice" label="资产原值">
<el-input <el-input
clearable clearable
style="width: 90px" style="width: 95px"
placeholder="请输入" placeholder="请输入"
v-model.trim="queryParams.minBuyPrice" v-model.trim="queryParams.minBuyPrice"
/> />
@ -139,7 +139,7 @@
<el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;"> <el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;">
<el-input <el-input
clearable clearable
style="width: 90px" style="width: 95px"
placeholder="请输入" placeholder="请输入"
v-model.trim="queryParams.maxBuyPrice" v-model.trim="queryParams.maxBuyPrice"
/> />
@ -392,10 +392,11 @@ export default {
components: { EquipmentEntryEditDialog }, components: { EquipmentEntryEditDialog },
emits: ['update:isVisible', 'submit'], // 声明事件 emits: ['update:isVisible', 'submit'], // 声明事件
created() { created() {
console.log(this.$route) console.log('🚀 ~ this.$route:', this.$route)
this.orderId = this.$route.query && this.$route.query.orderId this.orderId = this.$route.query && this.$route.query.orderId
this.isAddVisible = this.$route.query && this.$route.query.isAddVisible console.log('🚀 ~ this.orderId:', this.orderId)
this.isApprovalVisible = this.$route.query && this.$route.query.isApprovalVisible this.isAddVisible = this.$route.query.isAddVisible && JSON.parse(this.$route.query.isAddVisible)
this.isApprovalVisible = this.$route.query.isApprovalVisible && JSON.parse(this.$route.query.isApprovalVisible)
if (!this.orderId) { if (!this.orderId) {
this.pageTitle = '新增设备录入' this.pageTitle = '新增设备录入'
this.submitButtonText = '提交申请' this.submitButtonText = '提交申请'
@ -567,8 +568,8 @@ export default {
}, },
equipmentDeployment() { equipmentDeployment() {
this.$router.push({ this.$router.push({
name: 'equipmentInputAdd', // 完整路径 path: '/equipment/equipment-input/add',
params: { // 因为使用path，所以用query传递参数 query: {
orderId: this.orderId orderId: this.orderId
} }
}) })
@ -723,7 +724,11 @@ export default {
this.dialogList = row.purchaseInvoices || [] this.dialogList = row.purchaseInvoices || []
} }
this.dialogVisible = true this.dialogVisible = true
} },
importTemplate() {
// this.download('system/user/importTemplate', {
// }, `user_template_${new Date().getTime()}.xlsx`)
},
} }
} }
</script> </script>

42
src/views/EquipmentLedger/details.vue
View File

@ -84,23 +84,23 @@
<el-input clearable maxlength="20" placeholder="最大使用年限" v-model="form.maxServiceLifeYears" readonly /> <el-input clearable maxlength="20" placeholder="最大使用年限" v-model="form.maxServiceLifeYears" readonly />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="管理模式" prop="manageType">
<el-input v-model="form.manageTypeName" placeholder="管理方式" readonly />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="装备数量" prop="count">
<el-input v-model="form.count" placeholder="装备数量" readonly />
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="计数单位" prop="unit"> <el-form-item label="计数单位" prop="unit">
<el-input v-model="form.unit" placeholder="计数单位" readonly /> <el-input v-model="form.unit" placeholder="计数单位" readonly />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">
<el-form-item label="管理模式" prop="manageType">
<el-input v-model="form.manageTypeName" placeholder="管理方式" readonly />
</el-form-item>
</el-col> -->
</el-row>
<el-row :gutter="24">
<!-- <el-col :span="6">
<el-form-item label="装备数量" prop="count">
<el-input v-model="form.count" placeholder="装备数量" readonly />
</el-form-item>
</el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="采购日期" prop="purchaseDate"> <el-form-item label="采购日期" prop="purchaseDate">
<el-input v-model="form.purchaseDate" placeholder="采购日期" readonly /> <el-input v-model="form.purchaseDate" placeholder="采购日期" readonly />
@ -169,9 +169,9 @@
v-else-if=" v-else-if="
item.fileUrl && item.fileUrl &&
(item.fileUrl.includes('.doc') || (item.fileUrl.includes('.doc') ||
item.fileUrl.includes('.docx') || item.fileUrl.includes('.docx') ||
item.fileUrl.includes('.DOC') || item.fileUrl.includes('.DOC') ||
item.fileUrl.includes('.DOCX')) item.fileUrl.includes('.DOCX'))
" "
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer" style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
src="@/assets/images/word.png" src="@/assets/images/word.png"
@ -208,9 +208,9 @@
v-else-if=" v-else-if="
item.fileUrl && item.fileUrl &&
(item.fileUrl.includes('.doc') || (item.fileUrl.includes('.doc') ||
item.fileUrl.includes('.docx') || item.fileUrl.includes('.docx') ||
item.fileUrl.includes('.DOC') || item.fileUrl.includes('.DOC') ||
item.fileUrl.includes('.DOCX')) item.fileUrl.includes('.DOCX'))
" "
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer" style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
src="@/assets/images/word.png" src="@/assets/images/word.png"
@ -247,9 +247,9 @@
v-else-if=" v-else-if="
item.fileUrl && item.fileUrl &&
(item.fileUrl.includes('.doc') || (item.fileUrl.includes('.doc') ||
item.fileUrl.includes('.docx') || item.fileUrl.includes('.docx') ||
item.fileUrl.includes('.DOC') || item.fileUrl.includes('.DOC') ||
item.fileUrl.includes('.DOCX')) item.fileUrl.includes('.DOCX'))
" "
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer" style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
src="@/assets/images/word.png" src="@/assets/images/word.png"