diff --git a/web/client/src/sections/business/actions/achievement-report.js b/web/client/src/sections/business/actions/achievement-report.js index 66c27f3..6f570da 100644 --- a/web/client/src/sections/business/actions/achievement-report.js +++ b/web/client/src/sections/business/actions/achievement-report.js @@ -29,10 +29,11 @@ export function getAchievementDetail(query) { } //回款明细 编号集合 -export function getReceivedNumbers() { +export function getReceivedNumbers(query = {}) { return (dispatch) => basicAction({ type: "get", dispatch: dispatch, + query: query, actionType: "GET_RECEIVED_DETAIL_NUMBERS", url: `${ApiTable.getReceivedNumbers}`, msg: { option: "查询回款明细编号集合" }, @@ -40,10 +41,11 @@ export function getReceivedNumbers() { }); } //导入回款明细 -export function importBackDetails(values) { +export function importBackDetails(values, query = {}) { return dispatch => basicAction({ type: 'post', dispatch: dispatch, + query: query, actionType: 'RECEIVED_DETAIL_BULK_ADD', url: ApiTable.importBackDetails, data: values, diff --git a/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx b/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx index 3e9bc77..3556a56 100644 --- a/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx +++ b/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx @@ -34,8 +34,8 @@ const ContractDetails = (props) => { default: columns.push({ title: columnKeys[key], dataIndex: key, key: key, - render: (text, record) => text === 0 ? text : text ? text : '—', - width: 32 + columnKeys[key].length * 16 + render: (text, record) => text === 0 ? text : text ? text : '-', + width: 32 + columnKeys[key].length * 32 }); break; } @@ -218,6 +218,7 @@ const ContractDetails = (props) => { importModalV ? { setImportModalV(false); + getContractDetailData(); }} /> : '' } { diff --git a/web/client/src/sections/business/containers/performanceReport/importContractDetailsModal.js b/web/client/src/sections/business/containers/performanceReport/importContractDetailsModal.js index a3b22c9..0dab5c7 100644 --- a/web/client/src/sections/business/containers/performanceReport/importContractDetailsModal.js +++ b/web/client/src/sections/business/containers/performanceReport/importContractDetailsModal.js @@ -4,27 +4,40 @@ import { connect } from 'react-redux'; import { Modal, Form, Button, Notification } from '@douyinfe/semi-ui'; import { IconUpload } from '@douyinfe/semi-icons'; import XLSX from 'xlsx'; +import moment from 'moment'; import { contractDetailsColumnKeys } from '../../constants/index'; +const ColumnDateKey = ['applyDate', 'recConDate', 'acceptanceDate', 'backConfirmDate']; +const ColumnDateName = ['申请日期', '收到合同日期', '验收日期', '收入确认时间']; //下载模板和上传文件读取 const ImportContractDetailsModal = props => { const { dispatch, actions, onCancel } = props; - const { humanAffairs } = actions; + const { businessManagement } = actions; const [msg, setMsg] = useState(''); const [loading, setLoading] = useState(''); const [postData, setPostData] = useState([]); + const [uploadAble, setUploadAble] = useState(false); + const [allNumbers, setAllNumbers] = useState([]); //初始化 useEffect(() => { + //查询明细表已存在编号数据接口通用 + dispatch(businessManagement.getReceivedNumbers({ tableModel: 'ContractDetail' })).then(r => { + if (r.success) { + setUploadAble(true); + setAllNumbers(r.payload.data); + } + }) }, []); const confirm = () => { if (postData.length) { setLoading(true) - // dispatch(humanAffairs.addSalesMemberBulk(postData)).then(res => { - // if (res.success) { - // onCancel() - // } - // setLoading(false) - // }) + //导入明细接口通用 + dispatch(businessManagement.importBackDetails(postData, { tableModel: 'ContractDetail' })).then(res => { + if (res.success) { + onCancel() + } + setLoading(false) + }) } else { Notification.warning({ content: '没有数据可以提交，请上传数据文件', duration: 2 }) } @@ -94,9 +107,29 @@ const ImportContractDetailsModal = props => { }) } + const judgeNullTime = (v) => { + //注意的点：xlsx将excel中的时间内容解析后，会小一天 + //如2020/8/1，xlsx会解析成 Fri Jul 31 2020 23:59:17 GMT+0800 小了43秒 + let a = new Date(v); + a.setTime(a.getTime() + 43 * 1000); + return v ? a : null; + } - const judgeNull = (value) => { - return value ? String(value).trim().replace(/\s*/g, "") : null; + const judgeTimeValid = (time) => { + let valid = true; + if (!time) { + return valid;//可以不填 + } + const ymd = /^((19|20)[0-9]{2})[\/\-]((0[1-9])|(1[0-2]))[\/\-]((0[1-9])|((1|2)[0-9])|(3[0-1]))$/;//年月日 + if (time instanceof Date) { + let timeStr = moment(time).format('YYYY/MM/DD'); + if (!ymd.test(timeStr)) { + valid = false; + } + } else { + valid = false; + } + return valid; } return ( @@ -137,12 +170,51 @@ const ImportContractDetailsModal = props => { return } let postData = []; + let yearPattern = /^(19|20)\d{2}$/;//1900-2099年 + let zzsPattern = /^[+]{0,1}(\d+)$/;//正整数 for (let i = 0; i < res.length; i++) { let d = res[i]; let obj = {}; Object.keys(contractDetailsColumnKeys).map(key => { - obj[key] = d[contractDetailsColumnKeys[key]] || ''; + //四个日期验证“申请日期”、“收到合同日期”、“验收日期”、“收入确认时间” + if (ColumnDateKey.indexOf(key) != -1) {//两个时间 + obj[key] = judgeNullTime(d[contractDetailsColumnKeys[key]]); + } else { + obj[key] = d[contractDetailsColumnKeys[key]] || null; + } }) + //年度 序号 编号必填 + if (!obj.year || !obj.serialNo || !obj.number) { + error(`第${i + 2}行【年度】、【序号】、【编号】存在空值，请填写`) + return + } + //年度 + if (obj.year && !yearPattern.test(obj.year)) { + error(`第${i + 2}行【年度】填写错误`) + return + } + //序号 正整数 + if (obj.serialNo && !zzsPattern.test(obj.serialNo)) { + error(`第${i + 2}行【序号】填写错误，需要为非负整数`) + return + } + let exist = allNumbers.find(m => m.number == obj.number);//数据库中 已有该编号 + if (exist) { + error(`第${i + 2}行的【编号】在系统中已存在`) + return + } + if (postData.some(p => p.number == obj.number)) {//编号 唯一 + error(`第${i + 2}行【编号】重复，请更改后重新上传`) + return + } + + for (let k = 0; k < ColumnDateKey.length; k++) { + let cValid = judgeTimeValid(obj[ColumnDateKey[k]]); + if (!cValid) { + error(`第${i + 2}行【${ColumnDateName[k]}】错误，请填写yyyy/mm/dd格式`) + return + } + } postData.push(obj); } setPostData(postData) @@ -151,7 +223,7 @@ const ImportContractDetailsModal = props => { onSuccess({ message: msg }) }) }}> -