Merge branch 'glms/feature/0812_zmr_divPower' into glms/feature/1.4.2

YLErpWeb/wwwroot/Scripts/app/underlying/underlyingDividendInfo.js

@@ -28,10 +28,13 @@ function saveInfo(dataId, rowId) {
     g_grid.jqGrid('saveRow', rowId,
         {
             successfunc: function (response) {
-                var msg = response.responseJSON.msg;
+                var result = response.responseJSON || {};
+                var msg = result.msg || "保存失败";
                 main.message(msg);
                 $("#systemTip").text(new Date().toLocaleString() + " " + msg);
+                if (!result.success) return false;
                 g_grid.trigger('reloadGrid');
+                return true;
             },
             "url": "/ex_dividend_info/SaveDividend",
             "extraparam": data,
@@ -150,4 +153,4 @@ $(function () {
         onPaging: onJqgridPaging
     };
     g_grid = jQuery('#listGrid').jqGrid(obj);
-});
+});

YLErpWeb/wwwroot/Scripts/app/underlying/underlyinglist.js

@@ -164,7 +164,7 @@ $(function () {
 
 //设置除权
 function SetDividEnd(cellValue, options, rowObject) {
-    if (rowObject.UnderlyingInstrumentType !== "Stock" || rowObject.CommodityCode === "篮子标的" || !g_dividend) return "";
+    if (["Stock", "Fund"].indexOf(rowObject.UnderlyingInstrumentType) < 0 || rowObject.CommodityCode === "篮子标的" || !g_dividend) return "";
     var imageHtml = "<input type=\"button\" value=\"除权\" class=\"wentiEdit btn-info\" onclick=\"openDividEnd('" + rowObject.EncryptId + "');\" />";
     return imageHtml;
 }