Merge branch 'groupmealweb' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.Web into groupmealweb

src/pages/database/basic/batching/components/CreateForm.jsx

@@ -174,6 +174,7 @@ const CreateForm = (props) => {
         formRef={formRef}
         initialValues={props.values}
         onFinish={props.onFinish}
+        submitter={false}
       >
         <Row gutter={16}>
           <Col lg={12} md={12} sm={24}>
@@ -207,67 +208,8 @@ const CreateForm = (props) => {
               placeholder="请输入原料名称"
             />
           </Col>
-          {/* <Col lg={8} md={12} sm={24}>
-            <ProFormText
-              label={fieldLabels.specs}
-              name="specs"
-              rules={[
-                {
-                  required: true,
-                  max: 500,
-                },
-              ]}
-              placeholder="请输入规格型号"
-            />
-          </Col> */}
         </Row>
-        
-        {/* <Row gutter={16}>
-          <Col lg={8} md={12} sm={24}>
-            <ProFormSelect
-              label={fieldLabels.aittribute}
-              name="aittribute"
-              rules={[
-                {
-                  required: true,
-                  message: '请选择物料属性',
-                },
-              ]}
-              options={[
-                {
-                  value: '0',
-                  label: '成品',
-                },
-                {
-                  value: '1',
-                  label: '半成品',
-                },
-                {
-                  value: '2',
-                  label: '易耗品',
-                },
-              ]}
-              placeholder="请选择物料属性"
-            />
-          </Col>
-          <Col lg={8} md={12} sm={24}>
-            <ProFormDigit
-              label={fieldLabels.price}
-              name="price"
-              placeholder="请输入成本价"
-              min={1}
-            />
-          </Col>
-          <Col lg={8} md={12} sm={24}>
-          <ProFormDigit
-              label={fieldLabels.netrecovery}
-              name="netrecovery"
-              min={1}
-              max={100}
-              placeholder="请输入净料率"
-            />
-          </Col>
-        </Row> */}
+ 
         <Row gutter={16}>
           <Col lg={12} md={12} sm={24}>
            
@@ -359,85 +301,14 @@ const CreateForm = (props) => {
       options={itemsuity}
     />
           </Col>
-          {/* <Col lg={8} md={12} sm={24}>
-            <ProFormSelect
-              label={fieldLabels.OutstockUint}
-              name="outstockUint"
-              rules={[
-                {
-                  required: true,
-                  message: '请选择出库单位',
-                },
-              ]}
-              request={async () => itemsuity}
-              placeholder="请选择出库单位"
-            />
-          </Col> */}
-          {/* <Col lg={8} md={12} sm={24}>
-          <ProFormDigit
-              label={fieldLabels.proportion}
-              name="proportion"
-              rules={[
-                {
-                  required: true,
-                  message: '请输入出入库换算比例',
-                },
-              ]}
-              placeholder="请输入换算比例"
-            />
-          </Col> */}
-          {/* <Col lg={8} md={12} sm={24}>
-            <ProFormSelect
-              label={fieldLabels.status}
-              name="status"
-              rules={[
-                {
-                  required: true,
-                  message: '请选择状态',
-                },
-              ]}
-              options={[
-                {
-                  value: '0',
-                  label: '正常',
-                },
-                {
-                  value: '1',
-                  label: '停用',
-                },
-              ]}
-              placeholder="请选择状态"
-            />
-          </Col> */}
-          {/* <Col lg={8} md={12} sm={24}>
-            <ProFormText
-              label={fieldLabels.foreignKeyRe}
-              name="foreignKeyRe"
-              placeholder="请输入关联外键"
-            />
-          </Col> */}
-        </Row>
-        {/* <ProForm.Item name="membersList" trigger="onValuesChange">
-          <EditableProTable
-            rowKey="id"
-            toolBarRender={false}
-            columns={columns}
-            recordCreatorProps={{
-              newRecordType: 'dataSource',
-              record: () => ({
-                id: Date.now(),
-              }),
-            }}
-            editable={{
-              type: 'multiple',
-              editableKeys,
-              onChange: setEditableRowKeys,
-              actionRender: (row, _, dom) => {
-                return [dom.delete];
-              },
-            }}
-          />
-        </ProForm.Item> */}
+         </Row>
+         <Row  gutter={4}>
+         <Col span={12}></Col>
+          <Col  span={12}>
+            <Button  htmlType="button" style={{float:'right',left:10}} onClick={onCancel} >取消</Button>
+            <Button type="primary" htmlType="submit" style={{float:'right'}} >保存</Button>
+          </Col>
+         </Row>
       </ProForm>
     </Modal>
   );