Merge branch 'v2-220418' of…

src/pages/commodity/material/materialPendingAdd/add.tsx

@@ -68,6 +68,8 @@ const MaterialAdd = (props) => {
       formActions.setFieldState('sourceListCard', (state) => {
         FormPath.setIn(state, 'visible', true);
       })
+      console.log(state.dataSource)
+
       if (!state.dataSource) {
         message.error(intl.formatMessage({ id: 'material.should.select.purchaseSelection', defaultMessage: '请选择采购选品'}));
       }
@@ -135,6 +137,17 @@ const MaterialAdd = (props) => {
     </UploadFiles>
   )
 
+  const createDescriptionElement = () => {
+    return {
+      desc() {
+        if (query?.type !== 'sourceData' ) {
+          return null;
+        }
+        return React.createElement('div', { className: styles['label-required'] }, `参考品牌: ${state.dataSource?.referenceBrand}`);
+      } 
+    }
+  };
+
   const handleSubmit = async (value) => {
     console.log("values", value);
     const { 
@@ -299,7 +312,8 @@ const MaterialAdd = (props) => {
           // renderListTableRemove: renderListTableRemove,
           renderAddition: renderAddition(),
           uploadContainer: uploadContainer,
-          customizeFileItemRender: customizeFileItemRender
+          customizeFileItemRender: customizeFileItemRender,
+          ...createDescriptionElement(),
         }}
         effects={($, actions) => {
           useAsyncCascader('category', fetchCategoryData)

src/pages/commodity/material/materialPendingAdd/index.tsx

@@ -264,7 +264,7 @@ const MaterialQuery = () => {
           name: target.name,
           goodsId: target.id,
           type: target.type,
-          brand: target.brand?.name,
+          referenceBrand: target.brand?.name,
           goodsPic: target.goodsPic?.map((_item) => {
             return {
               name: _item,
@@ -288,6 +288,7 @@ const MaterialQuery = () => {
             // rowSelection: selectRow
             rowSelection: selectRow
           }}
+          keepAlive={false}
           columns={columns}
           currentRef={ref}
           fetchTableData={fetchListData}
@@ -300,7 +301,7 @@ const MaterialQuery = () => {
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect($, actions, 'code', FORM_FILTER_PATH);
                 useAsyncCascader('materialGroupId', fetchTreeData)
-                useAsyncCascader('categoryId', fetchCategoryData)
+                useAsyncCascader('customerCategoryId', fetchCategoryData)
                 useAsyncSelect('brandId', fetchBrand, ["name", "id"])
               }}
             />

src/pages/commodity/material/materialPendingAdd/schema/add.tsx

@@ -128,6 +128,7 @@ export const getSchema = (schema: ISchema): ISchema => {
                 'x-component-props': {
                   showSearch: true,
                 },
+                description: `{{desc()}}`
               },
               category: {
                 title: intl.formatMessage({ id: 'material.category', defaultMessage: '品类' }),

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/schema/index.tsx

@@ -48,6 +48,12 @@ export const deliveryPlanManagementAwaitSRMSchema: ISchema = {
             },
           },
           properties: {
+            digest: {
+              type: 'string',
+              'x-component-props': {
+                placeholder: '计划摘要',
+              }
+            },
             '[startTime, endTime]': {
               type: 'daterange',
               'x-component-props': {

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/schema/index.tsx

@@ -48,6 +48,12 @@ export const deliveryPlanManagementQuerySchema: ISchema = {
             },
           },
           properties: {
+            digest: {
+              type: 'string',
+              'x-component-props': {
+                placeholder: '计划摘要',
+              }
+            },
             '[startTime, endTime]': {
               type: 'daterange',
               'x-component-props': {

src/pages/systemSetting/parameterSetting/index.tsx

@@ -312,12 +312,12 @@ const ParameterSetting: React.FC<{}> = () => {
                   <p>{item.description}</p>
                 </div>
                 <div className={styles.setItemRight}>
+                  <AuthButton btnCode='parameterSetting.setup' >
                     {
                       item.isSettting ?
-                      <AuthButton btnCode='parameterSetting.setup' >
                         <a onClick={() => handleVisibleModalType(item.id)}>{intl.formatMessage({ id: 'systemSetting.parameterSetting.setApplicableMall' })}</a> : <a onClick={() => handleVisibleModalType(item.id)}>{intl.formatMessage({ id: 'systemSetting.shezhicanshu', defaultMessage: '设置参数' })}</a>
-                      </AuthButton> : null
                     }
+                  </AuthButton>
                   {/* <Switch defaultChecked={item.isSettting} onChange={(v) => onChangeShowSetBtn(v, item.id)} /> */}
                 </div>
               </div>
@@ -516,11 +516,11 @@ const ParameterSetting: React.FC<{}> = () => {
                   >
                     {({ getFieldValue }) => getFieldValue('status') && (
                       <>
-                        <Form.Item label={intl.formatMessage({ id: 'systemSetting.dangedingdanyunxushiyong', defaultMessage: '单个订单允许使用积分上限' })} name='userScoreLimit' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurudangedingdanyun', defaultMessage: '请输入单个订单允许使用积分上限' }) },{pattern: /^[1-9]\d*$/ , message: intl.formatMessage({ id: 'systemSetting.jifenshangxianzhengshuxingbi', defaultMessage: '积分上限整数型必须大于0' })}]}>
+                        <Form.Item label={intl.formatMessage({ id: 'systemSetting.dangedingdanyunxushiyong', defaultMessage: '单个订单允许使用积分上限' })} name='userScoreLimit' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurudangedingdanyun', defaultMessage: '请输入单个订单允许使用积分上限' }) }, { pattern: /^[1-9]\d*$/, message: intl.formatMessage({ id: 'systemSetting.jifenshangxianzhengshuxingbi', defaultMessage: '积分上限整数型必须大于0' }) }]}>
                           <Input />
                         </Form.Item>
                         <Space>
-                          <Form.Item label={intl.formatMessage({ id: 'systemSetting.jifendikoujinebili1', defaultMessage: '积分抵扣金额比例' })} name='deductionRate' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurujifendikoujin', defaultMessage: '请输入积分抵扣金额比例' }) },{pattern: /^[1-9]\d*$/ , message: intl.formatMessage({ id: 'systemSetting.jifendikoujinebili', defaultMessage: '积分抵扣金额比例整数型必须大于0' })}]}>
+                          <Form.Item label={intl.formatMessage({ id: 'systemSetting.jifendikoujinebili1', defaultMessage: '积分抵扣金额比例' })} name='deductionRate' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurujifendikoujin', defaultMessage: '请输入积分抵扣金额比例' }) }, { pattern: /^[1-9]\d*$/, message: intl.formatMessage({ id: 'systemSetting.jifendikoujinebili', defaultMessage: '积分抵扣金额比例整数型必须大于0' }) }]}>
                             <Input />
                           </Form.Item>
                           <div style={{ marginBottom: '24px', color: '#909399' }}>{intl.formatMessage({ id: 'systemSetting.jifendikou', defaultMessage: '积分可抵扣：￥1.00元' })}</div>
@@ -569,8 +569,8 @@ const ParameterSetting: React.FC<{}> = () => {
                   >
                     {({ getFieldValue }) => getFieldValue('status') && (
                       <Space>
-                        <Form.Item label={intl.formatMessage({ id: 'systemSetting.dingdanjineman', defaultMessage: '订单金额满' })} name='orderAmount' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurudingdanjineman', defaultMessage: '请输入订单金额满' }) }, {pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/ , message: intl.formatMessage({ id: 'systemSetting.dingdanjinemanbixuda', defaultMessage: '订单金额满必须大于0,最多保留2位小数' })}]}>
-                          <Input addonBefore={intl.formatMessage({id: 'common.money', defaultMessage: '￥'})} />
+                        <Form.Item label={intl.formatMessage({ id: 'systemSetting.dingdanjineman', defaultMessage: '订单金额满' })} name='orderAmount' rules={[{ required: true, message: intl.formatMessage({ id: 'systemSetting.qingshurudingdanjineman', defaultMessage: '请输入订单金额满' }) }, { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: intl.formatMessage({ id: 'systemSetting.dingdanjinemanbixuda', defaultMessage: '订单金额满必须大于0,最多保留2位小数' }) }]}>
+                          <Input addonBefore={intl.formatMessage({ id: 'common.money', defaultMessage: '￥' })} />
                         </Form.Item>
                         <div style={{ marginBottom: '24px', color: '#909399' }}>{intl.formatMessage({ id: 'systemSetting.yuanmianyunfei', defaultMessage: '元免运费' })}</div>
                       </Space>