瀏覽代碼

更新党员发展页面完成15%

Rockery 3 年之前
父節點
當前提交
e2b534e47c

+ 2 - 0
package.json

@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "area-data": "5.0.6",
     "axios": "0.24.0",
     "clipboard": "2.0.6",
     "core-js": "3.19.3",
@@ -55,6 +56,7 @@
     "sortablejs": "1.10.2",
     "v-viewer": "1.6.4",
     "vue": "2.6.14",
+    "vue-area-linkage": "5.1.0",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.8",
     "vue-pdf": "4.3.0",

+ 9 - 5
src/assets/styles/cust-global.scss

@@ -40,11 +40,15 @@
   height: 1.5em !important;
 }
 
-#app .sidebar-container.has-logo .sidebar-wrapper {
-  background: url("../images/layout-sidebar-wrapper-bg.png"), #304156;
-  background-size: 209px 290px, cover;
-  background-position: right 36px bottom 58px, center;
-  background-repeat: no-repeat, no-repeat;
+#app {
+  background: #f2f2f2;
+
+  .sidebar-container.has-logo .sidebar-wrapper {
+    background: url("../images/layout-sidebar-wrapper-bg.png"), #304156;
+    background-size: 209px 290px, cover;
+    background-position: right 36px bottom 58px, center;
+    background-repeat: no-repeat, no-repeat;
+  }
 }
 
 /* rocpartyprimarybtn button color ----Start */

文件差異過大導致無法顯示
+ 955 - 89
src/components/UpdatePartyDevelop/index.vue


+ 1 - 1
src/settings.js

@@ -24,7 +24,7 @@ module.exports = {
   /**
    * 是否固定头部
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * 是否显示logo

+ 229 - 207
src/views/PartyBuildingMgr/FullPartyMember/FullPartyMemberIndex.vue

@@ -3,223 +3,243 @@
  * @Author: Rockery
  * @Date: 2021-12-10 10:39:07
  * @LastEditors: Rockery
- * @LastEditTime: 2021-12-15 16:12:02
+ * @LastEditTime: 2021-12-16 10:51:58
  * @FilePath: \party_construct_web\src\views\PartyBuildingMgr\FullPartyMember\FullPartyMemberIndex.vue
  * @Copyright: Copyright (c) 2016~2021 Rockery(1113269755@qq.com)
 -->
 
 <template>
   <div class="app-container fullpartymember">
-    <div class="fullpartymember-head">
-      <div class="fullpartymember-head-title">
-        <div>
-          <img :src="require('@/assets/logo/home-main-title-logo.png')" @error="imgViewerOnerror" />
-        </div>
-        <div>正式党员管理</div>
-      </div>
-      <div class="fullpartymember-head-btn">
-        <div>列表样式</div>
-        <svg-icon
-          icon-class="partydatacard"
-          class="fullpartymember-head-btn-card"
-          :class="{ 'is-active': listActiveType === 'CARDLIST' }"
-          @click="handleCardListClick"
-        />
-        <svg-icon
-          icon-class="partydatalist"
-          class="fullpartymember-head-btn-list"
-          :class="{ 'is-active': listActiveType === 'TABLELIST' }"
-          @click="handleTableListClick"
-        />
-      </div>
-    </div>
-
-    <div class="app-container-queryform" v-show="showSearch">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-        <el-form-item prop="beginTime">
-          <el-date-picker
-            v-model="queryParams.beginTime"
-            type="date"
-            size="small"
-            clearable
-            value-format="yyyy-MM-dd"
-            style="width: 100%;"
-            placeholder="请选择入党开始时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item prop="endTime">
-          <el-date-picker
-            v-model="queryParams.endTime"
-            type="date"
-            size="small"
-            clearable
-            value-format="yyyy-MM-dd"
-            style="width: 100%;"
-            placeholder="请选择入党结束时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入姓名"
-            clearable
-            size="small"
-            style="width: 100%;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item prop="sex">
-          <el-select
-            v-model="queryParams.sex"
-            placeholder="请选择性别"
-            clearable
-            size="small"
-            style="width: 100%;"
-          >
-            <el-option
-              v-for="sexOption in sexOptions"
-              :key="sexOption.dictValue"
-              :label="sexOption.dictLabel"
-              :value="sexOption.dictValue"
+    <template v-if="pageType == 'LIST'">
+      <div class="fullpartymember-listpage">
+        <div class="fullpartymember-head">
+          <div class="fullpartymember-head-title">
+            <div>
+              <img
+                :src="require('@/assets/logo/home-main-title-logo.png')"
+                @error="imgViewerOnerror"
+              />
+            </div>
+            <div>正式党员管理</div>
+          </div>
+          <div class="fullpartymember-head-btn">
+            <div>列表样式</div>
+            <svg-icon
+              icon-class="partydatacard"
+              class="fullpartymember-head-btn-card"
+              :class="{ 'is-active': listActiveType === 'CARDLIST' }"
+              @click="handleCardListClick"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            v-hasPermi="['partybuildingmgr:situationdesc:query']"
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQueryClick"
-          >搜索</el-button>
-          <el-button
-            v-hasPermi="['partybuildingmgr:situationdesc:reset']"
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQueryClick"
-          >重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="app-container-main fullpartymember-main" :class="showSearch ? 'mt15' : ''">
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            v-hasPermi="['partybuildingmgr:situationdesc:add']"
-            type="rocpartyprimarybtn"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAddClick"
-          >新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            v-hasPermi="['partybuildingmgr:situationdesc:transferin']"
-            type="rocpartyprimaryplainbtn"
-            icon="el-icon-circle-plus-outline"
-            size="mini"
-            @click="handleTransferInClick"
-          >转入</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-row :gutter="10">
-        <template v-if="listActiveType === 'CARDLIST'">
-          <el-col :span="24">
-            <div class="fullpartymember-main-list">
-              <template v-if="list.length > 0">
-                <div class="list-row">
-                  <div v-for="item in 20" :key="item" class="list-cell">
-                    <div class="list-cell-img">
-                      <img
-                        :src="require('@/assets/images/home-main-list-card-img.png')"
-                        @error="imgViewerOnerror"
-                      />
-                      <div class="list-cell-shield">
-                        <div class="list-cell-shield-content">
-                          <div class="shield-content-label">入党时间</div>
-                          <div class="shield-content-datetime">1921年7月1日</div>
-                          <el-button
-                            type="rocwhiteplainbtn"
-                            style="width: 100%;"
-                            @click="handleViewMaterialClick"
-                          >查看资料</el-button>
-                          <div
-                            class="shield-content-relation"
-                            @click="handleOrgRelationChangeClick"
-                          >组织关系变更 ></div>
+            <svg-icon
+              icon-class="partydatalist"
+              class="fullpartymember-head-btn-list"
+              :class="{ 'is-active': listActiveType === 'TABLELIST' }"
+              @click="handleTableListClick"
+            />
+          </div>
+        </div>
+
+        <div class="app-container-queryform" v-show="showSearch">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="queryParams.beginTime"
+                type="date"
+                size="small"
+                clearable
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+                placeholder="请选择入党开始时间"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="date"
+                size="small"
+                clearable
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+                placeholder="请选择入党结束时间"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item prop="name">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入姓名"
+                clearable
+                size="small"
+                style="width: 100%;"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item prop="sex">
+              <el-select
+                v-model="queryParams.sex"
+                placeholder="请选择性别"
+                clearable
+                size="small"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="sexOption in sexOptions"
+                  :key="sexOption.dictValue"
+                  :label="sexOption.dictLabel"
+                  :value="sexOption.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                v-hasPermi="['partybuildingmgr:situationdesc:query']"
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="handleQueryClick"
+              >搜索</el-button>
+              <el-button
+                v-hasPermi="['partybuildingmgr:situationdesc:reset']"
+                icon="el-icon-refresh"
+                size="mini"
+                @click="resetQueryClick"
+              >重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <div class="app-container-main fullpartymember-main" :class="showSearch ? 'mt15' : ''">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                v-hasPermi="['partybuildingmgr:situationdesc:add']"
+                type="rocpartyprimarybtn"
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAddClick"
+              >新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                v-hasPermi="['partybuildingmgr:situationdesc:transferin']"
+                type="rocpartyprimaryplainbtn"
+                icon="el-icon-circle-plus-outline"
+                size="mini"
+                @click="handleTransferInClick"
+              >转入</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+          <el-row :gutter="10">
+            <template v-if="listActiveType === 'CARDLIST'">
+              <el-col :span="24">
+                <div class="fullpartymember-main-list">
+                  <template v-if="list.length > 0">
+                    <div class="list-row">
+                      <div v-for="item in 20" :key="item" class="list-cell">
+                        <div class="list-cell-img">
+                          <img
+                            :src="require('@/assets/images/home-main-list-card-img.png')"
+                            @error="imgViewerOnerror"
+                          />
+                          <div class="list-cell-shield">
+                            <div class="list-cell-shield-content">
+                              <div class="shield-content-label">入党时间</div>
+                              <div class="shield-content-datetime">1921年7月1日</div>
+                              <el-button
+                                type="rocwhiteplainbtn"
+                                style="width: 100%;"
+                                @click="handleViewMaterialClick"
+                              >查看资料</el-button>
+                              <div
+                                class="shield-content-relation"
+                                @click="handleOrgRelationChangeClick"
+                              >组织关系变更 ></div>
+                            </div>
+                          </div>
                         </div>
+                        <div class="list-cell-name">罗正峰</div>
                       </div>
                     </div>
-                    <div class="list-cell-name">罗正峰</div>
-                  </div>
+                  </template>
+                  <template v-else>
+                    <div class="fullpartymember-main-list-nodata">暂无数据</div>
+                  </template>
                 </div>
-              </template>
-              <template v-else>
-                <div class="fullpartymember-main-list-nodata">暂无数据</div>
-              </template>
-            </div>
-          </el-col>
-        </template>
-        <template v-else>
-          <el-col :span="24" class="mt15">
-            <el-table
-              :data="list"
-              stripe
-              border
-              :header-cell-style="{'text-align':'center'}"
-              header-row-class-name="develop-table_header-row"
-              class="develop-main-table"
-              style="width: 100%;"
-            >
-              <el-table-column label="党员姓名" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="性别" prop="name" align="center" :show-overflow-tooltip="true" />
-              <el-table-column label="党龄" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="入党介绍人" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="申请入党时间" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column label="正式入党时间" prop="name" :show-overflow-tooltip="true" />
-              <el-table-column
-                label="操作"
-                align="center"
-                fixed="right"
-                width="200"
-                class-name="small-padding fixed-width"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:view']"
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    style="color: #909399;"
-                    @click="handleViewClick(scope.row)"
-                  >详情</el-button>
-                  <el-button
-                    v-hasPermi="['partybuildingmgr:partymemberdevelop:reactivate']"
-                    size="mini"
-                    type="text"
-                    style="color: #de0010;"
-                    @click="handleReactivateClick(scope.row)"
+              </el-col>
+            </template>
+            <template v-else>
+              <el-col :span="24" class="mt15">
+                <el-table
+                  :data="list"
+                  stripe
+                  border
+                  :header-cell-style="{'text-align':'center'}"
+                  header-row-class-name="develop-table_header-row"
+                  class="develop-main-table"
+                  style="width: 100%;"
+                >
+                  <el-table-column label="党员姓名" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column
+                    label="性别"
+                    prop="name"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                  />
+                  <el-table-column label="党龄" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="入党介绍人" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="申请入党时间" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column label="正式入党时间" prop="name" :show-overflow-tooltip="true" />
+                  <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    width="200"
+                    class-name="small-padding fixed-width"
                   >
-                    <svg-icon icon-class="relachange" />&nbsp;&nbsp;组织关系变更
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-        </template>
-        <el-col :span="24">
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="initData"
-          />
-        </el-col>
-      </el-row>
-    </div>
+                    <template slot-scope="scope">
+                      <el-button
+                        v-hasPermi="['partybuildingmgr:partymemberdevelop:view']"
+                        size="mini"
+                        type="text"
+                        icon="el-icon-view"
+                        style="color: #909399;"
+                        @click="handleViewClick(scope.row)"
+                      >详情</el-button>
+                      <el-button
+                        v-hasPermi="['partybuildingmgr:partymemberdevelop:reactivate']"
+                        size="mini"
+                        type="text"
+                        style="color: #de0010;"
+                        @click="handleReactivateClick(scope.row)"
+                      >
+                        <svg-icon icon-class="relachange" />&nbsp;&nbsp;组织关系变更
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </template>
+            <el-col :span="24">
+              <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="initData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+    </template>
+    <template v-else-if="pageType == 'ADD'">
+      <div class="fullpartymember-addpage">
+        <update-party-develop />
+      </div>
+    </template>
+    <template v-else>
+      <div>&nbsp;</div>
+    </template>
 
     <!-- 组织关系变更对话框 -->
     <el-dialog
@@ -351,10 +371,13 @@
 export default {
   name: "Fullpartymember",
   components: {
-    'roc-vue-pdf-dialog': () => import('@/components/RocVuePdfDialog')
+    'roc-vue-pdf-dialog': () => import('@/components/RocVuePdfDialog'),
+    'update-party-develop': () => import('@/components/UpdatePartyDevelop')
   },
   data() {
     return {
+      // 页面类型
+      pageType: 'ADD',
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -363,7 +386,6 @@ export default {
       listActiveType: 'CARDLIST',
       // 性别选项列表
       sexOptions: [],
-
       // 查询条件
       queryParams: {
         pageNum: 0,