qiangmj / ebc-Mes

Commit 9ac94f2451532670e99204bf25a491ffdd7e84e7

Authored by zhangzzzz
1 parent 96c9de86

同步代码；

Inline Side-by-side
Showing 3 changed files with 359 additions and 2 deletions
.prettierrc 0 → 100644
  View file @9ac94f2
  1 +{
  2 + "printWidth": 150,
  3 + "eslintIntegration": true,
  4 + "stylelintIntegration": true,
  5 + "tabWidth": 2,
  6 + "semi": true,
  7 + "singleQuote": false,
  8 + "quoteProps": "as-needed",
  9 + "jsxSingleQuote": false,
  10 + "bracketSpacing": true,
  11 + "arrowParens": "avoid",
  12 + "htmlWhitespaceSensitivity": "css",
  13 + "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
  14 + "files.insertFinalNewline": true,
  15 + "useTabs": false,
  16 + "endOfLine": "lf",
  17 + "ignorePath": ".gnore",
  18 + "trailingComma": "es5",
  19 + "jsxBracketSameLine": false,
  20 + "bracketSameLine": false
  21 +}
0 22 \ No newline at end of file
... ...
src/mes/common/commonModelComponent/index.js
  View file @9ac94f2
... ... @@ -348,6 +348,7 @@ const useCommonModelEvent = props => {
348 348 useEffect(
349 349 () => {
350 350 if (!props.bFinish) return;
  351 + window.refreshTableList = undefined;
351 352  
352 353 const { firstTableName } = props;
353 354 if (!firstTableName) return;
... ...
src/mes/costomPageFun/index.js
  View file @9ac94f2
... ... @@ -126,6 +126,58 @@ const costomPageFun = ({ props, tableName, sFieldName, actionName }) => {
126 126 result = true;
127 127 handleZlxjCheck(props, sFieldName);
128 128 break;
  129 + case "mesBtnClick-slave0-BtnRight.foremanReview":
  130 + result = true;
  131 + window.refreshTableList = ["slave1"];
  132 + handleCjlbshCheck(props);
  133 + break;
  134 + case "mesBtnClick-slave0-BtnRight.reverseReview":
  135 + result = true;
  136 + window.refreshTableList = ["slave1"];
  137 + handleCjlbfsCheck(props);
  138 + break;
  139 + case "mesBtnClick-slave0-BtnRight.ipqcReview":
  140 + result = true;
  141 + window.refreshTableList = ["slave1"];
  142 + handlePgshCheck(props);
  143 + break;
  144 + case "mesBtnClick-slave0-BtnRight.ipqcReverseReview":
  145 + result = true;
  146 + window.refreshTableList = ["slave1"];
  147 + handlePgfsCheck(props);
  148 + break;
  149 + case "mesBtnClick-slave0-BtnRight.confirmSubmit":
  150 + result = true;
  151 + window.refreshTableList = ["slave1"];
  152 + handleConfirmSubmit(props);
  153 + break;
  154 + case "mesBtnClick-slave0-BtnRight..edit":
  155 + case "mesBtnClick-slave0-BtnRight.edit":
  156 + {
  157 + window.refreshTableList = ["slave1"];
  158 + const { slave0Data } = props;
  159 + result = true;
  160 + const slave0DataNew = [{ ...slave0Data[0], bSubmit: 0, handleType: slave0Data[0].handleType || "update" }];
  161 + props.onExecInstructSet({
  162 + nextProps: { ...props, slave0Data: slave0DataNew },
  163 + btnConfig: {
  164 + showName: "保存",
  165 + sInstruct: JSON.stringify([
  166 + {
  167 + opr: "save",
  168 + data: [
  169 + {
  170 + tablename: "EptCompletionSiteClearanceMaster",
  171 + srcDataset: "slave0",
  172 + },
  173 + ],
  174 + },
  175 + ]),
  176 + },
  177 + });
  178 + break;
  179 + }
  180 +
129 181 default:
130 182 break;
131 183 }
... ... @@ -968,7 +1020,6 @@ const handleSlaveWyrj2BtnPre = props => {
968 1020 const [rowData = {}] = listData;
969 1021  
970 1022 const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
971   - console.log("=====rowData", rowData, tableData);
972 1023 if (iIndex === -1) {
973 1024 message.info("暂无数据！");
974 1025 return;
... ... @@ -1444,7 +1495,7 @@ const mesTableBtnClick4 = async props => {
1444 1495 sInstruct: JSON.stringify([
1445 1496 {
1446 1497 opr: "save",
1447   - doNotRefresh: true,
  1498 + // doNotRefresh: true,
1448 1499 data: [
1449 1500 {
1450 1501 tablename: "qlyqualityinspectionmaster",
... ... @@ -1462,4 +1513,288 @@ const mesTableBtnClick4 = async props => {
1462 1513 }
1463 1514 };
1464 1515  
  1516 +// 完工情场确认-车间领班审核
  1517 +const handleCjlbshCheck = async props => {
  1518 + const faceResult = await getFaceResult(props);
  1519 +
  1520 + if (!faceResult) return;
  1521 +
  1522 + const { name } = faceResult;
  1523 + const { slave0Config, slave0Data = [] } = props;
  1524 + const filterConfig = slave0Config?.gdsconfigformslave?.filter(item => {
  1525 + return item.sName === "sForemanCheckMemo";
  1526 + });
  1527 +
  1528 + const returnData = await new Promise(resolve => {
  1529 + props.onSaveState({
  1530 + commonRepairModalParams: {
  1531 + visible: true,
  1532 + title: "领班审核备注",
  1533 + tableName: "slave0",
  1534 + config: slave0Config,
  1535 + record: { ...slave0Data[0], bSubmit: 0 },
  1536 + filterConfig,
  1537 + callback: rowData => {
  1538 + resolve(rowData);
  1539 + },
  1540 + },
  1541 + });
  1542 + });
  1543 +
  1544 + if (commonUtils.isEmptyObject(returnData)) return;
  1545 +
  1546 + const slave0DataNew = [
  1547 + {
  1548 + ...returnData,
  1549 + bSubmit: 1,
  1550 + tForemanCheckDate: moment().format("YYYY-MM-DD HH:mm:ss"),
  1551 + sForemanCheckPerson: name,
  1552 + bForemanCheck: 1,
  1553 + handleType: returnData.handleType || "update",
  1554 + },
  1555 + ];
  1556 +
  1557 + props.onSaveState({ slave0Data: slave0DataNew });
  1558 + props.onExecInstructSet({
  1559 + nextProps: { ...props, slave0Data: slave0DataNew },
  1560 + btnConfig: {
  1561 + showName: "保存",
  1562 + sInstruct: JSON.stringify([
  1563 + {
  1564 + opr: "save",
  1565 + doNotRefresh: true,
  1566 + data: [
  1567 + {
  1568 + tablename: "EptCompletionSiteClearanceMaster",
  1569 + srcDataset: "slave0",
  1570 + },
  1571 + ],
  1572 + },
  1573 + ]),
  1574 + },
  1575 + });
  1576 +};
  1577 +
  1578 +// 完工情场确认-车间领班反审
  1579 +const handleCjlbfsCheck = async props => {
  1580 + const faceResult = await getFaceResult(props);
  1581 + if (!faceResult) return;
  1582 +
  1583 + const { slave0Data = [] } = props;
  1584 +
  1585 + const slave0DataNew = [{ ...slave0Data[0], bForemanCheck: 0, bIPQCCheck: 0, handleType: slave0Data[0].handleType || "update" }];
  1586 +
  1587 + props.onSaveState({ slave0Data: slave0DataNew });
  1588 + props.onExecInstructSet({
  1589 + nextProps: { ...props, slave0Data: slave0DataNew },
  1590 + btnConfig: {
  1591 + showName: "保存",
  1592 + sInstruct: JSON.stringify([
  1593 + {
  1594 + opr: "save",
  1595 + doNotRefresh: true,
  1596 + data: [
  1597 + {
  1598 + tablename: "EptCompletionSiteClearanceMaster",
  1599 + srcDataset: "slave0",
  1600 + },
  1601 + ],
  1602 + },
  1603 + ]),
  1604 + },
  1605 + });
  1606 +};
  1607 +
  1608 +// 完工情场确认-品管审核
  1609 +const handlePgshCheck = async props => {
  1610 + const faceResult = await getFaceResult(props);
  1611 +
  1612 + if (!faceResult) return;
  1613 +
  1614 + const { name } = faceResult;
  1615 + const { slave0Config, slave0Data = [] } = props;
  1616 + const filterConfig = slave0Config?.gdsconfigformslave?.filter(item => {
  1617 + return item.sName === "sIPQCCheckMemo";
  1618 + });
  1619 +
  1620 + const returnData = await new Promise(resolve => {
  1621 + props.onSaveState({
  1622 + commonRepairModalParams: {
  1623 + visible: true,
  1624 + title: "品管审核备注",
  1625 + tableName: "slave0",
  1626 + config: slave0Config,
  1627 + record: { ...slave0Data[0], bSubmit: 0 },
  1628 + filterConfig,
  1629 + callback: rowData => {
  1630 + resolve(rowData);
  1631 + },
  1632 + },
  1633 + });
  1634 + });
  1635 +
  1636 + if (commonUtils.isEmptyObject(returnData)) return;
  1637 +
  1638 + const slave0DataNew = [
  1639 + {
  1640 + ...returnData,
  1641 + bSubmit: 1,
  1642 + tIPQCCheckDate: moment().format("YYYY-MM-DD HH:mm:ss"),
  1643 + sIPQCCheckPerson: name,
  1644 + bIPQCCheck: 1,
  1645 + handleType: returnData.handleType || "update",
  1646 + },
  1647 + ];
  1648 +
  1649 + props.onSaveState({ slave0Data: slave0DataNew });
  1650 + props.onExecInstructSet({
  1651 + nextProps: { ...props, slave0Data: slave0DataNew },
  1652 + btnConfig: {
  1653 + showName: "保存",
  1654 + sInstruct: JSON.stringify([
  1655 + {
  1656 + opr: "save",
  1657 + doNotRefresh: true,
  1658 + data: [
  1659 + {
  1660 + tablename: "EptCompletionSiteClearanceMaster",
  1661 + srcDataset: "slave0",
  1662 + },
  1663 + ],
  1664 + },
  1665 + ]),
  1666 + },
  1667 + });
  1668 +};
  1669 +
  1670 +// 完工情场确认-品管反审
  1671 +const handlePgfsCheck = async props => {
  1672 + const faceResult = await getFaceResult(props);
  1673 + if (!faceResult) return;
  1674 +
  1675 + const { slave0Data = [] } = props;
  1676 +
  1677 + const slave0DataNew = [{ ...slave0Data[0], bIPQCCheck: 0, handleType: slave0Data[0].handleType || "update" }];
  1678 +
  1679 + props.onSaveState({ slave0Data: slave0DataNew });
  1680 + props.onExecInstructSet({
  1681 + nextProps: { ...props, slave0Data: slave0DataNew },
  1682 + btnConfig: {
  1683 + showName: "保存",
  1684 + sInstruct: JSON.stringify([
  1685 + {
  1686 + opr: "save",
  1687 + doNotRefresh: true,
  1688 + data: [
  1689 + {
  1690 + tablename: "EptCompletionSiteClearanceMaster",
  1691 + srcDataset: "slave0",
  1692 + },
  1693 + ],
  1694 + },
  1695 + ]),
  1696 + },
  1697 + });
  1698 +};
  1699 +
  1700 +// 完工清场确认-确认提交
  1701 +const handleConfirmSubmit = async props => {
  1702 + const { slave0Data } = props;
  1703 + const slave0RowData = slave0Data[0];
  1704 + const { tFirstCompleteTime, tFirstClearanceTime, tSecondStartTime } = slave0RowData;
  1705 + if (tFirstCompleteTime) {
  1706 + // 完工时间需小于清场时间
  1707 + if (moment(tFirstCompleteTime).isAfter(moment(tFirstClearanceTime))) {
  1708 + message.error("完工时间需小于清场时间", 3);
  1709 + return;
  1710 + }
  1711 + }
  1712 +
  1713 + if (tSecondStartTime) {
  1714 + // 清场时间需小于第二单开单时间
  1715 + if (moment(tFirstClearanceTime).isAfter(moment(tSecondStartTime))) {
  1716 + message.error("清场时间需小于第二单开单时间", 3);
  1717 + return;
  1718 + }
  1719 + }
  1720 +
  1721 + if (!tFirstCompleteTime || !tSecondStartTime) {
  1722 + const confirmResult = await new Promise(resolve => {
  1723 + Modal.confirm({
  1724 + title: "温馨提示：",
  1725 + content: "工单完工时间或者第二单开工时间未填写是否继续提交？",
  1726 + closable: true,
  1727 + maskClosable: true,
  1728 + wrapClassName: "mesCommonModal",
  1729 + onOk() {
  1730 + resolve(1);
  1731 + },
  1732 + onCancel() {
  1733 + resolve(0);
  1734 + },
  1735 + });
  1736 + });
  1737 +
  1738 + if (!confirmResult) return;
  1739 + }
  1740 +
  1741 + const { sMachineGuid, sUserName, sTeamNo, sTeamId } = commonUtils.getAppData("userinfo");
  1742 + const addState = {
  1743 + sMachineId: sMachineGuid,
  1744 + bSave: 1,
  1745 + bSubmit: 1,
  1746 + sFormId: "17086722220003015078585693314000",
  1747 + sMakePerson: sUserName,
  1748 + sFirstTeamNo: sTeamNo,
  1749 + sSecondTeamNo: sTeamNo,
  1750 + sFirstTeamId: sTeamId,
  1751 + sSecondTeamId: sTeamId,
  1752 + sFirstClearancePerson: sUserName,
  1753 + handleType: slave0RowData.handleType || "update"
  1754 + };
  1755 + const slave0DataNew = [{ ...slave0RowData, ...addState }];
  1756 +
  1757 + let refreshDataset = "slave1";
  1758 + if (addState.handleType === 'add') {
  1759 + window.rowclickAfterFunc = (nextProps) => {
  1760 + const { slave1Data } = nextProps;
  1761 + props.onSaveState({ slave1SelectedRowKeys: [slave1Data[0].sId] });
  1762 + }
  1763 + } else {
  1764 + refreshDataset = "*";
  1765 + }
  1766 +
  1767 + props.onExecInstructSet({
  1768 + nextProps: { ...props, bSaveAndUpdate: true, slave0Data: slave0DataNew },
  1769 + btnConfig: {
  1770 + showName: "保存",
  1771 + sInstruct: JSON.stringify([
  1772 + {
  1773 + opr: "save",
  1774 + doNotRefresh: true,
  1775 + data: [
  1776 + {
  1777 + tablename: "EptCompletionSiteClearanceMaster",
  1778 + srcDataset: "slave0",
  1779 + },
  1780 + ].map(item => {
  1781 + if (!slave0RowData.sBillNo) {
  1782 + return {
  1783 + ...item,
  1784 + maxBillNo: "sBillNo"
  1785 + }
  1786 + } else {
  1787 + return item;
  1788 + }
  1789 + }),
  1790 + },
  1791 + {
  1792 + opr: "refresh",
  1793 + dataset: refreshDataset
  1794 + },
  1795 + ]),
  1796 + },
  1797 + });
  1798 +};
  1799 +
1465 1800 export default costomPageFun;
... ...