装备录入编辑

This commit is contained in:
bb_pan 2025-10-15 10:46:47 +08:00
parent 2ddea71248
commit d5310f9c5a
3 changed files with 189 additions and 190 deletions

View File

@ -124,7 +124,7 @@ export const addInterDevice = (data = {}) => {
// 修改装备 新接口
export const equipmentEditApiNew = (data = {}) => {
return request({
url: '/material-mall/order/editDevice',
url: '/material-mall/order/updateDevice',
method: 'POST',
data
})

View File

@ -1,12 +1,15 @@
<template>
<!-- 弹窗内容区域 -->
<div class="app-container" style="height: calc(100vh - 84px);overflow-y:unset">
<div class="app-container" style="height: calc(100vh - 84px); overflow-y: unset">
<div class="page-header">
<div>
<i class="el-icon-arrow-left goBack-btn" @click="goBack"
style="border-color: transparent;color: #00a288;background: transparent;padding-left: 0;padding-right: 0;"
>返回</i>
<span class="page-title">新增装备</span>
<i
class="el-icon-arrow-left goBack-btn"
@click="goBack"
style="border-color: transparent; color: #00a288; background: transparent; padding-left: 0; padding-right: 0"
>返回</i
>
<span class="page-title">{{ pageTitle }}</span>
</div>
<div class="dialog-footer" style="float: right">
<el-button size="medium" @click="goBack">取消</el-button>
@ -17,60 +20,57 @@
<el-form
label-width="110px"
ref="formRef"
style="padding: 12px;overflow-y: auto;height: calc(100vh - 180px);width: 100%"
style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
label-position="right"
:model="form"
:rules="equipRules"
>
<div style="display:flex;padding-bottom: 5px">
<div style="width: 5px;background-color: #00a288;margin-right: 10px"></div>
<div style="display: flex; padding-bottom: 5px">
<div style="width: 5px; background-color: #00a288; margin-right: 10px"></div>
基础信息
</div>
<el-row :gutter="24" style="padding-top: 10px">
<el-col :span="6">
<el-form-item label="专业" prop="major">
<el-select v-model="form.major" placeholder="请选择专业" @change="majorChange" style="width: 100%"
clearable
<el-select
v-model="form.major"
placeholder="请选择专业"
@change="majorChange"
style="width: 100%"
clearable
>
<el-option
v-for="item in majorList"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-option v-for="item in majorList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序" prop="process">
<el-cascader style="width: 100%" clearable
v-model="form.process"
placeholder="请选择工序"
:options="processList"
@change="processChange"
<el-cascader
style="width: 100%"
clearable
v-model="form.process"
placeholder="请选择工序"
:options="processList"
@change="processChange"
></el-cascader>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="装备类目" prop="category">
<el-cascader style="width: 100%" clearable
v-model="form.category"
:options="categoryList"
placeholder="请选择装备类目"
@change="categoryChange"
<el-cascader
style="width: 100%"
clearable
v-model="form.category"
:options="categoryList"
placeholder="请选择装备类目"
@change="categoryChange"
></el-cascader>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="装备名称" prop="name">
<el-input
autocomplete="off"
maxlength="30"
placeholder="请输入装备名称"
v-model="form.name"
clearable
/>
<el-input autocomplete="off" maxlength="30" placeholder="请输入装备名称" v-model="form.name" clearable />
</el-form-item>
</el-col>
</el-row>
@ -100,18 +100,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="生产厂家" prop="manufacturerId">
<el-select
v-model="form.manufacturerId"
placeholder="请选择生产厂家"
clearable
style="width: 100%"
>
<el-option
v-for="item in manufacturerList"
:key="item.id"
:label="item.label"
:value="item.id"
/>
<el-select v-model="form.manufacturerId" placeholder="请选择生产厂家" clearable style="width: 100%">
<el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
@ -126,7 +116,7 @@
:picker-options="{
disabledDate(time) {
return time.getTime() > Date.now()
}
},
}"
>
</el-date-picker>
@ -148,12 +138,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="装备原始编码" prop="originalCode">
<el-input
clearable
maxlength="20"
placeholder="请输入装备原始编码"
v-model="form.originalCode"
/>
<el-input clearable maxlength="20" placeholder="请输入装备原始编码" v-model="form.originalCode" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -180,8 +165,8 @@
@change="deviceTypeChange"
style="width: 100%"
>
<el-option label="编码" :value="0"/>
<el-option label="数量" :value="1"/>
<el-option label="编码" value="0" />
<el-option label="数量" value="1" />
</el-select>
</el-form-item>
</el-col>
@ -197,18 +182,13 @@
:precision="0"
:controls="false"
style="width: 100%"
:disabled="form.manageType === 0"
:disabled="form.manageType == 0"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<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" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -222,7 +202,7 @@
:picker-options="{
disabledDate(time) {
return time.getTime() > Date.now()
}
},
}"
>
</el-date-picker>
@ -230,45 +210,30 @@
</el-col>
</el-row>
<div style="display:flex;padding-bottom: 10px">
<div style="width: 5px;background-color: #00a288;margin-right: 10px"></div>
<div style="display: flex; padding-bottom: 10px">
<div style="width: 5px; background-color: #00a288; margin-right: 10px"></div>
特征属性
</div>
<el-row :gutter="24" style="padding-top: 10px">
<el-col :span="6">
<el-form-item label="专业特征" prop="specialtyFeature">
<el-input
autocomplete="off"
maxlength="30"
v-model="form.specialtyFeature"
clearable
/>
<el-input autocomplete="off" maxlength="30" v-model="form.specialtyFeature" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序特征" prop="processFeature">
<el-input
autocomplete="off"
maxlength="30"
v-model="form.processFeature"
clearable
/>
<el-input autocomplete="off" maxlength="30" v-model="form.processFeature" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="类目特征" prop="categoryFeature">
<el-input
autocomplete="off"
maxlength="30"
v-model="form.categoryFeature"
clearable
/>
<el-input autocomplete="off" maxlength="30" v-model="form.categoryFeature" clearable />
</el-form-item>
</el-col>
</el-row>
<div style="display:flex;padding-bottom: 10px">
<div style="width: 5px;background-color: #00a288;margin-right: 10px"></div>
<div style="display: flex; padding-bottom: 10px">
<div style="width: 5px; background-color: #00a288; margin-right: 10px"></div>
装备图片
</div>
<el-row :gutter="24" style="padding-top: 10px">
@ -284,8 +249,8 @@
</el-col>
</el-row>
<div style="display:flex;padding-bottom: 10px">
<div style="width: 5px;background-color: #00a288;margin-right: 10px"></div>
<div style="display: flex; padding-bottom: 10px">
<div style="width: 5px; background-color: #00a288; margin-right: 10px"></div>
相关证书
</div>
<el-row :gutter="24" style="padding-top: 10px">
@ -296,7 +261,7 @@
:value="form.certificateList"
:limit="3"
:fileSize="10"
:fileType="['doc','docx', 'ppt','pdf']"
:fileType="['doc', 'docx', 'ppt', 'pdf']"
@change="handleCertificateChange"
/>
</el-form-item>
@ -307,11 +272,11 @@
:value="form.inspectionList"
:limit="3"
:fileSize="10"
:fileType="['doc','docx', 'ppt','pdf']"
:fileType="['doc', 'docx', 'ppt', 'pdf']"
@change="handleInspectionChange"
/>
</el-form-item>
<el-form-item label="采购发票" prop="purchaseInvoices">
<FileUpload
v-model="form.purchaseInvoices"
@ -324,7 +289,6 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
@ -335,7 +299,9 @@ import {
getEquipmentAddIdApi,
firstLevel,
secondAndThirdLevel,
fourthToSixthLevel
fourthToSixthLevel,
getDeviceApi,
equipmentEditApiNew,
} from '@/api/EquipmentEntryApply'
import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
import ImageUpload from '@/components/ImageUpload'
@ -346,6 +312,9 @@ export default {
emits: ['update:isVisible', 'submit', 'getOrderId'], //
data() {
return {
isSubmit: false,
query: {},
pageTitle: '新增装备',
//
majorList: [],
processList: [],
@ -353,8 +322,8 @@ export default {
manufacturerList: [],
form: {
major: '', //
process: '', //
category: '', //
process: [], //
category: [], //
name: '', //
specificationModel: '', //
originalValue: '', //
@ -373,73 +342,72 @@ export default {
// deviceTypeList: [], //
mainFileList: [], //
certificateList: [], //
inspectionList: [] //
inspectionList: [], //
},
//
equipRules: {
major: [
{ required: true, message: '请选择专业', trigger: 'change' }
],
process: [
{ required: true, message: '请选择工序', trigger: 'change' }
],
category: [
{ required: true, message: '请选择装备类目', trigger: 'change' }
],
name: [
{ required: true, message: '请输入装备名称', trigger: 'blur' }
],
specificationModel: [
{ required: true, message: '请输入规格型号', trigger: 'blur' }
],
originalValue: [
{ required: true, message: '请输入资产原值', trigger: 'blur' }
],
productionDate: [
{ required: true, message: '请选择出厂日期', trigger: 'change' }
],
manufacturerId: [
{ required: true, message: '请输入生产厂家', trigger: 'blur' }
],
originalCode: [
{ required: true, message: '请输入装备原始编码', trigger: 'blur' }
],
nextMaintenanceDate: [
{ required: true, message: '请选择下次维保日期', trigger: 'change' }
],
maxServiceLifeYears: [
{ required: true, message: '请输入装备寿命', trigger: 'blur' }
],
manageType: [
{ required: true, message: '请选择管理方式', trigger: 'change' }
],
count: [
{ required: true, message: '请输入装备数量', trigger: 'blur' }
],
unit: [
{ required: true, message: '请输入计数单位', trigger: 'blur' }
],
purchaseDate: [
{ required: true, message: '请选择采购日期', trigger: 'change' }
],
// deviceTypeList: [
// { required: true, message: '', trigger: 'change' }
// ],
/* certificateList: [
{ required: true, message: '请上传合格证', trigger: 'change' }
],
inspectionList: [
{ required: true, message: '请上传检测证书', trigger: 'change' }
] */
}
major: [{ required: true, message: '请选择专业', trigger: 'change' }],
process: [{ required: true, message: '请选择工序', trigger: 'change' }],
category: [{ required: true, message: '请选择装备类目', trigger: 'change' }],
name: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
specificationModel: [{ required: true, message: '请输入规格型号', trigger: 'blur' }],
originalValue: [{ required: true, message: '请输入资产原值', trigger: 'blur' }],
productionDate: [{ required: true, message: '请选择出厂日期', trigger: 'change' }],
manufacturerId: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }],
originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }],
nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }],
maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }],
manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
},
}
},
created() {
this.firstLevel()
this.getManufacturerSelectList()
this.query = this.$route.query
if (this.query && this.query.maId) {
this.pageTitle = '编辑装备'
this.orderId = this.query.orderId
this.getInfo()
}
},
methods: {
//
async getInfo() {
try {
const res = await getDeviceApi(this.query.maId)
console.log('🚀 ~ getInfo ~ res:', res)
this.form = res.data
this.form.mainFileList = res.data.appearanceImages
? res.data.appearanceImages.map((item) => item.fileUrl).join(',')
: []
this.form.certificateList = res.data.certificates
? res.data.certificates.map((item) => item.fileUrl).join(',')
: []
this.form.inspectionList = res.data.inspectionReports
? res.data.inspectionReports.map((item) => item.fileUrl).join(',')
: []
this.form.purchaseInvoices = res.data.purchaseInvoices
? res.data.purchaseInvoices.map((item) => item.fileUrl).join(',')
: []
this.form.process = [String(res.data.mainProcessId), String(res.data.subProcessId)].filter(Boolean)
console.log('🚀 ~ getInfo ~ this.form.process:', this.form.process)
this.form.category = [
String(res.data.mainCategoryId),
String(res.data.subCategoryId),
String(res.data.branchId),
].filter(Boolean)
const res2 = await secondAndThirdLevel({ firstLevelId: this.form.majorId })
this.processList = this.convertToSubTree(res2.data)
const res3 = await fourthToSixthLevel({ thirdLevelId: this.form.subProcessId })
this.categoryList = this.convertToSubTree(res3.data)
} catch (error) {
console.log('🚀 ~ getInfo ~ error:', error)
}
},
//
getManufacturerSelectList() {
getManufacturerSelectApi().then((res) => {
@ -453,7 +421,7 @@ export default {
* 获取一级类型
*/
firstLevel() {
firstLevel().then(res => {
firstLevel().then((res) => {
if (res.code === 200) {
this.majorList = res.data
}
@ -462,9 +430,9 @@ export default {
majorChange(item) {
if (!item) {
this.processList = []
this.form.process = ''
this.form.process = []
} else {
secondAndThirdLevel({ firstLevelId: item }).then(res => {
secondAndThirdLevel({ firstLevelId: item }).then((res) => {
if (res.code === 200) {
this.processList = this.convertToSubTree(res.data)
}
@ -472,24 +440,23 @@ export default {
}
},
processChange(item) {
console.log('🚀 ~ processChange ~ item:', item)
if (item.length === 0) {
this.categoryList = []
this.form.category = ''
this.form.category = []
} else {
fourthToSixthLevel({ thirdLevelId: item[item.length - 1] }).then(res => {
fourthToSixthLevel({ thirdLevelId: item[item.length - 1] }).then((res) => {
if (res.code === 200) {
this.categoryList = this.convertToSubTree(res.data)
}
})
}
},
categoryChange(item) {
},
categoryChange(item) {},
//
goBack() {
// this.$router.go(-1)
this.$router.push({ path: '/equipment/equipment-input/index' })
this.$router.go(-1)
// this.$router.push({ path: '/equipment/equipment-input/index' })
},
deviceTypeChange(val) {
if (val === 0) {
@ -525,11 +492,17 @@ export default {
*/
async handleSubmit() {
console.log('🚀 ~ handleSubmit ~ this.form:', this.form)
this.$refs['formRef'].validate(async valid => {
if (valid) {
const result = await getEquipmentAddIdApi()
this.orderId = result.data.id
this.form.orderId = this.orderId
this.$refs['formRef'].validate(async (valid) => {
if (valid) {
if (this.isSubmit) return
this.isSubmit = true
const loading = this.$loading()
try {
if (!this.query.maId) {
const result = await getEquipmentAddIdApi()
this.orderId = result.data.id
this.form.orderId = this.orderId
}
// ID
// this.form.typeId = this.form.deviceTypeList[this.form.deviceTypeList.length - 1]
//
@ -541,22 +514,22 @@ export default {
if (this.form.mainFileList) {
const arr = this.form.mainFileList.split(',')
console.log('🚀 ~ 提交 ~ arr:', arr)
appearanceImages = arr.map(item => {
appearanceImages = arr.map((item) => {
const parts = item.split('/')
return {
fileName: parts[parts.length - 1],
fileUrl: item
fileUrl: item,
}
})
console.log('🚀 ~ handleSubmit ~ appearanceImages:', appearanceImages)
}
if (this.form.certificateList) {
const arr = this.form.certificateList.split(',')
certificates = arr.map(item => {
certificates = arr.map((item) => {
const parts = item.split('/')
return {
fileName: parts[parts.length - 1],
fileUrl: item
fileUrl: item,
}
})
console.log('🚀 ~ handleSubmit ~ certificates:', certificates)
@ -567,11 +540,11 @@ export default {
}
if (this.form.inspectionList) {
const arr = this.form.inspectionList.split(',')
inspectionReports = arr.map(item => {
inspectionReports = arr.map((item) => {
const parts = item.split('/')
return {
fileName: parts[parts.length - 1],
fileUrl: item
fileUrl: item,
}
})
console.log('🚀 ~ handleSubmit ~ inspectionReports:', inspectionReports)
@ -582,17 +555,24 @@ export default {
}
if (this.form.purchaseInvoices) {
const arr = this.form.purchaseInvoices.split(',')
purchaseInvoices = arr.map(item => {
purchaseInvoices = arr.map((item) => {
const parts = item.split('/')
return {
fileName: parts[parts.length - 1],
fileUrl: item
fileUrl: item,
}
})
console.log('🚀 ~ handleSubmit ~ purchaseInvoices:', purchaseInvoices)
}
const res = await addInterDevice({ ...this.form, appearanceImages, certificates, inspectionReports, purchaseInvoices })
let res = null
const params = { ...this.form, appearanceImages, certificates, inspectionReports, purchaseInvoices }
if (this.query && this.query.maId) {
params.maId = this.query.maId
res = await equipmentEditApiNew(params)
} else {
res = await addInterDevice(params)
}
if (res.code === 200) {
// this.goBack()
this.$router.push({
@ -600,13 +580,18 @@ export default {
query: {
orderId: this.orderId,
isAddVisible: false,
isApprovalVisible: false
}
isApprovalVisible: false,
},
})
}
} catch (error) {
console.log('🚀 ~ handleSubmit ~ error:', error)
} finally {
this.isSubmit = false
loading.close()
}
}
)
})
},
/**
* 转换类型数据为树形结构适用于级联选择器
@ -616,15 +601,15 @@ export default {
const tree = []
//
list.forEach(item => {
list.forEach((item) => {
map[item.value] = {
value: item.value.toString(),
label: item.label
label: item.label,
}
})
//
list.forEach(item => {
list.forEach((item) => {
const current = map[item.value]
const parent = map[item.parentId]
@ -639,8 +624,8 @@ export default {
})
return tree
}
}
},
},
}
</script>

View File

@ -254,13 +254,13 @@
<el-button type="text" @click="handleViewDetail(row)">
<i class="el-icon-view"></i> 查看
</el-button>
<!-- <el-button
<el-button
type="text"
@click="editRowInfo(row.maId)"
@click="editRowInfo(row)"
v-if="row.orderStatus == '3' && !isAddVisible"
>
<i class="el-icon-edit"></i> 编辑
</el-button> -->
</el-button>
<el-button
type="text"
@click="deleteRowInfo(row)"
@ -341,6 +341,7 @@ export default {
},
data() {
return {
isSubmit: false,
isAddVisible: false,
isApprovalVisible: false,
isEditVisible: false,
@ -506,6 +507,9 @@ export default {
* 处理表单提交
*/
handleSubmit() {
if(this.isSubmit) return
this.isSubmit = true
const loading = this.$loading()
equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
if (res.code === 200) {
this.$message({
@ -515,6 +519,9 @@ export default {
// this.goBack()
this.$router.push({ path: '/equipment/equipmentEntry/equipment-entry-apply' })
}
}).finally(() => {
this.isSubmit = false
loading.close()
})
},
@ -559,10 +566,17 @@ export default {
},
//
editRowInfo(orderId) {
this.orderId = orderId.toString()
this.isViewMode = false //
this.isEditVisible = true
editRowInfo(row) {
// this.orderId = orderId.toString()
// this.isViewMode = false //
// this.isEditVisible = true
this.$router.push({
path: '/equipment/equipment-input/add',
query: {
maId: row.maId,
orderId: this.orderId
}
})
},
//