fix:渠道商品选会员过滤，修改商品价格类型禁用

src/pages/commodity/products/addChannelItem/selectChannel.tsx

@@ -168,6 +168,7 @@ const SelectChannel:React.FC<IProps> = (props) => {
 
   // 获取渠道会员
   const fetchMemberData = (params: any) => {
+    params.roleId = selectedOption.value
     return new Promise((resolve, reject) => {
       PublicApi.getMemberManageLowerChannelPageByname(params).then(res => {
         const { data } = res
@@ -240,7 +241,7 @@ const SelectChannel:React.FC<IProps> = (props) => {
             name="add-channel-merchant" 
             labelAlign="left"
             colon={false}
-            initialValues={{channelMemberRoleId: memberRoleList[0].roleId}}
+            initialValues={{childMemberRoleId: memberRoleList[0].roleId}}
           >
             {/* <Form.Item name="channelMemberRoleId">
               <Radio.Group buttonStyle="solid" defaultValue={1} className={styles.customizeRadio}>

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -558,7 +558,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         label={
           <span>
             单位&nbsp;
-              <Tooltip title="这是一段描述?">
+              <Tooltip title="例如平方英尺、千克、米、升等，请设置为与货品管理中对应的货品相同单位">
               <QuestionCircleOutlined />
             </Tooltip>
           </span>
@@ -598,7 +598,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         label={
           <span>
             最小起订&nbsp;
-              <Tooltip title="这是一段描述?">
+              <Tooltip title="您设置了最小起订后，采购下单时最小购买数量为最小起订设置的值">
               <QuestionCircleOutlined />
             </Tooltip>
           </span>
@@ -621,7 +621,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         label={
           <span>
             产品定价&nbsp;
-              <Tooltip title="这是一段描述?">
+              <Tooltip title="现货价格：表示是现货销售的价格，价格明码标价，采购时按照标价下单，价格需要询价：表示价格未设定，需要询价报价后再下单采购">
               <QuestionCircleOutlined />
             </Tooltip>
           </span>
@@ -632,18 +632,24 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         }]}
         // initialValue={planPrice}
       >
-        <Radio.Group onChange={handlePlanPriceChange}>
-          <Radio value={1}>现货价格</Radio>
-          <Radio value={2}>价格需要询价</Radio>
-          <Radio value={3}>积分兑换商品</Radio>
-        </Radio.Group>
+        {
+          history.location.query?.id ? <Radio.Group onChange={handlePlanPriceChange} disabled={!productInfoByEdit.isUpdateAttribute}>
+            <Radio value={1}>现货价格</Radio>
+            <Radio value={2}>价格需要询价</Radio>
+            <Radio value={3}>积分兑换商品</Radio>
+          </Radio.Group> : <Radio.Group onChange={handlePlanPriceChange}>
+            <Radio value={1}>现货价格</Radio>
+            <Radio value={2}>价格需要询价</Radio>
+            <Radio value={3}>积分兑换商品</Radio>
+          </Radio.Group>
+        }
       </Form.Item>
       <Form.Item
         name="isMemberPrice"
         label={
           <span>
             会员折扣&nbsp;
-              <Tooltip title="这是一段描述?">
+              <Tooltip title="是否允许会员使用会员折扣价购买当前商品">
               <QuestionCircleOutlined />
             </Tooltip>
           </span>

src/pages/commodity/products/addProductsItem/selectGoodsForm.tsx

@@ -128,7 +128,7 @@ const SelectGoodsForm: React.FC<Iprops> = (props) => {
 
   return (<>
     {
-      selectCategoryId && selectBrandId ? <>
+      selectCategoryId ? <>
         <Form
           {...layout}
           form={selectGoodsForm}

src/pages/commodity/products/index.tsx

@@ -40,8 +40,8 @@ interface paramItem {
   code: string;
   priceType?: number;
   priceTypeList: number[];
-  min: number;
-  max: number;
+  min: any;
+  max: any;
   brandId: number;
   customerCategoryId: number;
   status?: number;
@@ -732,7 +732,7 @@ const Products: React.FC<{}> = () => {
                             style={{ width: '40%', textAlign: 'center' }} 
                             min={0} 
                             placeholder="最低价格" 
-                            onChange={(e)=>setFilterParams({...filterParams, min: +e})}
+                            onChange={(e)=>setFilterParams({...filterParams, min: e})}
                           />
                           <Input
                             style={{
@@ -755,7 +755,7 @@ const Products: React.FC<{}> = () => {
                             }}
                             min={0}
                             placeholder="最高价格"
-                            onChange={(e)=>setFilterParams({...filterParams, max: +e})}
+                            onChange={(e)=>setFilterParams({...filterParams, max: e})}
                           />
                         </Input.Group>
                       </Col>

src/pages/commodity/products/schema/channelSchema.tsx

@@ -133,10 +133,10 @@ export const channelSchema: ISchema = {
                   label: '现货价格',
                   value: 1,
                 },
-                {
-                  label: '价格需要询价',
-                  value: 2,
-                },
+                // {
+                //   label: '价格需要询价',
+                //   value: 2,
+                // },
                 {
                   label: '积分兑换商品',
                   value: 3,