Merge branch 'order_jzr' into 'master'

Order jzr See merge request !246

Merge branch 'order_jzr' into 'master'
Order jzr See merge request !246
莫红玲
2 parents f4116581 a79d6a9c
Showing 4 changed files with 25 additions and 14 deletions
src/pages/order3/FinancialCreditMail/api.ts
src/pages/order3/FinancialCreditMail/components/EditModal.tsx
src/pages/order3/FinancialCreditMail/components/List.tsx
src/pages/order3/FinancialCreditMail/components/ShopModal.tsx
 import { http } from '@/typing/http';
 import request from '@/utils/request';
 import { ORDER3, FINANCE2_HOST } from '@/utils/host';
-import { common } from '@/typing/common';
+import { PageParams } from '@/typing/common';
  
-interface Params extends common.PageParams {
+interface Params extends PageParams {
 }
  
 interface FinParmas {
@@ -29,21 +29,21 @@ export interface Shop {
 export interface SaveParam {
   financeCompanyId?: number, // 金融公司id
   financeCompanyName?: string, // 金融公司名称
-  shopInfo?: Shop[]
+  shopList?: Shop[]
 }
 /** 信贷资料金融公司不邮寄列表 */
 export function getFinancialListApi(): http.PromiseResp<SaveParam[]> {
-  return request.get(`${ORDER3}/erp/system/order/loan/material/post/config`);
+  return request.get(`${ORDER3}/erp/system/loan/material/post/config`);
 }
  
 /**保存信贷资料金融公司不邮寄 */
 export function saveFinancialApi(params: SaveParam): http.PromiseResp<any> {
-  return request.post(`${ORDER3}/erp/system/order/loan/material/post/config/save`, params);
+  return request.post(`${ORDER3}/erp/system/loan/material/post/config/save`, params);
 }
  
 /**删除信贷资料金融公司不邮寄 */
 export function deleteFinancialApi(params	: any): http.PromiseResp<any> {
-  return request.post(`${ORDER3}/erp/system/order/loan/material/post/config/delete`, params, { contentType: 'form-urlencoded' });
+  return request.post(`${ORDER3}/erp/system/loan/material/post/config/delete`, params, { contentType: 'form-urlencoded' });
 }
 /** 查询金融公司 */
 export function getCompanyList(params: FinParmas) : http.PromiseResp<CompanyList[]> {
@@ -3,6 +3,7 @@ import { Modal, Button, message, Form, Select } from &#39;antd&#39;;
 import {useStore} from '../index';
 import {SaveParam, saveFinancialApi, Shop} from '../api';
 import _ from 'lodash';
+import ShopSelectNew from '@/components/ShopSelectNew';
  
 export default function DetailModal() {
   const {visible, setVisible, data, setLoading: setPageLoading, companyList, shopData, currentData, setIsEdit, isEdit} = useStore();
@@ -15,8 +16,8 @@ export default function DetailModal() {
   useEffect(() => {
     if (visible && currentData.current) {
       setFiancial({financeCompanyId: currentData.current.financeCompanyId, financeCompanyName: currentData.current.financeCompanyName});
-      setShop(currentData.current.shopInfo);
-      const _shop = currentData.current?.shopInfo.map((item: any) => item.shopId);
+      setShop(currentData.current.shopList);
+      const _shop = currentData.current?.shopList.map((item: any) => ({label: item.shopName, value: item.shopId}));
       form.setFieldsValue({
         shop: _shop || [],
         company: currentData.current?.financeCompanyId || undefined
@@ -32,8 +33,9 @@ export default function DetailModal() {
  
   async function onFinish() {
     const param = await form.validateFields();
+    const _shop = param.shop.map((v: any) => ({shopId: v.value, shopName: v.label}));
     setConfirmLoading(true);
-    const params = {financeCompanyId: financial.financeCompanyId, financeCompanyName: financial.financeCompanyName, shopInfo: shop};
+    const params = {financeCompanyId: financial.financeCompanyId, financeCompanyName: financial.financeCompanyName, shopList: _shop};
     saveFinancialApi(params)
     .then(res => {
       message.success(res.result);
@@ -68,6 +70,7 @@ export default function DetailModal() {
       maskClosable={false}
       onCancel={handleCancel}
       afterClose={form.resetFields}
+      width="50%"
       footer={[
         <Button key="cancel" loading={confirmLoading} onClick={handleCancel} style={{marginLeft: 10}}>取消</Button>,
         <Button key="submit" onClick={_.debounce(onFinish, 380)} type="primary" htmlType="submit" loading={confirmLoading}>确认</Button>
@@ -88,13 +91,14 @@ export default function DetailModal() {
           </Select>
         </Form.Item>
         <Form.Item label="门店" rules={[{required: true, message: '请选择门店'}]} name="shop">
-          <Select allowClear mode="multiple" placeholder="请选择门店" showSearch optionFilterProp="label" onChange={(key, value) => _onChangeShop(key, value)}>
+          <ShopSelectNew defaultOptions={{bizTypes: "1"}} placeholder="请选择门店" multiple />
+          {/* <Select allowClear mode="multiple" placeholder="请选择门店" showSearch optionFilterProp="label" onChange={(key, value) => _onChangeShop(key, value)}>
             {shopData.length > 0 && shopData.map(role => (
               <Select.Option key={role.id} value={role.id} label={role.name}>
                 {role.name}
               </Select.Option>
             ))}
-          </Select>
+          </Select> */}
         </Form.Item>
       </Form>
     </Modal>
 import React from 'react';
 import { Table, Popconfirm, message, Space } from 'antd';
 import { useStore } from '../index';
-import {SaveParam, deleteFinancialApi} from '../api';
+import {SaveParam, deleteFinancialApi, Shop} from '../api';
  
 const Column = Table.Column;
  
@@ -28,6 +28,13 @@ export default function LargeList() {
     setVisible(true);
     setIsEdit(true);
   }
+
+  function renderShop(shopList: Shop[] = []) {
+    if (!shopList.length) {
+      return '--';
+    }
+    return `${shopList[0].shopName}等${shopList.length}个门店`;
+  }
   return (
     <Table
       dataSource={data || []}
@@ -36,7 +43,7 @@ export default function LargeList() {
       pagination={false}
     >
       <Column title="金融公司" dataIndex="financeCompanyName" align="left" />
-      <Column title="适用门店" dataIndex="shopInfo" align="left" render={(_text, record) => <span style={{color: "#4189FD"}} onClick={() => lookShop(record)}>查看</span>} />
+      <Column title="适用门店" dataIndex="shopList" align="left" render={(_text, record: any) => <span style={{color: "#4189FD", cursor: 'pointer'}} onClick={() => lookShop(record)}>{renderShop(record?.shopList)}</span>} />
       <Column
         title="操作"
         align="center"
@@ -19,7 +19,7 @@ export default function LargeList() {
       onOk={handleCancel}
     >
       <Table
-        dataSource={currentData.current?.shopInfo || []}
+        dataSource={currentData.current?.shopList || []}
         rowKey="shopId"
         pagination={false}
       >