1.五彩：采购发票增加图标可以批量删除已勾选的明细数据

Min
1 parent d4cfb69b
Showing 5 changed files with 67 additions and 5 deletions
src/assets/disabledelete.svg
src/components/Common/CommonComponent/index.js
src/components/Common/CommonNewBill.js
src/components/Common/CommonTable/index.js
src/components/Common/commonBusiness.js
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568961105953" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9439" width="22" height="22" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M799.104 874.24a62.464 62.464 0 0 1-62.4 62.4H287.36a62.464 62.464 0 0 1-62.4-62.336V212.096h574.208v662.208zM349.632 100.224c0-7.232 5.632-12.8 12.8-12.8h299.904c7.232 0 12.8 5.568 12.8 12.8v37.568H349.632v-37.568z m636.608 37.568H749.504v-37.568c0-48-39.168-87.168-87.168-87.168H362.432c-48 0-87.168 39.168-87.168 87.168v37.568H37.76a37.568 37.568 0 1 0 0 75.2h112V874.24a137.6 137.6 0 0 0 137.536 137.536h449.408a137.6 137.6 0 0 0 137.6-137.6V212.16h112a37.568 37.568 0 0 0 37.504-37.568 36.864 36.864 0 0 0-37.568-36.8zM512 823.872a37.568 37.568 0 0 0 37.568-37.568V386.432a37.568 37.568 0 1 0-75.136 0v399.872c0 20.8 16.768 37.568 37.568 37.568z m-175.168 0a37.568 37.568 0 0 0 37.632-37.568V386.432a37.568 37.568 0 1 0-75.2 0v399.872a38.592 38.592 0 0 0 37.568 37.568z m350.336 0a37.568 37.568 0 0 0 37.568-37.568V386.432a37.568 37.568 0 1 0-75.2 0v399.872c0 20.8 16.832 37.568 37.632 37.568z" fill="#8a8a8a" p-id="9440"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568961105953" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9439" width="22" height="22" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M799.104 874.24a62.464 62.464 0 0 1-62.4 62.4H287.36a62.464 62.464 0 0 1-62.4-62.336V212.096h574.208v662.208zM349.632 100.224c0-7.232 5.632-12.8 12.8-12.8h299.904c7.232 0 12.8 5.568 12.8 12.8v37.568H349.632v-37.568z m636.608 37.568H749.504v-37.568c0-48-39.168-87.168-87.168-87.168H362.432c-48 0-87.168 39.168-87.168 87.168v37.568H37.76a37.568 37.568 0 1 0 0 75.2h112V874.24a137.6 137.6 0 0 0 137.536 137.536h449.408a137.6 137.6 0 0 0 137.6-137.6V212.16h112a37.568 37.568 0 0 0 37.504-37.568 36.864 36.864 0 0 0-37.568-36.8zM512 823.872a37.568 37.568 0 0 0 37.568-37.568V386.432a37.568 37.568 0 1 0-75.136 0v399.872c0 20.8 16.768 37.568 37.568 37.568z m-175.168 0a37.568 37.568 0 0 0 37.632-37.568V386.432a37.568 37.568 0 1 0-75.2 0v399.872a38.592 38.592 0 0 0 37.568 37.568z m350.336 0a37.568 37.568 0 0 0 37.568-37.568V386.432a37.568 37.568 0 1 0-75.2 0v399.872c0 20.8 16.832 37.568 37.632 37.568z" fill="#8a8a8a" p-id="9440"></path></svg>
@@ -284,8 +284,8 @@ export default class CommonComponent extends Component {
   onFocus = () => {
     this.isDropdownFilter = false;
     this.setState({ sActiveDisplay: false });
-    console.log(this.props, 'asdasdads');
-    
+
+
   };
  
   onBlur = event => {
@@ -694,6 +694,15 @@ class CommonNewBill extends Component {
     }
   };
  
+  handleTableDelSelect = (name, isWait, tableSelectedRowKeys) => {
+    const { slaveSelectedRowKeys, slaveData, slaveConfig, sModelsId, masterData } = this.props;
+    const slaveReturnData = this.props.onDataRowDel(name, isWait, tableSelectedRowKeys);
+    this.props.onSaveState({
+      ...slaveReturnData,
+    });
+    return true;
+  };
+
   /* 迭代删除从表子表数据  */
   handleDelSlaveChild = (tableData, sId, tableSelectedKeys) => {
     const filterData = tableData.filter(item => item.sFatherSlaveId === sId);
@@ -1418,6 +1427,7 @@ class CommonNewBill extends Component {
               onSetTabNumList={this.handleSetTabNumList}
               onDataRowDownload={this.handleDownload}
               onDelRow={this.handleTableDel}
+              onDelRowSelect={this.handleTableDelSelect}
               onJsonModalOk={this.handleJSONModalOk}
             />
             {visible ? (
@@ -1994,6 +2004,9 @@ const BillComponent = Form.create({
       : false; /* 是否是树形的单据 */
  
   const bSlaveSort = slaveConfig?.gdsconfigformslave?.find(item => item.sControlName === "handleSort")?.bVisible || false;
+  const markSelectRowKeys = commonUtils.isNotEmptyArr(slaveData)
+    ? slaveData.filter(item => item.bMark).map(item => item.sId)
+    : [];
  
   const slaveTableProps = {
     ...commonBusiness.getTableTypes("slave", props),
@@ -2010,12 +2023,14 @@ const BillComponent = Form.create({
     },
     noVlistTable: bPagination,
     onDelRow: props.onDelRow,
+    onDelRowSelect: props.onDelRowSelect,
     data: bSingleTree && commonUtils.isNotEmptyArr(slaveData) ? commonUtils.genTreeByArr(slaveData, "sId", "sFatherSlaveId") : slaveData,
     onTreeAddChild: props.onDataRowAddChild,
     customConfig: props.customConfig,
     isDragAndDrop: bSlaveSort,
     onMoveRow: props.onMoveRow,
-    isSettingFunctions:true
+    isSettingFunctions:true,
+    markSelectRowKeys: markSelectRowKeys
   };
  
   const bCheck0 = commonUtils.isNotEmptyObject(slave0Config) && slave0Config.sTbName === "sysbillcheckresult" ? true : false;
@@ -2670,6 +2685,7 @@ const BillComponent = Form.create({
       separateTabName10 = separateTabConfig.showName;
     }
   }
+  console.log('333props', props);
  
   const flexRowStyle = bFlow ? { display: "flex", flexDirection: "row" } : {};
   const flexContentStyle = bFlow ? { width: "75%" } : {};
@@ -53,6 +53,8 @@ import ParamIcon from &#39;@/assets/param.svg&#39;;
 import sAlumiteIcon from '@/assets/sAlumite.svg';
 import ReplaceIcon from '@/assets/extract.svg';
 import DisReplaceIcon from '@/assets/disableExtract.svg';
+import DelSelectIcon from '@/assets/delete.svg';
+import DisDelSelectIcon from '@/assets/disabledelete.svg';
 import DisAlumiteIcon from '@/assets/disabledsAlumite.svg';
 import ShowImg from '@/components/Common/ShowImage/ShowImage';
 import ShowImgStyle from '@/components/Common/ShowImage/ShowImage.less';
@@ -2964,6 +2966,8 @@ class CommonTableRc extends React.Component {
       sAlumitePopup = this.findVisibleControlName(this.props, 'BtnPopupsAlumiteBomBillNo'); /* 表头放大镜 */
       bCopyMore = this.findVisibleControlName(this.props, 'BtnCopyMore'); /* 复制多行 */
       bReplace = this.findVisibleControlName(this.props, 'BtnReplace'); /* 替换材料 */
+      const { sModelsType } = this.props.app.currentPane;
+      const bDelSelect = sModelsType?.includes('purchase/purchasecheck') ? true : false;
  
       const setNoCommonOperate = props.tableProps.setNoCommonOperate; /* 没有默认的增加删除按钮 */
       let operateWidth = isSlaveInfoM ? 80 : 0;
@@ -3312,7 +3316,7 @@ class CommonTableRc extends React.Component {
                 this.props.enabled ? <UploadOutlined /> : <UploadOutlined style={{ color: 'rgb(189, 189, 189)' }} />
               }
             </a>
-          </Upload></span> : <span> {setOperation}  {headPopup ? <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : ''} </span>),
+          </Upload></span> : <span> {setOperation} {bDelSelect ? <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, "BtnDelSelect")) ? this.delSelectTbRow : null}>{!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, "BtnDelSelect")) ? <img src={DelSelectIcon} alt="删除选中" width="16px" height="15px" /> : <img src={DisDelSelectIcon} alt="删除选中" width="16px" height="15px" />}</a> : ""}  {headPopup ? <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : ''} </span>),
         width: operateWidth + 'px',
         // fixed: commonUtils.isNotEmptyObject(this.props.tableProps.AutoTableHeight) ? 'right' : false,
         fixed: 'right',
@@ -3937,6 +3941,12 @@ class CommonTableRc extends React.Component {
     }, 0);
   };
  
+  delSelectTbRow = (index, record, btnName) => {
+    setTimeout(() => {
+      this.handleDelSelectRow(index, record, btnName);
+    }, 0);
+  };
+
   paramModalTbRow = (index, record) => {
     this.handleParamRow(index, record);
   };
@@ -5295,6 +5305,41 @@ class CommonTableRc extends React.Component {
       }
     }
   };
+
+  handleDelSelectOkRow = (index, record, tableSelectedRowKeys) => {
+    setTimeout(() => {
+      if (this.props.onDelRowSelect(this.props.name, true, tableSelectedRowKeys)) {
+        this.handleSumAllColumn(this.props.config, this.state.dataSource);
+      }
+    }, 0);
+
+  };
+  /**   下载行   */
+  handleDelSelectRow = (index, record, btnName) => {
+    const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？';
+    const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？';
+    const _this = this;
+    console.log('rrr', this.props);
+    const { markSelectRowKeys = []} = this.props;
+
+    if(commonUtils.isEmptyArr(markSelectRowKeys)){
+      message.warn('请至少选择一行数据!');
+      return;
+    }
+    confirm({
+      title: '确认要删除已选中数据吗?',
+      onOk() {
+        _this.handleDelSelectOkRow(index, record, markSelectRowKeys);
+      },
+      onCancel() {
+        return false;
+      },
+      okText: BtnSure,
+      cancelText: BtnCancel
+    });
+  };
+
+
   /**   查看工艺参数   */
   handleParamRow = (index, record) => {
     const tableSelectedRowKeys = [];
@@ -319,6 +319,7 @@ export function getTableTypes(name, props) {
     onCopyRow: props.onDataRowCopy,
     onCopyAllRow: props.onDataRowCopyAll,
     onDelRow: props.onDataRowDel,
+    onDelRowSelect : props.onDelRowSelect,
     onDownloadRow: props.onDataRowDownload,
     onShowParamRow: props.onDataRowShowParam,
     onSelectRowChange: props.onTableSelectRowChange,