This commit is contained in:
parent
52cfb19000
commit
1644f8e6eb
|
|
@ -233,14 +233,27 @@
|
|||
<el-row :gutter="15">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="电压等级" prop="voltage">
|
||||
<el-input
|
||||
<!-- <el-input
|
||||
v-model="addOrEditForm.voltage"
|
||||
placeholder="请输入电压等级（如：500）"
|
||||
style="width: 100%"
|
||||
maxlength="10"
|
||||
show-word-limit
|
||||
:disabled="isView"
|
||||
/> -->
|
||||
<el-select
|
||||
clearable
|
||||
placeholder="请选择电压等级"
|
||||
v-model="addOrEditForm.voltage"
|
||||
style="width: 100%; min-width: 200px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in voltageList"
|
||||
:key="item.value"
|
||||
:label="item.value"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
@ -449,6 +462,13 @@ export default {
|
|||
submitLoading: false,
|
||||
isAdd: true,
|
||||
isView: false,
|
||||
voltageList: [
|
||||
{ value: '35kv及以下', label: '35kv及以下' },
|
||||
{ value: '110kv', label: '110kv' },
|
||||
{ value: '220kv', label: '220kv' },
|
||||
{ value: '500kv', label: '500kv' },
|
||||
{ value: '500kv以上', label: '500kv以上' }
|
||||
],
|
||||
|
||||
// 搜索参数
|
||||
searchParams: {
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ export default {
|
|||
}
|
||||
},
|
||||
handleDialog(row, type) {
|
||||
this.dialogTitle = type ? '编码设备详情' : '编码设备编辑'
|
||||
this.dialogTitle = type ? '编码工具详情' : '编码工具编辑'
|
||||
this.isView = type
|
||||
this.dialogVisible = true
|
||||
this.getManufacturerSelect()
|
||||
|
|
|
|||
|
|
@ -118,8 +118,8 @@
|
|||
style="width: 150px"
|
||||
/>
|
||||
<el-input
|
||||
v-else-if="column.prop == 'toolPrice'"
|
||||
v-model="row.toolPrice"
|
||||
v-else-if="column.prop == 'originCost'"
|
||||
v-model="row.originCost"
|
||||
placeholder="请输入"
|
||||
maxlength="9999"
|
||||
@input="handlePriceInput(row)"
|
||||
|
|
@ -313,7 +313,7 @@ export default {
|
|||
{ label: '计量单位', prop: 'unitName' },
|
||||
{ label: '生产厂家', prop: 'supplierId', width: 180, required: true },
|
||||
{ label: '出厂日期', prop: 'productionDate', width: 180, required: true },
|
||||
{ label: '资产原值(万元)', prop: 'toolPrice', width: 150, required: true },
|
||||
{ label: '资产原值(万元)', prop: 'originCost', width: 150, required: true },
|
||||
{ label: '原始编码', prop: 'identifyCode', width: 150, required: true },
|
||||
{ label: '合格证', prop: 'certificates', width: 100, required: true },
|
||||
{ label: '检测证书', prop: 'inspectionReports', width: 100, required: true },
|
||||
|
|
@ -427,7 +427,7 @@ export default {
|
|||
supplierId: this.dialogForm.supplierId,
|
||||
supplierName: this.dialogForm.supplierName,
|
||||
productionDate: this.dialogForm.productionDate,
|
||||
toolPrice: null,
|
||||
originCost: null,
|
||||
identifyCode: null,
|
||||
certificates: [], // 合格证
|
||||
inspectionReports: [], // 检测证书
|
||||
|
|
@ -463,7 +463,7 @@ export default {
|
|||
this.$message.error(`第${i + 1}行出厂日期不能为空`)
|
||||
return
|
||||
}
|
||||
if (!item.toolPrice) {
|
||||
if (!item.originCost) {
|
||||
this.$message.error(`第${i + 1}行资产原值不能为空`)
|
||||
return
|
||||
}
|
||||
|
|
@ -519,7 +519,7 @@ export default {
|
|||
})
|
||||
},
|
||||
handlePriceInput(row) {
|
||||
let val = String(row.toolPrice ?? '')
|
||||
let val = String(row.originCost ?? '')
|
||||
|
||||
// 1️⃣ 只保留数字和 .
|
||||
val = val.replace(/[^\d.]/g, '')
|
||||
|
|
@ -529,7 +529,7 @@ export default {
|
|||
if (dotIndex !== -1) {
|
||||
val = val.slice(0, dotIndex + 1) + val.slice(dotIndex + 1).replace(/\./g, '')
|
||||
}
|
||||
row.toolPrice = val
|
||||
row.originCost = val
|
||||
},
|
||||
handleFile(row) {
|
||||
// 打开文件预览
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ module.exports = {
|
|||
// 部署生产环境和开发环境下的URL。
|
||||
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
||||
// 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
|
||||
publicPath: process.env.NODE_ENV === 'production' ? '/iws/glweb/' : '/', // 宏源打包时无需更改
|
||||
publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', // 宏源打包时无需更改
|
||||
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
|
||||
outputDir: 'dist',
|
||||
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
|
||||
|
|
@ -38,10 +38,10 @@ module.exports = {
|
|||
// target: `http://localhost:18080`,
|
||||
// target: `http://192.168.0.96:28080`,//马
|
||||
// target: `http://192.168.0.110:18080`,//洪
|
||||
// target: `http://192.168.0.41:28080`,//蒋
|
||||
target: `http://192.168.0.41:28080`,//蒋
|
||||
// target: `http://36.33.26.201:17788/proxyApi`, //测试
|
||||
// target: `http://36.33.26.201:21999/prod-api`, //测试
|
||||
target: `http://127.0.0.1:28080`,
|
||||
// target: `http://127.0.0.1:28080`,
|
||||
// target: `http://192.168.137.1:18080`,//
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue