commit

src/pages/regulatoryRepository/dataStatis/index.vue

@@ -2,19 +2,19 @@
   <div class="data-statis">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="协会信息数据统计" name="listOfSociety">
-        <list-of-society></list-of-society>
+        <list-of-society v-if="activeName === 'listOfSociety'"></list-of-society>
       </el-tab-pane>
       <el-tab-pane label="委员信息数据统计" name="listOfMember">
-        <list-of-member></list-of-member>
+        <list-of-member v-if="activeName === 'listOfMember'"></list-of-member>
       </el-tab-pane>
       <el-tab-pane label="参与外部协会会议统计" name="listOfMeeting">
-        <list-of-meeting></list-of-meeting>
+        <list-of-meeting v-if="activeName === 'listOfMeeting'"></list-of-meeting>
       </el-tab-pane>
       <el-tab-pane label="参与外部标准制修订信息统计" name="listOfStandard">
-        <list-of-standard></list-of-standard>
+        <list-of-standard v-if="activeName === 'listOfStandard'"></list-of-standard>
       </el-tab-pane>
       <el-tab-pane label="标准法规研究项目费用统计信息" name="listOfCost">
-        <list-of-cost></list-of-cost>
+        <list-of-cost v-if="activeName === 'listOfCost'"></list-of-cost>
       </el-tab-pane>
     </el-tabs>
   </div>

src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue

@@ -2,36 +2,38 @@
 <template>
     <div id="listOfMember" class="child2">
         <!-- 第一第二行表单 -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+        <el-form :inline="true" :model="form" class="demo-form-inline">
             <el-form-item label="提报单位名称">
-        <el-input v-model="formQuery.name" size="small" placeholder="请输入提报单位"></el-input>
+                <el-input v-model="form.unit" size="small" placeholder="请输入提报单位"></el-input>
             </el-form-item>
             <el-form-item label="协会名称">
-        <el-input v-model="formQuery.meeting" size="small" placeholder="请输入协会名称"></el-input>
+                <el-input v-model="form.scName" size="small" placeholder="请输入协会名称"></el-input>
             </el-form-item>
             <el-form-item label="会员角色">
-        <el-select v-model="formQuery.role" size="small" placeholder="请选择会员角色">
+                <el-input v-model="form.role" size="small" placeholder="请输入会员角色"></el-input>
-          <el-option label="1" value="one"></el-option>
+                <!--        <el-select v-model="form.role" size="small" placeholder="请选择会员角色">-->
-          <el-option label="2" value="two"></el-option>
+                <!--          <el-option label="1" value="one"></el-option>-->
-        </el-select>
+                <!--          <el-option label="2" value="two"></el-option>-->
+                <!--        </el-select>-->
             </el-form-item>
             <el-form-item label="所在部门">
-        <el-select v-model="formQuery.part" size="small" placeholder="请选择所在部门">
+                <el-input v-model="form.department" size="small" placeholder="请输入所在部门"></el-input>
-          <el-option label="1" value="one"></el-option>
+                <!--        <el-select v-model="form.department" size="small" placeholder="请选择所在部门">-->
-          <el-option label="2" value="two"></el-option>
+                <!--          <el-option label="1" value="one"></el-option>-->
-        </el-select>
+                <!--          <el-option label="2" value="two"></el-option>-->
+                <!--        </el-select>-->
             </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('form')">清空</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="dialogVisible1 = true">导入</el-button>-->
-        <el-button type="primary" size="small" @click="dialogVisible2 = 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/>
@@ -47,57 +49,56 @@
          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="unit" label="提报单位名称" width="120">
-        <el-table-column align="center" prop="unitName" label="提报单位名称" width="120">
                     <template slot-scope="scope">
-            {{ scope.row.unitName || '-' }}
+                        {{ scope.row.unit || '-' }}
                     </template>
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="totalName"
+                        prop="scName"
                         label="协会名称-标委会"
-          width="auto"
+                        width="160"
                 >
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="branchName"
+                        prop="sscName"
                         label="协会名称-分标委"
-          width="auto"
+                        width="160"
                 >
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="workName"
+                        prop="wgName"
                         label="协会名称-工作组"
-          width="auto"
+                        width="160"
                 >
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="thisTime"
+                        prop="curTime"
                         label="本届入会时间"
-          width="120"
+                        width="220"
                 >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+                    <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="vipRole"
+                        prop="role"
                         label="会员角色"
                         width="120">
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="players"
+                        prop="attend"
                         label="参与人"
                         width="120"
                 >
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="post"
+                        prop="job"
                         label="职务"
                         width="120">
                 </el-table-column>
@@ -109,18 +110,18 @@
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="num"
+                        prop="tel"
                         label="联系方式"
                         width="120">
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="timeOffice"
+                        prop="term"
                         label="任期"
                         width="120"
                 >
                     <template slot-scope="scope">
-            {{ scope.row.date }}
+                        {{ scope.row.term }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -137,17 +138,17 @@
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="passWord"
+                        prop="password"
                         label="密码"
                         width="120"
                 >
                     <template slot-scope="scope">
-            {{ scope.row.date || '-' }}
+                        {{ scope.row.password || '-' }}
                     </template>
                 </el-table-column>
                 <el-table-column
                         align="center"
-          prop="remarks"
+                        prop="remark"
                         label="备注"
                         width="120">
                 </el-table-column>
@@ -157,12 +158,15 @@
                             <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, '删除']" v-btn-permission="''">
+                                    <el-dropdown-item :command="[scope.row, '删除']">
                                         删除
                                     </el-dropdown-item>
+                                    <el-dropdown-item :command="[scope.row, '查看']">
+                                        查看
+                                    </el-dropdown-item>
                                 </el-dropdown-menu>
                             </el-dropdown>
                         </div>
@@ -171,108 +175,152 @@
             </el-table>
             <loading :loading="loading">加载中...</loading>
             <pagination
-        :page="formQuery.page"
+                    :page="form.page"
                     :total="tableTotal"
                     @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"/>
         </div>
         <!-- 新增抽屉 -->
         <el-drawer
-      size="50%"
+                size="1000px"
+                :before-close="addDrawerClose"
                 :title="drawerTitle"
                 :visible.sync="drawerTable">
-      <div style="margin: 10px;"></div>
+            <div class="demo-drawer-content" v-if="drawerTable">
-      <el-form label-width="150px" style="overflow-y: scroll" :model="formShowData" :rules="formRules">
+                <div class="content">
-        <el-form-item label="提报单位名称">
+                    <div class="standard-table-search">
-          <el-input v-model="formShowData.unitName" type="text" placeholder="请填写"></el-input>
+                        <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="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 label="协会名称-委员会">
+                                    <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.totalName" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.scName"
+                                                placeholder="请输入协会名称-委员会"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="协会名称-分表委">
+                                    <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.branchName" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.sscName"
+                                                placeholder="请输入协会名称-分标委"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="协会名称-工作组">
+                                    <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.workName" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.wgName"
+                                                placeholder="请输入协会名称-工作组"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="本届入会时间">
+                                    <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.thisTime" placeholder="日期选择" type="text"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.role"
+                                                placeholder="请输入会员角色"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="会员角色">
+                                    <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-select v-model="formShowData.vipRole" placeholder="请选择会员角色">
+                                        <el-input
-            <el-option label="1" value="one"></el-option>
+                                                :disabled="DrawerType === 'see'"
-            <el-option label="2" value="two"></el-option>
+                                                v-model="addForm.attend"
-          </el-select>
+                                                placeholder="请输入参与人"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="参与人">
+                                    <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-select v-model="formShowData.players" placeholder="请选择参与人">
+                                        <el-date-picker
-            <el-option label="1" value="one"></el-option>
+                                                v-model="addForm.curTime"
-            <el-option label="2" value="two"></el-option>
+                                                :disabled="DrawerType === 'see'"
-          </el-select>
+                                                value-format="yyyy-MM-dd HH:mm:ss"
+                                                type="datetime"
+                                                placeholder="请选择本届入会时间">
+                                        </el-date-picker>
                                     </el-form-item>
-        <el-form-item label="职务">
+                                    <el-form-item prop="job" label="职务" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.post" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.job"
+                                                placeholder="请输入职务"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="所在部门">
+                                    <el-form-item prop="department" label="所在部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.partment" placeholder="请填写">
+                                        <el-input
-          </el-input>
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.department"
+                                                placeholder="请输入所在部门"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="联系方式">
+                                    <el-form-item prop="tel" label="联系方式" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.tel"
+                                                placeholder="请输入联系方式"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="任期">
+                                    <el-form-item prop="term" label="任期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.timeOffice" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.term"
+                                                placeholder="请输入任期"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="证书">
+                                    <el-form-item prop="certificate" label="证书" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.certificate" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.certificate"
+                                                placeholder="请输入证书"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="账号">
+                                    <el-form-item prop="account" label="账号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.account" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.account"
+                                                placeholder="请输入账号"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="密码">
+                                    <el-form-item prop="password" label="密码" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.passWord" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.password"
+                                                placeholder="请输入密码"
+                                                :maxlength="500"/>
                                     </el-form-item>
-        <el-form-item label="备注">
+                                    <el-form-item prop="remark" label="备注" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-input v-model="formShowData.remarks" type="text" placeholder="请填写"></el-input>
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.remark"
+                                                placeholder="请输入备注"
+                                                :maxlength="500"/>
                                     </el-form-item>
                                 </el-form>
-      <div class="demo-drawer-footer">
+                            </el-col>
-        <el-button size="small" @click="drawerTable = false">取消</el-button>
+                        </el-row>
-        <el-button size="small" type="primary" @click="submit">提交</el-button>
+                    </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>
-      <!-- 导入弹框 -->
-      <el-dialog
-        title="导入文件"
-        :visible.sync="dialogVisible1"
-        width="30%"
-      >
-        <el-button class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--   导出弹框 -->
-      <el-dialog
-        title="导出文件"
-        :visible.sync="dialogVisible2"
-        width="30%"
-      >
-        <el-form :model="formInlineOut">
-          <el-form-item label="名称">
-            <el-input v-model="formInlineOut.name"></el-input>
-          </el-form-item>
-          <el-form-item label="序号">
-            <el-input v-model="formInlineOut.num"></el-input>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="formInlineOut.remarks"></el-input>
-          </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible2 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-      </span>
-      </el-dialog>
-    </div>
     </div>
 
 
@@ -283,97 +331,260 @@ export default {
         name: "child2",
         data() {
             return {
-      // 表格加载
+                subLoading: false,
                 loading: false,
-      formQuery: {
+                form: {
-        name: '',
+                    unit: '',
-        meeting: '',
+                    scName: '',
                     role: '',
-        part: '',
+                    department: '',
-        current: 1,
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                 },
                 tableTotal: 0,
                 tableData: [],
-
                 multipleSelection: [],
-
                 // 新增、编辑抽屉
                 drawerTable: false,
                 drawerTitle: '',
-      formRules: {},
+                formRules: {
-
+                    unit: [
-      formShowData: {
+                        {required: true, message: '请输入提报单位名称', trigger: 'blur'},
-        unitName: '',
+                    ],
-        totalName: '',
+                    scName: [
-        branchName: '',
+                        {required: true, message: '请输入协会名称-标委会', trigger: 'blur'},
-        workName: '',
+                    ],
-        thisTime: '',
+                    sscName: [
-        vipRole: '',
+                        {required: true, message: '请输入协会名称-分标委', trigger: 'blur'},
-        players: '',
+                    ],
-        post: '',
+                    wgName: [
+                        {required: true, message: '请输入协会名称-工作组', trigger: 'blur'},
+                    ],
+                    role: [
+                        {required: true, message: '请输入会员角色', trigger: 'blur'},
+                    ],
+                    attend: [
+                        {required: true, message: '请输入参与人', trigger: 'blur'},
+                    ],
+                    curTime: [
+                        {required: true, message: '请选择本届入会时间', trigger: 'change'},
+                    ],
+                    job: [
+                        {required: true, message: '请输入职务', trigger: 'blur'},
+                    ],
+                    department: [
+                        {required: true, message: '请输入所在部门', trigger: 'blur'},
+                    ],
+                    tel: [
+                        {required: true, message: '请输入联系方式', trigger: 'blur'},
+                    ],
+                    term: [
+                        {required: true, message: '请输入任期', trigger: 'blur'},
+                    ],
+                    certificate: [
+                        {required: true, message: '请输入证书', trigger: 'blur'},
+                    ],
+                    account: [
+                        {required: true, message: '请输入账号', trigger: 'blur'},
+                    ],
+                    password: [
+                        {required: true, message: '请输入密码', trigger: 'blur'},
+                    ],
+                    remark: [
+                        {required: true, message: '请输入备注', trigger: 'blur'},
+                    ]
+                },
+                addForm: {
+                    unit: '',
+                    scName: '',
+                    sscName: '',
+                    wgName: '',
+                    role: '',
+                    attend: '',
+                    curTime: '',
+                    job: '',
                     department: '',
-        num: '',
+                    tel: '',
-        timeOffice: '',
+                    term: '',
                     certificate: '',
                     account: '',
-        passWord: '',
+                    password: '',
-        remarks: ''
+                    remark: ''
                 },
-
+                DrawerType: '',
-      dialogVisible1: false,
-      dialogVisible2: false,
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-      currentPage: 1
             }
         },
-
         created() {
-    console.log(1)
         },
-
+        mounted() {
+            this.getTableData()
+        },
         methods: {
+            getTableData () {
+                this.$http.get('wgdCensusZ/wgd-commi-info/queryAllCommiInfos',this.form, {
+                    _this: this
+                }, res => {
+                    if (res.ok) {
+                        this.tableData = res.data.list
+                        this.tableTotal = res.data.count
+                    }
+                })
+            }, // 获取数据
             handleSelectionChange(val) {
                 this.multipleSelection = val;
             },
-    //增加方法
+            formDataAdd() {
-    formDataAdd() {},
+                this.DrawerType = 'add'
+                this.drawerTitle = '新增'
+                this.drawerTable = true
+            },// 新增
+            addDrawerClose () {
+                this.addForm = {}
+                this.drawerTable = false
+            }, // 关闭新增drawer
             submit() {
-    },
+                this.$refs['addForm'].validate((valid) => {
-    //删除方法
+                    if (valid) {
+                        this.subLoading = true
+                        let url = ''
+                        let tips = ''
+                        if (this.DrawerType === 'edit') {
+                            url = 'wgdCensusZ/wgd-commi-info/modCommiInfo'
+                            tips = '编辑'
+                        }else if (this.DrawerType === 'add') {
+                            url = 'wgdCensusZ/wgd-commi-info/addCommiInfo'
+                            tips = '添加'
+                        }
+                        this.$http.post(url, this.addForm, {
+                            _this: this
+                        }, res => {
+                            this.subLoading = false
+                            if (res.ok) {
+                                this.drawerTable = false
+                                this.$message.success(tips + '成功')
+                                this.getTableData()
+                            } else {
+                                this.$message.warning(tips + '失败')
+                            }
+                        })
+                    } else {
+                        this.$message.warning('请检查表单是否填写正确')
+                    }
+                })
+            }, // 提交
             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-commi-info/delCommiInfos', {
+                            ids: ids
+                        }, {
+                            _this: this
+                        }, res => {
+                            if (res.ok) {
+                                this.$message.success('删除成功')
+                                this.form.page = 1
+                                this.getTableData()
+                            } else {
+                                this.$message.warning('删除失败')
+                            }
+                        })
+                    }).catch(() => {})
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },//删除方法
             /** 查询 */
-    queryForm() {},
+            queryForm() {
-    //清空
+                this.form.page = 1
+                this.getTableData()
+            }, // 查询
             resetForm() {
-    },
+                this.form.unit = ''
+                this.form.scName = ''
+                this.form.role = ''
+                this.form.department = ''
+                this.form.page = 1
+                this.getTableData()
+            },// 清空
             // 列表更多按钮
             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,
+                            unit: command[0].unit,
+                            scName: command[0].scName,
+                            sscName: command[0].sscName,
+                            wgName: command[0].wgName,
+                            role: command[0].role,
+                            attend: command[0].attend,
+                            curTime: this.$moment(command[0].curTime).format("YYYY-MM-DD HH:mm:ss"),
+                            job: command[0].job,
+                            department: command[0].department,
+                            tel: command[0].tel,
+                            term: command[0].term,
+                            certificate: command[0].certificate,
+                            account: command[0].account,
+                            password: command[0].password,
+                            remark: command[0].remark,
+                        }
                         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-commi-info/delCommiInfos', {
+                                ids: command[0].id
+                            }, {
+                                _this: this
+                            }, res => {
+                                if (res.ok) {
+                                    this.$message.success('删除成功')
+                                    this.form.page = 1
+                                    this.getTableData()
+                                } else {
+                                    this.$message.warning('删除失败')
+                                }
+                            })
+                        }).catch(() => {})
                         break;
                 }
             },
-    editRowOne() {},
-    deleteRowOne() {},
             /** 分页  */
             pageChange(page) {
-      this.formQuery.page = page
+                this.form.page = page
                 this.getTableData()
             },
             pageSizeChange(pageSize) {
-      this.formQuery.pageSize = pageSize
+                this.form.pageSize = pageSize
                 this.getTableData()
             },
         }
@@ -385,7 +596,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;
         }

src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue

@@ -103,154 +103,290 @@
     </div>
     <!-- 新增抽屉 -->
     <el-drawer
+            size="1000px"
+            :before-close="addDrawerClose"
             :title="drawerTitle"
             :visible.sync="drawerTable">
       <div style="margin: 10px;"></div>
-        <el-form style="overflow-y: scroll" label-width="150px" :model="formShowData" :rules="formRules">
+      <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-          <el-form-item label="协会名称-委员会">
+        <el-form-item prop="unit" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.totalName" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.unit"
+                  placeholder="请输入提报单位名称"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会名称-分表委">
+        <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.branchName" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.scName"
+                  placeholder="请输入协会名称-委员会"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会名称-工作组">
+        <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.workName" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.sscName"
+                  placeholder="请输入协会名称-分标委"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="会员角色">
+        <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.vipRole" placeholder="请选择会员角色">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.wgName"
-            </el-select>
+                  placeholder="请输入协会名称-工作组"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="参与人">
+        <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.players" placeholder="请选择参与人">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.role"
-            </el-select>
+                  placeholder="请输入会员角色"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="标准">
+        <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.standard" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.attend"
+                  placeholder="请输入参与人"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="标准负责人">
+        <el-form-item prop="standard" label="标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.standardLeader" placeholder="请选择标准负责人">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.standard"
-            </el-select>
+                  placeholder="请输入标准"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="责任领导">
+        <el-form-item prop="charge" label="标准负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.leader" placeholder="请选择责任领导">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.charge"
-            </el-select>
+                  placeholder="请输入标准负责人"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="初始入会时间">
+        <el-form-item prop="leader" label="责任领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.startTime" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.leader"
+                  placeholder="请输入责任领导"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="本届入会时间">
+        <el-form-item label="初始入会时间" style="width: 100%; margin-right:10px" prop="iniTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.thisTime" type="text"></el-input>
+          <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="会费标准">
+        <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.costStandard" type="text"></el-input>
+          <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 label="费用列支">
+        <el-form-item prop="costStandard" label="费用标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.cost" placeholder="请选择费用列支">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.costStandard"
-            </el-select>
+                  placeholder="请输入费用标准"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="上次缴纳时间">
+        <el-form-item prop="costOutlay" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.lastTime" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.costOutlay"
+                  placeholder="请输入费用列支"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="缴纳年限">
+        <el-form-item label="上次缴纳时间" style="width: 100%; margin-right:10px" prop="lastPayTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.costYears" type="text"></el-input>
+          <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 label="2017年缴费">
+        <el-form-item prop="payPeriod" label="缴费年限" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.cost2017" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.payPeriod"
+                  placeholder="请输入缴费年限"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="2018年缴费">
+        <el-form-item prop="handler" label="经办人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.cost2018" placeholder="请选择2018年缴费">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.handler"
-            </el-select>
+                  placeholder="请输入经办人"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="2019年缴费">
+        <el-form-item prop="department" label="部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.cost2019" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.department"
+                  placeholder="请输入部门"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="2020年缴费">
+        <el-form-item prop="asProper" label="协会性质" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.cost2020" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.asProper"
+                  placeholder="请输入协会性质"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="2021年缴费">
+        <el-form-item prop="asStatus" label="协会状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.cost2021" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.asStatus"
+                  placeholder="请输入协会状态"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="经办人">
+        <el-form-item prop="asContact" label="协会联络人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.person" placeholder="请选择经办人">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.asContact"
-            </el-select>
+                  placeholder="请输入协会联络人"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="部门">
+        <el-form-item prop="tel" label="协会联络人电话" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.partment" placeholder="请选择部门">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.tel"
-            </el-select>
+                  placeholder="请输入协会联络人电话"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会性质">
+        <el-form-item prop="mail" label="协会联络人邮箱" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.nature" placeholder="请选择协会性质">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.mail"
-            </el-select>
+                  placeholder="请输入协会联络人邮箱"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会状态">
+        <el-form-item prop="p17" label="2017缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.state" placeholder="请选择协会性质">
+          <el-input
-              <el-option label="1" value="one"></el-option>
+                  :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                  v-model="addForm.p17"
-            </el-select>
+                  placeholder="请输入2017缴费"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会联络人">
+        <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 v-model="formShowData.linkMan" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p18"
+                  placeholder="请输入2018缴费"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会联络人电话">
+        <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 v-model="formShowData.num" type="text"></el-input>
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p19"
+                  placeholder="请输入2019缴费"
+                  :maxlength="500"/>
         </el-form-item>
-          <el-form-item label="协会联络人邮箱">
+        <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 v-model="formShowData.email" type="text"></el-input>
+          <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="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" @click="addDrawerClose">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" type="primary" @click="submit">提交</el-button>
       </div>
     </el-drawer>
-    <!-- 导入弹框 -->
-<!--    <el-dialog
-      title="导入文件"
-      :visible.sync="dialogVisible1"
-      width="30%"
-    >
-      <el-button class="leading-in">点击或拖拽上传文件</el-button>
-    </el-dialog>
-    <el-dialog
-      title="导出文件"
-      :visible.sync="dialogVisible2"
-      width="30%"
-    >
-      <el-form :model="formInlineOut">
-        <el-form-item label="名称">
-          <el-input v-model="formInlineOut.name" style="width:350px"></el-input>
-        </el-form-item>
-        <el-form-item label="序号">
-          <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible2 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-      </span>
-    </el-dialog>-->
-    <!--  删除提示弹框  -->
   </div>
 
 
@@ -279,49 +415,13 @@ export default {
       drawer: false,
       size: '600px',
       // 新增的集合
-      formShowData: {
+      addForm: {},
-        totalName: '',
-        branchName: '',
-        workName: '',
-        vipRole: '',
-        players: '',
-        standard: '',
-        standardLeader: '',
-        leader: '',
-        startTime: '',
-        thisTime: '',
-        costStandard: '',
-        cost: '',
-        lastTime: '',
-        costYears: '',
-        cost2017: '',
-        cost2018: '',
-        cost2019: '',
-        cost2020: '',
-        cost2021: '',
-        person: '',
-        partment: '',
-        nature: '',
-        state: '',
-        linkMan: '',
-        num: '',
-        email: '',
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      // 文件导入
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-
       // 新增，编辑框
       drawerTitle: '',
       drawerTable: false,
-
+      DrawerType: '',
       formRules: {},
+
     }
 
   },
@@ -337,6 +437,7 @@ export default {
     submit() {
 
     },
+    addDrawerClose () {},
     //删除方法
     deleteDetail(index, rows) {
     },

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -378,7 +378,7 @@
                                 this.$message.success(tips + '成功')
                                 this.getData()
                             } else {
-                                this.$message.warning(tips + '添加失败')
+                                this.$message.warning(tips + '失败')
                             }
                         })
                     } else {
@@ -449,8 +449,14 @@
                 this.form.reviseStatus = ''
                 this.getData()
             },
-            pageChange (page) {},
+            pageChange (page) {
-            pageSizeChange (pageSize) {},
+                this.form.page = page
+                this.getData()
+            },
+            pageSizeChange (pageSize) {
+                this.form.pageSize = pageSize
+                this.getData()
+            },
             handleCommand (command) {
                 switch (command[1]) {
                     case '编辑':
@@ -530,9 +536,11 @@
                 height: calc(~'100% - 20px') !important;
             }
         }
+        .add-form-item {
             /deep/.el-form-item__content {
                 width: calc(~'100% - 180px');
             }
+        }
         display: flex;
         flex-direction: column;
         .content-center {