diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 4e1d93f..8c34e0e 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -258,8 +258,7 @@ const deleteRowInfo = async (row: any) => { getList() } }) - .catch(() => { - }) + .catch(() => {}) } //获取详情接口 const getDetailData = async (row: any) => { @@ -294,6 +293,7 @@ const getDetailData = async (row: any) => { maintenanceAlarmDay, isZone, zoneId, + expirationTime, } = res Object.assign(addAndEditForm, { @@ -324,6 +324,7 @@ const getDetailData = async (row: any) => { maintenanceAlarmDay, isZone, zoneId, + expirationTime, }) if (settleinTitle.value == '装备编辑') { @@ -500,8 +501,7 @@ const handleUpdateUpDown = (row: any, maStatus: any) => { getList() } }) - .catch(() => { - }) + .catch(() => {}) } /* @@ -688,6 +688,13 @@ const equipRules = ref({ trigger: 'blur', }, ], + expirationTime: [ + { + required: true, + trigger: 'change', + message: '请选择标准使用时间', + }, + ], person: [{ required: true, message: '联系人不能为空', trigger: 'blur' }], checkDate: [{ required: true, message: '校验日期不能为空', trigger: 'blur' }], @@ -742,11 +749,15 @@ const submitFun = (type: any) => { ) } if (type === 2 || type === 4) { - equipRules.value.mainFileList = [] // 清空规则,相当于不校验 - equipRules.value.detailsFileList = [] // 清空规则,相当于不校验 + equipRules.value.mainFileList = [] // 清空规则,相当于不校验 + equipRules.value.detailsFileList = [] // 清空规则,相当于不校验 } else { - equipRules.value.mainFileList = [{ required: true, message: '请上传主展示图', trigger: 'change' }] // 清空规则,相当于不校验 - equipRules.value.detailsFileList = [{ required: true, message: '请上传详情展示图', trigger: 'change' }] // 清空规则,相当于不校验 + equipRules.value.mainFileList = [ + { required: true, message: '请上传主展示图', trigger: 'change' }, + ] // 清空规则,相当于不校验 + equipRules.value.detailsFileList = [ + { required: true, message: '请上传详情展示图', trigger: 'change' }, + ] // 清空规则,相当于不校验 } addAndEditFormRef.value.validate(async (valid: any) => { @@ -766,7 +777,7 @@ const submitFun = (type: any) => { } }) addAndEditForm.tableList = equipTableList.value - if (type != 2 && type !=4) { + if (type != 2 && type != 4) { for (let i = 0; i < addAndEditForm.tableList.length; i++) { const row = addAndEditForm.tableList[i] for (const key in row) { @@ -1093,6 +1104,7 @@ const addAndEditForm = reactive({ tableList: [], isZone: true, // 是否上架专区 zoneId: '', // 专区id + expirationTime: '', }) // const addAndEditFormTemp = reactive() const uploadUrl = import.meta.env.VITE_API_URL + '/file/upload' @@ -1555,34 +1567,29 @@ const handleDel = (index: any) => { 查询 - + >查询 + 重置 - + >重置 + 装备新增 - + >装备新增 + 批量上架 - + >批量上架 + 批量下架 - + >批量下架 + @@ -1590,9 +1597,8 @@ const handleDel = (index: any) => { class="primary-lease" type="primary" @click="handleBatchAddVisible" - >批量新增 - + >批量新增 + @@ -1627,7 +1633,7 @@ const handleDel = (index: any) => {