update

徐烜
1 parent 9b2f289a
Showing 12 changed files with 194 additions and 83 deletions
src/main/java/com/bsth/entity/Personnel.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/main.js
src/main/resources/static/pages/scheduleApp/module/other/MyDictionaryRadioGroupTemplate.html
src/main/resources/static/pages/scheduleApp/module/other/MyDictionarySelectTemplate.html
src/main/resources/static/pages/scheduleApp/module/other/truefalseRadioGroupTemplate.html
@@ -39,7 +39,7 @@ public class Personnel {
     /** 分公司编码 */
     private String brancheCompanyCode;
     /** 工号 */
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false)
     private String jobCode;
     /** 姓名 */
     @Column(nullable = false)
@@ -49,7 +49,7 @@ public class Personnel {
     private String papersCode;
     /** 一卡通工作卡号 */
     private String icCardCode;
-    /** 性别（TODO：暂时使用男/女，不使用字典） */
+    /** 性别（字典类型sexType） */
     private String personnelType;
     /** 所属岗位/工种（TODO：暂时不使用字典） */
     private String posts;
@@ -85,7 +85,7 @@
                     <label class="col-md-2 control-label">设备供应厂商*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
-                                name="supplierName" ng-model="ctrl.busInfoForDetail.supplierName" readonly/>
+                                name="supplierName" ng-value="ctrl.busInfoForDetail.supplierName | dict:'snames':'未知'" readonly/>
                     </div>
                 </div>
@@ -218,28 +218,28 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否空调车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForDetail.hvacCar" disabled="true" dicgroup="truefalseType" name="hvacCar"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.hvacCar" disabled="true" dicgroup="truefalseType" name="hvacCar"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">有无人售票：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForDetail.ticketType" disabled="true" dicgroup="truefalseType" name="ticketType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.ticketType" disabled="true" dicgroup="truefalseType" name="ticketType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有LED服务屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForDetail.ledScreen" disabled="true" dicgroup="truefalseType" name="ledScreen"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.ledScreen" disabled="true" dicgroup="truefalseType" name="ledScreen"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有TV视屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForDetail.tvVideoType" disabled="true" dicgroup="truefalseType" name="tvVideoType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.tvVideoType" disabled="true" dicgroup="truefalseType" name="tvVideoType"></sa-Radiogroup>
                     </div>
                 </div>
@@ -279,7 +279,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForDetail.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
                     </div>
                 </div>
@@ -128,21 +128,30 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">设备供应厂商*：</label>
                     <div class="col-md-3">
-                        <div class="input-group">
-                            <ui-select ng-model="ctrl.busInfoForSave.supplierName_selected"
-                                       on-select="ctrl.supplierName_selected_change($item, $model)"
-                                       theme="bootstrap" name="supplierName" required>
-                                <ui-select-match placeholder="请选择设备厂商...">{{$select.selected.name}}</ui-select-match>
-                                <ui-select-choices repeat="item in ctrl.supplierNames">
-                                    <span ng-bind="item.name"></span>
-                                </ui-select-choices>
-                            </ui-select>
-                            <span class="input-group-btn">
-                                <button type="button" ng-click="ctrl.supplierName_selected_remove()" class="btn btn-default">
-                                    <span class="glyphicon glyphicon-trash"></span>
-                                </button>
-                            </span>
-                        </div>
+                        <!--<div class="input-group">-->
+                            <!--<ui-select ng-model="ctrl.busInfoForSave.supplierName_selected"-->
+                                       <!--on-select="ctrl.supplierName_selected_change($item, $model)"-->
+                                       <!--theme="bootstrap" name="supplierName" required>-->
+                                <!--<ui-select-match placeholder="请选择设备厂商...">{{$select.selected.name}}</ui-select-match>-->
+                                <!--<ui-select-choices repeat="item in ctrl.supplierNames">-->
+                                    <!--<span ng-bind="item.name"></span>-->
+                                <!--</ui-select-choices>-->
+                            <!--</ui-select>-->
+
+                            <sa-Select model="ctrl.busInfoForSave"
+                                       dicgroup="snames"
+                                       placeholder="请选择设备厂商..."
+                                       name="supplierName"
+                                       codename="supplierName"
+                                    ></sa-Select>
+
+
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" ng-click="ctrl.supplierName_selected_remove()" class="btn btn-default">-->
+                                    <!--<span class="glyphicon glyphicon-trash"></span>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
                     </div>
                     <!-- 隐藏快，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.supplierName.$error.required">
@@ -324,28 +333,28 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否空调车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.hvacCar" dicgroup="truefalseType" name="hvacCar"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.hvacCar" dicgroup="truefalseType" name="hvacCar"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">有无人售票：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.ticketType" dicgroup="truefalseType" name="ticketType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.ticketType" dicgroup="truefalseType" name="ticketType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有LED服务屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.ledScreen" dicgroup="truefalseType" name="ledScreen"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.ledScreen" dicgroup="truefalseType" name="ledScreen"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有TV视屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.tvVideoType" dicgroup="truefalseType" name="tvVideoType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.tvVideoType" dicgroup="truefalseType" name="tvVideoType"></sa-Radiogroup>
                     </div>
                 </div>
@@ -376,7 +385,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
                     </div>
                 </div>
@@ -324,28 +324,28 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否空调车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.hvacCar" disabled="true" dicgroup="truefalseType" name="hvacCar"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.hvacCar" disabled="true" dicgroup="truefalseType" name="hvacCar"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">有无人售票：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.ticketType" disabled="true" dicgroup="truefalseType" name="ticketType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.ticketType" disabled="true" dicgroup="truefalseType" name="ticketType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有LED服务屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.ledScreen" disabled="true" dicgroup="truefalseType" name="ledScreen"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.ledScreen" disabled="true" dicgroup="truefalseType" name="ledScreen"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否有TV视屏：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.tvVideoType" disabled="true" dicgroup="truefalseType" name="tvVideoType"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.tvVideoType" disabled="true" dicgroup="truefalseType" name="tvVideoType"></sa-Radiogroup>
                     </div>
                 </div>
@@ -376,7 +376,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否电车：</label>
                     <div class="col-md-3">
-                        <truefalse-Dic model="ctrl.busInfoForSave.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></truefalse-Dic>
+                        <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" disabled="true" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
                     </div>
                 </div>
@@ -79,12 +79,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">性别：</label>
                     <div class="col-md-4">
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen" ng-value="'男性'" ng-model="ctrl.employeeInfoForDetail.personnelType" disabled/>男性
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="ledScreen" ng-value="'女性'" ng-model="ctrl.employeeInfoForDetail.personnelType" disabled/>女性
-                        </label>
+                        <sa-Radiogroup model="ctrl.employeeInfoForDetail.personnelType" disabled="true" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
                 <div class="form-group">
@@ -117,14 +117,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">性别：</label>
                     <div class="col-md-4">
-                        <label class="radio-inline">
-                            <input type="radio" name="personnelType"
-                                   ng-value="'男性'" ng-model="ctrl.employeeInfoForSave.personnelType"/>男性
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="personnelType"
-                                   ng-value="'女性'" ng-model="ctrl.employeeInfoForSave.personnelType"/>女性
-                        </label>
+                        <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
@@ -117,14 +117,7 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">性别：</label>
                     <div class="col-md-4">
-                        <label class="radio-inline">
-                            <input type="radio" name="personnelType"
-                                   ng-value="'男性'" ng-model="ctrl.employeeInfoForSave.personnelType"/>男性
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="personnelType"
-                                   ng-value="'女性'" ng-model="ctrl.employeeInfoForSave.personnelType"/>女性
-                        </label>
+                        <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
                     </div>
                 </div>
@@ -106,7 +106,7 @@
                 <span ng-bind="info.jobCode"></span>
             </td>
             <td>
-                <span ng-bind="info.personnelType"></span>
+                <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span>
             </td>
             <td>
                 <span ng-bind="info.company"></span>
@@ -928,44 +928,138 @@ angular.module(&#39;ScheduleApp&#39;).filter(&quot;dict&quot;, [function() {
     };
 }]);
-angular.module('ScheduleApp').directive("truefalseDic", [function() {
+angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
+    return {
+        restrict: 'E',
+        templateUrl: '/pages/scheduleApp/module/other/MyDictionarySelectTemplate.html',
+        scope: {
+            model: "="
+        },
+        controllerAs: "$saSelectCtrl",
+        bindToController: true,
+        controller: function($scope) {
+            var self = this;
+            self.datas = []; // 关联的字典数据，内部格式 {code:{值},name:{名字}}
+        },
+
+        /**
+         * 重要属性如下：
+         * model 是绑定外部值。
+         * dicgroup 字典组的类型
+         * name input name属性值
+         */
+        link: function(scope, element, attr, ctrl) {
+            // 1、获取属性
+            var dicgroup_attr = attr['dicgroup']; // 字典组的类型
+            var name_attr = attr['name']; // input name属性值
+            var dicname_attr = attr['dicname']; // model关联的字典名字段
+            var codename_attr = attr['codename']; // model关联的字典值字段
+            var placeholder_attr = attr['placeholder']; // select placeholder提示
+
+            // 系统的字典对象，使用dictionaryUtils类获取
+            var origin_dicgroup;
+            var dic_key; // 字典key
+
+            if (dicgroup_attr) { // 赋值指定的字典数据
+                origin_dicgroup = dictionaryUtils.getByGroup(dicgroup_attr);
+                for (dic_key in origin_dicgroup) {
+                    var data = {}; // 重新组合的字典元素对象
+                    if (dic_key == "true")
+                        data.code = true;
+                    else
+                        data.code = dic_key;
+                    data.name = origin_dicgroup[dic_key];
+                    scope["$saSelectCtrl"].datas.push(data);
+                }
+            }
+
+            if (name_attr) {
+                scope["$saSelectCtrl"].nv = name_attr;
+            }
+            if (placeholder_attr) {
+                scope["$saSelectCtrl"].ph = placeholder_attr;
+            }
+
+            scope["$saSelectCtrl"].select = function($item) {
+                if (codename_attr) {
+                    scope["$saSelectCtrl"].model[codename_attr] = $item.code;
+                }
+                if (dicname_attr) {
+                    scope["$saSelectCtrl"].model[dicname_attr] = $item.name;
+                }
+            };
+
+            scope["$saSelectCtrl"].remove = function() {
+                if (codename_attr) {
+                    scope["$saSelectCtrl"].model[codename_attr] = null;
+                }
+                if (dicname_attr) {
+                    scope["$saSelectCtrl"].model[dicname_attr] = null;
+                }
+                scope["$saSelectCtrl"].cmodel = null;
+            };
+
+            $timeout(function() {
+                // 创建内部使用的绑定对象
+                var model_code = scope["$saSelectCtrl"].model[codename_attr];
+                scope["$saSelectCtrl"].cmodel = model_code;
+            }, 0);
+        }
+    };
+}]);
+
+angular.module('ScheduleApp').directive("saRadiogroup", [function() {
     /**
-     * true，false组合的单元按钮组的指令。
+     * 使用字典数据的单选按钮组的指令。
      * 指令名称：truefalse-Dic
      */
     return {
         restrict: 'E',
-        templateUrl: '/pages/scheduleApp/module/other/truefalseRadioGroupTemplate.html',
+        templateUrl: '/pages/scheduleApp/module/other/MyDictionaryRadioGroupTemplate.html',
         scope: {
             model: "="
         },
+        controllerAs: "ctrl",
+        bindToController: true,
+        controller: function($scope) {
+            //$scope["model"] = {selectedOption: null};
+            //console.log("controller");
+            //console.log("controller:" + $scope["model"]);
+        },
         /**
+         * 重要属性如下：
          * model 是绑定外部值。
          * disabled 说明是否不能修改
          * dicgroup 字典组的类型
+         * name input name属性值
          */
         link: function(scope, element, attr) {
+            //console.log("link");
+            //console.log("link:" + scope.model);
+            //scope["model"] = {selectedOption: null};
+
             if (attr["name"]) {
-                scope["nv"] = attr["name"];
+                scope["ctrl"].nv = attr["name"];
             }
             if (attr["disabled"]) {
-                element.find("input").attr("disabled", "");
+                scope["ctrl"].disabled = true;
             }
             if (attr["dicgroup"]) {
                 var obj = dictionaryUtils.getByGroup(attr['dicgroup']);
-                if (obj["true"])
-                    scope["trueDesc"] = obj["true"];
-                else
-                    scope["trueDesc"] = "未知true";
-
-                if (obj["false"])
-                    scope["falseDesc"] = obj["false"];
-                else
-                    scope["falseDesc"] = "未知false";
-            } else {
-                scope["trueDesc"] = "未知true";
-                scope["falseDesc"] = "未知false";
+                scope["ctrl"].dic = obj;
+                // 处理 scope["dic"] key值
+                scope["ctrl"].dicvalueCalcu = function(value) {
+                    if (value == "true") {
+                        //console.log(value);
+                        return true;
+                    } else if (value == "false") {
+                        //console.log(value);
+                        return false;
+                    } else {
+                        return value;
+                    }
+                };
             }
         }
     };
+<div>
+    <!--<label class="radio-inline">-->
+        <!--<input type="radio" name="{{nv}}"-->
+               <!--ng-value="true" ng-model="model" {{disabled}}/>{{trueDesc}}-->
+    <!--</label>-->
+    <!--<label class="radio-inline">-->
+        <!--<input type="radio" name="{{nv}}"-->
+               <!--ng-value="false" ng-model="model" {{disabled}}/>{{falseDesc}}-->
+    <!--</label>-->
+
+    <!-- 单选按钮组模版 -->
+    <!--
+        使用 ng-repeat 循环生成input radio时候，双向绑定会有问题，因为ng-repeat有自己的controller，
+        会影响外部的controller绑定，网上有很多解决方法，这里使用controllerAs方式，让指令定义自己的控制器别名，
+        模版里指定别名就不会和ng-repeat控制器混了。
+    -->
+
+    <label class="radio-inline" ng-repeat="(dicvalue, dicdesc) in ctrl.dic">
+        <input type="radio" name="{{ctrl.nv}}"
+                ng-value="ctrl.dicvalueCalcu(dicvalue)" ng-model="ctrl.model" ng-disabled="ctrl.disabled" />{{dicdesc}}
+    </label>
+</div>
 \ No newline at end of file
+
+<div class="input-group">
+    <ui-select ng-model="$saSelectCtrl.cmodel" on-select="$saSelectCtrl.select($item)"
+               theme="bootstrap" name="{{$saSelectCtrl.nv}}" >
+        <ui-select-match placeholder="{{$saSelectCtrl.ph}}">{{$select.selected.name}}</ui-select-match>
+        <ui-select-choices repeat="item.code as item in $saSelectCtrl.datas">
+            <span ng-bind="item.name"></span>
+        </ui-select-choices>
+    </ui-select>
+    <span class="input-group-btn">
+        <button type="button" ng-click="$saSelectCtrl.remove()" class="btn btn-default">
+            <span class="glyphicon glyphicon-trash"></span>
+        </button>
+    </span>
+</div>
-<div>
-    <label class="radio-inline">
-        <input type="radio" name="{{nv}}"
-               ng-value="true" ng-model="model" {{disabled}}/>{{trueDesc}}
-    </label>
-    <label class="radio-inline">
-        <input type="radio" name="{{nv}}"
-               ng-value="false" ng-model="model" {{disabled}}/>{{falseDesc}}
-    </label>
-</div>
 \ No newline at end of file