部署

patch/预生产部署包_20241016_qy_sy/cmpTaxDeclarationListEx.js

@@ -0,0 +1,120 @@
+var error_path;
+shr.defineClass("shr.compensation.CmpTaxDeclarationEx", shr.compensation.CmpTaxDeclaration, {
+    editViewDisable: true,
+    initalizeDOM: function () {
+        shr.compensation.CmpTaxDeclarationEx.superClass.initalizeDOM.call(this);
+
+    },
+    getCompanyIncomesAction: function () {
+        var _self = this;
+        var day = new Date();
+        var today = day.format("yyyy-MM");
+        //添加选择月份弹框
+        $("#taxPeriodDialog").remove();
+        var $body = $(document.body);
+        var dialog = _self.getTaxPeriodDialog();
+        var buttons = _self.getTaxPeriodButtons();
+        $body.append(dialog);
+        showDialog("#taxPeriodDialog",
+            '申报数据明细查询',//'人员报送',
+            dialog, buttons, 750, 300);
+        var taxPeriodDate_json = {};
+        taxPeriodDate_json.validate = "{required:true}";
+        taxPeriodDate_json.id = "taxPeriodDate";
+        taxPeriodDate_json.format = 'yyyy-mm';
+        taxPeriodDate_json.maxDate = today;
+
+        taxPeriodDate_json.isRemoveDay = true;
+        taxPeriodDate_json.ctrlType = 'Date';
+        $('#taxPeriodDate').shrDateTimePicker(taxPeriodDate_json);
+        $('#taxPeriodDate').shrDateTimePicker("setValue", today);
+    },
+    getTaxPeriodButtons: function () {
+        var self = this;
+        var buttons = [{
+            text: '确定',//'确定',
+            click: function () {
+                var taxPeriodDate = $("#taxPeriodDate").shrDateTimePicker("getValue");
+                if (taxPeriodDate == null) {
+                    shr.showError({
+                        message: '选择月份不能为空'//'选择报送月份不能为空'
+                    });
+                    return;
+                }
+                taxPeriodDate = taxPeriodDate.slice(0, taxPeriodDate.length - 3);
+                $("#taxPeriodDialog").dialog("close");
+                self.doReport({taxPeriodDate: taxPeriodDate});
+            }
+        }];
+        return buttons;
+    },
+    doReport: function (taxPeriodDate) {
+        var _self = this;
+//		var serviceId =_self.getFieldValue("serviceID");
+        var selectedRowsData = $('#grid').jqGrid('getSelectedRowsData');
+        var temp = [];
+        for (i = 0; i < selectedRowsData.length; i++) {
+
+            var selectedData = selectedRowsData[i];
+            temp.push(selectedData.id);
+        }
+        var selectedIds = temp.join(",");
+
+        var param = _self.assembleFullQueryParam();
+        param.selectedIds = selectedIds;
+        param.taxPeriodDate = taxPeriodDate.taxPeriodDate;
+        //调用后台人员申报接口
+        _self.remoteCall({
+            method: "getCompanyIncomes",
+            param: param,
+            success: function (response) {
+
+                shr.showInfo({
+//					message : "已提交系统进行人员报送，需要等待几分钟，可在执行任务监控中查看运行进度；报送完成后将会推送消息告知",
+                    message: "已提交系统进行人员报送，需要等待几分钟，可在执行任务监控中查看运行进度；",
+                    hideAfter: 10
+                });
+                return;
+            }
+        });
+    },
+    assembleFullQueryParam : function(){
+        var _self = this;
+        var postData=$('#grid').jqGrid("getGridParam","postData");
+        $('#grid')._pingPostData(postData);
+        totalRecords = $('#grid').jqGrid('getGridParam', 'records');
+        var param = $.extend({}, postData);
+        var selectedIdsP = _self.getSelectedFields().toString();
+        param.totalRecords =totalRecords;
+        param.selectedData = selectedIdsP;
+        param.page = 1;
+        param.isAll = true;
+        param.columnModel = "id";
+        return param;
+    },
+    getTaxPeriodDialog: function () {
+        var line = '选择月份';//'选择报送月份';
+        var msg1 = '说明：';//'说明：';
+        var msg2 = '1、\t企业申报数据明细查询；';//'1、	当月新增人员，或任职受雇从业信息有变更的人员需要进行人员报送；';
+        var msg3 = '2、\t综合所得查询。';//'2、	已报送成功的人员在发起下一次人员报送任务之前，始终有效，无需每月都报送。';
+        var html = ['<div id="taxPeriodDialog" style="padding:5px;">',
+            '<div class="photoState" style="margin-left:0px;">',
+            '<table width="100%">',
+            '<tr>',
+            '<td width="20%"><h6>' + line + '</h6></td>',
+            '<td width="40%">',
+            '<input type="text" id="taxPeriodDate" name="taxPeriodDate" class="input-height" style=""/>',
+            '</td>',
+            '<td width="40%"></td>',
+            '</tr>',
+            '</table>',
+            '<div style="color:#428bca;width:auto;height:auto;">' +
+            '<p>' + msg1 + '</p>' +
+            '<p>' + msg2 + '</p>' +
+            '<p>' + msg3 + '</p>',
+            '</div>',
+            '</div>',
+            '</div>'].join('');
+        return html;
+    },
+});

patch/预生产部署包_20241016_qy_sy/compensationjzt/CmpCalDynamicListEx.js

@@ -0,0 +1,39 @@
+shr.defineClass("shr.compensation.CmpCalDynamicListExExEx", shr.compensation.CmpCalDynamicList, {
+
+    initalizeDOM: function () {
+        var _self = this;
+        shr.compensation.CmpCalDynamicListExExEx.superClass.initalizeDOM.call(_self);
+    },
+    /**
+     * 同步人员纳税信息
+     */
+    synTaxPersonRecordAction(){
+        var _self = this;
+        //_self.cmpschemeid 获取计算规则ID
+        // $.block.show({
+            // text: '正在获取参数！',
+            // })
+        _self.remoteCall({
+            method: 'taxPaymentBackCalculate',
+            param: {
+                cmpschemeid:_self.cmpschemeid
+            },
+            async: false,
+            success: function (data) {
+                console.log(data);
+                if(data){
+                    // $.block.hide()
+                    shr.showInfo({
+                        message: "同步成功，修改"+data.update+"条  新增"+data.add
+                        , hideAfter: 2
+                    });
+                }
+            }, error: function (response) {
+                shr.showError({
+                    message: response.summary
+                    , hideAfter: 2
+                });
+            }
+        });
+    }
+});

patch/预生产部署包_20241016_qy_sy/compensationjzt/CmpCalDynamicListExExEx.js

@@ -0,0 +1,74 @@
+shr.defineClass("shr.compensation.CmpCalDynamicListExExEx", shr.compensation.CmpCalDynamicListExEx, {
+
+    initalizeDOM: function () {
+        var _self = this;
+        shr.compensation.CmpCalDynamicListExExEx.superClass.initalizeDOM.call(_self);
+    },
+       /**
+     * 个税反算同步
+     */
+	   taxPaymentBackSynAction(){
+        var _self = this;
+        // _self.cmpschemeid 获取计算规则ID
+        $.block.show({
+            text: '正在同步，请勿操作！',
+            })
+        _self.remoteCall({
+            method: 'taxPaymentBackSyn',
+            param: {
+                cmpschemeid:_self.cmpschemeid
+            },
+            async: false,
+            success: function (data) {
+                console.log(data);
+                if(data){
+                    $.block.hide()
+                    shr.showInfo({
+                        message: data.msg
+                        , hideAfter: 2
+                    });
+                }
+            }, error: function (response) {
+                $.block.hide()
+                shr.showError({
+                    message: response.summary
+                    , hideAfter: 2
+                });
+            }
+        });
+    }
+    ,
+	   /**
+     * 个税反算
+     */
+	   taxPaymentBackCalculateAction(){
+        var _self = this;
+        // _self.cmpschemeid 获取计算规则ID
+        $.block.show({
+            text: '正在同步，请勿操作！',
+            })
+        _self.remoteCall({
+            method: 'taxPaymentBackCalculate',
+            param: {
+                cmpschemeid:_self.cmpschemeid
+            },
+            async: false,
+            success: function (data) {
+                console.log(data);
+                if(data){
+                    $.block.hide()
+                    shr.showInfo({
+                        message: data.msg
+                        , hideAfter: 2
+                    });
+                }
+            }, error: function (response) {
+                $.block.hide()
+                shr.showError({
+                    message: response.summary
+                    , hideAfter: 2
+                });
+            }
+        });
+    }
+});

patch/预生产部署包_20241016_qy_sy/compensationjzt/IncomeTaxDeclareListEx.js

@@ -0,0 +1,373 @@
+shr.defineClass("shr.compensation.IncomeTaxDeclareListEx", shr.compensation.IncomeTaxDeclareList, {
+    initalizeDOM: function () {
+        shr.compensation.IncomeTaxDeclareListEx.superClass.initalizeDOM.call(this);
+        var _self = this;
+    },
+    /**
+        * 个税申报按钮事件
+        */
+    taxDeclareAction: function () {
+        var _self = this;
+        // if (!_self.hasTaxImp) {
+        //     shr.showError({
+        //         message: '操作失败，需开通云服务后才能使用，请系统管理员前往【系统设置-云服务设置-云服务注册及连接】进行注册。'
+        //         , hideAfter: 5
+        //     });
+        // } else {
+        var selectedId = _self.getSelectedIds();
+        if (!selectedId) {
+            return;
+        }
+        var param = {};
+        param.selectedId = selectedId;
+        _self.remoteCall({
+            type: "post",
+            method: "taxDeclare",
+            param: param,
+            showBlock: true,
+            success: function (res) {
+                if (res.success) {
+                    shr.showInfo({ message: res.info, hideAfter: 10 });
+                } else {
+                    if (res.hasErrData) {
+                        if (res.hasCheckDataErr) {
+                            shr.showWarning({ message: '以下员工数据异常，无法进行个税申报，请点击异常人员名单查看失败原因及操作指引。', hideAfter: 10 });
+                            document.location.href = shr.getContextPath() + res.excel;
+                        } else {
+                            shr.showError({ message: res.errorMsg, hideAfter: 10 })
+                        }
+                    }
+                    if (res.dataError) {
+                        shr.showWarning({ message: res.errMsg, hideAfter: 10 });
+                    }
+                    if (res.issueError) {
+                        _self.showConfirm(res.errMsg, function () {
+                            _self.reloadPage({
+                                uipk: "com.kingdee.shr.compensation.app.tax.IncomeTaxIssue.person.list"
+                            });
+                        }, function () {
+                            _self.reloadPage({
+                                uipk: "com.kingdee.shr.compensation.app.incomeTax.TaxPersonRecordEntry.list"
+                            });
+                        });
+                    }
+                    if (res.reductionError) {
+                        shr.showWarning({ message: res.errMsg, hideAfter: 10 });
+                    }
+                }
+                _self.queryGrid();
+            }
+        });
+        // }
+    },
+    /**
+    * 生成申报数据
+    */
+    generateTaxDataAction: function () {
+        var _self = this;
+        var html = [], buttons = [], $dialog = $("#generateDataDialog"), $body = $(document.body);
+        if ($dialog.size() == 0) {
+            $dialog = $("<div id='generateDataDialog' class='tiny-dialog'></div>").appendTo($body);
+        }
+        html = ['<div id="generateDataHtml">',
+            '<div class="sync-row row-fluid">',
+            '<div data-ctrlrole="labelContainer">',
+            '<div class="col-lg-6 textLeft"><div class="field_label" title="' + '纳税单位名称' + '">' +
+            '纳税单位名称' + '</div></div>',
+            '<div class="col-lg-6 field-ctrl"><input id="taxUnitF7" class="taxUnitF7 input-height" validate="{required:true}"></input></div>',
+            '</div>',
+            '</div>',
+            '<div class="sync-row row-fluid" style="margin-top:20px">',
+            '<div data-ctrlrole="labelContainer">',
+            '<div class="col-lg-6 textLeft"><div class="field_label"  title="' + '税款所属期（所得月份）' + '">' +
+            '税款所属期（所得月份）' + '</div></div>',
+            '<div class="col-lg-6 field-ctrl">',
+            '<div><div class="ui-datepicker-layout"><div class="ui-datepicker-inputframe"><input id="yearMonthData" name="yearMonthData" class="block-father input-height" value="" validate="" placeholder="" type="text" dataextenal="" autocomplete="off" istotemplate="true" ctrlrole="datetimepicker"></div></div></div>',
+            '</div>',
+            '</div>',
+            '</div>',
+            '</div>'];
+        var saveSettingButton = _self.getSaveSettingButton();
+        buttons.push(saveSettingButton);
+        showDialog("#generateDataDialog",
+            '生成申报数据',
+            html.join(""), buttons, 700, 320, '取消');
+        var dateTimePicker_json = {};
+
+        dateTimePicker_json.readonly = '';
+        dateTimePicker_json.validate = '{required:true}';
+        dateTimePicker_json.format = 'yyyy-mm';
+        dateTimePicker_json.id = "yearMonthData";
+
+        dateTimePicker_json.isRemoveDay = true;
+        dateTimePicker_json.ctrlType = 'Date';
+
+        $('#yearMonthData').shrDateTimePicker(dateTimePicker_json);
+        var date = new Date();
+        var dateStr = date.format('yyyy-MM');
+        var dateArr = dateStr.split('-');
+        if (parseInt(dateArr[1]) == 1) {
+            dateStr = (parseInt(dateArr[0]) - 1) + "-12";
+        } else {
+            dateStr = dateArr[0] + "-" + (parseInt(dateArr[1]) - 1);
+        }
+        $('#yearMonthData').shrDateTimePicker('setValue', dateStr, 'yyyy-MM');
+        var grid_f7_json = {
+            id: "taxUnitF7",
+            name: "taxUnitF7",
+            subWidgetName: "shrPromptGrid",
+            validate: "{required:true}",
+            subWidgetOptions: {
+                title: '选择纳税单位:',
+                uipk: "com.kingdee.shr.compensation.app.tax.TaxDeclareTaxUnitF7",
+                filter: '',
+                multiselect: true,
+                isInput: true,
+            },
+        };
+        /**
+         * 默认当前员工所有的纳税单位数据权限
+         */
+        $("#taxUnitF7").shrPromptBox(grid_f7_json);
+        //		$("#taxUnitF7").shrPromptBox("option",{
+        //			onchange:function(e,value) {
+        //				var info = value.current;
+        //				$.each(info, function(index, item){
+        //					
+        //				})
+        //			}
+        //		});
+        shr.callHandler({
+            handler: "com.kingdee.shr.compensation.web.handler.tax.TaxDeclareTaxUnitF7Handler",
+            action: "getPersonAllPermTaxUnit",
+            async: false,
+            param: {},
+            error: function (ret) {
+                var message = ret.responseText;
+                shr.showWarning({
+                    message: message,
+                    hideAfter: 5
+                });
+                return;
+            },
+            success: function (res) {
+                // console.log(res);
+                // $("#taxUnitF7").shrPromptBox("setValue", res);
+            }
+        });
+    },
+
+
+
+
+
+
+
+
+
+    // 更正申报
+    updateDeclareAction: function () {
+        var _self = this;
+        //if (!_self.hasTaxImp) {
+        //    shr.showError({
+        //        message: '操作失败，需开通云服务后才能使用，请系统管理员前往【系统设置-云服务设置-云服务注册及连接】进行注册。'
+        //        , hideAfter: 5
+        //    });
+        //    return;
+        //}
+        var selectedId = _self.getSelectedIds();
+        if (!selectedId) {
+            return;
+        }
+        if (selectedId.indexOf(",") > -1) {
+            shr.showError({
+                message: '请选择单条记录做更正申报。'
+                , hideAfter: 5
+            });
+            return;
+        }
+        var canUpdate = true;// 是否能更正申报
+        var param = {};
+        param.selectedId = selectedId;
+        // _self.remoteCall({
+        //     type: "post",
+        //     method: "beforeUpdateDeclare",
+        //     param: param,
+        //     async: false,
+        //     showBlock: true,
+        //     success: function (res) {
+        //         if (res) {
+        //             canUpdate = true;
+        //         } else {
+        //             //不成功
+        //             canUpdate = false;
+        //             shr.showError({message: res, hideAfter: 10})
+        //         }
+        //     }
+        // });
+        if (canUpdate) {
+            var isEnableExcelPwd = $('#updateDeclare').attr('data-isenableexcelpwd');
+            var callback = function (psw) {
+                $.extend(param, {
+                    //handler: "com.kingdee.shr.compensation.web.handler.tax.IncomeTaxDeclareListHandler",
+                    handler: "com.kingdee.eas.custom.compensation.handler.IncomeTaxDeclareListHandlerEx",
+                    method: "updateDeclare",
+                    psw: psw,
+                    isEnableExcelPwd: JSON.parse(isEnableExcelPwd)
+                });
+                shr.urlLocate(shr.getContextPath() + "/dynamic.do", param);
+                shr.showWarning({
+                    message: "已提交金税系统更正申报"
+					
+                });
+				_self.queryGrid();
+            };
+
+            if (_self.isNeedExportFilePassword('#updateDeclare')) {
+                fieldSensitiveService.setExportPsw(callback);
+            } else {
+                callback();
+            }
+        }
+    },
+
+    // 撤销更正
+    cancelUpdateAction: function () {
+        var _self = this;
+        //if (!_self.hasTaxImp) {
+        //    shr.showError({
+        //        message: '操作失败，需开通云服务后才能使用，请系统管理员前往【系统设置-云服务设置-云服务注册及连接】进行注册。'
+        //        , hideAfter: 5
+        //    });
+        //    return;
+        //}
+        var selectedId = _self.getSelectedIds();
+        if (!selectedId) {
+            return;
+        }
+        if (selectedId.indexOf(",") > -1) {
+            shr.showError({
+                message: '请选择单条记录进行撤销更正。'
+                , hideAfter: 5
+            });
+            return;
+        }
+        var canCancel = true;
+        var param = {};
+        param.selectedId = selectedId;
+        // _self.remoteCall({
+        //     type: "post",
+        //     method: "beforeCancelUpdate",
+        //     param: param,
+        //     async: false,
+        //     showBlock: true,
+        //     success: function (res) {
+        //         if (res) {
+        //             canCancel = true;
+        //         } else {
+        //             //不成功
+        //             canCancel = false;
+        //             shr.showError({message: res, hideAfter: 10})
+        //         }
+        //     }
+        // });
+        if (canCancel) {
+            _self.remoteCall({
+                type: "post",
+                method: "cancelUpdate",
+                param: param,
+                showBlock: true,
+                success: function (res) {
+                    shr.showWarning({
+                        message: "已提交金税系统撤销更正"
+						
+                    });
+					_self.queryGrid();
+                }
+            });
+        }
+    },
+    // 作废申报
+    cancelDeclareAction: function () {
+        var _self = this;
+        //if (!_self.hasTaxImp) {
+        //    shr.showError({
+        //        message: '操作失败，需开通云服务后才能使用，请系统管理员前往【系统设置-云服务设置-云服务注册及连接】进行注册。'
+        //        , hideAfter: 5
+        //    });
+        //    return;
+        //}
+        var selectedId = _self.getSelectedIds();
+        if (!selectedId) {
+            return;
+        }
+        if (selectedId.indexOf(",") > -1) {
+            shr.showError({
+                message: '请选择单条记录进行作废。'
+                , hideAfter: 5
+            });
+            return;
+        }
+        var canCancel = true;
+        var param = {};
+        param.selectedId = selectedId;
+        // _self.remoteCall({
+        //     type: "post",
+        //     method: "beforeCancelDeclare",
+        //     param: param,
+        //     async: false,
+        //     showBlock: true,
+        //     success: function (res) {
+        //         if (res) {
+        //             canCancel = true;
+        //         } else {
+        //             //不成功
+        //             canCancel = false;
+        //             shr.showError({message: res, hideAfter: 10})
+        //         }
+        //     }
+        // });
+        if (canCancel) {
+            var isEnableExcelPwd = $('#cancelDeclare').attr('data-isenableexcelpwd');
+            var callback = function (psw) {
+                $.extend(param, {
+                    //handler: "com.kingdee.shr.compensation.web.handler.tax.IncomeTaxDeclareListHandler",
+                    handler: "com.kingdee.eas.custom.compensation.handler.IncomeTaxDeclareListHandlerEx",
+                    method: "cancelDeclare",
+                    psw: psw,
+                    isEnableExcelPwd: JSON.parse(isEnableExcelPwd)
+                });
+                shr.urlLocate(shr.getContextPath() + "/dynamic.do", param);
+                shr.showWarning({
+                    message: "已提交金税系统作废申报，需要等待几分钟，可在任务执行监控中查看运行进度"
+                });
+            };
+
+            if (_self.isNeedExportFilePassword('#cancelDeclare')) {
+                fieldSensitiveService.setExportPsw(callback);
+            } else {
+                callback();
+            }
+        }
+    },
+
+
+
+
+
+    //任务监控
+    taskMonitorAction: function () {
+        var self = this;
+        var urlParam = {
+            uipk: "com.kingdee.eas.custom.shuiyou.task.app.Task.list",
+            //uipk: "com.kingdee.shr.compensation.app.taxCal.TaxCalTask.list",
+            catalog: "TAX"
+        };
+        self.reloadPage(urlParam);
+    },
+
+
+
+
+
+});

patch/预生产部署包_20241016_qy_sy/compensationjzt/InterInitDynamicListEx.js

@@ -0,0 +1,84 @@
+/**
+ *税款计算
+ */
+shr.defineClass("shr.compensation.InterInitDynamicListEx", shr.compensation.InterInitDynamicList, {
+
+    initalizeDOM: function () {
+        var _self = this;
+        shr.compensation.InterInitDynamicListEx.superClass.initalizeDOM.call(_self);
+
+    },
+
+
+    //任务监控
+    taskMonitorAction: function () {
+        var self = this;
+        var urlParam = {
+            //uipk: "com.kingdee.shr.compensation.app.taxCal.TaxCalTask.list",
+            uipk: "com.kingdee.eas.custom.shuiyou.task.app.Task.list",
+            catalog: "CAL"
+        };
+        self.reloadPage(urlParam);
+    },
+    /**
+   * 调用算税接口
+   */
+    calTaxAction: function (isReCalc) {
+        var _self = this;
+        var isOk = _self.checkTaxYearExists();
+        if (!isOk) {
+            return;
+        }
+        var billIds = this.getSelectedIds("initdetail.id");
+        var period = _self.getFastFilterItems()['enterData'].values;
+        var periodBegin = period.startDatetime;
+        var periodEnd = period.endDatetime;
+        var params = {
+            selectedData: billIds,
+            periodBegin: periodBegin,
+            periodEnd: periodEnd,
+            fieldName_key: "initdetail.id",
+        };
+        var apiName = "calTax";
+        if (isReCalc === true) {
+            apiName = "reCalc";
+        }
+        _self.remoteCall({
+            type: "post",
+            method: "checkReduction",
+            param: params,
+            showBlock: true,
+            success: function (res) {
+                if (!res) {
+                    _self.doRemoteWithBatchAction({
+                        method: apiName,
+                        selectedData: billIds,
+                        periodBegin: periodBegin,
+                        periodEnd: periodEnd,
+                        fieldName_key: "initdetail.id",
+                    });
+                } else {
+                    var msg = "选择列表数据中包含需提交附表员工，建议您先进入附表上传页面导入对应附表后再进行接口算税。";
+                    _self.showMergeConfirm(msg,
+                        function () {
+                            _self.reloadPage({
+                                uipk: "com.kingdee.shr.compensation.app.incomeTax.ReductionSummary.list"
+                            });
+                        },
+                        function () {
+                            _self.doRemoteWithBatchAction({
+                                method: apiName,
+                                selectedData: billIds,
+                                periodBegin: periodBegin,
+                                periodEnd: periodEnd,
+                                fieldName_key: "initdetail.id",
+                            });
+                        });
+                }
+            }
+        });
+    },
+
+
+
+});

patch/预生产部署包_20241016_qy_sy/compensationjzt/TaxPersonRecordListEx.js

@@ -0,0 +1,159 @@
+shr.defineClass("shr.compensation.TaxPersonRecordListEx", shr.compensation.TaxPersonRecordList, {
+	initalizeDOM : function(){
+		shr.compensation.TaxPersonRecordListEx.superClass.initalizeDOM.call(this);
+		var _self = this;
+	},
+	/**
+     * 同步人员纳税信息
+     */
+    synTaxPersonRecordAction(){
+        var _self = this;
+        var html = [], buttons = [], $dialog = $("#generateDataDialog"), $body = $(document.body);
+		if($dialog.size() == 0) {
+			$dialog = $("<div id='generateDataDialog' class='tiny-dialog'></div>").appendTo($body);
+		}
+		html = ['<div id="generateDataHtml" style="margin-left:235px">',
+		        	'<div class="sync-row row-fluid">',
+				        '<div data-ctrlrole="labelContainer">',
+				        	'<div class="col-lg-6 textLeft"><div class="field_label" title="'+'纳税单位名称'+'">'+
+				        	'纳税单位名称'+'</div></div>'		,		
+				        	'<div class="col-lg-6 field-ctrl"><input id="taxUnitF7" class="taxUnitF7" validate="{required:true}"></input></div>',
+				        '</div>',
+				     '</div>',
+				    '<div class="sync-row row-fluid" style="margin-top:20px">',
+				        '<div data-ctrlrole="labelContainer">',
+				            '<div class="col-lg-6 textLeft"><div class="field_label"  title="'+'所属年月'+'">'+
+				            '所属年月'+'</div></div>',
+				            '<div class="col-lg-6 field-ctrl">',
+				                '<div><div class="ui-datepicker-layout"><div class="ui-datepicker-inputframe"><input id="yearMonthData" name="yearMonthData" class="block-father input-height" value="" validate="" placeholder="" type="text" dataextenal="" autocomplete="off" istotemplate="true" ctrlrole="datetimepicker"></div></div></div>',			
+				        	'</div>',
+				        '</div>',
+		        	'</div>',
+		        '</div>'];
+		var saveSettingButton = _self.getSaveSettingButton();
+		buttons.push(saveSettingButton);
+		showDialog("#generateDataDialog", 
+				'同步纳税人员信息',
+				html.join(""),buttons, 700, 320, '取消');
+		var dateTimePicker_json = {};
+		
+		dateTimePicker_json.readonly = '';
+		dateTimePicker_json.validate = '{required:true}';
+		dateTimePicker_json.format = 'yyyy-mm';
+		dateTimePicker_json.id = "yearMonthData";
+		
+		dateTimePicker_json.isRemoveDay = true;
+		dateTimePicker_json.ctrlType = 'Date';
+		
+		$('#yearMonthData').shrDateTimePicker(dateTimePicker_json);	
+		var date = new Date();
+		var dateStr = date.format('yyyy-MM');
+		var dateArr = dateStr.split('-');
+		if(parseInt(dateArr[1]) == 1){
+			dateStr = (parseInt(dateArr[0]) - 1) + "-12";
+		}else{
+			dateStr = dateArr[0] + "-" + (parseInt(dateArr[1]) - 1);
+		}
+		$('#yearMonthData').shrDateTimePicker('setValue',dateStr , 'yyyy-MM');
+    	var grid_f7_json = {
+    			id: "taxUnitF7",
+    			name: "taxUnitF7",
+    			subWidgetName:"shrPromptGrid",
+    			validate:"{required:true}",
+    			subWidgetOptions: {
+    				title: '选择纳税单位:',
+    				uipk: "com.kingdee.shr.compensation.app.tax.TaxDeclareTaxUnitF7",
+    				filter:'',
+    				multiselect:true,
+    				isInput:true,
+    			},
+    	};
+        $("#taxUnitF7").shrPromptBox(grid_f7_json);
+		// $("#yearMonthData").shrDateTimePicker("disable")
+        shr.callHandler({
+		    handler: "com.kingdee.shr.compensation.web.handler.tax.TaxDeclareTaxUnitF7Handler",
+			action : "getPersonAllPermTaxUnit",
+			async: false,
+			param : {
+			},
+			error:function(ret){		
+				var message = ret.responseText;
+				shr.showWarning({
+					message : message,
+                    hideAfter : 5
+				});			
+				return;
+			},
+			success : function(res){
+				console.log(res);
+				// $("#taxUnitF7").shrPromptBox("setValue",res);
+			}
+		});
+        // _self.remoteCall({
+        //     method: 'synTaxPersonRecord',
+        //     param: {
+        //         cmpschemeid:_self.cmpschemeid
+        //     },
+        //     async: false,
+        //     success: function (data) {
+        //         console.log(data);
+        //     }, error: function (response) {
+        //         shr.showError({
+        //             message: response.summary
+        //             , hideAfter: 2
+        //         });
+        //     }
+        // });
+    },
+    getSaveSettingButton : function(){
+		var _self = this;
+		var saveSettingButton = {
+			text : '确定',
+			click : function(){
+				var selectedTaxUnits = $('#taxUnitF7').shrPromptBox("getValue");
+				var yearMonth =$('#yearMonthData').shrDateTimePicker("getValue");
+				if(!selectedTaxUnits||selectedTaxUnits.length==0){
+					shr.showError({message : '纳税单位不能为空',hideAfter : 5});	
+					return;
+				}
+				if(!yearMonth||yearMonth==""){
+					shr.showError({message : '所属年月不能为空',hideAfter : 5});
+					return;
+				}
+				var taxUnitId="";
+				for(var i=0;i<selectedTaxUnits.length;i++){
+					if(i==0){
+						taxUnitId=selectedTaxUnits[i].id;
+					}else{
+						taxUnitId=taxUnitId+","+selectedTaxUnits[i].id;
+					}
+				}
+				var param = {};
+				param.taxUnitIds=taxUnitId;
+				yearMonth=yearMonth.slice(0,yearMonth.length-3);
+				param.yearMonth=yearMonth;
+				//存在数据库里
+				console.log("param",param);
+
+                _self.remoteCall({
+                    method: 'synTaxPersonRecord',
+                    param: param,
+                    async: false,
+                    success: function (data) {
+                        $("#generateDataDialog").remove()
+                        _self.queryGrid();
+                        console.log(data);
+                    }, error: function (response) {
+
+                        shr.showError({
+                            message: response.summary
+                            , hideAfter: 2
+                        });
+                    }
+                });
+			}	
+		}
+		return saveSettingButton;
+	},
+    
+});

patch/预生产部署包_20241016_qy_sy/syConfig.properties

@@ -0,0 +1,6 @@
+ip=https://test-openapi.17win.com
+appKey=46639607259987202405271637080
+appSecret=oTmd/QGL2xOfIKItqFGKnw\u003D\u003D
+version=1.0.0
+cronText=0 10 * * * ? 
+

patch/预生产部署包_20241016_qy_sy/taxDirectDeductionListEx.js

@@ -0,0 +1,246 @@
+shr.defineClass("shr.compensation.TaxDirectDeductionListEx", shr.compensation.TaxDirectDeductionListHandler, {
+    editViewDisable: true,
+    canEdit: 0,
+    initalizeDOM: function () {
+        shr.compensation.TaxDirectDeductionListEx.superClass.initalizeDOM.call(this);
+    },
+    collectAction: function () {
+        var _self = this;
+        var buttons = [], $dialog = $("#getPersonCollectDialog"), $body = $(document.body);
+        if ($dialog.size() == 0) {
+            $dialog = $("<div id='getPersonCollectDialog' class='tiny-dialog'></div>").appendTo($body);
+        }
+        var day = new Date();
+        var today = day.format("yyyy-MM");
+        var html = ['<div id="generateDataHtml">',
+            '<div class="sync-row row-fluid">',
+            '<div data-ctrlrole="labelContainer">',
+            '<div class="col-lg-2 textLeft"><div class="field_label" title="' + '纳税单位名称' + '">' +
+            '纳税单位名称' + '</div></div>',
+            '<div class="col-lg-7 field-ctrl"><input id="taxUnitF7" class="taxUnitF7" validate="{required:true}"></input></div>',
+            '</div>',
+            '</div>',
+            '<p></p>' ,
+            // '<table width="100%">',
+            // '<tr>',
+            // '<td width="20%"><h6>选择年份</h6></td>' ,
+            // '<td width="40%">',
+            // '<input type="text" id="taxPeriodDate" name="taxPeriodDate" class="input-height" style=""/>',
+            // '</td>',
+            // '<td width="40%"></td>',
+            // '</tr>',
+            // '</table>',
+            '</div>'];
+        var saveSettingButton = _self.getSaveSettingButton();
+        buttons.push(saveSettingButton);
+        showDialog("#getPersonCollectDialog",
+            '6万直接扣除人员归集',
+            html.join(""), buttons, 600, 290, '取消');
+        // var taxPeriodDate_json = {};
+        // taxPeriodDate_json.validate = "{required:true}";
+        // taxPeriodDate_json.id = "taxPeriodDate";
+        // taxPeriodDate_json.format = 'yyyy-mm';
+        // taxPeriodDate_json.maxDate = today;
+        //
+        // taxPeriodDate_json.isRemoveDay = true;
+        // taxPeriodDate_json.ctrlType = 'Date';
+        // $('#taxPeriodDate').shrDateTimePicker(taxPeriodDate_json);
+        // $('#taxPeriodDate').shrDateTimePicker("setValue",today);
+        var grid_f7_json = {
+            id: "taxUnitF7",
+            name: "taxUnitF7",
+            subWidgetName: "shrPromptGrid",
+            validate: "{required:true}",
+            subWidgetOptions: {
+                title: '选择纳税单位:',
+                uipk: "com.kingdee.shr.compensation.app.tax.TaxDeclareTaxUnitF7",
+                filter: '',
+                multiselect: true,
+                isInput: true,
+            },
+        };
+        // 默认当前员工所有的纳税单位数据权限
+        $("#taxUnitF7").shrPromptBox(grid_f7_json);
+        shr.callHandler({
+            handler: "com.kingdee.shr.compensation.web.handler.tax.TaxDirectDeductionListHandler",
+            action: "getTaxUnitForPersonCollect",
+            async: false,
+            param: {},
+            success: function (res) {
+                $("#taxUnitF7").shrPromptBox("setValue", res);
+            }
+        });
+    },
+    getSaveSettingButton: function () {
+        var _self = this;
+        return {
+            text: '确定',
+            click: function () {
+                var selectedTaxUnits = $('#taxUnitF7').shrPromptBox("getValue");
+                if (!selectedTaxUnits || selectedTaxUnits.length === 0) {
+                    shr.showError({message: '纳税单位不能为空', hideAfter: 5});
+                    return;
+                }
+                var taxUnitId = "";
+                for (var i = 0; i < selectedTaxUnits.length; i++) {
+                    if (i === 0) {
+                        taxUnitId = selectedTaxUnits[i].id;
+                    } else {
+                        taxUnitId = taxUnitId + "," + selectedTaxUnits[i].id;
+                    }
+                }
+                var taxPeriodDate = '';//$('#taxPeriodDate').shrDateTimePicker("getValue");
+                _self.remoteCall({
+                    method: "beforePersonCollect",
+                    param: {taxUnitIds: taxUnitId,period: taxPeriodDate},
+                    success: function (data) {
+                        if (data.length > 0) {
+                            shr.showConfirm('以下纳税单位【' + data + '】已经存在归集后的数据，确定覆盖更新吗？',
+                                function () {
+                                    _self.doPersonCollect(taxUnitId,taxPeriodDate);
+                                    $("#getPersonCollectDialog").dialog("close");
+                                });
+                        } else {
+                            _self.doPersonCollect(taxUnitId,taxPeriodDate);
+                            $("#getPersonCollectDialog").dialog("close");
+                        }
+                    }
+                })
+            }
+        }
+    },
+    doPersonCollect: function (taxUnitId,taxPeriodDate) {
+        var _self = this;
+        var param = {};
+        param.taxUnitIds = taxUnitId;
+        param.taxPeriodDate=taxPeriodDate;
+        _self.remoteCall({
+            type: "post",
+            method: "personCollect",
+            param: param,
+            success: function (res) {
+                shr.showInfo({message: "已提交金税系统获取不满6万元人员名单，需要等待几分钟，可在任务执行监控中查看运行进度；获取完成后将会推送消息告知。", hideAfter: 5});
+            }
+        });
+    },
+    taxPersonReportAction: function () {
+        var _self = this;
+        var buttons = [], $dialog = $("#getReportCollectDialog"), $body = $(document.body);
+        if ($dialog.size() == 0) {
+            $dialog = $("<div id='getReportCollectDialog' class='tiny-dialog'></div>").appendTo($body);
+        }
+        var day = new Date();
+        var today = day.format("yyyy-MM");
+        var html = ['<div id="generateReportDataHtml">',
+            '<div class="sync-row row-fluid">',
+            '<div data-ctrlrole="labelContainer">',
+            '<div class="col-lg-2 textLeft"><div class="field_label" title="' + '纳税单位名称' + '">' +
+            '纳税单位名称' + '</div></div>',
+            '<div class="col-lg-7 field-ctrl"><input id="taxUnitF7Report" class="taxUnitF7" validate="{required:true}"></input></div>',
+            '</div>',
+            '</div>',
+            '<p></p>' ,
+            '<table width="100%">',
+            '<tr>',
+            '<td width="20%"><h6>选择年份</h6></td>' ,
+            '<td width="40%">',
+            '<input type="text" id="taxPeriodDate" name="taxPeriodDate" class="input-height" style=""/>',
+            '</td>',
+            '<td width="40%"></td>',
+            '</tr>',
+            '</table>',
+            '</div>'];
+        var saveSettingButton = _self.getSaveReportButton();
+        buttons.push(saveSettingButton);
+        showDialog("#getReportCollectDialog",
+            '6万直接扣除人员归集',
+            html.join(""), buttons, 600, 290, '取消');
+        var taxPeriodDate_json = {};
+        taxPeriodDate_json.validate = "{required:true}";
+        taxPeriodDate_json.id = "taxPeriodDate";
+        taxPeriodDate_json.format = 'yyyy-mm';
+        taxPeriodDate_json.maxDate = today;
+
+        taxPeriodDate_json.isRemoveDay = true;
+        taxPeriodDate_json.ctrlType = 'Date';
+        $('#taxPeriodDate').shrDateTimePicker(taxPeriodDate_json);
+        $('#taxPeriodDate').shrDateTimePicker("setValue",today);
+        var grid_f7_json = {
+            id: "taxUnitF7Report",
+            name: "taxUnitF7",
+            subWidgetName: "shrPromptGrid",
+            validate: "{required:true}",
+            subWidgetOptions: {
+                title: '选择纳税单位:',
+                uipk: "com.kingdee.shr.compensation.app.tax.TaxDeclareTaxUnitF7",
+                filter: '',
+                multiselect: true,
+                isInput: true,
+            },
+        };
+        // 默认当前员工所有的纳税单位数据权限
+        $("#taxUnitF7Report").shrPromptBox(grid_f7_json);
+        shr.callHandler({
+            handler: "com.kingdee.shr.compensation.web.handler.tax.TaxDirectDeductionListHandler",
+            action: "getTaxUnitForPersonCollect",
+            async: false,
+            param: {},
+            success: function (res) {
+                $("#taxUnitF7Report").shrPromptBox("setValue", res);
+            }
+        });
+    },
+    getSaveReportButton: function () {
+        var _self = this;
+        return {
+            text: '确定',
+            click: function () {
+                var selectedTaxUnits = $('#taxUnitF7Report').shrPromptBox("getValue");
+                if (!selectedTaxUnits || selectedTaxUnits.length === 0) {
+                    shr.showError({message: '纳税单位不能为空', hideAfter: 5});
+                    return;
+                }
+                var taxUnitId = "";
+                for (var i = 0; i < selectedTaxUnits.length; i++) {
+                    if (i === 0) {
+                        taxUnitId = selectedTaxUnits[i].id;
+                    } else {
+                        taxUnitId = taxUnitId + "," + selectedTaxUnits[i].id;
+                    }
+                }
+                var taxPeriodDate = $('#taxPeriodDate').shrDateTimePicker("getValue");
+                _self.remoteCall({
+                    method: "beforePersonCollect",
+                    param: {taxUnitIds: taxUnitId,period: taxPeriodDate},
+                    success: function (data) {
+                        if (data.length > 0) {
+                            shr.showConfirm('以下纳税单位【' + data + '】已经存在归集后的数据，确定覆盖更新吗？',
+                                function () {
+                                    _self.doPersonReportCollect(taxUnitId,taxPeriodDate);
+                                    $("#getPersonCollectDialog").dialog("close");
+                                });
+                        } else {
+                            _self.doPersonReportCollect(taxUnitId,taxPeriodDate);
+                            $("#getPersonCollectDialog").dialog("close");
+                        }
+                    }
+                })
+            }
+        }
+    },
+    doPersonReportCollect: function (taxUnitId,taxPeriodDate) {
+        var _self = this;
+        var param = {};
+        param.taxUnitIds = taxUnitId;
+        param.period = taxPeriodDate;
+        _self.remoteCall({
+            type: "post",
+            method: "taxPersonReport",
+            param: param,
+            success: function (res) {
+                shr.showInfo({message: "已提交金税系统获取养老金，需要等待几分钟，可在任务执行监控中查看运行进度；获取完成后将会推送消息告知。", hideAfter: 5});
+            }
+        });
+    },
+
+});

patch/预生产部署包_20241016_qy_sy/taxUnitListEx.js

@@ -0,0 +1,45 @@
+shr.defineClass("shr.compensation.tax.taxUnit.TaxUnitListEx", shr.compensation.tax.taxUnit.TaxUnitList, {
+    initalizeDOM: function () {
+        shr.compensation.tax.taxUnit.TaxUnitListEx.superClass.initalizeDOM.call(this);
+    },
+
+    businessAegistrationAction: function () {
+
+        var billIds = $('#grid').jqGrid("getSelectedRows");
+        if (billIds.length ==1) {
+            shr.showInfo({
+                hideAfter: 5000,
+                message: "注册中，请稍等！ "
+            });
+            setTimeout(() => {
+                var id = billIds.toString();
+                var url = shr.getContextPath() + "/dynamic.do?handler=com.kingdee.eas.custom.shuiyou.inter.handler.TaxUnitListHandlerEx&method=businessAegistration";
+                url += '&id=' + encodeURIComponent(id);
+                $.ajax({
+                    url: url,
+                    async: true,
+                    success: function (response) {
+                        let message = (response ? (response.data ? response.data.info:"失败") : "失败");
+                        shr.showInfo({
+                            hideAfter: 5,
+                            message: message
+                        });
+                    }
+                    , error: function (response) {
+                        let message = (response ? (response.data ? response.data.error:"失败") : "失败");
+                        shr.showInfo({
+                            hideAfter: 5,
+                            message: response.data.error
+                        });
+                    }
+                });
+            }, 100);
+        } else if (billIds.length == 0) {
+            shr.showError({
+                hideAfter: 5,
+                message: "请选中一行！"
+            });
+        }
+
+    }
+});

patch/预生产部署包_20241016_qy_sy/部署文档.txt

@@ -0,0 +1,63 @@
+注意：
+1、特殊的包需要在下面按照格式书写清楚
+2、只要部署*_metas.jar后缀的包则需要重启子系统树
+
+-----------------------------------后端部署文件------------------------------------
+-----------------------------------开发人员张庆阳----------------------------------
+1.部署内容: 
+1）薪酬核算-个税服务
+-----------------------------------开发人员张庆阳----------------------------------
+后端部署包：
+1、部署包，将文件夹sdk下的10个包(
+    bcprov-jdk15on-163.jar,crypto_v5.3.3.1.jar,hutool-all-5.7.18.jar,
+    jackson-2.9.9.jar,javasafeengine-jdk18_bc160on.jar,logback-1.2.3.jar,
+    okhttp-3.14.4.jar,opentaxsdk-20240627-SNAPSHOT.jar,slf4j-api-1.7.28.jar,
+    swxajce_v5.3.3.1.jar
+)
+1）将提供部署包添加至以下路径
+1.1）/ehrapp/eas/server/lib/sp
+1.2）/ehrapp/eas/server/lib/addon/customer/lib
+
+2、部署包sp_qy_shuiyou_src.jar
+1）将sp_qy_shuiyou_src.jar进行备份
+2）将提供部署包添加至以下路径
+2.1）/ehrapp/eas/server/lib/sp
+2.2）/ehrapp/eas/server/deploy/fileserver.ear/easWebClient/lib/sp
+
+3、部署包sp_qy_six_shuiyou_websrc.jar
+1）将sp_qy_six_shuiyou_websrc.jar进行备份
+2）将提供部署包添加至以下路径
+2.1）/ehrapp/eas/server/lib/addon/customer/lib
+
+4、部署包sp_qy_shuiyou_metas.jar
+1）将sp_qy_shuiyou_metas.jar进行备份
+2）将提供部署包添加至以下路径
+2.1）/ehrapp/eas/server/metas/sp
+2.2）/ehrapp/eas/server/deploy/fileserver.ear/easWebClient/metas/sp
+
+5、部署配置文件syConfig.properties
+1）将syConfig.properties进行备份
+2）将提供配置文件添加至以下路径（如果没有sy文件夹，则创建sy文件夹）
+2.1）/ehrapp/eas/server/properties/sy
+-----------------------------------后端部署文件-------------------------------------
+
+
+-----------------------------------前端部署文件-------------------------------------
+-----------------------------------开发人员张庆阳-----------------------------------
+1.部署内容: 
+1）薪酬核算-个税服务-个税申报结果表。
+1.1）将文件 cmpTaxDeclarationListEx.js 添加至 /ehrapp/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/shuiyou/tax/six
+
+2）薪酬核算-个税服务-人员报税信息-人员确认名单
+2.1）将文件 taxDirectDeductionListEx.js 添加至 /ehrapp/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/shuiyou/tax/six
+
+3）薪酬核算-个税服务-税款计算
+3.1）将文件夹compensationjzt下的5个js
+（CmpCalDynamicListEx.js，CmpCalDynamicListExExEx.js，IncomeTaxDeclareListEx.js，InterInitDynamicListEx.js，TaxPersonRecordListEx.js）
+ 添加至 /ehrapp/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/compensationjzt
+
+
+4）薪酬核算-个税服务-纳税单位
+4.1）将文件 taxUnitListEx.js 添加至 /ehrapp/eas/server/deploy/easweb.ear/shr_web.war/addon/customer/shuiyou/tax
+
+