Merge remote-tracking branch 'origin/bug_fix'

莫红玲
2 parents 2b1e339f c0120bbe
Showing 9 changed files with 38 additions and 11 deletions
src/pages/capital/ReceiveRules/component/AddAuthItems.tsx
src/pages/capital/ReceiveRules/component/AuthCheckResult.tsx
src/pages/capital/ReceiveRules/subPages/GoodsDimension/components/AuthTableList/index.tsx
src/pages/capital/ReceiveRules/subPages/GoodsDimension/components/PageAuthEdit/index.tsx
src/pages/capital/ReceiveRules/subPages/PostDimension/AddItems.tsx
src/pages/capital/ReceiveRules/subPages/PostDimension/AuthTableList.tsx
src/pages/capital/ReceiveRules/subPages/PostDimension/index.tsx
src/pages/capital/ReceiveRules/subPages/ShopsDimension/index.tsx
src/pages/capital/StandardMange/components/Add/index.tsx
@@ -76,6 +76,7 @@ function CreateModal(props: Props) {
     >
       <Form
         form={form}
+        labelWrap
         onFinish={submit}
         labelCol={{ span: 6 }}
         wrapperCol={{ span: 15 }}
@@ -95,7 +96,7 @@ function CreateModal(props: Props) {
             <PostSelectNew multiple={multiple} labelInValue disabled={disabled} />
           </FormItem>
         ) : null}
-        <FormItem name="maxNum" label="最大领用数量" rules={[{ required: true }]}>
+        <FormItem name="maxNum" label="最大免费领用数量" rules={[{ required: true }]}>
           <Input placeholder="请输入" />
         </FormItem>
         <FormItem
@@ -36,7 +36,7 @@ export default function AuthCheckResult({ data }: Props) {
       />
       <Column title="门店" dataIndex="shopName" />
       <Column title="岗位" dataIndex="postName" />
-      <Column title="最大领用数量" dataIndex="maxNum" />
+      <Column title="最大免费领用数量" dataIndex="maxNum" />
       <Column
         title="领用周期"
         dataIndex="period"
@@ -44,7 +44,7 @@ export default function AuthTableList({ onChange, value }: Props) {
       >
         <Column title="适用门店" dataIndex="shopIds" render={text => text.map((i: { label: any; }) => i.label).join('；')} />
         <Column title="适用岗位" dataIndex="postList" render={text => text.map((i: { label: any; }) => i.label).join('；')} />
-        <Column title="最大领用数量" dataIndex="maxNum" />
+        <Column title="最大免费领用数量" dataIndex="maxNum" />
         <Column
           title="领用周期"
           dataIndex="period"
@@ -126,7 +126,7 @@ export default function SpecConfig(props: Props) {
             render={(text, record) => <RenderGoodsSpec specList={text} />}
           />
           <Column
-            title="最大领用数量"
+            title="最大免费领用数量"
             dataIndex="maxNum"
             render={(text, record: OdSetting.GoodsAuthList) => <span>{`${text}${record.unit}`}</span>}
           />
@@ -60,7 +60,7 @@ function CreateModal(props: Props) {
         <FormItem name="post" label="适用岗位" rules={[{ required: true }]}>
           <PostSelectNew multiple labelInValue />
         </FormItem>
-        <FormItem name="num" label="最大领用数量" rules={[{ required: true }]}>
+        <FormItem name="num" label="最大免费领用数量" rules={[{ required: true }]}>
           <Input placeholder="请输入" />
         </FormItem>
         <FormItem name="times" label="领用周期" rules={[{ required: true }]}>
@@ -23,7 +23,7 @@ export default function AuthTableList({ onChange, value }: Props) {
   const onSureItem = (v) => {
     const additem = { ...v, ...v.standardId };
     const newData: any = [...rowValue];
-    const index = rowValue.findIndex((i: any) => i.id === additem.id)
+    const index = rowValue.findIndex((i: any) => i.id === additem.id);
     if (index > -1) {
       newData.splice(index, 1, additem);
       message.info("该物品已添加，已保留最新数据");
@@ -52,7 +52,7 @@ export default function AuthTableList({ onChange, value }: Props) {
           dataIndex="specList"
           render={(text, record) => <RenderGoodsSpec specList={text} />}
         />
-        <Column title="最大领用数量" dataIndex="maxNum" />
+        <Column title="最大免费领用数量" dataIndex="maxNum" />
         <Column
           title="领用周期"
           dataIndex="period"
@@ -38,7 +38,7 @@ export default function EditModal(props: Props) {
       }))
     };
     setConfirmloading(true);
-    api.savePostDimensionCheck({...params, pageSize: 1000}).then(res => {
+    api.savePostDimensionCheck({ ...params, pageSize: 1000 }).then(res => {
       if (res.data && res.data.total) {
         Modal.confirm({
           title: '已有授权信息，继续提交将覆盖以下授权',
@@ -112,7 +112,7 @@ export default function SpecConfig() {
           />
           <Column title="型号规格" dataIndex="specList" render={(text, record) => <RenderGoodsSpec specList={text} />} />
           <Column
-            title="最大领用数量"
+            title="最大免费领用数量"
             dataIndex="maxNum"
             render={(text, record: OdSetting.GoodsAuthList) => <span>{`${text}${record.unit}`}</span>}
           />
@@ -211,7 +211,7 @@ export default function AddItem() {
             ))}
           </Select>
         </Form.Item>
-        <h1 style={{ marginBottom: 20 }}>4.领用条件</h1>
+        <h1 style={{ marginBottom: 20 }}>4.个人承担</h1>
         <Form.Item label="领用前提条件" name="premise" rules={[{ required: true, message: '请选择' }]}>
           <Select disabled={!!editDisabled} placeholder="请选择">
             <Option value={0} key={0}>无限制</Option>
@@ -223,12 +223,38 @@ export default function AddItem() {
           {({ getFieldValue }): any => {
             const premise = getFieldValue("premise");
             return premise ? (
-              <Form.Item label={premise === 1 ? "入职后" : "转正后"} name="premiseValue" {...layout} rules={[{ required: true, message: '请输入' }]}>
+              <Form.Item label={`${premise === 1 ? "入职后" : "转正后"}(≤)`} name="premiseValue" {...layout} rules={[{ required: true, message: '请输入' }]}>
                 <InputNumber disabled={!!editDisabled} style={{ width: '100%' }} addonAfter="月" min={0} placeholder="请输入领取前提条件值" />
               </Form.Item>
             ) : null;
           }}
         </Form.Item>
+        <Form.Item label="支付方式" name="gathering" rules={[{ required: true, message: '请选择' }]}>
+          <Select disabled={!!editDisabled} placeholder="请选择">
+            <Option value={1} key={1}>单独收取</Option>
+            <Option value={2} key={2}>随工资收取</Option>
+          </Select>
+        </Form.Item>
+        <Form.Item label="支付时间" name="sequence" rules={[{ required: true, message: '请选择' }]}>
+          <Select disabled={!!editDisabled} placeholder="请选择">
+            <Option value={1} key={1}>领用后 </Option>
+            <Option value={2} key={2}>申领后</Option>
+          </Select>
+        </Form.Item>
+        <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.sequence != currentValues.sequence}>
+          {({ getFieldValue }): any => {
+            const sequence = getFieldValue("sequence");
+            return sequence === 2 ? (
+              <Form.Item label="个人承担金额" name="assumeCost" {...layout} rules={[{ required: true, message: '请输入' }]}>
+                <InputNumber disabled={!!editDisabled} precision={2} style={{ width: '100%' }} addonAfter="元" min={0} placeholder="请输入" />
+              </Form.Item>
+            ) : null;
+          }}
+        </Form.Item>
+        <h1 style={{ marginBottom: 20 }}>5.领用规则</h1>
+        <Form.Item label="最小单位领用数量" name="everyMinNum" {...layout}>
+          <InputNumber disabled={!!editDisabled} style={{ width: '100%' }} min={0} placeholder="请输入" />
+        </Form.Item>
         <Row justify="center">
           <Button type="primary" onClick={() => { setBreadcrumbs([{ name: '列表', key: 'list' }]); setCurrentBreadcrumb({ name: '列表', key: 'list' }); }}>返回</Button>
           <Button style={{ marginLeft: 25 }} type="primary" disabled={!!editDisabled} loading={saveConfig} onClick={() => form.submit()}>保存</Button>