username@email.com
2025-06-23 f3f02a5a68c0e1d70a5447dc7bc8385a92c1807f
修改报销提交生成单号的异常
4个文件已修改
119 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
@@ -8,6 +8,34 @@
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <script type="text/javascript">
         
        function CheckStaff() {
            var IsCanSubmit = true;
                $.ajax({
                    url: "https://yocaisim.51zhengcai.com/api/CYOSSetting/GetShowID",
                    type: "GET",
                    dataType: "json",
                    data: {  },
                    global: false,
                    cache: false,
                    async: false,
                    success: function (msg) {
                        $("#txtEvaluationContent").val(msg.data);
                        IsCanSubmit = true;
                    },
                    error: function (xhr, status, error) {
                        console.error('File upload failed:', status, error);
                        alertMsg('生成单号失败');
                        IsCanSubmit = false;
                    }
                });
            return IsCanSubmit;
        }
        //查看
        function checkSelFile(obj) {
            if (obj == 1) {
@@ -123,6 +151,7 @@
                </td>
                <td>
                    <input id="txtDepart" type="text"  runat="server"  style=" width:180px;" readonly="readonly" />
                    <input type="hidden" runat ="server" id="txtEvaluationContent" />
                </td>
                </tr>
            <tr>
@@ -270,11 +299,16 @@
            
            <tr>
                <td colspan="2" style="text-align: center;">
                    <asp:Button ID="Button1" runat="server" OnClick="btn_baocun_form" Text="保存" /> &nbsp;&nbsp;&nbsp;
                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="提交" />&nbsp;&nbsp;&nbsp;
                     <asp:Button ID="Button3" runat="server" OnClick="btn_tijiao_form" Text="保存" />&nbsp;&nbsp;&nbsp;
                    <asp:Button ID="Button1" runat="server" OnClientClick="if(CheckStaff())return true;else return false; " OnClick="btn_baocun_form" Text="提交" /> &nbsp;&nbsp;&nbsp;
                     <asp:Button ID="Button2" runat="server" OnClick="btn_jixu_form" Text="继续报销" /> &nbsp;&nbsp;&nbsp;
                    
                </td>
            </tr>
        </table>
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
@@ -86,15 +86,15 @@
                    selSubject.Disabled = true;
                    txtPlanContent.Disabled = true;
                    selHoubufapiaoStatus.Disabled = true;
                    this.Button1.Enabled = false;
                    this.Button3.Enabled = false;
                    this.Button2.Enabled = false;
                }
                if (!string.IsNullOrEmpty(Request["zaici"]))
                {
                    this.Button1.Enabled = false;
                    this.Button3.Enabled = false;
                    this.Button2.Enabled = false;
                    this.btn_submit.Text = "再次提交";
                    this.Button1.Text = "再次提交";
                }
                if (m_OA_WorkPlan != null)
@@ -120,7 +120,7 @@
        }
        //表单提交
        protected void btn_submit_form(object sender, EventArgs e)
        protected void btn_baocun_form(object sender, EventArgs e)
        {
             var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
                if(HideKeyidFapiao.Length<=1 && this.selHoubufapiaoStatus.Value  == "1")
@@ -188,27 +188,27 @@
                        }
                    }
                  
                    if (string.IsNullOrEmpty(m_OA_WorkPlan.EvaluationContent))
                    {
                        using (var client = new HttpClient())
                        {
                            HttpResponseMessage response = client.GetAsync(url).Result;
                            response.EnsureSuccessStatusCode();
                            string responseBody = response.Content.ReadAsStringAsync().Result;
                            JavaScriptSerializer serializer = new JavaScriptSerializer();
                            var person = serializer.Deserialize<Responsebody>(responseBody);
                            if (person != null && person.code == 1)
                            {
                                m_OA_WorkPlan.EvaluationContent = person.data;
                            }
                            else
                            {
                                JavaScript.MessageBox("生成报销单号失败", this);
                                return;
                            }
                        }
                    }
                    //m_OA_WorkPlan.EvaluationContent = "";
                    //if (string.IsNullOrEmpty(m_OA_WorkPlan.EvaluationContent))
                    //{
                    //    using (var client = new HttpClient())
                    //    {
                    //        HttpResponseMessage response = client.GetAsync(url).Result;
                    //        response.EnsureSuccessStatusCode();
                    //        string responseBody = response.Content.ReadAsStringAsync().Result;
                    //        JavaScriptSerializer serializer = new JavaScriptSerializer();
                    //        var person = serializer.Deserialize<Responsebody>(responseBody);
                    //        if (person != null && person.code == 1)
                    //        {
                    //            m_OA_WorkPlan.EvaluationContent = person.data;
                    //        }
                    //        else
                    //        {
                    //            JavaScript.MessageBox("生成报销单号失败", this);
                    //            return;
                    //        }
                    //    }
                    //}
                    m_OA_WorkPlan.EvaluationContent = this.txtEvaluationContent.Value;
                  
                    m_OA_WorkPlan.RewardResult = this.selSubject.Value;
                    var a_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(this.selSubject.Value.ToInt32());
@@ -390,7 +390,7 @@
        //表单保存
        protected void btn_baocun_form(object sender, EventArgs e)
        protected void btn_tijiao_form(object sender, EventArgs e)
        {
            var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
            //if (HideKeyidFapiao.Length <= 1 && this.selHoubufapiaoStatus.Value == "1")
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
@@ -51,6 +51,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtDepart;
        /// <summary>
        /// txtEvaluationContent 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtEvaluationContent;
        /// <summary>
        /// txtStaff 控件。
        /// </summary>
        /// <remarks>
@@ -132,6 +141,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selHoubufapiaoStatus;
        /// <summary>
        /// Button3 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button3;
        /// <summary>
        /// Button1 控件。
        /// </summary>
        /// <remarks>
@@ -139,15 +157,6 @@
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button Button1;
        /// <summary>
        /// btn_submit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_submit;
        /// <summary>
        /// Button2 控件。
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
@@ -42,7 +42,7 @@
            {
                //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
                OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
                if (model.ApprovalStatus !=4 )
                if (!string.IsNullOrEmpty(model.EvaluationContent) )
                {
                    JavaScript.MessageBox("已提交信息,不能删除", this);
                    return;