专业添加省份字段

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.cshtml

@@ -29,18 +29,22 @@
             <div id="SubjectNo" isvalid="yes" checkexpession="NotNull"></div>
             <input id="SubjectName" type="hidden" />
         </div>*@
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+    @*<div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
         <div id="Year" isvalid="yes" checkexpession="Num"></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+        <div class="lr-form-item-title">省份</div>
+        <div id="Province"></div>
+    </div>
+    @*<div class="col-xs-4 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">地市</div>
         <div id="City"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="CdMajor">
+    <div class="col-xs-4 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">县区</div>
         <div id="Area"></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="CdMajor">
         <div class="lr-form-item-title">系别</div>
         <div id="DeptNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js

@@ -27,33 +27,65 @@ var bootstrap = function ($, learun) {
                 text: 'subjectname',
                 maxHeight: 200
             });
-            $('#City').lrselect({
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
-                param: { strWhere: " cparent= 650000 " },
-                value: 'ccode',
-                text: 'cname',
+            $('#Province').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                param: { strWhere: " 1=1 " },
+                value: 'pcode',
+                text: 'pname',
                 maxHeight: 200,
-                select: function (item) {
-                    var Citys = $("#City").lrselectGet();
-                    if (Citys != null && Citys != "" && Citys != undefined) {
-                        $('#Area').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
-                            param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
-                            value: "acode",
-                            text: "aname",
-                            maxHeight: 200
-                        });
-                    } else {
-                        $('#Area').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
-                            param: { strWhere: " 1=1 and aparent ='' " },
-                            value: "acode",
-                            text: "aname",
-                            maxHeight: 200
-                        });
-                    }
-                }
-            })
+                //select: function (item) {
+                //    var Province = $("#Province").lrselectGet();
+                //    if (Province != null && Province != "" && Province != undefined) {
+                //        $('#City').lrselectRefresh({
+                //            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY',
+                //            param: { strWhere: " 1=1 and cparent in (" + Province + ")" },
+                //            value: "ccode",
+                //            text: "cname",
+                //            maxHeight: 200,
+                //            select: function (item) {
+                //                var Citys = $("#City").lrselectGet();
+                //                if (Citys != null && Citys != "" && Citys != undefined) {
+                //                    $('#Area').lrselectRefresh({
+                //                        url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+                //                        param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
+                //                        value: "acode",
+                //                        text: "aname",
+                //                        maxHeight: 200
+                //                    });
+                //                }
+                //            }
+                //        });
+                //    }
+                //}
+            });
+            //$('#City').lrselect({
+            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+            //    param: { strWhere: " cparent= 650000 " },
+            //    value: 'ccode',
+            //    text: 'cname',
+            //    maxHeight: 200,
+            //    select: function(item) {
+            //        var Citys = $("#City").lrselectGet();
+            //        if (Citys != null && Citys != "" && Citys != undefined) {
+            //            $('#Area').lrselectRefresh({
+            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+            //                param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
+            //                value: "acode",
+            //                text: "aname",
+            //                maxHeight: 200
+            //            });
+            //        } else {
+            //            $('#Area').lrselectRefresh({
+            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+            //                param: { strWhere: " 1=1 and aparent ='' " },
+            //                value: "acode",
+            //                text: "aname",
+            //                maxHeight: 200
+            //            });
+            //        }
+            //    }
+            //});
+            $("#City").lrselect();
             $("#Area").lrselect();
             $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'SubjectSpecies' });
             $('#F_SchoolId').lrDataSourceSelect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js

@@ -225,33 +225,46 @@ var bootstrap = function ($, learun) {
                     //            });
                     //    }
                     //},
-                    { label: "年度", name: "Year", width: 100, align: "left" },
                     {
-                        label: "地市", name: "City", width: 100, align: "left",
+                        label: "省份", name: "Province", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
                                 key: value,
-                                keyId: 'ccode',
+                                keyId: 'pcode',
                                 callback: function (_data) {
-                                    callback(_data['cname']);
+                                    callback(_data['pname']);
                                 }
                             });
                         }
                     },
-                    {
-                        label: "县区", name: "Area", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
-                                key: value,
-                                keyId: 'acode',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
-                    }
+                    //{ label: "年度", name: "Year", width: 100, align: "left" },
+                    //{
+                    //    label: "地市", name: "City", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                    //            key: value,
+                    //            keyId: 'ccode',
+                    //            callback: function (_data) {
+                    //                callback(_data['cname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "县区", name: "Area", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+                    //            key: value,
+                    //            keyId: 'acode',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
                 ],
                 mainId: 'ID',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs

@@ -133,6 +133,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("YEAR")]
         public string Year { get; set; }
         /// <summary> 
+        /// 省份
+        /// </summary> 
+        [Column("PROVINCE")]
+        public string Province { get; set; }
+        /// <summary> 
         /// 地市 
         /// </summary> 
         [Column("CITY")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs

@@ -48,7 +48,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.CheckMark, 
                 t.Year, 
                 t.City, 
-                t.Area
+                t.Area,
+t.Province 
                 ");
                 strSql.Append("  FROM CdMajor t ");
                 strSql.Append("  WHERE 1=1 ");