Merge branch 'master' of gitlab.feewee.cn:FEV2/fw-cms into bug_fix

王强
2 parents 635cdedb 05e56527
Showing 10 changed files with 281 additions and 14 deletions
config/routers/contract.ts
src/pages/contract/LaborDispatching/api.ts
src/pages/contract/LaborDispatching/components/Filter/index.tsx
src/pages/contract/LaborDispatching/index.tsx
src/pages/contract/LaborDispatching/style.css
src/pages/contract/LaborDispatching/style.less
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
@@ -75,4 +75,8 @@ export default [
     path: "/contract/kt/expressLogisticsArticle/setting", //快递物流物品配置
     component: "./contract/ExpressLogisticsArticleSetting",
   },
+  {
+    path: "/contract/kt/laborDispatching", //劳务派遣配置
+    component: "./contract/LaborDispatching",
+  }
 ];
+import { http } from "@/typing/http";
+import request from "@/utils/request";
+import { CONTRACT_HOST } from "@/utils/host";
+
+export interface PageParams{
+    current?: number;
+    pageSize?: number;
+    placeName?:string;//服务地点名称
+}
+
+export interface Item {
+    id?:number;//id
+    placeType?:number;//服务地点类型，1门店、2食堂、3车辆库房、4配件库房
+    placeId?:number;//服务地点id
+    placeName?:number;//服务地点名称
+    address?:number;//派遣地点位置
+    addressLng?:number;//劳务派遣地点位置经度
+    addressLat?:number;//劳务派遣地点位置纬度
+    wxQrCodeFid?:string;//小程序二维码文件id
+}
+
+/**
+ * 分页查询快递收费标准
+ */
+ export function getLabourQrcodePage(params?: PageParams): http.PromisePageResp<Item> {
+    return request.get(`${CONTRACT_HOST}/erp/labour/qrcode/page`, { params });
+}
+import React, { useState, memo } from "react";
+import { Row, Col, Input } from "antd";
+import _ from "lodash";
+
+interface Props {
+    setParams:any;
+    innerParams:any;
+}
+
+function Filter({ setParams, innerParams }:Props) {
+    const _onChange = _.debounce((val: string) => {
+        setParams({ placeName: val, current: 1 }, true);
+    }, 500);
+    return (
+      <Row style={{flex: 1}}>
+        <Col span={8} style={{marginRight: 10}}>
+          <Input.Search
+            allowClear
+            placeholder="服务地点"
+            onChange={(e) => _onChange(e.target.value)}
+            style={{ maxWidth: 180, marginRight: 15 }}
+          />
+        </Col>
+      </Row>
+    );
+}
+
+export default Filter;
 \ No newline at end of file
+import React, { useState } from "react";
+import { Card, ConfigProvider, Table, Input } from "antd";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import zhCN from "antd/lib/locale-provider/zh_CN";
+import usePagination from "@/hooks/usePagination";
+import Filter from './components/Filter';
+import * as API from './api';
+import _ from "lodash";
+import st from "./style.less";
+
+interface Props {
+}
+enum PlaceType{
+  '--' = 0,
+  '门店' = 1,
+  '食堂',
+  '车辆库房',
+  '配件库房'
+}
+
+const { Column } = Table;
+
+function expressChargingStandard(props:Props) {
+  const {
+    list: LabourList,
+    loading,
+    paginationConfig,
+    innerParams,
+    setParams
+  } = usePagination<API.Item>(API.getLabourQrcodePage, {current: 1, pageSize: 10});
+  const _onChange = _.debounce((val: string) => {
+    setParams({ placeName: val, current: 1 }, true);
+}, 500);
+  return (
+    <PageHeaderWrapper 
+      title="派遣人员打卡二维码"
+    >
+      <ConfigProvider locale={zhCN}>
+        <Card className={st.page}>
+          <div className={st.header}>
+            <Input.Search
+              allowClear
+              placeholder="服务地点"
+              onChange={(e) => _onChange(e.target.value)}
+              style={{ maxWidth: 180, marginRight: 15 }}
+            />
+          </div>
+          <Table
+            size="middle"
+            loading={loading}
+            dataSource={LabourList}
+            scroll={{ y: 800 }}
+            pagination={{ ...paginationConfig }}
+            rowKey={(item: API.Item) => `${item.id}`}
+            onChange={(_pagination) => setParams({ ..._pagination }, true)}
+          >       
+            <Column title="服务地点" width={200} dataIndex="placeName" render={(t:any, item:API.Item) => `${t || '--'}(${PlaceType[item.placeType || 0]})`} /> 
+            <Column title="位置" width={200} dataIndex="address" render={(t:any) => t || '-'} />
+            <Column
+              title="打卡二维码"
+              width={200}
+              dataIndex="wxQrCodeFid"
+              render={(t:any, item:API.Item) => (
+                <span>
+                  <a title="点击下载二维码" href={`/api/file/download?fid=${item.wxQrCodeFid}`}>
+                    查看
+                  </a>  
+                </span>
+                )}
+            />
+            {/* <Column 
+              title="操作"
+              width={100} 
+              dataIndex="unit"
+              render={(text, row:API.Item) => (
+                <span>
+                  <Popconfirm title="是否编辑?" onConfirm={() => edit(row)} okText="确定" cancelText="取消">
+                    <a
+                      onClick={(e) => {
+                          e.preventDefault();
+                      }}
+                      style={{ color: "#FAAD14" }}
+                    >
+                      编辑
+                    </a>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                  <Popconfirm title="是否删除?" onConfirm={() => _delete(row)} okText="确定" cancelText="取消">
+                    <a
+                      onClick={(e) => {
+                          e.preventDefault();
+                      }}
+                      style={{ color: "red" }}
+                    >
+                      删除
+                    </a>
+                  </Popconfirm>
+                </span>
+                
+              )}
+            />  */}
+          </Table>
+        </Card>
+      </ConfigProvider>
+    </PageHeaderWrapper>
+  );
+}
+
+export default expressChargingStandard;
 \ No newline at end of file
+.page {
+  position: relative;
+}
+.page .header {
+  margin-bottom: 10px;
+  height: 32px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.page .header .add {
+  position: absolute;
+  right: 28px;
+  top: 24px;
+  z-index: 10;
+}
+.table :global .ant-table table {
+  width: 100%;
+  border-collapse: collapse;
+  text-align: center;
+  border-radius: 4px 4px 0 0;
+}
+.table :global .ant-table-thead > tr > th,
+.table :global .ant-table-tbody > tr > td {
+  padding: 16px 16px;
+  word-break: break-word;
+  text-align: center;
+  -ms-word-break: break-all;
+}
+.table .cover {
+  align-items: center;
+  height: 68px;
+}
+.table .cover img {
+  border-radius: 4%;
+  height: 100%;
+  width: auto;
+  min-width: 100px;
+  max-width: 100px;
+}
+//@import '~antd/lib/style/themes/default.less';
+
+.page {
+    position: relative;
+  
+    .header {
+      margin-bottom: 10px;
+      height: 32px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      .add {
+        position: absolute;
+        right: 28px;
+        top: 24px;
+        z-index: 10;
+      }
+    }
+    
+  }
+  .table {
+      :global {
+        .ant-table table {
+          width: 100%;
+          border-collapse: collapse;
+          text-align: center;
+          border-radius: 4px 4px 0 0;
+        }
+        .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+          padding: 16px 16px;
+          word-break: break-word;
+          text-align: center;
+          -ms-word-break: break-all;
+        }
+      }
+      .cover {
+        align-items: center;
+        height: 68px;
+        img {
+          border-radius: 4%;
+          height: 100%;
+          width: auto;
+          min-width: 100px;
+          max-width: 100px;
+        }
+      }
+    }
+  
 \ No newline at end of file
 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}
       >