This commit is contained in:
parent
6ca7001cd9
commit
b992fcc0bc
|
|
@ -112,6 +112,15 @@ export const equipmentAddApiNew = (data = {}) => {
|
|||
})
|
||||
}
|
||||
|
||||
// 新增装备
|
||||
export const addInterDevice = (data = {}) => {
|
||||
return request({
|
||||
url: '/material-mall/order/interDevice',
|
||||
method: 'POST',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改装备 新接口
|
||||
export const equipmentEditApiNew = (data = {}) => {
|
||||
return request({
|
||||
|
|
@ -129,6 +138,13 @@ export const equipmentDraftListApiNew = (data = {}) => {
|
|||
params: data
|
||||
})
|
||||
}
|
||||
export const getDeviceListApi = (data) => {
|
||||
return request({
|
||||
url: '/material-mall/order/getDevice',
|
||||
method: 'GET',
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
// 提交申请接口
|
||||
export const equipmentSubmitApiNew = (data = {}) => {
|
||||
|
|
@ -226,5 +242,12 @@ export const fourthToSixthLevel = (data = {}) => {
|
|||
})
|
||||
}
|
||||
|
||||
// 装备台账详情
|
||||
export const getDeviceApi = (id) => {
|
||||
return request({
|
||||
url: `/material-mall/device/getDevice/${id}`,
|
||||
method: 'GET',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -50,3 +50,12 @@ export const delDevice = (ids) => {
|
|||
method: 'post',
|
||||
})
|
||||
}
|
||||
|
||||
// 厂家
|
||||
export const getManufacturerSelectApi = (data = {}) => {
|
||||
return request({
|
||||
url: '/material-mall/ma_supplier_info/select',
|
||||
method: 'GET',
|
||||
params: data
|
||||
})
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
|
|
@ -11,7 +11,7 @@
|
|||
<el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
|
||||
<el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
|
||||
<el-button size="mini" circle icon="el-icon-menu" />
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-menu slot="dropdown" style="max-height: 880px; overflow-y: auto;">
|
||||
<template v-for="item in columns">
|
||||
<el-dropdown-item :key="item.key">
|
||||
<el-checkbox :checked="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<el-input
|
||||
clearable
|
||||
style="width: 200px"
|
||||
placeholder="请输入关键字"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.createUser"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -40,39 +40,39 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="dveName" label="装备名称:">
|
||||
<el-form-item prop="name" label="装备名称:">
|
||||
<el-input
|
||||
clearable
|
||||
style="width: 200px"
|
||||
placeholder="请输入关键字"
|
||||
v-model.trim="queryParams.dveName"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.name"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="devModel" label="规格型号:">
|
||||
<el-form-item prop="specificationModel" label="规格型号:">
|
||||
<el-input
|
||||
clearable
|
||||
style="width: 200px"
|
||||
placeholder="请输入关键字"
|
||||
v-model.trim="queryParams.devModel"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.specificationModel"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="identifyCode" label="装备原始编码:">
|
||||
<el-form-item prop="originalCode" label="装备原始编码:">
|
||||
<el-input
|
||||
clearable
|
||||
style="width: 200px"
|
||||
placeholder="请输入关键字"
|
||||
v-model.trim="queryParams.identifyCode"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.originalCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="brand" label="生产厂家:">
|
||||
<el-form-item prop="manufacturer" label="生产厂家:">
|
||||
<el-input
|
||||
clearable
|
||||
style="width: 200px"
|
||||
placeholder="请输入关键字"
|
||||
v-model.trim="queryParams.brand"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.manufacturer"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -149,34 +149,66 @@
|
|||
<el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
|
||||
column-key="orderNumber" fixed min-width="200"
|
||||
/>
|
||||
<el-table-column prop="proType" label="专业" align="center" show-overflow-tooltip min-width="100"/>
|
||||
<el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
|
||||
<el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.mainGx }} > {{ scope.row.childGx }}
|
||||
{{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.devCategory }} > {{ scope.row.devSubcategory }}
|
||||
{{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
|
||||
{{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="dveName" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="devModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="identifyCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="unitName" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="brand" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<!-- <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
|
||||
<el-table-column prop="buyPrice" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="originalValue" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<!-- <el-table-column prop="orderNumber" label="最大使用年限(年)" align="center"/>-->
|
||||
<!-- <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
|
||||
<el-table-column prop="operateAddress" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="orderNumber" label="装备外观" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="orderNumber" label="合格证" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="orderNumber" label="定期检验报告" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="orderNumber" label="采购发票" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
|
||||
<el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
|
||||
<template v-slot="{ row }">
|
||||
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
|
||||
<template v-slot="{ row }">
|
||||
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
|
||||
<template v-slot="{ row }">
|
||||
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
|
||||
<template v-slot="{ row }">
|
||||
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-for="(item, index) in columns"
|
||||
v-if="item.visible"
|
||||
:key="index"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
:label="item.label"
|
||||
:prop="item.prop"
|
||||
>
|
||||
<template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
|
||||
<span>
|
||||
{{ getFeatureValue(row, item.prop) }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="devCount" label="特征项1" align="center"/>-->
|
||||
<!-- <el-table-column prop="devCount" label="特征值1" align="center"/>-->
|
||||
<el-table-column prop="createUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
|
||||
|
|
@ -226,11 +258,28 @@
|
|||
:limit.sync="queryParams.pageSize"
|
||||
/>
|
||||
</el-form>
|
||||
|
||||
<!-- 弹框 -->
|
||||
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
|
||||
<el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
|
||||
<el-table-column type="index" width="55" label="序号" align="center" />
|
||||
<el-table-column label="附件名称" prop="fileName" align="center">
|
||||
<!-- 插槽 -->
|
||||
<template v-slot="{ row }">
|
||||
<span style="color: #00a288; cursor: pointer" @click="handleFile(row)">{{ row.fileName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">关 闭</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { equipmentDraftListApiNew, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
|
||||
import { getDeviceListApi, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
|
||||
|
||||
export default {
|
||||
name: 'EquipmentDetailList',
|
||||
|
|
@ -244,10 +293,10 @@ export default {
|
|||
createUser: '',
|
||||
createTime: '',
|
||||
entryStatus: '',
|
||||
dveName: '',
|
||||
devModel: '',
|
||||
identifyCode: '',
|
||||
brand: '',
|
||||
name: '',
|
||||
specificationModel: '',
|
||||
originalCode: '',
|
||||
manufacturer: '',
|
||||
productionDate: '',
|
||||
minBuyPrice: '',
|
||||
maxBuyPrice: '',
|
||||
|
|
@ -255,7 +304,30 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10
|
||||
},
|
||||
tableData: []
|
||||
columns: [
|
||||
{ key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
|
||||
{ key: 27, label: `特征值1`, prop: 'featureValue1', visible: true },
|
||||
{ key: 28, label: `特征项2`, prop: 'featureItem2', visible: true },
|
||||
{ key: 29, label: `特征值2`, prop: 'featureValue2', visible: true },
|
||||
{ key: 30, label: `特征项3`, prop: 'featureItem3', visible: true },
|
||||
{ key: 31, label: `特征值3`, prop: 'featureValue3', visible: true },
|
||||
{ key: 32, label: `特征项4`, prop: 'featureItem4', visible: true },
|
||||
{ key: 33, label: `特征值4`, prop: 'featureValue4', visible: true },
|
||||
{ key: 34, label: `特征项5`, prop: 'featureItem5', visible: true },
|
||||
{ key: 35, label: `特征值5`, prop: 'featureValue5', visible: true },
|
||||
{ key: 36, label: `特征项6`, prop: 'featureItem6', visible: true },
|
||||
{ key: 37, label: `特征值6`, prop: 'featureValue6', visible: true },
|
||||
{ key: 38, label: `特征项7`, prop: 'featureItem7', visible: true },
|
||||
{ key: 39, label: `特征值7`, prop: 'featureValue7', visible: true },
|
||||
{ key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
|
||||
{ key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
|
||||
{ key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
|
||||
{ key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
|
||||
],
|
||||
tableData: [],
|
||||
dialogVisible: false,
|
||||
dialogTitle: '',
|
||||
dialogList: [],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -266,7 +338,7 @@ export default {
|
|||
* 获取装备申请列表
|
||||
*/
|
||||
getEquipmentApplyList() {
|
||||
equipmentDraftListApiNew(this.queryParams)
|
||||
getDeviceListApi(this.queryParams)
|
||||
.then(res => {
|
||||
this.tableData = res.data.rows
|
||||
this.total = res.data.total
|
||||
|
|
@ -375,7 +447,40 @@ export default {
|
|||
colspan: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
getFeatureValue(row, prop) {
|
||||
const match = prop.match(/feature(Item|Value)(\d+)/)
|
||||
if (!match) return '-'
|
||||
|
||||
const type = match[1] // 'Item' or 'Value'
|
||||
const index = Number(match[2]) - 1
|
||||
const list = row.propertyVoList || []
|
||||
|
||||
if (!list[index]) return '-'
|
||||
|
||||
return type === 'Item' ? list[index].propertyName : list[index].propertyValue
|
||||
},
|
||||
handleFile(row) {
|
||||
// 打开文件预览
|
||||
window.open(row.fileUrl, '_blank')
|
||||
},
|
||||
// 查看
|
||||
handleView(row, type) {
|
||||
if (type == 1) {
|
||||
this.dialogTitle = '装备外观'
|
||||
this.dialogList = row.appearanceImages || []
|
||||
} else if (type == 2) {
|
||||
this.dialogTitle = '合格证'
|
||||
this.dialogList = row.certificates || []
|
||||
} else if (type == 3) {
|
||||
this.dialogTitle = '定期检验报告'
|
||||
this.dialogList = row.inspectionReports || []
|
||||
} else if (type == 4) {
|
||||
this.dialogTitle = '采购发票'
|
||||
this.dialogList = row.purchaseInvoices || []
|
||||
}
|
||||
this.dialogVisible = true
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,12 +63,12 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备名称" prop="deviceName">
|
||||
<el-form-item label="装备名称" prop="name">
|
||||
<el-input
|
||||
autocomplete="off"
|
||||
maxlength="30"
|
||||
placeholder="请输入装备名称"
|
||||
v-model="form.deviceName"
|
||||
v-model="form.name"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -76,67 +76,63 @@
|
|||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="规格型号" prop="itemTypeModel">
|
||||
<el-form-item label="规格型号" prop="specificationModel">
|
||||
<el-input
|
||||
autocomplete="off"
|
||||
maxlength="30"
|
||||
v-model="form.itemTypeModel"
|
||||
v-model="form.specificationModel"
|
||||
placeholder="请输入规格型号"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="资产原值" prop="buyPrice">
|
||||
<el-form-item label="资产原值" prop="originalValue">
|
||||
<el-input
|
||||
@input="handlePriceInput"
|
||||
autocomplete="off"
|
||||
maxlength="20"
|
||||
v-model="form.buyPrice"
|
||||
v-model="form.originalValue"
|
||||
placeholder="请输入资产原值"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="出厂日期" prop="productionDate">
|
||||
<el-form-item label="生产厂家" prop="manufacturer">
|
||||
<el-select
|
||||
v-model="form.manufacturer"
|
||||
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>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="生产日期" prop="productionDate">
|
||||
<el-date-picker
|
||||
v-model="form.productionDate"
|
||||
type="date"
|
||||
placeholder="请选择出厂日期"
|
||||
placeholder="请选择生产日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="生产厂家" prop="brand">
|
||||
<el-input
|
||||
v-model="form.brand"
|
||||
autocomplete="off"
|
||||
placeholder="请输入生产厂家"
|
||||
maxlength="20"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备原始编码" prop="identifyCode">
|
||||
<el-input
|
||||
clearable
|
||||
maxlength="20"
|
||||
placeholder="请输入装备原始编码"
|
||||
v-model="form.identifyCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="下次维保日期" prop="nextCheckTime">
|
||||
<el-form-item label="下次维保日期" prop="nextMaintenanceDate">
|
||||
<el-date-picker
|
||||
v-model="form.nextCheckTime"
|
||||
v-model="form.nextMaintenanceDate"
|
||||
placeholder="请选择下次维保日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="date"
|
||||
|
|
@ -146,19 +142,29 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备寿命" prop="lifespan">
|
||||
<el-form-item label="装备原始编码" prop="originalCode">
|
||||
<el-input
|
||||
clearable
|
||||
maxlength="20"
|
||||
placeholder="请输入装备寿命"
|
||||
v-model="form.lifespan"
|
||||
placeholder="请输入装备原始编码"
|
||||
v-model="form.originalCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="管理模式" prop="deviceType">
|
||||
<el-form-item label="最大使用年限" prop="maxServiceLifeYears">
|
||||
<el-input
|
||||
clearable
|
||||
maxlength="20"
|
||||
placeholder="请输入最大使用年限"
|
||||
v-model="form.maxServiceLifeYears"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="管理模式" prop="manageType">
|
||||
<el-select
|
||||
v-model="form.deviceType"
|
||||
v-model="form.manageType"
|
||||
placeholder="请选择管理方式"
|
||||
clearable
|
||||
@change="deviceTypeChange"
|
||||
|
|
@ -172,9 +178,9 @@
|
|||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备数量" prop="deviceCount">
|
||||
<el-form-item label="装备数量" prop="count">
|
||||
<el-input
|
||||
v-model="form.deviceCount"
|
||||
v-model="form.count"
|
||||
placeholder="请输入装备数量"
|
||||
clearable
|
||||
maxlength="10"
|
||||
|
|
@ -182,9 +188,9 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="计数单位" prop="unitName">
|
||||
<el-form-item label="计数单位" prop="unit">
|
||||
<el-input
|
||||
v-model="form.unitName"
|
||||
v-model="form.unit"
|
||||
placeholder="请输入计数单位"
|
||||
clearable
|
||||
maxlength="11"
|
||||
|
|
@ -274,6 +280,17 @@
|
|||
@change="handleInspectionChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采购发票" prop="purchaseInvoices">
|
||||
<FileUpload
|
||||
v-model="form.purchaseInvoices"
|
||||
:value="form.purchaseInvoices"
|
||||
:limit="3"
|
||||
:fileSize="10"
|
||||
:fileType="['pdf', 'jpg', 'png', 'jpeg']"
|
||||
@change="handlePurchaseInvoicesChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
|
@ -283,12 +300,13 @@
|
|||
|
||||
<script>
|
||||
import {
|
||||
equipmentAddApiNew,
|
||||
addInterDevice,
|
||||
getEquipmentAddIdApi,
|
||||
firstLevel,
|
||||
secondAndThirdLevel,
|
||||
fourthToSixthLevel
|
||||
} from '@/api/EquipmentEntryApply'
|
||||
import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
|
||||
import ImageUpload from '@/components/ImageUpload'
|
||||
import FileUpload from '@/components/ImageUpload'
|
||||
|
||||
|
|
@ -301,25 +319,26 @@ export default {
|
|||
majorList: [],
|
||||
processList: [],
|
||||
categoryList: [],
|
||||
manufacturerList: [],
|
||||
form: {
|
||||
major: '', // 专业
|
||||
process: '', // 工序
|
||||
category: '', // 类目
|
||||
deviceName: '', // 装备名称
|
||||
itemTypeModel: '', // 规格型号
|
||||
buyPrice: '', // 资产原值
|
||||
name: '', // 装备名称
|
||||
specificationModel: '', // 规格型号
|
||||
originalValue: '', // 资产原值
|
||||
productionDate: '', // 出厂日期
|
||||
brand: '', // 生产厂家
|
||||
identifyCode: '', // 装备原始编码
|
||||
nextCheckTime: '', // 下次维保日期
|
||||
lifespan: '', // 装备寿命
|
||||
deviceType: '', // 管理模式
|
||||
deviceCount: 1, // 装备数量
|
||||
unitName: '', // 计数单位
|
||||
manufacturer: '', // 生产厂家
|
||||
originalCode: '', // 装备原始编码
|
||||
nextMaintenanceDate: '', // 下次维保日期
|
||||
maxServiceLifeYears: '', // 装备寿命
|
||||
manageType: '', // 管理模式
|
||||
count: 1, // 装备数量
|
||||
unit: '', // 计数单位
|
||||
specialtyFeature: '', // 专业特征
|
||||
processFeature: '', // 工序特征
|
||||
categoryFeature: '', // 类目特征
|
||||
deviceTypeList: [], // 装备类型列表
|
||||
// deviceTypeList: [], // 装备类型列表
|
||||
mainFileList: [], // 展示图
|
||||
certificateList: [], // 合格证
|
||||
inspectionList: [] // 检测证书
|
||||
|
|
@ -335,43 +354,43 @@ export default {
|
|||
category: [
|
||||
{ required: true, message: '请选择装备类目', trigger: 'change' }
|
||||
],
|
||||
deviceName: [
|
||||
name: [
|
||||
{ required: true, message: '请输入装备名称', trigger: 'blur' }
|
||||
],
|
||||
itemTypeModel: [
|
||||
specificationModel: [
|
||||
{ required: true, message: '请输入规格型号', trigger: 'blur' }
|
||||
],
|
||||
buyPrice: [
|
||||
originalValue: [
|
||||
{ required: true, message: '请输入资产原值', trigger: 'blur' }
|
||||
],
|
||||
productionDate: [
|
||||
{ required: true, message: '请选择出厂日期', trigger: 'change' }
|
||||
],
|
||||
brand: [
|
||||
manufacturer: [
|
||||
{ required: true, message: '请输入生产厂家', trigger: 'blur' }
|
||||
],
|
||||
identifyCode: [
|
||||
originalCode: [
|
||||
{ required: true, message: '请输入装备原始编码', trigger: 'blur' }
|
||||
],
|
||||
nextCheckTime: [
|
||||
nextMaintenanceDate: [
|
||||
{ required: true, message: '请选择下次维保日期', trigger: 'change' }
|
||||
],
|
||||
lifespan: [
|
||||
maxServiceLifeYears: [
|
||||
{ required: true, message: '请输入装备寿命', trigger: 'blur' }
|
||||
],
|
||||
deviceType: [
|
||||
manageType: [
|
||||
{ required: true, message: '请选择管理方式', trigger: 'change' }
|
||||
],
|
||||
deviceCount: [
|
||||
count: [
|
||||
{ required: true, message: '请输入装备数量', trigger: 'blur' }
|
||||
|
||||
],
|
||||
unitName: [
|
||||
unit: [
|
||||
{ required: true, message: '请输入计数单位', trigger: 'blur' }
|
||||
],
|
||||
deviceTypeList: [
|
||||
{ required: true, message: '请选择装备类型', trigger: 'change' }
|
||||
],
|
||||
// deviceTypeList: [
|
||||
// { required: true, message: '请选择装备类型', trigger: 'change' }
|
||||
// ],
|
||||
/* certificateList: [
|
||||
{ required: true, message: '请上传合格证', trigger: 'change' }
|
||||
],
|
||||
|
|
@ -383,8 +402,18 @@ export default {
|
|||
},
|
||||
created() {
|
||||
this.firstLevel()
|
||||
this.getManufacturerSelectList()
|
||||
},
|
||||
methods: {
|
||||
// 获取厂家
|
||||
getManufacturerSelectList() {
|
||||
getManufacturerSelectApi().then((res) => {
|
||||
console.log('🚀 ~ getManufacturerSelectList ~ res:', res)
|
||||
if (res.code === 200) {
|
||||
this.manufacturerList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 获取一级类型
|
||||
*/
|
||||
|
|
@ -428,12 +457,12 @@ export default {
|
|||
},
|
||||
deviceTypeChange(val) {
|
||||
if (val === 0) {
|
||||
this.form.deviceCount = '1'
|
||||
this.form.count = '1'
|
||||
}
|
||||
},
|
||||
// 价格输入处理
|
||||
handlePriceInput(v) {
|
||||
this.form.buyPrice = v.replace(/[^\d.]/g, '')
|
||||
this.form.originalValue = v.replace(/[^\d.]/g, '')
|
||||
},
|
||||
// 处理图片上传变化
|
||||
handleImageChange(files) {
|
||||
|
|
@ -450,12 +479,16 @@ export default {
|
|||
this.form.inspectionList = files
|
||||
this.$refs.formRef.validateField('inspectionList')
|
||||
},
|
||||
|
||||
// 处理采购发票上传变化
|
||||
handlePurchaseInvoicesChange(files) {
|
||||
this.form.purchaseInvoices = files
|
||||
this.$refs.formRef.validateField('purchaseInvoices')
|
||||
},
|
||||
/**
|
||||
* 处理表单提交
|
||||
*/
|
||||
async handleSubmit() {
|
||||
console.log(this.form)
|
||||
console.log('🚀 ~ handleSubmit ~ this.form:', this.form)
|
||||
this.$refs['formRef'].validate(async valid => {
|
||||
if (valid) {
|
||||
const result = await getEquipmentAddIdApi()
|
||||
|
|
@ -465,8 +498,53 @@ export default {
|
|||
// this.form.typeId = this.form.deviceTypeList[this.form.deviceTypeList.length - 1]
|
||||
// 获取类目的最后一个值
|
||||
this.form.typeId = this.form.category[this.form.category.length - 1]
|
||||
if (this.form.mainFileList) {
|
||||
const arr = this.form.mainFileList.split(',')
|
||||
console.log('🚀 ~ 提交 ~ arr:', arr)
|
||||
this.form.mainFileList = arr.map(item => {
|
||||
const parts = item.split('/')
|
||||
return {
|
||||
fileName: parts[parts.length - 1],
|
||||
fileUrl: item
|
||||
}
|
||||
})
|
||||
console.log('🚀 ~ handleSubmit ~ this.form.mainFileList:', this.form.mainFileList)
|
||||
}
|
||||
if (this.form.certificateList) {
|
||||
const arr = this.form.certificateList.split(',')
|
||||
this.form.certificateList = arr.map(item => {
|
||||
const parts = item.split('/')
|
||||
return {
|
||||
fileName: parts[parts.length - 1],
|
||||
fileUrl: item
|
||||
}
|
||||
})
|
||||
console.log('🚀 ~ handleSubmit ~ this.form.certificateList:', this.form.certificateList)
|
||||
}
|
||||
if (this.form.inspectionList) {
|
||||
const arr = this.form.inspectionList.split(',')
|
||||
this.form.inspectionList = arr.map(item => {
|
||||
const parts = item.split('/')
|
||||
return {
|
||||
fileName: parts[parts.length - 1],
|
||||
fileUrl: item
|
||||
}
|
||||
})
|
||||
console.log('🚀 ~ handleSubmit ~ this.form.inspectionList:', this.form.inspectionList)
|
||||
}
|
||||
if (this.form.purchaseInvoices) {
|
||||
const arr = this.form.purchaseInvoices.split(',')
|
||||
this.form.purchaseInvoices = arr.map(item => {
|
||||
const parts = item.split('/')
|
||||
return {
|
||||
fileName: parts[parts.length - 1],
|
||||
fileUrl: item
|
||||
}
|
||||
})
|
||||
console.log('🚀 ~ handleSubmit ~ this.form.purchaseInvoices:', this.form.purchaseInvoices)
|
||||
}
|
||||
|
||||
const res = await equipmentAddApiNew(this.form)
|
||||
const res = await addInterDevice(this.form)
|
||||
if (res.code === 200) {
|
||||
this.goBack()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,347 @@
|
|||
<template>
|
||||
<!-- 弹窗内容区域 -->
|
||||
<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
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-form
|
||||
label-width="110px"
|
||||
ref="formRef"
|
||||
style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
|
||||
label-position="right"
|
||||
:model="form"
|
||||
v-loading="isLoading"
|
||||
>
|
||||
<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-input v-model="form.major" placeholder="专业" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="工序" prop="process">
|
||||
<el-input v-model="form.process" placeholder="工序" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备类目" prop="category">
|
||||
<el-input v-model="form.category" placeholder="装备类目" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="装备名称" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="规格型号" prop="specificationModel">
|
||||
<el-input v-model="form.specificationModel" placeholder="规格型号" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="资产原值" prop="originalValue">
|
||||
<el-input v-model="form.originalValue" placeholder="资产原值" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="生产厂家" prop="manufacturer">
|
||||
<el-input v-model="form.manufacturer" placeholder="请输入生产厂家" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="出厂日期" prop="productionDate">
|
||||
<el-input v-model="form.productionDate" placeholder="出厂日期" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="下次维保日期" prop="nextMaintenanceDate">
|
||||
<el-input v-model="form.nextMaintenanceDate" placeholder="下次维保日期" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="装备原始编码" prop="originalCode">
|
||||
<el-input clearable maxlength="20" placeholder="装备原始编码" v-model="form.originalCode" readonly />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="最大使用年限" prop="maxServiceLifeYears">
|
||||
<el-input clearable maxlength="20" placeholder="最大使用年限" v-model="form.maxServiceLifeYears" readonly />
|
||||
</el-form-item>
|
||||
</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-form-item label="计数单位" prop="unit">
|
||||
<el-input v-model="form.unit" placeholder="计数单位" readonly />
|
||||
</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>
|
||||
<el-row :gutter="24" style="padding-top: 10px">
|
||||
<el-col :span="6" v-for="(item, index) in form.propertyVoList" :key="index">
|
||||
<el-form-item :label="item.propertyName" prop="specialtyFeature">
|
||||
<el-input v-model="item.propertyValue" readonly />
|
||||
</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>
|
||||
<el-row :gutter="24" style="padding-top: 10px">
|
||||
<el-col>
|
||||
<el-form-item>
|
||||
<div
|
||||
v-if="form.appearanceImages && form.appearanceImages.length > 0"
|
||||
style="display: flex; align-items: center; margin-bottom: 10px"
|
||||
>
|
||||
<div v-for="(item, index) in form.appearanceImages" :key="index">
|
||||
<el-image
|
||||
:src="item.url"
|
||||
alt=""
|
||||
:preview-src-list="[item.url]"
|
||||
style="width: 120px; height: 120px; margin-right: 10px"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
<el-row :gutter="24" style="padding-top: 10px">
|
||||
<el-col>
|
||||
<el-form-item label="合格证" prop="certificates">
|
||||
<div
|
||||
v-if="form.certificates && form.certificates.length > 0"
|
||||
style="display: flex; align-items: center; margin-bottom: 10px"
|
||||
>
|
||||
<div v-for="(item, index) in form.certificates" :key="index">
|
||||
<!-- 后缀如果包含 .pdf 显示pdf图标 -->
|
||||
<img
|
||||
v-if="item.url.includes('.pdf') || item.url.includes('.PDF')"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/pdf.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<!-- 后缀如果包含 .word 显示 word图片 -->
|
||||
<img
|
||||
v-else-if="
|
||||
item.url.includes('.doc') ||
|
||||
item.url.includes('.docx') ||
|
||||
item.url.includes('.DOC') ||
|
||||
item.url.includes('.DOCX')
|
||||
"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/word.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<el-image
|
||||
v-else
|
||||
:src="item.url"
|
||||
alt=""
|
||||
:preview-src-list="[item.url]"
|
||||
style="width: 120px; height: 120px; margin-right: 10px"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="检测证书" prop="inspectionReports">
|
||||
<div
|
||||
v-if="form.inspectionReports && form.inspectionReports.length > 0"
|
||||
style="display: flex; align-items: center; margin-bottom: 10px"
|
||||
>
|
||||
<div v-for="(item, index) in form.inspectionReports" :key="index">
|
||||
<!-- 后缀如果包含 .pdf 显示pdf图标 -->
|
||||
<img
|
||||
v-if="item.url.includes('.pdf') || item.url.includes('.PDF')"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/pdf.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<!-- 后缀如果包含 .word 显示 word图片 -->
|
||||
<img
|
||||
v-else-if="
|
||||
item.url.includes('.doc') ||
|
||||
item.url.includes('.docx') ||
|
||||
item.url.includes('.DOC') ||
|
||||
item.url.includes('.DOCX')
|
||||
"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/word.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<el-image
|
||||
v-else
|
||||
:src="item.url"
|
||||
alt=""
|
||||
:preview-src-list="[item.url]"
|
||||
style="width: 120px; height: 120px; margin-right: 10px"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采购发票" prop="purchaseInvoices">
|
||||
<div
|
||||
v-if="form.purchaseInvoices && form.purchaseInvoices.length > 0"
|
||||
style="display: flex; align-items: center; margin-bottom: 10px"
|
||||
>
|
||||
<div v-for="(item, index) in form.purchaseInvoices" :key="index">
|
||||
<!-- 后缀如果包含 .pdf 显示pdf图标 -->
|
||||
<img
|
||||
v-if="item.url.includes('.pdf') || item.url.includes('.PDF')"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/pdf.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<!-- 后缀如果包含 .word 显示 word图片 -->
|
||||
<img
|
||||
v-else-if="
|
||||
item.url.includes('.doc') ||
|
||||
item.url.includes('.docx') ||
|
||||
item.url.includes('.DOC') ||
|
||||
item.url.includes('.DOCX')
|
||||
"
|
||||
style="width: 120px; height: 120px; margin-right: 10px; cursor: pointer"
|
||||
src="@/assets/images/word.png"
|
||||
fit="fill"
|
||||
@click="handleFile(item)"
|
||||
/>
|
||||
<el-image
|
||||
v-else
|
||||
:src="item.url"
|
||||
alt=""
|
||||
:preview-src-list="[item.url]"
|
||||
style="width: 120px; height: 120px; margin-right: 10px"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getDeviceApi } from '@/api/EquipmentEntryApply'
|
||||
|
||||
export default {
|
||||
name: 'EquipmentDetails',
|
||||
data() {
|
||||
return {
|
||||
isLoading: false,
|
||||
form: {
|
||||
deviceTypeList: [], // 装备类型列表
|
||||
appearanceImages: [], // 展示图
|
||||
certificates: [], // 合格证
|
||||
inspectionReports: [], // 检测证书
|
||||
purchaseInvoices: [], // 采购发票
|
||||
},
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getInfo()
|
||||
},
|
||||
methods: {
|
||||
async getInfo() {
|
||||
try {
|
||||
this.isLoading = true
|
||||
const res = await getDeviceApi(this.$route.query.id)
|
||||
this.form = res.data
|
||||
this.form.process = this.form.mainProcess + '>' + this.form.subProcess
|
||||
this.form.category =
|
||||
this.form.mainCategory + '>' + this.form.subCategory + (this.form.branch ? '>' + this.form.branch : '')
|
||||
this.form.manageTypeName = this.form.manageType === 0 ? '编码' : '数量'
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ getInfo ~ error:', error)
|
||||
} finally {
|
||||
this.isLoading = false
|
||||
}
|
||||
},
|
||||
// 返回上一页
|
||||
goBack() {
|
||||
this.$router.go(-1)
|
||||
},
|
||||
handleFile(item) {
|
||||
window.open(item.url, '_blank')
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.page-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
padding-bottom: 15px;
|
||||
font-size: 18px;
|
||||
border-bottom: 1px solid #e6e6e6;
|
||||
justify-content: space-between;
|
||||
|
||||
.page-title {
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
margin-left: 15px;
|
||||
color: #303133;
|
||||
}
|
||||
}
|
||||
|
||||
.dialog-content {
|
||||
padding: 10px 0;
|
||||
min-height: 200px; // 确保有足够高度
|
||||
}
|
||||
|
||||
.goBack-btn:hover {
|
||||
cursor: pointer;
|
||||
color: #33b5a0;
|
||||
}
|
||||
|
||||
.dialog-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 10px; // 按钮间距
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue