Merge remote-tracking branch 'origin/master'

src/ssctp/public/lang/standard/simpchn/7010.json

@@ -229,6 +229,7 @@
   "701001RWCL-0205": "停止接单",
   "701001RWCL-0206": "开始接单",
   "701001RWCL-0207": "有新的作业任务",
+  "701001RWCL-0208": "批量审核",
   
 
   "refer-0001": "编码",

src/ssctp/sscuser/sscuser/list/requestApi.js

@@ -103,6 +103,16 @@ let requestApiOverwrite = {
             }
         })
     },
+    // 作业任务批量审核
+    batchTaskApproveAction: (opt) => {
+        ajax({
+            url: '/nccloud/' + opt.data.mod + '/ssctp/sscbd/SSCTaskHandleBatchApproveAction.do',
+            data: opt.data,
+            success: (data) => {
+                opt.success(data)
+            }
+        })
+    },
     // 作业任务联查操作记录
     taskQueryOperationAction: (opt) => {
         ajax({

src/ssctp/sscuser/sscuser/list/sscUserList.js

@@ -116,6 +116,8 @@ class SscUserList extends Component {
             orderInfo: true, // 接单按钮提示语
             theme: '', // 当前主题
         }
+        //选中的行数据
+        selectedRows: [],
         // 查询条件
         this.queryKey = {
             taskstatus: 'pending',
@@ -144,6 +146,13 @@ class SscUserList extends Component {
         // 待处理pklist
         this.pendingPklist = [];
     }
+    /**
+     * 勾选行触发
+     */
+    buttonController(props, moduleId, record, index, status) {
+        let checkedrows = props.table.getCheckedRows(moduleId);
+        this.selectedRows = checkedrows;
+    }
     componentWillMount() {
         // debugger
         const key = this.props.getUrlParam("process") ? this.props.getUrlParam("process").toLowerCase() : 'pending'
@@ -824,6 +833,52 @@ class SscUserList extends Component {
             })
         }
     }
+    //批量审核点击
+    clickBatchAudit() {
+        if (!this.selectedRows || Object.keys(this.selectedRows).length == 0) {
+           alert("请先选择行后重试");
+        } else {
+            const dataList = [];
+            
+            for(var i =0; i < this.selectedRows.length; i++){
+                let item = this.selectedRows[i].data.values;
+                console.log(item);
+                let dataItem ={
+                    pk_currenttask: item.pk_currenttask.value,
+                    pk_task: item.pk_task.value,
+                    reason: this.state.reason,
+                    billtype: item.billtypecode.value,
+                    billno: item.billno.value,
+                    busiid: item.busiid.value,
+                    skipcodes: this.state.skipcodes,
+                    actiontype: "sscapprove",
+                    ntbCheck: this.state.ntbCheck,
+                    jkCheck: this.state.jkCheck,
+                    ts: item.ts.value,
+                    pk_group: item.pk_group.value,
+                    transtypecode: item.transtypecode.value,
+                    mod: item.module.value,
+                    ...this.auditPointBarInst.getAuditData(true)
+                }
+                dataList.push(dataItem);
+            }
+            let data = {
+                    batchDataList:dataList
+                }
+            console.log("查看参数-------",data)
+            requestApi.batchTaskApproveAction({
+                data: {
+                    batchDataList:dataList
+                },
+                success: (data) => {
+                    if (data.success) {
+                       
+                        
+                    }
+                }
+            })
+        }
+    }
 
     handleSagaErrorClick = () => {
         const { currentRowData: { saga_gtxid, busiid, billtypecode } } = this.state;
@@ -1295,19 +1350,14 @@ class SscUserList extends Component {
                                 btnsLeftArea={(
                                     <div className="get-bill-checkbox">
                                         <NCButton
-                                            className={getBillClass}
+                                            className={currentKey == 'pending' ? 'show' : 'hide'}
                                             onClick={() => {
-                                                if (this.state.getBillStatus) {
-                                                    this.getBillChange.call(this, false)
-                                                } else {
-                                                    this.getBillChange.call(this, true)
-                                                }
+                                                this.clickBatchAudit.call(this)
                                             }}
-                                            onMouseEnter={() => this.setState({ orderInfo: false })}
-                                            onMouseLeave={() => this.setState({ orderInfo: true })}
-
                                         >
-                                            {orderInnerContent}
+                                            {(
+                                                <span >{multiLang && multiLang.get('701001RWCL-0208')}</span>
+                                            )}
                                         </NCButton>
                                         <NCButton
                                             className={getBillClass}
@@ -1324,7 +1374,7 @@ class SscUserList extends Component {
                                         >
                                             {orderInnerContent}
                                         </NCButton>
-                                    </div>
+                                    </div>      
                                 )}
                                 btnsClick={buttonClick.bind(this)}
                                 currentKey={currentKey}
@@ -1368,6 +1418,9 @@ class SscUserList extends Component {
                             pkname: tablePkName,
                             lazyload: false,
                             showIndex: true,
+                            showCheck: true,
+                            onSelected: this.buttonController.bind(this),
+                            onSelectedAll: this.buttonController.bind(this),
                             onRowDoubleClick: (...params) => { onRowDoubleClick.call(this, ...params) },
                             sort: {
                                 mode: 'single',
@@ -1402,7 +1455,7 @@ class SscUserList extends Component {
                         {/* <div
                             className='scroll-add-more'
                             style={{display: addMoreOnOff ? 'block' : 'none'}}
-                        >{multiLang && multiLang.get('701001RWCL-0062')}</div>{/*"701001RWCL-0062": "滑动加载更多"*/} */}
+                        >{multiLang && multiLang.get('701001RWCL-0062')}</div>{/*"701001RWCL-0062": "滑动加载更多"*/} 
                     </div>
                 </div>