Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/pages/financeItem/Edit.jsx

@@ -25,28 +25,23 @@ export default (props) => {
 
   const [params] = useSearchParams()
   const id = params.get('id')
-  const [ycType, setYcType] = useState()
 
-  const onChange = (e) => {
-    setYcType(e.target.value);
-  };
   useEffect(() => {
     if (id) {
       getTfItemFinanceId(id).then((res) => {
         formRef.current?.setFieldsValue(res)
-        setYcType(res?.ycType);
       })
     }
   }, [])
 
   const onFinish = (values) => {
     if (!id) {
-      postTfItemFinance(ycType, ...values).then((res) => {
+      postTfItemFinance(values).then((res) => {
         navigate(-1)
       })
     } else if (id) {
       let financeItemId = id
-      putTfItemFinance(id, { financeItemId, ycType, ...values }).then((res) => {
+      putTfItemFinance(id, { financeItemId, ...values }).then((res) => {
         navigate(-1)
       })
     }
@@ -56,7 +51,7 @@ export default (props) => {
     minimumFractionDigits: 4,
     maximumFractionDigits: 4,
   })
-  console.log('ycType', ycType);
+
   return (
     <Page>
       <Card>
@@ -87,20 +82,14 @@ export default (props) => {
           <ProFormText name="fromOrg" label="来源机构" />
           <ProFormText name="toOrg" label="目的机构" />
           <ProFormText name="attach" label="附件" />
-          {/* <ProFormRadio.Group
+          <ProFormRadio.Group
             name="ycType"
             label="收支类型"
             options={[
               { label: '收入', value: 1 },
-              { label: '支出', value: `${-1}` },
+              { label: '支出', value: -1 },
             ]}
-          /> */}
-          <Form.Item label="收支类型">
-            <Radio.Group name="ycType" onChange={onChange} value={ycType}>
-              <Radio value={1}>收入</Radio>
-              <Radio value={0}>支出</Radio>
-            </Radio.Group>
-          </Form.Item>
+          />
         </ProForm>
       </Card>
     </Page>

src/pages/package/components/Package.jsx

@@ -5,6 +5,7 @@ import {
   ProFormMoney,
   ProFormSelect,
   ProFormText,
+  ProFormRadio,
 } from "@ant-design/pro-components";
 import { Button, Row, Col } from "antd";
 import { useNavigate } from "react-router-dom";
@@ -62,24 +63,32 @@ export default (props) => {
     >
       <ProFormText name="packageName" label="套餐名称" />
       <ProFormText name="packageType" label="套餐类型" />
-      <ProForm.Item name="thumb" label="图片">
+      <ProForm.Item name="thumb" label="套餐图片">
         <UploadImage onChange={onChange} />
       </ProForm.Item>
-      <ProFormMoney name="charge" label="价格" />
-      <ProFormText name="limitType" label="是否限制型消费" />
+      <ProFormMoney name="charge" label="套餐价格" />
+      {/* <ProFormText name="limitType" label="是否限制型消费" /> */}
       <ProFormText name="limitNum" label="限制数目" />
       <ProFormSelect
         name="limitUnit"
         label="限制单位"
         options={[
-          { key: "year", label: "year" },
-          { key: "month", label: "month" },
-          { key: "day", label: "day" },
-          { key: "order", label: "order" },
+          { key: "year", label: "年" },
+          { key: "month", label: "月" },
+          { key: "day", label: "日" },
+          { key: "order", label: "次" },
         ]}
       />
-      <ProFormText name="desc" label="说明" />
-      <ProFormSelect
+      <ProFormText name="desc" label="套餐说明" />
+      <ProFormRadio.Group
+        name="limitType"
+        label="是否限制型消费"
+        options={[
+          { label: '是', value: 1 },
+          { label: '否', value: 0 },
+        ]}
+      />
+      {/* <ProFormSelect
         name="status"
         label="状态"
         options={[
@@ -92,6 +101,14 @@ export default (props) => {
             value: 1,
           },
         ]}
+      /> */}
+      <ProFormRadio.Group
+        name="status"
+        label="套餐状态"
+        options={[
+          { label: '上架', value: 1 },
+          { label: '下架', value: 0 },
+        ]}
       />
     </ProForm>
   );

src/pages/package/index.jsx

@@ -44,6 +44,12 @@ export default (props) => {
     {
       title: "限制单位",
       dataIndex: "limitUnit",
+      valueEnum: {
+        'order': "次",
+        'day': "日",
+        'month': "月",
+        'year': "年",
+      },
       search: false,
     },