装备新增属性必填
This commit is contained in:
parent
19b2b4cc10
commit
871fa7ff27
|
|
@ -71,12 +71,6 @@ const getSelectId = (list: any, id: any) => {
|
|||
for (let i in list) {
|
||||
if (list[i].id == id) {
|
||||
//查询到就返回该数组对象的value
|
||||
console.log('21',list[i].propertyNames)
|
||||
if( list[i].propertyNames!=null){
|
||||
list[i].propertyNames.forEach((item:any) =>{
|
||||
options.value.push({'label':item,'value':item})
|
||||
})
|
||||
}
|
||||
return [list[i].id]
|
||||
}
|
||||
if (list[i].children) {
|
||||
|
|
@ -180,11 +174,7 @@ const maId: any = ref('')
|
|||
const editRowInfo = (row: any) => {
|
||||
settleinTitle.value = '装备编辑'
|
||||
getDetailData(row)
|
||||
if(row.devInfoProperties!=null){
|
||||
row.devInfoProperties.forEach((item:any)=>{
|
||||
propertyNamesTwo.value.push({'propertyName':item.propertyName,'propertyValue':item.propertyValue})
|
||||
})
|
||||
}
|
||||
|
||||
disabledForm.value = false
|
||||
isEditDisabled.value = true
|
||||
isViewForm.value = false
|
||||
|
|
@ -291,11 +281,7 @@ const getDetailData = async (row: any) => {
|
|||
descriptionFormList.value[0].examinationPdfs = examinationPdf
|
||||
options.value=[]
|
||||
addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
|
||||
if(res.devInfoProperties!=null){
|
||||
res.devInfoProperties.forEach((item:any)=>{
|
||||
propertyNamesTwo.value.push({'propertyName':item.propertyName,'propertyValue':item.propertyValue})
|
||||
})
|
||||
}
|
||||
propertyNames.value = addAndEditForm.devInfoProperties
|
||||
// addAndEditForm.deviceTypeList[0].data.propertyNames.forEach((item:any) =>{
|
||||
// options.value.push({'label':item,'value':item})
|
||||
// })
|
||||
|
|
@ -536,23 +522,6 @@ const equipRules = ref({
|
|||
// ],
|
||||
})
|
||||
|
||||
const maTypeRules = ref({
|
||||
propertyName: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入属性描述',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
propertyValue: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入属性值',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
|
||||
})
|
||||
|
||||
const getProertyNameRules = (item:any)=>{
|
||||
if(item.mustHave ==1){
|
||||
|
|
@ -646,7 +615,7 @@ const submitFun = (type: any) => {
|
|||
...addAndEditForm.detailsFileList,
|
||||
...addAndEditForm.detailsFileTempList,
|
||||
]
|
||||
addAndEditForm.devInfoProperties = propertyNames.value;
|
||||
|
||||
addAndEditFormRef.value.validate(async (valid: any) => {
|
||||
if (valid) {
|
||||
let isDescription = false
|
||||
|
|
@ -674,26 +643,9 @@ const submitFun = (type: any) => {
|
|||
} catch (error) {}
|
||||
}
|
||||
|
||||
// for(let index = 0;index < propertyNames.value.length;index++){
|
||||
// try {
|
||||
// const result = await new Promise((resolve,reject) => {
|
||||
// addAndEditFormRef.value.validateField(`propertyNames[${index}].propertyValue`,(error) => {
|
||||
// if(error){
|
||||
// reject(error);
|
||||
// }else{
|
||||
// resolve(true);
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
|
||||
// if (!result) {
|
||||
// isDescription = true
|
||||
// throw new Error('表单校验失败')
|
||||
// }
|
||||
// } catch (error) {}
|
||||
// }
|
||||
if (isDescription) return
|
||||
|
||||
addAndEditForm.devInfoProperties = propertyNames.value;
|
||||
addAndEditForm.typeId =
|
||||
addAndEditForm.deviceTypeList[addAndEditForm.deviceTypeList.length - 1]
|
||||
|
||||
|
|
@ -715,7 +667,7 @@ const submitFun = (type: any) => {
|
|||
message: '保存成功',
|
||||
duration: 1000,
|
||||
})
|
||||
propertyNamesTwo.value = []
|
||||
propertyNames.value = []
|
||||
dialogFormVisibleSettlein.value = false
|
||||
getList()
|
||||
}
|
||||
|
|
@ -736,13 +688,16 @@ const saveTemp = async () => {
|
|||
/* 关闭按钮 */
|
||||
const closeDialogBtn = () => {
|
||||
// ruleFormRef.value.resetFields()
|
||||
propertyNames.value = []
|
||||
// 获取装备树
|
||||
getTypeTreeData()
|
||||
dialogFormVisibleSettlein.value = false
|
||||
}
|
||||
/* 关闭对话框 */
|
||||
const handleClose = (done: () => void) => {
|
||||
// ruleFormRef.value.resetFields()
|
||||
done()
|
||||
propertyNamesTwo.value = []
|
||||
propertyNames.value = []
|
||||
dialogFormVisibleSettlein.value = false
|
||||
}
|
||||
|
||||
|
|
@ -779,6 +734,7 @@ const successResultCallBackFnDevicePic = (val: any) => {
|
|||
|
||||
const mainFileList: any = ref([]) //主展示
|
||||
const detailsFileList: any = ref([]) //详情展示
|
||||
const maTypeProperties: any = ref([]) //属性
|
||||
const insurancePdf: any = ref([]) //合格证
|
||||
const examinationPdf: any = ref([]) //检测证明
|
||||
//图片查看弹窗
|
||||
|
|
@ -944,6 +900,7 @@ const addAndEditForm = reactive<any>({
|
|||
examinationPdf: [],
|
||||
insurancePdfs: [],
|
||||
examinationPdfs: [],
|
||||
devInfoProperties:[],
|
||||
})
|
||||
const addAndEditFormTemp = reactive<any>({
|
||||
deviceName: '',
|
||||
|
|
@ -1059,20 +1016,7 @@ const propertyNames = ref<any>([
|
|||
])
|
||||
const propertyNamesTwo = ref<any>([
|
||||
])
|
||||
const options = ref<any>([
|
||||
// {
|
||||
// label:'重量',
|
||||
// value:1
|
||||
// },
|
||||
// {
|
||||
// label:'宽度',
|
||||
// value:2
|
||||
// },
|
||||
// {
|
||||
// label:'长度',
|
||||
// value:3
|
||||
// }
|
||||
])
|
||||
const options = ref<any>([])
|
||||
|
||||
</script>
|
||||
|
||||
|
|
@ -1496,7 +1440,7 @@ const options = ref<any>([
|
|||
>
|
||||
<el-row :gutter="20" style="display: flex;margin-top:10px;justify-content: left;">
|
||||
<el-col :span="12" >
|
||||
<el-form-item label="属性描述：" :rules="getProertyNameRules(item)" prop="propertyName">
|
||||
<el-form-item label="属性描述：">
|
||||
<el-input
|
||||
v-model="item.propertyName"
|
||||
placeholder="请输入"
|
||||
|
|
@ -1508,7 +1452,7 @@ const options = ref<any>([
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<el-form-item label="属性值：" :rules="getProertyValueRules(item)" prop="propertyValue">
|
||||
<el-form-item label="属性值：" :rules="getProertyValueRules(item)" :prop="item.propertyValue">
|
||||
<el-input
|
||||
v-model="item.propertyValue"
|
||||
placeholder="请输入"
|
||||
|
|
|
|||
Loading…
Reference in New Issue