Commit b380fbded56455e1156e288214c4256c73e5e84d
1 parent
58f0a1a3
fix:修复企业定制,编辑问题,fix:修复数据流转,启用不能点击批量删除问题
Showing
3 changed files
with
22 additions
and
5 deletions
... | ... | @@ -249,6 +249,9 @@ |
249 | 249 | } else { |
250 | 250 | disabledStatus1.value = false; |
251 | 251 | } |
252 | + if (hasDisableStatus.includes(1)) { | |
253 | + disabledStatus1.value = true; | |
254 | + } | |
252 | 255 | }; |
253 | 256 | |
254 | 257 | const handleDelete = async () => { |
... | ... | @@ -262,8 +265,8 @@ |
262 | 265 | } else { |
263 | 266 | createMessage.error('删除失败'); |
264 | 267 | } |
265 | - } catch (e) { | |
266 | - return e; | |
268 | + } catch (e: any) { | |
269 | + createMessage.error(e); | |
267 | 270 | } finally { |
268 | 271 | setLoading(false); |
269 | 272 | clearSelectedRowKeys(); | ... | ... |
... | ... | @@ -127,7 +127,6 @@ export const schemas: FormSchema[] = [ |
127 | 127 | colProps: { |
128 | 128 | span: 24, |
129 | 129 | }, |
130 | - | |
131 | 130 | slot: 'customProv', |
132 | 131 | }, |
133 | 132 | { |
... | ... | @@ -171,7 +170,8 @@ export const schemas: FormSchema[] = [ |
171 | 170 | }, |
172 | 171 | { |
173 | 172 | field: 'qrcode', |
174 | - label: '二维码', | |
173 | + label: '联系我们', | |
174 | + required: true, | |
175 | 175 | component: 'Input', |
176 | 176 | colProps: { |
177 | 177 | span: 24, | ... | ... |
... | ... | @@ -127,7 +127,21 @@ |
127 | 127 | delete newFieldValue.nameTown; |
128 | 128 | |
129 | 129 | // 表单校验 |
130 | - await validate(); | |
130 | + const values = await validate([ | |
131 | + 'name', | |
132 | + 'abbreviation', | |
133 | + 'officialWebsite', | |
134 | + 'email', | |
135 | + 'synopsis', | |
136 | + 'nameCountry', | |
137 | + 'address', | |
138 | + 'contacts', | |
139 | + 'tel', | |
140 | + 'id', | |
141 | + newFieldValue.qrCode == undefined ? 'prov' : '', | |
142 | + newFieldValue.codeTown == undefined ? 'qrcode' : '', | |
143 | + ]); | |
144 | + if (!values) return; | |
131 | 145 | compState.value.loading = true; |
132 | 146 | await updateEnterPriseDetail(newFieldValue); |
133 | 147 | createMessage.success('更新信息成功'); | ... | ... |