calendar action 页面调整

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarActionServiceImpl.java

@@ -148,7 +148,7 @@ public class CalendarActionServiceImpl extends BaseService implements ICalendarA
 
         CalendarActionExample actionExample = new CalendarActionExample();
         actionExample.createCriteria().andStatusEqualTo((byte) 1);
-        List<CalendarAction> actionList = calendarActionMapper.selectByExample(null);
+        List<CalendarAction> actionList = calendarActionMapper.selectByExample(actionExample);
         List<CalendarActionDto> actionDtoList = new ArrayList<>();
 
         actionList.forEach(p -> {

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CalendarServiceImpl.java

@@ -349,7 +349,8 @@ public class CalendarServiceImpl extends BaseService implements ICalendarService
 
     @Override
     public OperationResultDto getMaxConfigOrder() {
-        return new OperationResultDto(true, "", calendarExtMapper.getMaxConfigOrder() + 1);
+        Integer index = calendarExtMapper.getMaxConfigOrder();
+        return new OperationResultDto(true, "", index != null ? index + 1 : 1);
     }
 
     @Override

atms-web/src/main/webapp/app-resources/i18n/zh-CN/systemConfiguration.json

@@ -256,6 +256,7 @@
     "TaxCalendarCofigHead":"税务日历设置",
     "CalendarNumber":"日历编号",
     "Number":"编号",
+    "TaskName" : "名称",
     "Company":"公司",
     "CompanyName": "公司名称",
     "TaxEvent":"税务事项",
@@ -331,6 +332,10 @@
     "RelatedPerson": "相关人员",
 
 
+    "ButtonConfirm": "确定",
+    "ButtonCancel": "取消",
+    "ButtonCreate": "新建",
+    "ButtonSave": "保存",
 
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarAction/calendar-action.html

 <div id="calendar-action">
     <div class="calendar-action-Head">{{'CalendarActionHead'|translate}}</div>
-    <div ng-click="refreshAll()">Refresh</div>
     <div class="calendar-action-container">
         <div id="data-grid-action">
             <div>
@@ -14,7 +13,7 @@
                             <div id="editTaskType" ng-click="editTaskTypeList();">Edit</div>
                         </th>
                         <th colspan="9">Jurisdiction of Formation</th>
-                        <th rowspan="3">Operation</th>
+                        <th rowspan="3" style="width: 120px;">Operation</th>
                     </tr>
                     <tr>
                         <th colspan="3">Hong Kong</th>
@@ -24,39 +23,43 @@
                     <tr>
                         <th>Valid</th>
                         <th>Description</th>
-                        <th>Logic</th>
+                        <th style="width: 150px;">Logic</th>
                         <th>valid</th>
                         <th>Description</th>
-                        <th>Logic</th>
+                        <th style="width: 150px;">Logic</th>
                         <th>valid</th>
                         <th>Description</th>
-                        <th>Logic</th>
+                        <th style="width: 150px;">Logic</th>
                     </tr>
                     </thead>
                     <tbody  id="table-body">
-                    <tr ng-repeat="action in actionList">
+                    <tr ng-repeat="action in actionList track by $index">
                         <td>{{action.name}}</td>
-                        <td>{{action.triggerId}}</td>
-                        <td>{{action.taskTypeId}}</td>
-                        <td>{{action.status}}</td>
-                        <td>{{action.description}}</td>
+                        <td>{{getTriggerName(action.triggerId)}}</td>
+                        <td>{{getTaskTypeName(action.taskTypeId)}}</td>
+
+                        <td><div dx-check-box="{ value: {{action.jurisdictionDtoList[0].status == 1}}, readOnly:true}"/></td>
+                        <td>{{action.jurisdictionDtoList[0].description}}</td>
                         <td>
-                            <span>{{action.logicNum}}</span>
-                            <span>{{action.logicUnitId}}</span>
+                            <div class="logic-num">{{action.jurisdictionDtoList[0].logicNum}}</div>
+                            <div class="logic-unit">{{getLogicUnitName(action.jurisdictionDtoList[0].logicUnit)}}</div>
                         </td>
-                        <td>{{action.status}}</td>
-                        <td>{{action.description}}</td>
+
+                        <td><div dx-check-box="{ value: {{action.jurisdictionDtoList[1].status == 1}}, readOnly:true}"/></td>
+                        <td>{{action.jurisdictionDtoList[1].description}}</td>
                         <td>
-                            <span>{{action.logicNum}}</span>
-                            <span>{{action.logicUnitId}}</span>
+                            <div class="logic-num">{{action.jurisdictionDtoList[1].logicNum}}</div>
+                            <div class="logic-unit">{{getLogicUnitName(action.jurisdictionDtoList[1].logicUnit)}}</div>
                         </td>
-                        <td>{{action.status}}</td>
-                        <td>{{action.description}}</td>
+
+                        <td><div dx-check-box="{ value: {{action.jurisdictionDtoList[2].status == 1}}, readOnly:true}"/></td>
+                        <td>{{action.jurisdictionDtoList[2].description}}</td>
                         <td>
-                            <span>{{action.logicNum}}</span>
-                            <span>{{action.logicUnitId}}</span>
+                            <div class="logic-num">{{action.jurisdictionDtoList[2].logicNum}}</div>
+                            <div class="logic-unit">{{getLogicUnitName(action.jurisdictionDtoList[2].logicUnit)}}</div>
                         </td>
-                        <td>
+
+                        <td class="operation-button">
                             <span ng-click="editAction(action, 'Show')">Detail</span>
                             <span ng-click="editAction(action, 'Edit')">Edit</span>
                             <span ng-click="deleteAction(action)">Delete</span>
@@ -136,7 +139,7 @@
 
         <div class="modal-header">
             <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideEditActionPanel()">&times;</span>
-            <div class="long-title"><h3>Action Details</h3></div>
+            <div class="long-title"><h3>{{title}}</h3></div>
         </div>
 
         <div class="modal-body">
@@ -148,8 +151,8 @@
         </div>
 
         <div class="modal-footer">
-            <button ng-click="hideEditActionPanel();" class="btn btn-default btn-gray">{{'Cancel' | translate}}</button>
-            <button ng-click="saveAction();" class="btn btn-default btn-red">{{'NewTaxCalendar' | translate}}</button>
+            <button ng-click="hideEditActionPanel();" class="btn btn-default btn-gray">{{cancelActionText}}</button>
+            <button ng-show="!actionReadOnly" ng-click="saveAction();" class="btn btn-default btn-red">{{saveActionText}}</button>
         </div>
 
     </script>

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarAction/calendar-action.less

@@ -44,6 +44,24 @@
     text-align: center;
   }
 
+  #table-body .dx-checkbox-icon {
+    background: #bbb;
+  }
+
+  #table-body .logic-num {
+    border: 1px solid #bbb;
+    width: 40px;
+    border-radius: 4px;
+    display: inline-block;
+  }
+
+  #table-body .logic-unit {
+    border: 1px solid #bbb;
+    width: 95px;
+    border-radius: 4px;
+    display: inline-block;
+  }
+
   #editTaskType {
     color: red;
     font-size: smaller;
@@ -51,8 +69,12 @@
     outline: none;
   }
 
+  .operation-button span {
+    color: red;
+    outline: none;
+  }
 
-  #edit-task-type-pop, #edit-task-type, #edit-action-type-pop {
+  #edit-task-type-pop, #edit-task-type {
     .form-title {
       display: inline-block;
       vertical-align: middle;
@@ -86,7 +108,12 @@
     }
   }
 
-  #edit-action-type-pop {
+  #edit-action-pop {
+
+    .modal-header {
+      height: 75px;
+    }
+
     #form-container {
       margin: 10px;
     }
@@ -126,4 +153,4 @@
     }
   }
 
-}
+}
\ No newline at end of file

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.ctrl.js

@@ -9,7 +9,12 @@
         //设置页面标题-->查看,新建,编辑日历设置
         $scope.PageTitle = ($scope.calendarConfigId ? ($scope.isReadOnly ? $translate.instant('View') : $translate.instant('Edit')) : $translate.instant('NewTaxCalendar')) + $translate.instant('TaxCalendarSet');
         $scope.bhOptions = {
-            readOnly: true
+            readOnly: !!$scope.isReadOnly,
+            placeholder: $translate.instant('PleaseInput'),
+            validationRules: [{
+                type: "required",
+                message: $translate.instant('ValidDataRequired')
+            }]
         };
         $scope.companyOptions = {
             bindingOptions: {

atms-web/src/main/webapp/app/admin/systemConfiguration/calendarSetting/taxCalendarConfigEdit/tax-calendar-config-edit.html

@@ -6,8 +6,8 @@
     <div class="taxCalendarForm" id="taxCalendarConfigForm" dx-validation-group="{}">
         <div class="edit-line row">
             <div class="col-user-define-left col-padding">
-                <span class="title-first-n">{{'Number' | translate}}：</span>
-                <div class="form-box bh-box" ng-model="taxCalendarConfiguration.orderIndex" dx-text-box="bhOptions"></div>
+                <span class="title-first-n">{{'TaskName' | translate}}：</span>
+                <div class="form-box bh-box" ng-model="taxCalendarConfiguration.taskName" dx-text-box="bhOptions"></div>
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 <div class="form-box" ng-model="taxCalendarConfiguration.status" dx-radio-group="statusOptions"></div>
             </div>