Compare commits

...

Author SHA1 Message Date
  gwbvipvip 9da7337ad3 提交 2 years ago
  gwbvipvip a33e299bac bug修改 2 years ago
5 changed files with 13 additions and 4 deletions
Split View
  1. +2
    -1
      src/pages/foodMenu/foodMenuInfo/index.jsx
  2. +1
    -0
      src/pages/store/printer/Printer/index.jsx
  3. +6
    -1
      src/pages/store/printer/printerTemplate/index.jsx
  4. +2
    -2
      src/pages/store/storeDesktopNumber/components/CreateForm.jsx
  5. +2
    -0
      src/pages/store/storeDesktopNumber/index.jsx

+ 2
- 1
src/pages/foodMenu/foodMenuInfo/index.jsx View File

@@ -61,11 +61,12 @@ const handleRemove = async (selectedRows) => {
ids.push(item.id);
});
await DelFoodMenu(ids).then((r) => {
debugger
if (r.data) {
message.success('删除成功');
return true;
} else {
message.success('删除失败');
message.error('删除失败,该菜谱被使用');
return false;
}
});


+ 1
- 0
src/pages/store/printer/Printer/index.jsx View File

@@ -287,6 +287,7 @@ const PrinterInfo = () => {
formRef={formRef}
layout={'horizontal'}
autoFocusFirstInput>
<br/>
<ProFormText style={{ marginTop: '-10px', }} name="applicationId" label="应用ID" placeholder="请输入应用ID">
<Field mode={'edit'} />
</ProFormText>


+ 6
- 1
src/pages/store/printer/printerTemplate/index.jsx View File

@@ -97,7 +97,12 @@ const printerTemplateInfo = () => {
if (action == 'remove') {
SetIsAdd(false);
DelPrinterTemplater([targetKey]).then((result) => {
GetStoreTemplaterList();
if (result.data) {
GetStoreTemplaterList();
message.success('成功');
} else {
message.success('失败');
}
});




+ 2
- 2
src/pages/store/storeDesktopNumber/components/CreateForm.jsx View File

@@ -42,8 +42,8 @@ const CreateForm = (props) => {
}}
onFinish={async (value) => props.onFinish(value)}>
<ProFormGroup >
<ProFormDigitRange label="桌号范围" placeholder="请输入桌号范围" name="numbers" min={1} rules={[{ required: true }]}/>
<ProFormSelect label="排除桌号" mode="tags" placeholder="请输入排除的桌号" name="excludeNumber" width="md" />
<ProFormDigitRange label="桌号范围" placeholder="请输入桌号范围" name="numbers" fieldProps={{ precision: 0 }} min={1} rules={[{ required: true }]}/>
<ProFormSelect label="排除桌号" mode="tags" placeholder="请输入排除的桌号" precision={0} name="excludeNumber" width="md" />
<ProFormSelect label="适用店铺" mode="multiple" placeholder="请选择店铺" name="storeIds" width="md" valueEnum={props.storeInfoList}/>
</ProFormGroup>
</ProForm>


+ 2
- 0
src/pages/store/storeDesktopNumber/index.jsx View File

@@ -98,6 +98,7 @@ const storeDesktopNumber = () => {
title: '桌号',
dataIndex: 'number',
align: 'center',
search: false,
render: item => (
<>
<Button type="primary" shape="circle">
@@ -110,6 +111,7 @@ const storeDesktopNumber = () => {
title: '适用店铺',
align: 'center',
dataIndex: 'storeList',
search: false,
render: tags => (
<>
{tags.map(tag => {


Loading…
Cancel
Save