Merge branch 'dev' into 'master'

Dev See merge request !27

Merge branch 'dev' into 'master'
Dev See merge request !27
boyang
2 parents 576a38ce 82f250dd
Showing 1 changed file with 63 additions and 61 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
@@ -768,73 +768,69 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       }>
         open
         width={1000}
-        title={drawerTitle}
-        resize={{
-          onResize() {
-            console.log('resize!');
-          },
-          maxWidth: window.innerWidth * 0.8,
-          minWidth: 400,
+        modalProps={{
+          destroyOnClose: true,
+          maskClosable: true,
+          title: (
+            <div
+              style={{ display: 'flex', alignItems: 'center', width: '100%' }}
+            >
+              <span>{drawerTitle}</span>
+              {hasLocalData && (
+                <Button
+                  key="useLocalData"
+                  type="link"
+                  onClick={() => {
+                    useLocalFormData();
+                  }}
+                >
+                  使用草稿
+                </Button>
+              )}
+            </div>
+          ),
         }}
         onFinishFailed={() => {
           message.error('表单项存在错误，请检查');
           setSubmitBtnLoading(false);
         }}
         submitter={{
-          render: (props) => {
-            return [
-              <Button
-                key="cancel"
-                onClick={() => {
-                  onClose();
-                }}
-              >
-                取消
-              </Button>,
-              <Button
-                key="localSave"
-                loading={localSaveLoading}
-                hidden={!optType('add') && !optType('copy')}
-                onClick={() => {
-                  setLocalSaveLoading(true);
-                  saveFormDataToLocal();
-                }}
-              >
-                本地保存
-              </Button>,
-              <Button
-                key="ok"
-                type="primary"
-                loading={submitBtnLoading}
-                disabled={optType('after-sales-check')}
-                onClick={() => {
-                  setSubmitBtnLoading(true);
-                  props.submit();
-                }}
-              >
-                提交
-              </Button>,
-            ];
-          },
-        }}
-        form={form}
-        autoFocusFirstInput
-        drawerProps={{
-          destroyOnClose: true,
-          maskClosable: false,
-          extra: [
+          render: (props) => [
             <Button
-              key="useLocalData"
-              hidden={!hasLocalData}
-              type="link"
+              key="cancel"
               onClick={() => {
-                useLocalFormData();
+                onClose();
               }}
             >
-              使用草稿
+              取消
+            </Button>,
+            <Button
+              key="localSave"
+              loading={localSaveLoading}
+              hidden={!optType('add') && !optType('copy')}
+              onClick={() => {
+                setLocalSaveLoading(true);
+                saveFormDataToLocal();
+              }}
+            >
+              本地保存
+            </Button>,
+            <Button
+              key="ok"
+              type="primary"
+              loading={submitBtnLoading}
+              disabled={optType('after-sales-check')}
+              onClick={() => {
+                setSubmitBtnLoading(true);
+                props.submit();
+              }}
+            >
+              提交
             </Button>,
           ],
         }}
+        form={form}
+        autoFocusFirstInput
         submitTimeout={2000}
         onFinish={async (values) => {
           let res = {};
@@ -1235,7 +1231,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 value,
               }));
             }}
-            width="md"
+            width="xl"
             onChange={() => {
               form.setFieldValue('platformType', '');
             }}
@@ -1246,10 +1242,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           <ProFormDependency name={['companyType']}>
             {({ companyType }) => {
               const renderInstitutionContactName = () => (
-                <>
+                <Group>
                   <ProFormSelect
                     key="institutionContactName"
-                    width="md"
+                    width="xl"
                     showSearch
                     name="institutionContactName"
                     rules={[{ required: true, message: '请输入课题组名称!' }]}
@@ -1279,12 +1275,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     label="课题组名称"
                     placeholder="请输入名称"
                   />
-                  <ProFormText
-                    hidden={true}
+                  <ProFormDigit
+                    readonly
                     key="researchGroupId"
+                    width="md"
                     name="researchGroupId"
-                  ></ProFormText>
-                </>
+                    label="课题组Id"
+                    fieldProps={{ precision: 0 }} // 只允许整数
+                    rules={[{ required: true, message: '请重新选择课题组!' }]}
+                  />
+                </Group>
               );
               const renderPlatformType = (fieldKey) => (
                 <ProFormSelect
@@ -2163,6 +2163,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         value: false,
                       },
                     ]}
+                    rules={[{ required: true, message: '是否代买代购必填' }]}
                   />,
                   <ProFormRadio.Group
                     key="discount"
@@ -2180,6 +2181,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         value: false,
                       },
                     ]}
+                    rules={[{ required: true, message: '是否竞标/打折必填' }]}
                   />,
  
                   <ProFormSelect