From 05c832c2fb7c4c69da09007705a6ca45888553e8 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 18 Nov 2021 10:32:15 +0800
Subject: [PATCH] commit

---
 .../dataStatis/page/listOfMember.vue          |    2 +-
 .../dataStatis/page/listOfSociety.vue         | 1082 +++++++++++------
 2 files changed, 692 insertions(+), 392 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
index c3b483243..ca34966a5 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
@@ -25,7 +25,7 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-                <el-button type="" size="small" @click="resetForm('form')">清空</el-button>
+                <el-button type="" size="small" @click="resetForm()">清空</el-button>
             </el-form-item>
             <el-divider/>
             <div style="float: left">
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
index 0f39e58eb..836a46a06 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
@@ -2,38 +2,32 @@
 <template>
   <div id="listOfSociety" class="child1">
     <!--   查询框   -->
-    <el-form :inline="true" :model="formQuery">
-      <el-form-item label="协会名称:">
-        <el-input v-model="formQuery.name" size="small" placeholder="请填写协会名称"></el-input>
+    <el-form :inline="true" :model="form" class="demo-form-inline">
+      <el-form-item label="协会名称">
+        <el-input v-model="form.scName" size="small" placeholder="请填写协会名称"></el-input>
       </el-form-item>
-      <el-form-item label="会员角色:">
-        <el-input v-model="formQuery.role" size="small" placeholder="请输入会员角色"></el-input>
+      <el-form-item label="会员角色">
+        <el-input v-model="form.role" size="small" placeholder="请输入会员角色"></el-input>
       </el-form-item>
-      <el-form-item label="协会性质:">
-        <el-select v-model="formQuery.nature" size="small" placeholder="请输入协会性质">
-          <el-option label="1" value="one"></el-option>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
+      <el-form-item label="协会性质">
+        <el-input v-model="form.asProper" size="small" placeholder="请填写协会性质"></el-input>
       </el-form-item>
-      <el-form-item label="协会状态:">
-        <el-select v-model="formQuery.state" size="small" placeholder="请选择协会状态">
-          <el-option label="1" value="one"></el-option>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
+      <el-form-item label="协会状态">
+        <el-input v-model="form.asStatus" size="small" placeholder="请选择协会状态"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+        <el-button type="" size="small" @click="resetForm()">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left;">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
+<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">
           批量删除
         </el-button>
-        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+<!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
     </el-form>
     <el-divider/>
@@ -49,43 +43,68 @@
          fontWeight: 'bold', height: '48px'}"
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="50"/>
-        <el-table-column align="center" type="index" label="序号" width="50"/>
-        <el-table-column align="center" prop="totalName" label="协会名称-标委会" width="150"/>
-        <el-table-column align="center" prop="branchName" label="协会名称-分标委" width="150"/>
-        <el-table-column align="center" prop="workName" label="协会名称-工作组" width="150"/>
-        <el-table-column align="center" prop="vipRole" label="会员角色" width="150"/>
-        <el-table-column align="center" prop="players" label="参与人" width="150"/>
+        <el-table-column align="center" prop="scName" label="协会名称-标委会" width="150"/>
+        <el-table-column align="center" prop="sscName" label="协会名称-分标委" width="150"/>
+        <el-table-column align="center" prop="wgName" label="协会名称-工作组" width="150"/>
+        <el-table-column align="center" prop="role" label="会员角色" width="150"/>
+        <el-table-column align="center" prop="attend" label="参与人" width="150"/>
         <el-table-column align="center" prop="standard" label="标准" width="150"/>
-        <el-table-column align="center" prop="standardLeader" label="标准负责人" width="150"/>
+        <el-table-column align="center" prop="charge" label="标准负责人" width="150"/>
         <el-table-column align="center" prop="leader" label="责任领导" width="150"/>
-        <el-table-column align="center" prop="startTime" label="初始入会时间" width="150"/>
-        <el-table-column align="center" prop="thisTime" label="本届入会时间" width="150"/>
-        <el-table-column align="center" prop="costStandard" label="会费标准" width="150"/>
-        <el-table-column align="center" prop="cost" label="会费列支" width="150"/>
-        <el-table-column align="center" prop="lastTime" label="上次缴纳时间" width="150"/>
-        <el-table-column align="center" prop="costYears" label="缴费年限" width="150"/>
-        <el-table-column align="center" prop="cost2017" label="2017缴费" width="150"/>
-        <el-table-column align="center" prop="cost2018" label="2018缴费" width="150"/>
-        <el-table-column align="center" prop="cost2019" label="2019缴费" width="150"/>
-        <el-table-column align="center" prop="cost2020" label="2020缴费" width="150"/>
-        <el-table-column align="center" prop="cost2021" label="2021缴费" width="150"/>
-        <el-table-column align="center" prop="person" label="经办人" width="150"/>
-        <el-table-column align="center" prop="partment" label="部门" width="150"/>
-        <el-table-column align="center" prop="nature" label="协会性质" width="150"/>
-        <el-table-column align="center" prop="state" label="协会状态" width="150"/>
-        <el-table-column align="center" prop="linkMan" label="协会联络人" width="150"/>
-        <el-table-column align="center" prop="num" label="协会联络人电话" width="150"/>
-        <el-table-column align="center" prop="email" label="协会联络人邮箱" width="150"/>
+        <el-table-column align="center" prop="iniTime" label="初始入会时间" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.iniTime ? $moment(scope.row.iniTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="curTime" label="本届入会时间" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.curTime ? $moment(scope.row.curTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="costStandard" label="费用标准" width="150"/>
+        <el-table-column align="center" prop="costOutlay" label="费用列支" width="150"/>
+        <el-table-column align="center" prop="lastPayTime" label="上次缴纳时间" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lastPayTime ? $moment(scope.row.lastPayTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="payPeriod" label="缴费年限" width="150"/>
+        <el-table-column align="center" prop="handler" label="经办人" width="150"/>
+        <el-table-column align="center" prop="department" label="部门" width="150"/>
+        <el-table-column align="center" prop="asProper" label="协会性质" width="150"/>
+        <el-table-column align="center" prop="asStatus" label="协会状态" width="150"/>
+        <el-table-column align="center" prop="asContact" label="协会联络人" width="150"/>
+        <el-table-column align="center" prop="tel" label="协会联络人电话" width="150"/>
+        <el-table-column align="center" prop="mail" label="协会联络人邮箱" width="150"/>
+        <el-table-column align="center" prop="p17" label="2017缴费" width="150"/>
+        <el-table-column align="center" prop="p18" label="2018缴费" width="150"/>
+        <el-table-column align="center" prop="p19" label="2019缴费" width="150"/>
+        <el-table-column align="center" prop="p20" label="2020缴费" width="150"/>
+        <el-table-column align="center" prop="p21" label="2021缴费" width="150"/>
+        <el-table-column align="center" prop="p22" label="2022缴费" width="150"/>
+        <el-table-column align="center" prop="p23" label="2023缴费" width="150"/>
+        <el-table-column align="center" prop="p24" label="2024缴费" width="150"/>
+        <el-table-column align="center" prop="p25" label="2025缴费" width="150"/>
+        <el-table-column align="center" prop="p26" label="2026缴费" width="150"/>
+        <el-table-column align="center" prop="p27" label="2027缴费" width="150"/>
+        <el-table-column align="center" prop="p28" label="2028缴费" width="150"/>
+        <el-table-column align="center" prop="p29" label="2029缴费" width="150"/>
+        <el-table-column align="center" prop="p30" label="2030缴费" width="150"/>
+        <el-table-column align="center" prop="p31" label="2031缴费" width="150"/>
+        <el-table-column align="center" prop="p32" label="2032缴费" width="150"/>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">
+                  <el-dropdown-item :command="[scope.row, '查看']">
+                    查看
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']">
                     编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                  <el-dropdown-item :command="[scope.row, '删除']">
                     删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
@@ -96,7 +115,7 @@
       </el-table>
       <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="formQuery.page"
+        :page="form.page"
         :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
@@ -107,284 +126,297 @@
             :before-close="addDrawerClose"
             :title="drawerTitle"
             :visible.sync="drawerTable">
-      <div style="margin: 10px;"></div>
-      <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-        <el-form-item prop="unit" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.unit"
-                  placeholder="请输入提报单位名称"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.scName"
-                  placeholder="请输入协会名称-委员会"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.sscName"
-                  placeholder="请输入协会名称-分标委"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.wgName"
-                  placeholder="请输入协会名称-工作组"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.role"
-                  placeholder="请输入会员角色"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.attend"
-                  placeholder="请输入参与人"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="standard" label="标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.standard"
-                  placeholder="请输入标准"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="charge" label="标准负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.charge"
-                  placeholder="请输入标准负责人"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="leader" label="责任领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.leader"
-                  placeholder="请输入责任领导"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item label="初始入会时间" style="width: 100%; margin-right:10px" prop="iniTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-date-picker
-                  v-model="addForm.iniTime"
-                  :disabled="DrawerType === 'see'"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="请选择初始入会时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-date-picker
-                  v-model="addForm.curTime"
-                  :disabled="DrawerType === 'see'"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="请选择本届入会时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item prop="costStandard" label="费用标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.costStandard"
-                  placeholder="请输入费用标准"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="costOutlay" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.costOutlay"
-                  placeholder="请输入费用列支"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item label="上次缴纳时间" style="width: 100%; margin-right:10px" prop="lastPayTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-date-picker
-                  v-model="addForm.lastPayTime"
-                  :disabled="DrawerType === 'see'"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="请选择上次缴纳时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item prop="payPeriod" label="缴费年限" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.payPeriod"
-                  placeholder="请输入缴费年限"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="handler" label="经办人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.handler"
-                  placeholder="请输入经办人"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="department" label="部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.department"
-                  placeholder="请输入部门"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="asProper" label="协会性质" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.asProper"
-                  placeholder="请输入协会性质"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="asStatus" label="协会状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.asStatus"
-                  placeholder="请输入协会状态"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="asContact" label="协会联络人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.asContact"
-                  placeholder="请输入协会联络人"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="tel" label="协会联络人电话" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.tel"
-                  placeholder="请输入协会联络人电话"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="mail" label="协会联络人邮箱" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.mail"
-                  placeholder="请输入协会联络人邮箱"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p17" label="2017缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p17"
-                  placeholder="请输入2017缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p18" label="2018缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p18"
-                  placeholder="请输入2018缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p19" label="2019缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p19"
-                  placeholder="请输入2019缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p20" label="2020缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p20"
-                  placeholder="请输入2020缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p21" label="2021缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p21"
-                  placeholder="请输入2021缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p22" label="2022缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p22"
-                  placeholder="请输入2022缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p23" label="2023缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p23"
-                  placeholder="请输入2023缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p24" label="2024缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p24"
-                  placeholder="请输入2024缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p25" label="2025缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p25"
-                  placeholder="请输入2025缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p26" label="2026缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p26"
-                  placeholder="请输入2026缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p27" label="2027缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p27"
-                  placeholder="请输入2027缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p28" label="2028缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p28"
-                  placeholder="请输入2028缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p29" label="2029缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p29"
-                  placeholder="请输入2029缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p30" label="2030缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p30"
-                  placeholder="请输入2030缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p31" label="2031缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p31"
-                  placeholder="请输入2031缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-        <el-form-item prop="p32" label="2032缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input
-                  :disabled="DrawerType === 'see'"
-                  v-model="addForm.p32"
-                  placeholder="请输入2032缴费"
-                  :maxlength="500"/>
-        </el-form-item>
-      </el-form>
-      <div class="demo-drawer-footer">
-        <el-button size="small" @click="addDrawerClose">取消</el-button>
-        <el-button size="small" type="primary" @click="submit">提交</el-button>
+      <div class="demo-drawer-content" v-if="drawerTable">
+        <div class="content">
+          <div class="standard-table-search">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
+                  <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.scName"
+                            placeholder="请输入协会名称-委员会"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.sscName"
+                            placeholder="请输入协会名称-分标委"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.wgName"
+                            placeholder="请输入协会名称-工作组"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.role"
+                            placeholder="请输入会员角色"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.attend"
+                            placeholder="请输入参与人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="standard" label="标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.standard"
+                            placeholder="请输入标准"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="charge" label="标准负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.charge"
+                            placeholder="请输入标准负责人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="leader" label="责任领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.leader"
+                            placeholder="请输入责任领导"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item label="初始入会时间" style="width: 100%; margin-right:10px" prop="iniTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-date-picker
+                            v-model="addForm.iniTime"
+                            :disabled="DrawerType === 'see'"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="请选择初始入会时间">
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-date-picker
+                            v-model="addForm.curTime"
+                            :disabled="DrawerType === 'see'"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="请选择本届入会时间">
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item prop="costStandard" label="费用标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costStandard"
+                            placeholder="请输入费用标准"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="costOutlay" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costOutlay"
+                            placeholder="请输入费用列支"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item label="上次缴纳时间" style="width: 100%; margin-right:10px" prop="lastPayTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-date-picker
+                            v-model="addForm.lastPayTime"
+                            :disabled="DrawerType === 'see'"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="请选择上次缴纳时间">
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item prop="payPeriod" label="缴费年限" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.payPeriod"
+                            placeholder="请输入缴费年限"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="handler" label="经办人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.handler"
+                            placeholder="请输入经办人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="department" label="部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.department"
+                            placeholder="请输入部门"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="asProper" label="协会性质" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.asProper"
+                            placeholder="请输入协会性质"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="asStatus" label="协会状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.asStatus"
+                            placeholder="请输入协会状态"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="asContact" label="协会联络人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.asContact"
+                            placeholder="请输入协会联络人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="tel" label="协会联络人电话" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.tel"
+                            placeholder="请输入协会联络人电话"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="mail" label="协会联络人邮箱" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.mail"
+                            placeholder="请输入协会联络人邮箱"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p17" label="2017缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p17"
+                            placeholder="请输入2017缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p18" label="2018缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p18"
+                            placeholder="请输入2018缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p19" label="2019缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p19"
+                            placeholder="请输入2019缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p20" label="2020缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p20"
+                            placeholder="请输入2020缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p21" label="2021缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p21"
+                            placeholder="请输入2021缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p22" label="2022缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p22"
+                            placeholder="请输入2022缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p23" label="2023缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p23"
+                            placeholder="请输入2023缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p24" label="2024缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p24"
+                            placeholder="请输入2024缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p25" label="2025缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p25"
+                            placeholder="请输入2025缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p26" label="2026缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p26"
+                            placeholder="请输入2026缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p27" label="2027缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p27"
+                            placeholder="请输入2027缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p28" label="2028缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p28"
+                            placeholder="请输入2028缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p29" label="2029缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p29"
+                            placeholder="请输入2029缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p30" label="2030缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p30"
+                            placeholder="请输入2030缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p31" label="2031缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p31"
+                            placeholder="请输入2031缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="p32" label="2032缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.p32"
+                            placeholder="请输入2032缴费"
+                            :maxlength="500"/>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+      </div>
+      <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
+        <el-button
+                size="mini"
+                class="common-button-primary"
+                icon="el-icon-check"
+                type="primary"
+                :loading="subLoading"
+                @click="submit">提交
+        </el-button>
+        <el-button
+                size="mini"
+                class="common-button-default"
+                icon="el-icon-close"
+                @click="addDrawerClose">取消</el-button>
       </div>
     </el-drawer>
   </div>
@@ -396,32 +428,181 @@
 
 export default {
   name: "child1",
+  components: {},
+
   data() {
     return {
+      subLoading: false,
       // 表格加载loading
       loading: false,
-      formQuery: {
-        name: '',
+      form: {
+        scName: '',
         role: '',
-        nature: '',
-        state: '',
-        currentPage: 1,
+        asProper: '',
+        asStatus: '',
         page: 1,
-        pageSize: 10,
+        pageSize: this.$store.getters.userInfo.configContent,
       },
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
-      drawer: false,
-      size: '600px',
       // 新增的集合
-      addForm: {},
+      addForm: {
+        scName: '',
+        sscName: '',
+        wgName: '',
+        role: '',
+        attend: '',
+        standard: '',
+        charge: '',
+        leader: '',
+        iniTime: '',
+        curTime: '',
+        costStandard: '',
+        costOutlay: '',
+        lastPayTime: '',
+        payPeriod: '',
+        handler: '',
+        department: '',
+        asProper: '',
+        asStatus: '',
+        asContact: '',
+        tel: '',
+        mail: '',
+        p17: '',
+        p18: '',
+        p19: '',
+        p20: '',
+        p21: '',
+        p22: '',
+        p23: '',
+        p24: '',
+        p25: '',
+        p26: '',
+        p27: '',
+        p28: '',
+        p29: '',
+        p30: '',
+        p31: '',
+        p32: '',
+      },
       // 新增，编辑框
       drawerTitle: '',
       drawerTable: false,
       DrawerType: '',
-      formRules: {},
-
+      formRules: {
+        scName: [
+          {required: true, message: '请输入协会名称-标委会', trigger: 'blur'},
+        ],
+        sscName: [
+          {required: true, message: '请输入协会名称-分标委', trigger: 'blur'},
+        ],
+        wgName: [
+          {required: true, message: '请输入协会名称-工作组', trigger: 'blur'},
+        ],
+        role: [
+          {required: true, message: '请输入会员角色', trigger: 'blur'},
+        ],
+        attend: [
+          {required: true, message: '请输入参与人', trigger: 'blur'},
+        ],
+        standard: [
+          {required: true, message: '请输入标准', trigger: 'blur'},
+        ],
+        charge: [
+          {required: true, message: '请输入标准负责人', trigger: 'blur'},
+        ],
+        leader: [
+          {required: true, message: '请输入责任领导', trigger: 'blur'},
+        ],
+        iniTime: [
+          {required: true, message: '请选择初始入会时间', trigger: 'change'},
+        ],
+        curTime: [
+          {required: true, message: '请选择本届入会时间', trigger: 'change'},
+        ],
+        costStandard: [
+          {required: true, message: '请输入费用标准', trigger: 'blur'},
+        ],
+        costOutlay: [
+          {required: true, message: '请输入费用列支', trigger: 'blur'},
+        ],
+        lastPayTime: [
+          {required: true, message: '请选择上次缴纳时间', trigger: 'change'},
+        ],
+        payPeriod: [
+          {required: true, message: '请输入缴费年限', trigger: 'blur'},
+        ],
+        handler: [
+          {required: true, message: '请输入经办人', trigger: 'blur'},
+        ],
+        department: [
+          {required: true, message: '请输入部门', trigger: 'blur'},
+        ],
+        asProper: [
+          {required: true, message: '请输入协会性质', trigger: 'blur'},
+        ],
+        asStatus: [
+          {required: true, message: '请输入协会状态', trigger: 'blur'},
+        ],
+        asContact: [
+          {required: true, message: '请输入协会联络人', trigger: 'blur'},
+        ],
+        tel: [
+          {required: true, message: '请输入协会联络人电话', trigger: 'blur'},
+        ],
+        mail: [
+          {required: true, message: '请输入协会联络人邮箱', trigger: 'blur'},
+        ],
+        p17: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p18: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p19: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p20: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p21: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p22: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p23: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p24: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p25: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p26: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p27: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p28: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p29: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p30: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p31: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+        p32: [
+          {required: true, message: '请输入缴费信息', trigger: 'blur'},
+        ],
+      },
     }
 
   },
@@ -431,82 +612,197 @@ export default {
   methods: {
     /** 获取该页面内的列表数据 */
     getData() {
-      console.log(2)
+      this.loading = true
+      this.$http.get('wgdCensusZ/wgd-assoc-info/queryAllAssocInfos', this.form, {
+        _this: this
+      }, res => {
+        this.loading = false
+        if (res.ok) {
+          this.tableData = res.data.list
+          this.tableTotal = res.data.count
+        }
+      })
     },
-    //新增方法
     submit() {
-
-    },
-    addDrawerClose () {},
-    //删除方法
-    deleteDetail(index, rows) {
-    },
+      this.$refs['addForm'].validate((valid) => {
+        if (valid) {
+          this.subLoading = true
+          let url = ''
+          let tips = ''
+          if (this.DrawerType === 'edit') {
+            url = 'wgdCensusZ/wgd-assoc-info/modAssocInfo'
+            tips = '编辑'
+          }else if (this.DrawerType === 'add') {
+            url = 'wgdCensusZ/wgd-assoc-info/addAssocInfo'
+            tips = '添加'
+          }
+          this.$http.post(url, this.addForm, {
+            _this: this
+          }, res => {
+            this.subLoading = false
+            if (res.ok) {
+              this.drawerTable = false
+              this.$message.success(tips + '成功')
+              this.getData()
+            } else {
+              this.$message.warning(tips + '失败')
+            }
+          })
+        } else {
+          this.$message.warning('请检查表单是否填写正确')
+        }
+      })
+    }, // 提交
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    },// 关闭
+    deleteDetail() {
+      if (this.multipleSelection.length) {
+        this.$confirm('您是否确认删除选中数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          let ids = ''
+          this.multipleSelection.forEach(item => {
+            if (ids.length > 0) {
+              ids += ','
+              ids += item.id
+            } else {
+              ids = item.id
+            }
+          })
+          this.$http.post('wgdCensusZ/wgd-assoc-info/delAssocInfos', {
+            ids: ids
+          }, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.form.page = 1
+              this.getData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择要删除的数据')
+      }
+    }, // 删除
     /** 查询 */
-    queryForm() {},
-    //清空
-    resetForm() {
-      this.formQuery = {};
+    queryForm() {
+      this.form.page = 1
+      this.getData()
     },
+    resetForm() {
+      this.form.scName = ''
+      this.form.role = ''
+      this.form.asProper = ''
+      this.form.asStatus = ''
+      this.form.page = 1
+      this.getData()
+    }, //清空
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
     /** 新增 */
-    formDataAdd() {},
+    formDataAdd() {
+      this.DrawerType = 'add'
+      this.drawerTitle = '新增'
+      this.drawerTable = true
+    },
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
+        case "查看":
+          this.drawerTitle = '查看'
+          this.DrawerType = 'see'
+          this.drawerTable = true
+          this.addForm = command[0]
+          break;
         case "编辑":
-          this.editRowOne(command[0]);
+          this.DrawerType = 'edit'
+          this.drawerTitle = '编辑'
+          this.drawerTable = true
+          this.addForm = {
+            id: command[0].id,
+            scName: command[0].scName,
+            sscName: command[0].sscName,
+            wgName: command[0].wgName,
+            role: command[0].role,
+            attend: command[0].attend,
+            standard: command[0].standard,
+            charge: command[0].charge,
+            leader: command[0].leader,
+            iniTime: this.$moment(command[0].iniTime).format("YYYY-MM-DD HH:mm:ss"),
+            curTime: this.$moment(command[0].curTime).format("YYYY-MM-DD HH:mm:ss"),
+            costStandard: command[0].costStandard,
+            costOutlay: command[0].costOutlay,
+            lastPayTime: this.$moment(command[0].lastPayTime).format("YYYY-MM-DD HH:mm:ss"),
+            payPeriod: command[0].payPeriod,
+            handler: command[0].handler,
+            department: command[0].department,
+            asProper: command[0].asProper,
+            asStatus: command[0].asStatus,
+            asContact: command[0].asContact,
+            tel: command[0].tel,
+            mail: command[0].mail,
+            p17: command[0].p17,
+            p18: command[0].p18,
+            p19: command[0].p19,
+            p20: command[0].p20,
+            p21: command[0].p21,
+            p22: command[0].p22,
+            p23: command[0].p23,
+            p24: command[0].p24,
+            p25: command[0].p25,
+            p26: command[0].p26,
+            p27: command[0].p27,
+            p28: command[0].p28,
+            p29: command[0].p29,
+            p30: command[0].p30,
+            p31: command[0].p31,
+            p32: command[0].p32,
+          }
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.$confirm('您是否确认删除选中数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('wgdCensusZ/wgd-assoc-info/delAssocInfos', {
+              ids: command[0].id
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.$message.success('删除成功')
+                this.form.page = 1
+                this.getData()
+              } else {
+                this.$message.warning('删除失败')
+              }
+            })
+          }).catch(() => {})
           break;
       }
     },
-    /** 列表编辑 */
-    editRowOne(item) {
-      this.drawerTitle = '编辑'
-      this.formShowData = item
-      this.drawerTable = true
-    },
-    // 行内删除
-    deleteRowOne(val) {
-      let delId = {
-        id: val
-      }
-      this.$confirm('确定删除这些数据?', '提示', {
-        confirmButtonText: this.$t('m.determine'),
-        cancelButtonText: this.$t('m.cancel'),
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        delOnlyOne(delId).then(res => {
-          if (res.ok) {
-            this.$message.success('删除成功')
-            this.pageNo = 1
-            this.multipleSelection = ''
-            this.getTableData()
-          } else {
-            this.$message.warning('删除失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
     /** 分页  */
     pageChange(page) {
-      this.page = page
+      this.form.page = page
+      this.getData()
     },
     pageSizeChange(pageSize) {
-      this.pageSize = pageSize
+      this.form.pageSize = pageSize
+      this.getData()
     },
-
   }
 }
 </script>
@@ -516,7 +812,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+    }
+  }
   .pagination {
     position: inherit!important;
   }