From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index cb0524c..ecf5a7b 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -7,11 +7,14 @@
<zt-form-item label="鍚嶇О" prop="name" rules="required">
<el-input v-model="dataForm.name"></el-input>
</zt-form-item>
+ <zt-form-item v-if="dataForm.productType==='5'" prop="equipType" label="璁惧绫诲瀷" rules="required">
+ <el-input v-model="dataForm.equipType"></el-input>
+ </zt-form-item>
<zt-form-item label="鑺傜偣绫诲瀷" prop="productType" rules="required">
<zt-dict v-model="dataForm.productType" dict="product" @input="getDefaultImg"
:disabled="disabled"></zt-dict>
</zt-form-item>
- <zt-form-item label="杩愯鐘舵�佸浘" prop="operatImg" v-if="isShow">
+ <zt-form-item label="杩愯鐘舵�佸浘" prop="operatImg">
<el-input v-model="dataForm.operatImgName" @focus="selectPicture()"></el-input>
<el-image v-if="dataForm.operatImg" :src="url+dataForm.operatImg" style="height: 50px;width: 50px"></el-image>
</zt-form-item>
@@ -40,10 +43,12 @@
id: '',
pid: '',
name: '',
+ shipId: '',
productType: '',
operatImg: '',
operatImgName: '',
sort: '',
+ equipType: '',
status: ''
}
}
@@ -53,19 +58,25 @@
},
methods: {
init(id, params) {
+ if (params.shipId) {
+ this.dataForm.shipId = params.shipId
+ }
if (params.type === 'xh') {
this.isShow = false
this.dataForm.pid = null
this.dataForm.productType = 1
+ this.getDefaultImg(this.dataForm.productType)
} else if (params.type === 'zt') {
this.dataForm.pid = params.pid
this.dataForm.productType = 2
this.getProductList()
+ this.getDefaultImg(this.dataForm.productType)
} else {
this.dataForm.pid = params.pid
this.dataForm.productType = params.type
}
if (this.dataForm.productType === 10 && id == null) {
+ this.isShow = false
this.getDefaultImg(this.dataForm.productType)
}
},
@@ -81,8 +92,10 @@
productType: selected
}
let res = await this.$http.get(`/sysPictureBase/getDefaultImg`, {params: params})
- this.dataForm.operatImgName = res.data.name
- this.dataForm.operatImg = res.data.id
+ if (res.data) {
+ this.dataForm.operatImgName = res.data.name
+ this.dataForm.operatImg = res.data.id
+ }
},
selectPicture() {
this.$refs.pictureSelect.$refs.dialog.init(this.dataForm.productType)
--
Gitblit v1.9.1