OK

lib/数据更新脚本.txt

@@ -198,3 +198,13 @@ INSERT INTO CF_DICTIONARY (DICTIONARYID, DICKEY, DICVALUE, DICTYPEKEY, DICTYPE,
 -- 2024.7.19
 alter table cf_users add wxUserId varchar(50);
 
+-- 2024.7.22
+-- 民主生活会
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4189070a-b18e-0001-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4189070a-b18e-11ec-829d-7085c2a9999e', NULL, 1, 'home.pf_meetingEdit2', '编辑民主生活会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4189070a-b18e-0002-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4189070a-b18e-11ec-829d-7085c2a9999e', NULL, 2, 'home.pf_meetingAdd2', '新增民主生活会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4189070a-b18e-0003-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4189070a-b18e-11ec-829d-7085c2a9999e', NULL, 3, 'home.pf_meetingDetail2', '查看民主生活会详情', NULL, NULL, NULL, 0, 0, NULL);
+
+-- 组织生活会
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('3e8c2439-b18e-0001-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '3e8c2439-b18e-11ec-829d-7085c2a9999e', NULL, 1, 'home.pf_meetingEdit1', '编辑组织生活会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('3e8c2439-b18e-0002-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '3e8c2439-b18e-11ec-829d-7085c2a9999e', NULL, 2, 'home.pf_meetingAdd1', '新增组织生活会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('3e8c2439-b18e-0003-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '3e8c2439-b18e-11ec-829d-7085c2a9999e', NULL, 3, 'home.pf_meetingDetail1', '查看组织生活会详情', NULL, NULL, NULL, 0, 0, NULL);

src/main/resources/static/app/main/app.js

@@ -3077,6 +3077,37 @@
                     return $ocLazyLoad.load('../main/partylife/meeting/list.js?' + window.sysVersion);
                 }]
             }
+
+        }).state("home.pf_meetingEdit1", {
+            url: "pf_meetingEdit1",
+            params: { "partyLifeMeetingType": 1 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingAdd1", {
+            url: "pf_meetingAdd1",
+            params: { "partyLifeMeetingType": 1 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingDetail1", {
+            url: "pf_meetingDetail1",
+            templateUrl: "../main/partylife/meeting/detail.html?" + window.sysVersion,
+            controller: "pf_meetingDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/detail.js?' + window.sysVersion);
+                }]
+            }
+
         }).state("home.pf_meetingList2", {
             url: "pf_meetingList2",
             params: { "partyLifeMeetingType": 2 },
@@ -3088,6 +3119,35 @@
                     return $ocLazyLoad.load('../main/partylife/meeting/list.js?' + window.sysVersion);
                 }]
             }
+        }).state("home.pf_meetingEdit2", {
+            url: "pf_meetingEdit2",
+            params: { "partyLifeMeetingType": 2 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingAdd2", {
+            url: "pf_meetingAdd2",
+            params: { "partyLifeMeetingType": 2 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingDetail2", {
+            url: "pf_meetingDetail2",
+            templateUrl: "../main/partylife/meeting/detail.html?" + window.sysVersion,
+            controller: "pf_meetingDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("home.pf_meetingTxthList", {
             url: "pf_meetingTxthList",
             params: { "partyLifeMeetingType": 3 },

src/main/resources/static/app/main/partylife/djscgz/list.js

@@ -3,6 +3,7 @@
         $scope.loginUserId = AuthUser.getUser().Id;
         $scope.isShow = true;
         $scope.isAll = false;
+        $scope.pageId = "pf_djscgzList";
         $scope.tabNameAdd = "home.pf_djscgzAdd";
         $scope.tabNameEdit = "home.pf_djscgzEdit";
         $scope.tabNameDetail = "home.pf_djscgzDetail";

src/main/resources/static/app/main/partylife/dnjzjy/list.js

@@ -4,6 +4,7 @@
         $scope.isShow = false;
         $scope.moreTxt = "更多";
         $scope.isAll = false;
+        $scope.pageId = "pf_dnjzjyList";
         $scope.tabNameAdd = "home.pf_dnjzjyAdd";
         $scope.tabNameEdit = "home.pf_dnjzjyEdit";
         $scope.tabNameDetail = "home.pf_dnjzjyDetail";

src/main/resources/static/app/main/partylife/jljyxxyhd/detail.html

@@ -5,29 +5,12 @@
                 <div class="dj-formtable">
                     <table class="dj-table dj-table3">
                         <tr>
-                            <th>所属党组织</th>
-                            <td>{{dataModel.partyname}}</td>
-                            <th>会议名称</th>
-                            <td>{{dataModel.title}}</td>
-                            <th>会议时间</th>
-                            <td>{{dataModel.meetingdate | date:'yyyy-MM-dd'}}</td>
-                        </tr>
-                        <tr>
-                            <th>主持人</th>
-                            <td>{{dataModel.compere}}</td>
-                            <th>会议地址</th>
-                            <td colspan="3">{{dataModel.address}}</td>
-                        </tr>
-                        <tr>
-                            <th>“三重一大”类别</th>
-                            <td colspan="5">
-                                <div style="float: left;position: relative;display: inline-block;margin: 0px 0px 0px 5px;"
-                                     ng-repeat="it in scydTypeList">
-                                    <input type="checkbox" ng-model="it.checked" disabled
-                                           id="{{pageId}}_scydcheckbox_{{it.dickey}}"/>
-                                    <label for="{{pageId}}_scydcheckbox_{{it.dickey}}">{{it.dicvalue}}</label>
-                                </div>
-                            </td>
+                            <th>所属党组织<span style="color:red;">*</span></th>
+                            <td>{{dataModel.dzzmc}}</td>
+                            <th>活动名称<span style="color:red;">*</span></th>
+                            <td>{{dataModel.hdmc}}</td>
+                            <th>日期<span style="color:red;">*</span></th>
+                            <td>{{dataModel.rq}}</td>
                         </tr>
                     </table>
                 </div>
@@ -35,46 +18,41 @@
                     <div class="table-responsive list-table-panel">
                         <div class="list-table-title">
                             <div class="table-title">
-                                出席人员列表({{dataModel.personnellist.length}}人)
+                                统计明细表({{dataModel.fblist.length}}人)
                             </div>
                         </div>
                         <div class="outoflow" style="max-height: 300px;">
-                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                            <table class="table table-bordered">
                                 <thead>
                                 <tr>
                                     <th>序号</th>
-                                    <th>姓名</th>
-                                    <th>是否缺勤</th>
-                                    <th>缺勤原因</th>
+                                    <th>重点工作</th>
+                                    <th>名称</th>
+                                    <th>时间</th>
+                                    <th>教育对象</th>
+                                    <th>参加人数</th>
+                                    <th>备注</th>
+                                    <th>操作</th>
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <tr ng-repeat="it in dataModel.personnellist">
+                                <tr ng-repeat="it in dataModel.fblist">
                                     <td scope="row">{{$index+1}}</td>
-                                    <td>{{it.xm}}</td>
-                                    <td>{{it.isabsenteeismname}}</td>
-                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.absenteeismcause}}</td>
+                                    <td>{{it.zdgz}}</td>
+                                    <td>{{it.mc}}</td>
+                                    <td>{{it.sj}}</td>
+                                    <td>{{it.jydx}}</td>
+                                    <td>{{it.cjrs}}</td>
+                                    <td>{{it.remark}}</td>
                                 </tr>
-                                <tr ng-if="userList.length<=0">
-                                    <td colspan="7" style="text-align:center">暂无数据</td>
+                                <tr ng-if="dataModel.fblist.length<=0">
+                                    <td colspan="8" style="text-align:center">暂无数据</td>
                                 </tr>
                                 </tbody>
                             </table>
                         </div>
                     </div>
                 </div>
-                <div class="dj-formtable">
-                    <table class="dj-table">
-                        <tr>
-                            <th style="width: 5%;">列席人员</th>
-                            <td colspan="5">{{dataModel.personnel}}</td>
-                        </tr>
-                        <tr>
-                            <th style="width: 5%;">会议主要议程及结果</th>
-                            <td colspan="5">{{dataModel.result}}</td>
-                        </tr>
-                    </table>
-                </div>
             <bsfiles ng-model="reqFileModel"/>
         </div>
     </div>

src/main/resources/static/app/main/partylife/jljyxxyhd/detail.js

@@ -2,7 +2,16 @@
     $app.module('gtPartyApp').controller('pf_jljyxxyhdDetailCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
         $scope.editParams = $bsRouterState.$params($scope);
         $scope.pageId = $bsRouterState.tabs.activeTab;
-        $scope.dataModel = {}; 
+        $scope.dataModel = {};
+
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: true,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
 
         $scope.getData = function () {
             $http
@@ -21,15 +30,6 @@
 
         $scope.getData();
 
-        $scope.reqFileModel = {
-            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
-            filetype: 71,//文件类型
-            items: [],//列表数据地址
-            readonly: true,//是否只能查看
-            title: '附件',
-            addFileButton: '上传'
-        };
-
         $scope.pagechange = function () {
             $bsRouterState.$closeTab($scope);
         };

src/main/resources/static/app/main/partylife/jljyxxyhd/list.html

@@ -51,6 +51,7 @@
                                                        autocomplete="off"
                                                        autoclose="true"
                                                        data-date-format="yyyyMM" data-date-type="string"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.startDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>
@@ -58,6 +59,7 @@
                                                        autocomplete="off"
                                                        autoclose="true"
                                                        data-date-format="yyyyMM" data-date-type="string"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.endDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>
@@ -72,6 +74,9 @@
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
                             </div>
                         </div>
                     </div>

src/main/resources/static/app/main/partylife/jljyxxyhd/list.js

@@ -15,6 +15,7 @@
             selectdzzmc: "",
             defaultselected: $state.params.dzzdm
         };
+        $scope.resetTreeparams = angular.copy($scope.treeparams);
         //查询条件
         $scope.selectparams = {
             pageindex: 1,
@@ -25,6 +26,7 @@
             endDate: null
         };
         $scope.pageInfo = {ptotal: 0};
+        $scope.resetSelectparams = angular.copy($scope.selectparams);
 
         $scope.$on('tabChildReloadData', function (event, data) {
             if (data.name == 'pf_jljyxxyhdListCtrl') {
@@ -150,6 +152,11 @@
             $scope.treeparams.isunfold = !$scope.treeparams.isunfold;
             $scope.$emit('menudatas.toggle', !$scope.treeparams.isunfold);
         };
+        $scope.reset = function () {
+            $scope.selectparams = angular.copy($scope.resetSelectparams);
+            $scope.treeparams = angular.copy($scope.resetTreeparams);
+            $scope.loadData();
+        };
 
         $scope.loadData();
     });

src/main/resources/static/app/main/partylife/meeting/list.js

@@ -6,7 +6,7 @@
         $scope.moreTxt = "更多";
         $scope.partyLifeMeetingType = $state.params.partyLifeMeetingType;
         $scope.isAll = false;
-        $scope.pageId = "meetingList";
+        $scope.pageId = "meetingList" + $scope.partyLifeMeetingType;
         $scope.tabNameAdd = "home.pf_meetingAdd" + $scope.partyLifeMeetingType;
         $scope.tabNameEdit = "home.pf_meetingEdit" + $scope.partyLifeMeetingType;
         $scope.tabNameDetail = "home.pf_meetingDetail" + $scope.partyLifeMeetingType;

src/main/resources/static/app/main/partylife/scyd/list.html

@@ -72,6 +72,9 @@
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
                             </div>
                         </div>
                     </div>

src/main/resources/static/app/main/partylife/scyd/list.js

@@ -20,6 +20,7 @@
             selectdzzmc: "",
             defaultselected: $state.params.dzzdm
         };
+        $scope.resettreeparams = angular.copy($scope.treeparams);
         //查询条件
         $scope.selectparams = {
             pageindex: 1,
@@ -31,6 +32,7 @@
             endDate: null
         };
         $scope.pageInfo = {ptotal: 0};
+        $scope.resetselectparams = angular.copy($scope.selectparams);
 
         $scope.$on('tabChildReloadData', function (event, data) {
             if (data.name == 'pf_scydMeetingListCtrl') {
@@ -166,6 +168,12 @@
         };
 
         $scope.loadData();
-        // $scope.getPartyLifeMeetingTypeList();
+
+        $scope.reset = function () {
+            $scope.treeparams = angular.copy($scope.resettreeparams);
+            $scope.selectparams = angular.copy($scope.resetselectparams);
+            $scope.selectparams.partyLifeMeetingType = $scope.partyLifeMeetingType;
+            $scope.loadData();
+        }
     });
 })(angular);

src/main/resources/static/app/main/partylife/tqdflzhy/list.html

@@ -72,6 +72,9 @@
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
                             </div>
                         </div>
                     </div>

src/main/resources/static/app/main/partylife/tqdflzhy/list.js

@@ -20,6 +20,7 @@
             selectdzzmc: "",
             defaultselected: $state.params.dzzdm
         };
+        $scope.resetTreeparams = angular.copy($scope.treeparams);
         //查询条件
         $scope.selectparams = {
             pageindex: 1,
@@ -31,6 +32,7 @@
             endDate: null
         };
         $scope.pageInfo = {ptotal: 0};
+        $scope.resetselectparams = angular.copy($scope.selectparams);
 
         $scope.$on('tabChildReloadData', function (event, data) {
             if (data.name == 'pf_tqdflzhyMeetingListCtrl') {
@@ -164,6 +166,12 @@
                 $scope.moreTxt = "更多";
             }
         };
+        $scope.reset = function () {
+            $scope.selectparams = angular.copy($scope.resetSelectparams);
+            $scope.treeparams = angular.copy($scope.resetTreeparams);
+            $scope.loadData();
+        };
+
 
         $scope.loadData();
     });