diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
new file mode 100644
index 000000000..965223069
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -0,0 +1,800 @@
+<!--企标复审流程-->
+<template>
+<div class="qbfs-step1">
+  <ProcessHeader toggle>
+    <template slot="proName">企标复审流程</template>
+    <template slot="proNode">发起流程</template>
+  </ProcessHeader>
+  <div class="headerTabs">
+    <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+    <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+  </div>
+  <div class="content" v-show="active === '1'">
+    <div style="flex: auto; overflow: auto">
+      <process-title>
+        <template slot="title">基础信息</template>
+      </process-title>
+      <el-form
+        ref="qbfsForm"
+        :model="qbfsForm"
+        :rules="formRules"
+        class="label-input-form prc-content-border"
+        label-width="150px"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
+              <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择企业标准</el-button>
+            </el-form-item>
+            <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.entNumber"
+                placeholder="请输入企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.cnName"
+                placeholder="请输入中文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.enName"
+                placeholder="请输入英文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.entCategory"
+                placeholder="请输入企标类别"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.replaceNumber"
+                placeholder="请输入代替企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.replacedNumber"
+                placeholder="请输入被代替企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.releaseDate"
+                placeholder="请输入发布日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.implementDate"
+                placeholder="请输入实施日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.reviewDate"
+                placeholder="请输入复审日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+              <div class="file-box" v-if="fileList.length > 0">
+                <p v-for="item in fileList"
+                   :key="item.id"> {{ item.name }}
+                  <i
+                    title="下载"
+                    @click="downloadFile(item.id)"
+                    class="icon-download"
+                    v-btn-permission="''"
+                  />
+                  <i
+                    title="下载带水印"
+                    @click="downloadFileByWater(item.id, item.name)"
+                    class="icon-download2"
+                    v-btn-permission="''"
+                  />
+                </p>
+              </div>
+              <div v-else>
+                暂无数据
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </div>
+  <div class="content" v-show="active === '2'">
+    <div class="block" style="padding-top: 20px;">
+      <el-timeline>
+        <el-form
+          ref="roleForm"
+          :model="roleForm"
+          :rules="roleFormRules"
+          class="label-input-form">
+          <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-card>
+              <el-form-item prop="startUserName" style="margin-bottom: 0">
+                <h4>标准法规工程师</h4>
+                <div style="margin-top: 10px;width: 300px;">
+                  <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
+                  <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                            disabled></el-input>
+                </div>
+              </el-form-item>
+            </el-card>
+          </el-timeline-item>
+          <el-timeline-item timestamp="选择工作组组长，指派责任人" placement="top"
+                            :color="roleForm.dockUser ? '#66b1ff' : ''" >
+            <el-card>
+              <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                <h4>工作组组组长</h4>
+                <div style="margin-top: 10px;width: 300px;">
+                  <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                  <el-input v-model="roleForm.dockUserName" placeholder="选择工作组组长"
+                            @click.native="choiceZRR('dockUser', '选择工作组组长', roleForm.dockUser)">
+                  </el-input>
+                </div>
+              </el-form-item>
+            </el-card>
+          </el-timeline-item>
+        </el-form>
+      </el-timeline>
+    </div>
+  </div>
+  <!-- 选择企业标准抽屉-->
+  <el-drawer
+    title="选择企业标准"
+    :visible.sync="ListModel"
+    size="900px"
+    custom-class="demo-drawer"
+  >
+    <div class="demo-drawer-content">
+      <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+        <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+          <div class="left">
+            <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+              <el-form-item label="标准号"  class="search-item search-item-last">
+                <el-input
+                  v-model="standardSearch.standCode"
+                  placeholder="根据标准号查找"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" class="search-item search-item-last">
+                <el-input
+                  v-model="standardSearch.standName"
+                  placeholder="根据标准名称查找"
+                ></el-input>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  size="small"
+                  @click="getStandDataBtn">
+                  查询
+                </el-button>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button
+                  class="common-button-default"
+                  size="small"
+                  @click="clearSearch">清空
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <el-table
+            :data="standinfoList"
+            tooltip-effect="dark"
+            style="width: 100%"
+            border
+            height="100%"
+            :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+            @selection-change="selectListChange"
+            ref="selection"
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              label="企标编号"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="中文名称"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standEnName"
+              label="英文名称"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              label="发布日期"
+              sortable
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="putTime"
+              label="实施日期"
+              sortable
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              sortable
+              prop="standStatusShow"
+              label="文本状态"
+              width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <pagination
+          :page="page"
+          :pageSize="pageSize"
+          :total="total"
+          @pageChange="pageChange"
+          @pageSizeChange="pageSizeChange"
+        />
+      </div>
+    </div>
+    <div class="demo-drawer-footer">
+      <el-button size="mini" @click="closeDrawer">取消</el-button>
+      <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+    </div>
+  </el-drawer>
+  <ProcessFooter
+    show-save
+    show-submit
+    :submitLoading="isSubmit"
+    :saveLoading="saveLoading"
+    @save="handleSave"
+    @submit="handleSubmit"
+  >
+  </ProcessFooter>
+  <Role-tree
+    check-box
+    :is-title="drawerTitle"
+    :is-visible.sync="modalshowflag"
+    @checkedRole="checkedRole"
+    :nodeList="nodeList"
+  ></Role-tree>
+</div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "qbfsStep1",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      commentText: '',
+      fileList: [],
+      nodeList: [],
+      standinfoList: [], //企业标准数据
+      selectList: [], //选中的企标
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      drawerTitle: '',
+      ListModel: false,
+      saveLoading: false,
+      isSubmit: false,
+      modalshowflag: false,
+      standardSearch: {
+        standCode: "",
+        standName: ""
+      },
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+      },
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: "",
+        dockUserName: "",
+      },
+      //必填人员校验规则
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择工作组组长", trigger: "change"}
+        ],
+      },
+      formRules: {
+        entNumber: [
+          {required: true, message: "请填写企标编号", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDatas()
+    }
+    this.getData()
+  },
+  methods: {
+    getDatas(){
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.roleForm = mes.roleForm
+        this.qbfsForm = mes.qbfsForm
+        this.commentText = mes.commentText
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.qbfsForm = item.qbfsForm
+        this.roleForm = item.roleForm
+      });
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow(){
+      this.getStandDataBtn()
+      this.ListModel = true;
+    },
+    //企业标准查询this.standardSearch,
+    getStandDataBtn(){
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+           standCode: this.standardSearch.standCode,
+           standName: this.standardSearch.standName,
+           page: this.page,
+           pageSize: this.pageSize,
+      }, {
+        _this: this,
+      }, res => {
+        this.standinfoList = res.data.list
+        this.total = res.data.count
+      })
+
+    },
+    //企业标准清空
+    clearSearch(){
+      this.standardSearch = {
+        standCode: '',
+        standName: ''
+      }
+     this.getStandDataBtn()
+    },
+    //带入企业标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.qbfsForm.entNumber = this.selectList[0].standCode || '--'
+        this.qbfsForm.cnName = this.selectList[0].standName || '--'
+        this.qbfsForm.enName = this.selectList[0].standEnName || '--'
+        this.qbfsForm.entCategory = this.selectList[0].standSort || '--'
+        this.qbfsForm.replaceNumber = this.selectList[0].replaceStandNum || '--'
+        this.qbfsForm.replacedNumber = this.selectList[0].replacedStandNum || '--'
+        this.qbfsForm.releaseDate = this.selectList[0].issueTime || '--'
+        this.qbfsForm.implementDate = this.selectList[0].putTime || '--'
+        this.qbfsForm.reviewDate =   '--'   //复审日期字段未确定
+        this.fileList = this.selectList[0].standFileList
+        this.ListModel = false
+      }
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherBussStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'BUSINESS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //流程保存
+    handleSave(){
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '23')
+      _formData.append('json', JSON.stringify({
+        roleForm: this.roleForm,
+        qbfsForm: this.qbfsForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
+    //流程提交
+    handleSubmit() {
+      if(this.$route.query.prcNum === undefined){
+        this.$refs['qbfsForm'].validate((valid) => {
+          if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
+              if (valid) {
+                this.isSubmit = true
+                this.qbfsForm.commentText = this.commentText
+                var json = Object.assign(this.qbfsForm, this.roleForm)
+                this.$http.get('lawss/activiti/startProcess', {type: '23'}, {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.$http.post('lawss/activiti/completeTask', {
+                      taskIds: res.data,
+                      userId : this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message)
+                        this.isSubmit = false
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                      }
+                    })
+                  }
+                })
+              }else {
+                this.$message.warning('请检查人员信息表单是否填写完整')
+              }
+            })
+          } else {
+            this.$message.warning('请检查基础信息表单是否填写完整')
+          }
+        })
+      }else{
+        this.$refs['qbfsForm'].validate((valid) => {
+          if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
+              if (valid) {
+                this.isSubmit = true
+                this.qbfsForm.commentText = this.commentText
+                var json = Object.assign(this.qbfsForm, this.roleForm)
+                    this.$http.post('lawss/activiti/completeTask', {
+                      taskIds: res.data,
+                      userId : this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message)
+                        this.isSubmit = false
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                      }
+                    })
+              }else {
+                this.$message.warning('请检查人员信息表单是否填写完整')
+              }
+            })
+          } else {
+            this.$message.warning('请检查基础信息表单是否填写完整')
+          }
+        })
+        }
+    },
+    // 流程阶段负责人选择
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole (data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = data[0].id;
+        this.roleForm.dockUserName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step1 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
new file mode 100644
index 000000000..5f83570b1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
@@ -0,0 +1,545 @@
+<template>
+<div class="qbfs-step2">
+  <ProcessHeader toggle>
+    <template slot="proName">企标复审流程</template>
+    <template slot="proNode">工作组组长指派责任人</template>
+  </ProcessHeader>
+  <div class="headerTabs">
+    <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+    <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+  </div>
+  <div class="content" v-show="active === '1'">
+    <div style="flex: auto; overflow: auto">
+      <process-title>
+        <template slot="title">基础信息</template>
+      </process-title>
+      <el-form
+        ref="qbfsForm"
+        :model="qbfsForm"
+        :rules="formRules"
+        class="label-input-form prc-content-border"
+        label-width="150px"
+      >
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.entNumber"
+                placeholder="请输入企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.cnName"
+                placeholder="请输入中文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.enName"
+                placeholder="请输入英文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.entCategory"
+                placeholder="请输入企标类别"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.replaceNumber"
+                placeholder="请输入代替企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.replacedNumber"
+                placeholder="请输入被代替企标编号"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.releaseDate"
+                placeholder="请输入发布日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.implementDate"
+                placeholder="请输入实施日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.reviewDate"
+                placeholder="请输入复审日期"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+              <div class="file-box" v-if="fileList.length > 0">
+                <p v-for="item in fileList"
+                   :key="item.id"> {{ item.name }}
+                  <i
+                    title="下载"
+                    @click="downloadFile(item.id)"
+                    class="icon-download"
+                    v-btn-permission="''"
+                  />
+                  <i
+                    title="下载带水印"
+                    @click="downloadFileByWater(item.id, item.name)"
+                    class="icon-download2"
+                    v-btn-permission="''"
+                  />
+                </p>
+              </div>
+              <div v-else>
+                暂无数据
+              </div>
+            </el-form-item>
+            <el-form-item label="工作组成员" prop="jgUser" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.jgUser"
+                placeholder="请选择工作组成员"
+                clearable
+                @click.native="choiceZRR(null,'jgUser', '选择工作组成员', roleForm.jgUser)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div>
+      <el-collapse accordion>
+        <el-collapse-item title="回执说明">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </div>
+  <div class="content" v-show="active === '3'">
+    <div class="flow-list">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="detailData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :no-data-text="listNoDataText"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          sortable="custom"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="流程信息"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <loading :loading="loading">流程列表加载中</loading>
+    </div>
+  </div>
+  <ProcessFooter
+    show-transfer
+    show-submit
+    :transfer-loading="isTransfer"
+    :submitLoading="isSubmit"
+    :saveLoading="saveLoading"
+    :approval="true"
+    @transfer="handleTransfer"
+    @submit="handleSubmit"
+  >
+  </ProcessFooter>
+  <!-- 福田全公司选人解决方案 -->
+  <Role-tree
+    check-box
+    :is-title="drawerTitle"
+    :is-visible.sync="drawerModal"
+    @checkedRole="checkedRoles"
+    :nodeList="nodeList"
+  ></Role-tree>
+  <!--    选择责任人-->
+  <Role-tree
+    :is-title="drawerTitle"
+    :is-visible.sync="modalshowflag"
+    @checkedRole="checkedRole"
+    :nodeList="nodeList"
+  ></Role-tree>
+</div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfsStep2",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: '1',
+      fileList: [],
+      commentText: '',
+      detailData: [],
+      nodeList: [],
+      isSubmit: false,
+      saveLoading: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        jgUser: '',
+        jgUserId: '',
+      },
+      roleForm: {
+        jgUser: ""
+      },
+      formRules: {
+        jgUser: [
+          {required: true, message: "请选择工作组成员", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+      })
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRoles (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
+        this.dsadadadsada = scope.$index;
+      }
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.qbfsForm.jgUserId = idList;
+      this.qbfsForm.jgUser = nameList;
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
new file mode 100644
index 000000000..9efe35b31
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -0,0 +1,530 @@
+<template>
+  <div class="qbfs-step3">
+    <ProcessHeader toggle>
+      <template slot="proName">企标复审流程</template>
+      <template slot="proNode">工作组成员填写信息</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entNumber"
+                  placeholder="请输入企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.cnName"
+                  placeholder="请输入中文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.enName"
+                  placeholder="请输入英文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entCategory"
+                  placeholder="请输入企标类别"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replaceNumber"
+                  placeholder="请输入代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replacedNumber"
+                  placeholder="请输入被代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.releaseDate"
+                  placeholder="请输入发布日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.implementDate"
+                  placeholder="请输入实施日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.reviewDate"
+                  placeholder="请输入复审日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="fileList.length > 0">
+                  <p v-for="item in fileList"
+                     :key="item.id"> {{ item.name }}
+                    <i
+                      title="下载"
+                      @click="downloadFile(item.id)"
+                      class="icon-download"
+                      v-btn-permission="''"
+                    />
+                    <i
+                      title="下载带水印"
+                      @click="downloadFileByWater(item.id, item.name)"
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
+              </el-form-item>
+<!--              <el-form-item label="工作组成员" prop="jgUser" class="add-form-item form-item-disabled">-->
+<!--                <el-input-->
+<!--                  v-model="qbfsForm.jgUser"-->
+<!--                  placeholder="请选择工作组成员"-->
+<!--                  clearable-->
+<!--                ></el-input>-->
+<!--              </el-form-item>-->
+              <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                <el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
+                  <el-option
+                    v-for="item in associationOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfsStep3",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: '1',
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      fileList: [],
+      commentText: '',
+      detailData: [],
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        nextStatus: '',
+      },
+      formRules: {
+        nextStatus: [
+          {required: true, message: "请选择下一步状态", trigger: "change"}
+        ],
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+      })
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName
+      this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step3 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
new file mode 100644
index 000000000..bae052974
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -0,0 +1,567 @@
+<template>
+  <div class="qbfs-step4">
+    <ProcessHeader toggle>
+      <template slot="proName">企标复审流程</template>
+      <template slot="proNode">工作组组长审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entNumber"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.cnName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.reviewDate"
+                    placeholder="请输入复审日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                  <div class="file-box" v-if="fileList.length > 0">
+                    <p v-for="item in fileList"
+                       :key="item.id"> {{ item.name }}
+                      <i
+                        title="下载"
+                        @click="downloadFile(item.id)"
+                        class="icon-download"
+                        v-btn-permission="''"
+                      />
+                      <i
+                        title="下载带水印"
+                        @click="downloadFileByWater(item.id, item.name)"
+                        class="icon-download2"
+                        v-btn-permission="''"
+                      />
+                    </p>
+                  </div>
+                  <div v-else>
+                    暂无数据
+                  </div>
+                </el-form-item>
+                <!--              <el-form-item label="工作组成员" prop="jgUser" class="add-form-item form-item-disabled">-->
+                <!--                <el-input-->
+                <!--                  v-model="qbfsForm.jgUser"-->
+                <!--                  placeholder="请选择工作组成员"-->
+                <!--                  clearable-->
+                <!--                ></el-input>-->
+                <!--              </el-form-item>-->
+                <!--              <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">-->
+                <!--                <el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">-->
+                <!--                  <el-option-->
+                <!--                    v-for="item in associationOptions"-->
+                <!--                    :key="item.value"-->
+                <!--                    :label="item.label"-->
+                <!--                    :value="item.value">-->
+                <!--                  </el-option>-->
+                <!--                </el-select>-->
+                <!--              </el-form-item>-->
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                              @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+      </el-button>
+        <process-title>
+          <template slot="title">审核信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            label="审核状态">
+          </el-table-column>
+          <el-table-column
+            prop="XCXSSRQ"
+            align="center"
+            label="审核人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfsStep4",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: '1',
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      fileList: [],
+      commentText: '',
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        nextStatus: '',
+      },
+      formRules: {
+        nextStatus: [
+          {required: true, message: "请选择下一步状态", trigger: "change"}
+        ],
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+      })
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step4 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
new file mode 100644
index 000000000..4655f8afd
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -0,0 +1,863 @@
+<!--企标复审流程-->
+<template>
+  <div class="qbfz-step1">
+    <ProcessHeader toggle>
+      <template slot="proName">企标废止流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qbfsForm"
+          :model="standardSearch"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>
+              </el-form-item>
+              <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="standardSearch.standCode"
+                  placeholder="请输入企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="standardSearch.standName"
+                  placeholder="请输入中文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow" label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.enName"
+                  placeholder="请输入英文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow" label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.entCategory"
+                  placeholder="请输入企标类别"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow"  label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.replaceNumber"
+                  placeholder="请输入代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow" label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.replacedNumber"
+                  placeholder="请输入被代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow" label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.releaseDate"
+                  placeholder="请输入发布日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-show="standShow" label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="standardSearch.implementDate"
+                  placeholder="请输入实施日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                <el-input
+                  type="textarea"
+                  v-model="standardSearch.abolishCause"
+                  placeholder="请输入废止理由"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="roleForm"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>标准法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                              disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择标准法规部部长审核" placement="top"
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>标准法规部部长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规部部长"
+                              @click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择会签人员进行会签" placement="top"
+                              :color="roleForm.countersigner ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="countersignerName" style="margin-bottom: 0">
+                  <h4>会签人员</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.countersigner" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.countersignerName" placeholder="选择会签人员"
+                              @click.native="choiceZRRS">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择审定责任人审定" placement="top"
+                              :color="roleForm.examine ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="examineName" style="margin-bottom: 0">
+                  <h4>审定责任人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.examine" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.examineName" placeholder="选择审定责任人"
+                              @click.native="choiceZRR('examine', '选择审定责任人', roleForm.examine)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择批准负责人批准" placement="top"
+                              :color="roleForm.approver ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="approverName" style="margin-bottom: 0">
+                  <h4>批准负责人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.approver" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.approverName" placeholder="选择批准负责人"
+                              @click.native="choiceZRR('approver', '选择批准负责人', roleForm.approver)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!-- 选择企业标准抽屉-->
+    <el-drawer
+      title="选择企业标准"
+      :visible.sync="ListModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="标准号"  class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standCode"
+                    placeholder="根据标准号查找"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standName"
+                    placeholder="根据标准名称查找"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="getStandDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="standinfoList"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                label="企标编号"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                  <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                  <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                  <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="中文名称"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                  <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                  <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="standEnName"
+                label="英文名称"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                  <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                  <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                label="发布日期"
+                sortable
+              >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="putTime"
+                label="实施日期"
+                sortable
+              >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                sortable
+                prop="standStatusShow"
+                label="文本状态"
+                width="110"
+              >
+
+                <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                  <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                  <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    多选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+<!--    单选人-->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "qbfzStep1",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      commentText: '',
+      fileList: [],
+      nodeList: [],
+      standinfoList: [], //企业标准数据
+      selectList: [], //选中的企标
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      drawerTitle: '',
+      ListModel: false,
+      saveLoading: false,
+      isSubmit: false,
+      modalshowflag: false,
+      modalshowflag2: false,
+      nodeList2: [],
+      standShow: false,
+      standardSearch: {
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: '',
+        dockUserName: '',
+        countersigner: '',
+        countersignerName: '',
+        approver: '',
+        approverName: '',
+        examine: '',
+        examineName: '',
+      },
+      //必填人员校验规则
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择工作组组长", trigger: "change"}
+        ],
+      },
+      formRules: {
+        standCode: [
+          {required: true, message: "请填写企标编号", trigger: "change"}
+        ],
+        abolishCause: [
+          {required: true, message: "请填写废止理由", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDatas()
+    }
+    this.getData()
+  },
+  methods: {
+    getDatas(){
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.roleForm = mes.roleForm
+        this.standardSearch = mes.standardSearch
+        this.commentText = mes.commentText
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.standardSearch = item.standardSearch
+        this.roleForm = item.roleForm
+      });
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow(){
+      this.getStandDataBtn()
+      this.ListModel = true;
+    },
+    //企业标准查询this.standardSearch,
+    getStandDataBtn(){
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+        standCode: this.standardSearch.standCode,
+        standName: this.standardSearch.standName,
+        page: this.page,
+        pageSize: this.pageSize,
+      }, {
+        _this: this,
+      }, res => {
+        this.standinfoList = res.data.list
+        this.total = res.data.count
+      })
+
+    },
+    //企业标准清空
+    clearSearch(){
+      this.standardSearch = {
+        standCode: '',
+        standName: ''
+      }
+      this.getStandDataBtn()
+    },
+    //带入企业标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.standardSearch.standCode = this.selectList[0].standCode || '--'
+        this.standardSearch.standName = this.selectList[0].standName || '--'
+        this.standardSearch.enName = this.selectList[0].standEnName || '--'
+        this.standardSearch.entCategory = this.selectList[0].standSort || '--'
+        this.standardSearch.replaceNumber = this.selectList[0].replaceStandNum || '--'
+        this.standardSearch.replacedNumber = this.selectList[0].replacedStandNum || '--'
+        this.standardSearch.releaseDate = this.selectList[0].issueTime || '--'
+        this.standardSearch.implementDate = this.selectList[0].putTime || '--'
+        this.standardSearch.reviewDate =   '--'   //复审日期字段未确定
+        this.fileList = this.selectList[0].standFileList
+        this.standShow = true
+        this.ListModel = false
+      }
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherBussStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'BUSINESS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //流程保存
+    handleSave(){
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '23')
+      _formData.append('json', JSON.stringify({
+        roleForm: this.roleForm,
+        qbfsForm: this.qbfsForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
+    //流程提交
+    handleSubmit() {
+      if(this.$route.query.prcNum === undefined){
+        this.$refs['qbfsForm'].validate((valid) => {
+          if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
+              if (valid) {
+                this.isSubmit = true
+                this.qbfsForm.commentText = this.commentText
+                var json = Object.assign(this.qbfsForm, this.roleForm)
+                this.$http.get('lawss/activiti/startProcess', {type: '23'}, {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.$http.post('lawss/activiti/completeTask', {
+                      taskIds: res.data,
+                      userId : this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message)
+                        this.isSubmit = false
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                      }
+                    })
+                  }
+                })
+              }else {
+                this.$message.warning('请检查人员信息表单是否填写完整')
+              }
+            })
+          } else {
+            this.$message.warning('请检查基础信息表单是否填写完整')
+          }
+        })
+      }else{
+        this.$refs['qbfsForm'].validate((valid) => {
+          if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
+              if (valid) {
+                this.isSubmit = true
+                this.qbfsForm.commentText = this.commentText
+                var json = Object.assign(this.qbfsForm, this.roleForm)
+                this.$http.post('lawss/activiti/completeTask', {
+                  taskIds: res.data,
+                  userId : this.$store.getters.userInfo.userId,
+                  json: JSON.stringify(json)
+                }, {
+                  _this: this
+                }, res => {
+                  if (res.success) {
+                    this.$message.success(res.message)
+                    this.isSubmit = false
+                    this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                  }
+                })
+              }else {
+                this.$message.warning('请检查人员信息表单是否填写完整')
+              }
+            })
+          } else {
+            this.$message.warning('请检查基础信息表单是否填写完整')
+          }
+        })
+      }
+    },
+    // 流程阶段负责人选择
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole (data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = data[0].id;
+        this.roleForm.dockUserName = data[0].name;
+      }else if(this.type === 'examine'){
+        this.roleForm.examine = data[0].id;
+        this.roleForm.examineName = data[0].name;
+      }else if(this.type === 'approver'){
+        this.roleForm.approver = data[0].id;
+        this.roleForm.approverName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.countersigner.length > 0) {
+        this.nodeList2 = this.roleForm.countersigner.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.countersigner = idList;
+      this.roleForm.countersignerName = nameList;
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step1 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
new file mode 100644
index 000000000..30c7c4a51
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
@@ -0,0 +1,522 @@
+<template>
+  <div class="qbfz-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">企标废止流程</template>
+      <template slot="proNode">标准法规部部长审核</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entNumber"
+                  placeholder="请输入企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.cnName"
+                  placeholder="请输入中文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.enName"
+                  placeholder="请输入英文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entCategory"
+                  placeholder="请输入企标类别"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replaceNumber"
+                  placeholder="请输入代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replacedNumber"
+                  placeholder="请输入被代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.releaseDate"
+                  placeholder="请输入发布日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.implementDate"
+                  placeholder="请输入实施日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                <el-input
+                  type="textarea"
+                  v-model="qbfsForm.abolishCause"
+                  placeholder="请输入废止理由"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRoles"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <!--    选择责任人-->
+    <Role-tree
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep2",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: '1',
+      fileList: [],
+      commentText: '',
+      detailData: [],
+      nodeList: [],
+      isSubmit: false,
+      saveLoading: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        abolishCause: '',
+        reviewDate: '',
+        jgUser: '',
+        jgUserId: '',
+      },
+      roleForm: {
+        jgUser: ""
+      },
+      formRules: {
+        jgUser: [
+          {required: true, message: "请选择工作组成员", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+      })
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //流程驳回
+    beforeBack(){
+
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRoles (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
+        this.dsadadadsada = scope.$index;
+      }
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.qbfsForm.jgUserId = idList;
+      this.qbfsForm.jgUser = nameList;
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
new file mode 100644
index 000000000..5a771a8ee
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="qbfz-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">企标废止流程</template>
+      <template slot="proNode">会签人员会签并填写意见</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entNumber"
+                  placeholder="请输入企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.cnName"
+                  placeholder="请输入中文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.enName"
+                  placeholder="请输入英文名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.entCategory"
+                  placeholder="请输入企标类别"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replaceNumber"
+                  placeholder="请输入代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.replacedNumber"
+                  placeholder="请输入被代替企标编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.releaseDate"
+                  placeholder="请输入发布日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.implementDate"
+                  placeholder="请输入实施日期"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  type="textarea"
+                  v-model="qbfsForm.abolishCause"
+                  placeholder="请输入废止理由"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item  label="评审意见" prop="reviewComments" class="add-form-item form-item-disabled">
+                <el-input
+                  type="textarea"
+                  v-model="qbfsForm.reviewComments"
+                  placeholder="请输入评审意见"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRoles"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <!--    选择责任人-->
+    <Role-tree
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep3",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: '1',
+      fileList: [],
+      commentText: '',
+      detailData: [],
+      nodeList: [],
+      isSubmit: false,
+      saveLoading: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        abolishCause: '',
+        reviewComments: '',
+        reviewDate: '',
+        jgUser: '',
+        jgUserId: '',
+      },
+      roleForm: {
+        jgUser: ""
+      },
+      formRules: {
+        jgUser: [
+          {required: true, message: "请选择工作组成员", trigger: "change"}
+        ],
+      },
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+      })
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //流程驳回
+    beforeBack(){
+
+    },
+    //流程提交
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRoles (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
+        this.dsadadadsada = scope.$index;
+      }
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.qbfsForm.jgUserId = idList;
+      this.qbfsForm.jgUser = nameList;
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
new file mode 100644
index 000000000..27af71037
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "qbzxdjhgkStep1"
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 9964a2f91..fa54152c6 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -298,6 +298,51 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8" v-btn-permission="">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('23')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">企标复审流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="size ? 6 : 8" v-btn-permission="">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('24')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">企标废止流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="size ? 6 : 8" v-btn-permission="">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('25')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">企标制修订计划管控</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
       </div>
     </div>
   </div>
@@ -466,6 +511,24 @@ export default {
             name: 'bzchStep1'
           })
           break
+        // 企标复审流程
+        case '23':
+          this.$router.push({
+            name: 'qbfsStep1'
+          })
+          break
+        // 企标废止流程
+        case '24':
+          this.$router.push({
+            name: 'qbfzStep1'
+          })
+          break
+        // 企标制修订计划管控
+        case '25':
+          this.$router.push({
+            name: 'qbzxdjhgkStep1'
+          })
+          break
       }
     },
     checkPermission(permissionIdArray) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 4dfd9d325..190ceff58 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1534,6 +1534,42 @@ export default {
           })
         }
           break
+        case '23':
+          if (row.taskInfo === '工作组组长指派责任人') {
+            this.$router.push({
+              name: 'qbfsStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '工作组成员标准复审') {
+            this.$router.push({
+              name: 'qbfsStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '工作组组长审批') {
+            this.$router.push({
+              name: 'qbfsStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 3cc93b846..cf29d268f 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -528,6 +528,17 @@ export default {
             }
           })
           break
+        //企标复审
+        case '23':
+          this.$router.push({
+            name: 'qbfsStep1',
+            query: {
+              type: '23',
+              processName: '企标复审流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 11f4ae7b4..d8b90b8c6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -1,6 +1,6 @@
 <!-- 标准法规库 - 重点标准跟踪清单 -->
 <template>
-  <div id="listOfCountries" class="v-class">
+  <div id="listTracking" class="v-class">
     <div class="search-area">
       <div class="left">
         <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" >
@@ -56,6 +56,7 @@
       ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -290,11 +291,13 @@
                 @click="clearLawBtn"></el-button>
           </el-form-item>
         </el-form>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
         <el-table
             ref="selections"
             tooltip-effect="dark"
             style="width: 100%;overflow-y: auto;overflow-x: hidden;"
             border
+            :loading="lawInfoTableLoading"
             :data="lawInfoTable"
             :height="300"
             :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -360,6 +363,7 @@
         </el-table>
         <!--分页-->
         <pagination
+            v-show="this.lawInfoTableLoading === false"
             style="position: relative;"
             :page="handleSelectPage"
             :total="handleSelectTotal"
@@ -379,6 +383,8 @@ export default {
   name: "listTracking",
   data () {
     return {
+      lawInfoTableLoading: true,
+      tableLoading: true,
       lawInfoTable:[],
       handleSelectPage: 1,
       handleSelectTotal: 0,
@@ -535,6 +541,7 @@ export default {
       })
     },
     dataSourceChange() {
+      this.lawInfoTableLoading = true
       this.handleSelectForm.standType = this.handleSelectForm.dataSource
       this.searchLawBtn()
     },
@@ -571,6 +578,7 @@ export default {
     },
     //手动查找的清空按钮
     clearLawBtn(){
+      this.lawInfoTableLoading = true
       //清空的时候还是不要把人家选的数据源清空吧
       // this.handleSelectForm.dataSource = ''
       //清空标准编号/政策编号的查询
@@ -586,6 +594,7 @@ export default {
     },
     //手动查找的查询按钮
     searchLawBtn(){
+      this.lawInfoTableLoading = true
       console.log('533',this.handleSelectForm.dataSource)
       if (this.handleSelectForm.dataSource === 'INLAND'){
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
@@ -596,7 +605,11 @@ export default {
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
             }
           }else {
             this.$message.error(res.message)
@@ -615,10 +628,14 @@ export default {
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
             }
           }else {
             this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
         },e=>{
           this.lawInfoTable = []
@@ -634,10 +651,14 @@ export default {
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
             }
           }else {
             this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
         },e=>{
           this.lawInfoTable = []
@@ -653,10 +674,14 @@ export default {
             this.lawInfoTable = res.data.list
             this.handleSelectTotal = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
             }
           }else {
             this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
         },e=>{
           this.lawInfoTable = []
@@ -668,11 +693,13 @@ export default {
       }
     },
     handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
       this.handleSelectForm.page = page
       console.log(this.handleSelectForm.page)
       this.searchLawBtn()
     },
     handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
       this.handleSelectForm.pageSize = this.$store.getters.userInfo.configContent
       console.log(this.handleSelectForm.pageSize)
       this.searchLawBtn()
@@ -685,6 +712,7 @@ export default {
     //点击手动查找按钮
     handleSelect() {
       this.selectModal = true
+      this.lawInfoTableLoading = true
       this.handleSelectForm.standType = this.handleSelectForm.dataSource
       this.clearLawBtn()
       this.searchLawBtn()
@@ -864,6 +892,7 @@ export default {
     //分页查询
     searchSarAccess (advanceSearch) {
       console.log('准备开始分页查询')
+      this.tableLoading = true
       this.$http.get("sarIssueTrack/issueTrack", {
         current: this.sarSarAccessEOSearch.page,
         pageSize: this.$store.getters.userInfo.configContent,
@@ -875,8 +904,8 @@ export default {
         let arr = res.data;
         console.log('分页查询中',arr)
         this.sarAccessListDatas = arr.records
-        this.tableLoading = false
         this.sarAccessListTotal = res.data.total
+        this.tableLoading = false
       }, e => {
       });
       console.log('分页查询完毕')
@@ -948,7 +977,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
-#listOfCountries {
+#listTracking {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -961,7 +990,7 @@ export default {
     position: relative;
     flex: auto;
     width: 100%;
-    //height: calc(~'100% - 105px - 56px') !important;
+    height: calc(100% - 110px) !important;
     .pagination {
       position: static;
       /deep/ .pagination-slot {
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
index 463314d93..e6082f2d2 100644
--- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
@@ -2,191 +2,150 @@
 <template>
   <div id="translateCost" class="child2">
     <!--     第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="项目名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入项目名称" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="支出金额">
-          <el-input v-model="formInline1.money" size="small" placeholder="请输入支出金额" style="width: 170px"  ></el-input>
-        </el-form-item>
-        <el-form-item label="用途">
-          <el-input v-model="formInline1.use" size="small" placeholder="请输入用途"style="width:170px"   >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  onclick="" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--            handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery">
+      <el-form-item label="项目名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入项目名称"></el-input>
+      </el-form-item>
+      <el-form-item label="支出金额">
+        <el-input v-model="formQuery.money" size="small" placeholder="请输入支出金额"></el-input>
+      </el-form-item>
+      <el-form-item label="用途">
+        <el-input v-model="formQuery.use" size="small" placeholder="请输入用途">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="" size="small" onclick="">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+
+
     <!--     表格-->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
+          align="center"
+          type="index"
+          label="序号"
+          width="50"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="name"
-            label="项目名称"
+          align="center"
+          prop="name"
+          label="项目名称"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="payMoney"
-            label="支出金额"
-
-        >
-        </el-table-column>
-
-        <el-table-column
-            align="center"
-            prop="use"
-            label="用途"
-
-        >
-          <!--          <template slot-scope="scope">{{ scope.row.date }}</template>-->
-
+          align="center"
+          prop="payMoney"
+          label="支出金额">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="detailAnnex"
-            label="详细附件"
-
-        >
+          align="center"
+          prop="use"
+          label="用途">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="detailAnnex"
+          label="详细附件">
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!--     新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign"  v-model="labelPosition">
-            <el-form-item label="项目名称">
-              <el-input v-model="formLabelAlign.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="支出金额">
-              <el-input v-model="formLabelAlign.payMoney" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="用途">
-              <el-input v-model="formLabelAlign.use" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="详细附件">
-              <el-input v-model="formLabelAlign.detailAnnex" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="项目名称">
+            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="支出金额">
+            <el-input v-model="formShowData.payMoney" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="用途">
+            <el-input v-model="formShowData.use" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="详细附件">
+            <el-input v-model="formShowData.detailAnnex" type="text">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
+
+    </el-drawer>
+
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
+              width="30%"
+          >
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+        </div>-->
 
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
 
-      </el-drawer>
-    </div>
-    <!--     编辑抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2"  v-model="labelPosition">
-            <el-form-item label="项目名称">
-              <el-input v-model="formLabelAlign2.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="支出金额">
-              <el-input v-model="formLabelAlign2.payMoney" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="用途">
-              <el-input v-model="formLabelAlign2.use" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="详细附件">
-              <el-input v-model="formLabelAlign2.detailAnnex" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="addUser">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <div>
-      <!-- 导入弹框 -->
-      <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
-      >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-    </div>
-    <!--     页脚分页-->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
   </div>
 
 
-
 </template>
 
 <script>
@@ -194,43 +153,28 @@ export default {
   name: "child2",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         name: '',
         money: '',
-        use: ''
+        use: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        name: '1',
-        payMoney: '1',
-        use: '1',
-        detailAnnex: '1'
-      }],
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+      formShowData: {
         name: '',
         payMoney: '',
         use: '',
         detailAnnex: ''
       },
-      formLabelAlign2: {
-        name: '',
-        payMoney: '',
-        use: '',
-        detailAnnex: ''
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      /*formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },*/
-      dialogVisible3: false,
-      currentPage: 1
+
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
     }
   },
 
@@ -243,63 +187,54 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          name:this.formLabelAlign.name,
-          payMoney:this.formLabelAlign.payMoney,
-          use: this.formLabelAlign.use,
-          detailAnnex: this.formLabelAlign.detailAnnex
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    editRowOne() {
     },
-    addUser (){
-      this.$message.success('添加信息成功！')
-      this.dialogVisible2=false
+    deleteRowOne() {
+    },
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
       this.getTableData()
-    }
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
+    },
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child2{
+<style lang="less" scoped>
+.child2 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -307,20 +242,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
index 5339886f7..9978a6205 100644
--- a/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue
@@ -2,228 +2,172 @@
 <template>
   <div id="translateCost" class="child1">
     <!--     第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline" ref="formInline1">
-        <el-form-item label="标准名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入标准名称" style="width: 170px"  ></el-input>
-        </el-form-item>
-        <el-form-item label="标准编号">
-          <el-input v-model="formInline1.num" size="small" placeholder="请输入标准编号" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="补助来源">
-          <el-input v-model="formInline1.source" size="small" placeholder="请输入补助来源" style="width:170px"></el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" @click="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click.native.prevent="deleteDetail($index,tableData)" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--            handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery">
+      <el-form-item label="标准名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称"></el-input>
+      </el-form-item>
+      <el-form-item label="标准编号">
+        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准编号"></el-input>
+      </el-form-item>
+      <el-form-item label="补助来源">
+        <el-input v-model="formQuery.source" size="small" placeholder="请输入补助来源"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+
     <!--     表格-->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
-        >
+          align="center"
+          type="index"
+          label="序号"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="name"
-            label="标准名称"
-
-        >
+          align="center"
+          prop="name"
+          label="标准名称">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="num"
-            label="标准编号"
-
-        >
-        </el-table-column>
-
-        <el-table-column
-            align="center"
-            prop="source"
-            label="补助来源"
-
-        >
-          <!--          <template slot-scope="scope">{{ scope.row.date }}</template>-->
-
+          align="center"
+          prop="num"
+          label="标准编号">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="money"
-            label="补助金额"
-
-        >
+          align="center"
+          prop="source"
+          label="补助来源">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="time"
-            label="入账时间"
-
-        >
+          align="center"
+          prop="money"
+          label="补助金额">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="time"
+          label="入账时间">
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!--     新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign" >
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="标准编号">
-              <el-input v-model="formLabelAlign.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="补助来源">
-              <el-input v-model="formLabelAlign.source" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="补助金额">
-              <el-input v-model="formLabelAlign.money" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="标准名称">
+            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标准编号">
+            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="补助来源">
+            <el-input v-model="formShowData.source" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="补助金额">
+            <el-input v-model="formShowData.money" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="入账时间">
+            <el-input v-model="formShowData.time" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
 
-            <el-form-item label="入账时间">
-              <el-input v-model="formLabelAlign.time" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-
-      </el-drawer>
-    </div>
-    <!--     编辑抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2">
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign2.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="标准编号">
-              <el-input v-model="formLabelAlign2.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="补助来源">
-              <el-input v-model="formLabelAlign2.source" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="补助金额">
-              <el-input v-model="formLabelAlign2.money" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-
-            <el-form-item label="入账时间">
-              <el-input v-model="formLabelAlign2.time" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click.native.prevent="editSubForm">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <div>
-      <!-- 导入弹框 -->
-      <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
-      >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--      导出弹框 -->
-      <!--       <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
+    </el-drawer>
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
               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>
-    <!--     页脚分页-->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;      导出弹框 &ndash;&gt;
+                 <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>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -231,55 +175,28 @@ export default {
   name: "child1",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         name: '',
         num: '',
-        source: ''
+        source: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        name: '1',
-        num: '397433',
-        source: '来源1',
-        money: '2322',
-        time: '2020-02-02'
-      },{
-        name: '2',
-        num: '123456',
-        source: '来源2',
-        money: '1111',
-        time: '2020-04-06'
-      },{
-        name: '3',
-        num: '3',
-        source: '3',
-        money: '3',
-        time: '3'
-      }
-      ],
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+      formShowData: {
         name: '',
         num: '',
         source: '',
         money: '',
         time: ''
       },
-      formLabelAlign2: {
-        name: '',
-        num: '',
-        source: '',
-        money: '',
-        time: ''
-      },
-      rowIndex: null,
-      dialogVisible1: false,
-      dialogVisible2: false,
-      dialogVisible3: false,
-      currentPage: 1
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
     }
   },
 
@@ -288,95 +205,62 @@ export default {
   },
   methods: {
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          name:this.formLabelAlign.name,
-          num:this.formLabelAlign.num,
-          source: this.formLabelAlign.source,
-          money: this.formLabelAlign.money,
-          time: this.formLabelAlign.time
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
-    },
-    //编辑（修改）
-    drawer2:function (index,row) {
-      this.formLabelAlign2=Object.assign({},row);
-      console.log(index);
+    deleteDetail() {
     },
     //点击确定（编辑）(没出)
-    editSubForm(){
-      var editdata= _index;
-      console.log(editdata);
-      this.tableData[editdata].name=this.formLabelAlign2.name;
-      this.tableData[editdata].num=this.formLabelAlign2.num;
-      this.tableData[editdata].source=this.formLabelAlign2.source;
-      this.tableData[editdata].money=this.formLabelAlign2.money;
-      this.tableData[editdata].time=this.formLabelAlign2.time;
-      this.FormVisible = true;
+    handleSelectionChange() {
     },
     //清空
     resetForm(formName) {
-      this[formName] = {};
-
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    },
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
+    },
+    editRowOne() {
+    },
+    deleteRowOne() {
+    },
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
 
-      /*获取需要渲染到页面中的数据*/
-    getShowData:function (arr){
-      this.clonetableData=JSON.parse(JSON.stringify(arr));
-    },
-    /*专门为查询写的渲染数据*/
-    getShowData1:function (arr){
-      this.tableData=JSON.parse(JSON.stringify(arr));
-    },
-    /*分页*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-
-
-    }
 
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child1{
+<style lang="less" scoped>
+.child1 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -384,20 +268,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
index 9a21557d9..51518bacf 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfCost.vue
@@ -54,50 +54,21 @@ export default {
     }
   },
   mounted() {
+    console.log(5)
   },
   methods: {
     doubleClick(tab) {
       if (tab.name === 'first') {
         this.isChildUpdate1 = true
-        this.isChildUpdate2 = false
-        this.isChildUpdate3 = false
-        this.isChildUpdate4 = false
-        this.isChildUpdate5 = false
-        this.isChildUpdate6 = false
       } else if (tab.name === 'second') {
-        this.isChildUpdate1 = false
         this.isChildUpdate2 = true
-        this.isChildUpdate3 = false
-        this.isChildUpdate4 = false
-        this.isChildUpdate5 = false
-        this.isChildUpdate6 = false
       } else if (tab.name === 'third') {
-        this.isChildUpdate1 = false
-        this.isChildUpdate2 = false
         this.isChildUpdate3 = true
-        this.isChildUpdate4 = false
-        this.isChildUpdate5 = false
-        this.isChildUpdate6 = false
       } else if (tab.name === 'fourth') {
-        this.isChildUpdate1 = false
-        this.isChildUpdate2 = false
-        this.isChildUpdate3 = false
         this.isChildUpdate4 = true
-        this.isChildUpdate5 = false
-        this.isChildUpdate6 = false
       } else if (tab.name === 'fifth') {
-        this.isChildUpdate1 = false
-        this.isChildUpdate2 = false
-        this.isChildUpdate3 = false
-        this.isChildUpdate4 = false
         this.isChildUpdate5 = true
-        this.isChildUpdate6 = false
       }else if (tab.name === 'sixth'){
-        this.isChildUpdate1 = false
-        this.isChildUpdate2 = false
-        this.isChildUpdate3 = false
-        this.isChildUpdate4 = false
-        this.isChildUpdate5 = false
         this.isChildUpdate6 = true
       }
 
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
index 8d415f17f..49cdaabd4 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue
@@ -2,286 +2,282 @@
 <template>
   <div id="listOfMeeting" class="child3">
     <!-- 第一第二行表单 -->
-    <div class="Meeting">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="会议名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入会议名称"  style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="会议时间">
-          <el-select v-model="formInline1.time" size="small" placeholder="请选择会议时间"    style="width: 170px">
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="会议名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入会议名称"></el-input>
+      </el-form-item>
+      <el-form-item label="会议时间">
+        <el-select v-model="formQuery.time" size="small" placeholder="请选择会议时间">
           <el-option label="1" value="one"></el-option>
           <el-option label="2" value="two"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="参加单位">
-          <el-select v-model="formInline1.part" size="small" placeholder="请选择参加单位"    style="width: 170px">
-            <el-option label="1" value="one"></el-option>
-            <el-option label="2" value="two"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="主要议题">
-          <el-input v-model="formInline1.theme" size="small" placeholder="请输入主要议题" style="width: 170px" >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--        handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="参加单位">
+        <el-select v-model="formQuery.part" size="small" placeholder="请选择参加单位">
+          <el-option label="1" value="one"></el-option>
+          <el-option label="2" value="two"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主要议题">
+        <el-input v-model="formQuery.theme" size="small" placeholder="请输入主要议题">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer = 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>
+      </div>
+    </el-form>
+    <el-divider/>
     <!-- 表格 -->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333',padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
+          align="center"
+          type="index"
+          label="序号"
+          width="100"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="holdUnit"
-            label="主办单位"
-            width="150"
+          align="center"
+          prop="holdUnit"
+          label="主办单位"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="meetingName"
-            label="会议名称"
-            width="150"
+          align="center"
+          prop="meetingName"
+          label="会议名称"
+          width="150"
         >
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="meetingTime"
-            label="会议时间"
-            width="150"
-        >
-<!--          <template slot-scope="scope">{{ scope.row.date }}</template>-->
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="meetingArea"
-            label="会议地点"
-            width="150"
+          align="center"
+          prop="meetingTime"
+          label="会议时间"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="costStandard"
-            label="会费标准"
-            width="150"
+          align="center"
+          prop="meetingArea"
+          label="会议地点"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="reality"
-            label="会费实际发生"
-            width="150"
+          align="center"
+          prop="costStandard"
+          label="会费标准"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="costList"
-            label="费用列支"
-            width="150"
+          align="center"
+          prop="reality"
+          label="会费实际发生"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="partner"
-            label="参会人员"
-            width="150"
+          align="center"
+          prop="costList"
+          label="费用列支"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="leader"
-            label="主管领导"
-            width="150"
+          align="center"
+          prop="partner"
+          label="参会人员"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="unit"
-            label="参与单位"
-            width="150"
+          align="center"
+          prop="leader"
+          label="主管领导"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="meetingMeans"
-            label="会议资料"
-            width="150"
+          align="center"
+          prop="unit"
+          label="参与单位"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="meetingSound"
-            label="会议录音"
-            width="150"
+          align="center"
+          prop="meetingMeans"
+          label="会议资料"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="meetingTheme"
-            label="主要议题"
-            width="150"
+          align="center"
+          prop="meetingSound"
+          label="会议录音"
+          width="150"
         >
         </el-table-column>
+        <el-table-column
+          align="center"
+          prop="meetingTheme"
+          label="主要议题"
+          width="150"
+        >
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer">
-        <div style="margin: 10px;"></div>
-        <el-form :label-position="labelPosition" label-width="150px" style="overflow-y: scroll" :model="formLabelAlign"  v-model="labelPosition">
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;">
+        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
           <el-form-item label="主办单位">
-            <el-input v-model="formLabelAlign.holdUnit" type="text" placeholder="请填写" ></el-input>
+            <el-input v-model="formShowData.holdUnit" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="会议名称">
-            <el-input v-model="formLabelAlign.meetingName" type="text" placeholder="请填写" ></el-input>
+            <el-input v-model="formShowData.meetingName" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="会议时间">
-            <el-select v-model="formLabelAlign.meetingTime" type="text" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.meetingTime" type="text" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="会议地点">
-            <el-select v-model="formLabelAlign.meetingArea" type="text" placeholder="请填写" style="width: 433px">
+            <el-select v-model="formShowData.meetingArea" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="会费标准">
-            <el-select v-model="formLabelAlign.costStandard" placeholder="请选择" type="text" style="width: 433px">
+            <el-select v-model="formShowData.costStandard" placeholder="请选择" type="text">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="会费实际发生">
-            <el-select v-model="formLabelAlign.reality" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.reality" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="费用列支">
-            <el-select v-model="formLabelAlign.costList" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.costList" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="参会人员">
-            <el-input v-model="formLabelAlign.partner" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.partner" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="主管领导">
-            <el-input v-model="formLabelAlign.leader" placeholder="请填写" >
+            <el-input v-model="formShowData.leader" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="参与单位">
-            <el-input v-model="formLabelAlign.unit" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.unit" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="会议录音">
-            <el-input v-model="formLabelAlign.meetingSound" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.meetingSound" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="主要议题">
-            <el-input v-model="formLabelAlign.meetingTheme" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.meetingTheme" type="text" placeholder="请填写"></el-input>
           </el-form-item>
         </el-form>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
 
-      </el-drawer>
-    </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" 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>
-    <!-- 页脚分页 -->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
+              width="30%"
+          >
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;   导出弹框 &ndash;&gt;
+          <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>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -289,32 +285,20 @@ export default {
   name: "child3",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         name: '',
         time: '',
         part: '',
-        theme: ''
+        theme: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        holdUnit: '',
-        meetingName: '',
-        meetingTime: '',
-        meetingArea: '',
-        costStandard: '',
-        reality: '',
-        costList: '',
-        partner: '',
-        leader: '',
-        unit: '',
-        meetingMeans: '',
-        meetingSound: '',
-        meetingTheme: ''
-      }],
+      tableData: [],
       multipleSelection: [],
-      drawer: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+      formShowData: {
         holdUnit: '',
         mneetingName: '',
         meetingTime: '',
@@ -329,20 +313,16 @@ export default {
         meetingSound: '',
         meetingTheme: ''
       },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-      currentPage: 1
+      formRules: {},
+
+      drawerTitle: '',
+      drawerTable: false,
+
     }
   },
 
   created() {
-    this.getTableData()
+    console.log(4)
   },
 
   methods: {
@@ -350,75 +330,54 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          holdUnit:this.formLabelAlign.holdUnit,
-          meetingName: this.formLabelAlign.meetingName,
-          meetingTime: this.formLabelAlign.meetingTime,
-          meetingArea: this.formLabelAlign.meetingArea,
-          costStandard: this.formLabelAlign.costStandard,
-          reality: this.formLabelAlign.reality,
-          costList: this.formLabelAlign.costList,
-          partner: this.formLabelAlign.partner,
-          leader: this.formLabelAlign.leader,
-          unit:this.formLabelAlign.unit,
-          meetingMeans: this.formLabelAlign.meetingMeans,
-          meetingSound: this.formLabelAlign.meetingSound,
-          meetingTheme: this.formLabelAlign.meetingTheme
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
-    },
+    deleteDetail() {},
     //清空
-    resetForm(formName) {
-      this[formName] = {};
+    resetForm() {},
 
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    editRowOne() {},
+    deleteRowOne() {},
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    }
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child3{
+<style lang="less" scoped>
+.child3 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -426,20 +385,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
index 728cdef0e..124d1caf1 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
@@ -2,269 +2,269 @@
 <template>
   <div id="listOfMember" class="child2">
     <!-- 第一第二行表单 -->
-    <div class="Member">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="提报单位名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入提报单位"  style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="协会名称">
-          <el-input v-model="formInline1.meeting" size="small" placeholder="请输入协会名称"    style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="会员角色">
-          <el-select v-model="formInline1.role" size="small" placeholder="请选择会员角色"    style="width: 170px">
-            <el-option label="1" value="one"></el-option>
-            <el-option label="2" value="two"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所在部门">
-          <el-select v-model="formInline1.part" size="small" placeholder="请选择所在部门"    style="width: 180px">
-            <el-option label="1" value="one"></el-option>
-            <el-option label="2" value="two"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--        handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="提报单位名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入提报单位"></el-input>
+      </el-form-item>
+      <el-form-item label="协会名称">
+        <el-input v-model="formQuery.meeting" size="small" placeholder="请输入协会名称"></el-input>
+      </el-form-item>
+      <el-form-item label="会员角色">
+        <el-select v-model="formQuery.role" size="small" placeholder="请选择会员角色">
+          <el-option label="1" value="one"></el-option>
+          <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-option label="1" value="one"></el-option>
+          <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-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="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
+        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+      </div>
+    </el-form>
+    <el-divider/>
     <!-- 表格 -->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333',padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
-        <el-table-column
-            type="selection"
-            width="50">
+        @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="unitName" label="提报单位名称" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.unitName || '-' }}
+          </template>
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
-        >
-
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="unitName"
-            label="提报单位名称"
-            width="150"
+          align="center"
+          prop="totalName"
+          label="协会名称-标委会"
+          width="auto"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="totalName"
-            label="协会名称-标委会"
-            width="150"
+          align="center"
+          prop="branchName"
+          label="协会名称-分标委"
+          width="auto"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="branchName"
-            label="协会名称-分标委"
-            width="150">
-          <!--          show-overflow-tooltip>-->
+          align="center"
+          prop="workName"
+          label="协会名称-工作组"
+          width="auto"
+        >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="workName"
-            label="协会名称-工作组"
-            width="150">
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="thisTime"
-            label="本届入会时间"
-            width="150"
+          align="center"
+          prop="thisTime"
+          label="本届入会时间"
+          width="120"
         >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="vipRole"
-            label="会员角色"
-            width="150">
+          align="center"
+          prop="vipRole"
+          label="会员角色"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="players"
-            label="参与人"
-            width="150"
+          align="center"
+          prop="players"
+          label="参与人"
+          width="120"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="post"
-            label="职务"
-            width="150">
+          align="center"
+          prop="post"
+          label="职务"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="department"
-            label="所在部门"
-            width="150">
+          align="center"
+          prop="department"
+          label="所在部门"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="num"
-            label="联系方式"
-            width="150">
+          align="center"
+          prop="num"
+          label="联系方式"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="timeOffice"
-            label="任期"
-            width="150"
+          align="center"
+          prop="timeOffice"
+          label="任期"
+          width="120"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">
+            {{ scope.row.date }}
+          </template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="certificate"
-            label="证书"
-            width="150">
+          align="center"
+          prop="certificate"
+          label="证书"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="account"
-            label="账号"
-            width="150">
+          align="center"
+          prop="account"
+          label="账号"
+          width="120">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="passWord"
-            label="密码"
-            width="150"
+          align="center"
+          prop="passWord"
+          label="密码"
+          width="120"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">
+            {{ scope.row.date || '-' }}
+          </template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="remarks"
-            label="备注"
-            width="150">
+          align="center"
+          prop="remarks"
+          label="备注"
+          width="120">
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-    <div class="member-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer">
-        <div style="margin: 10px;"></div>
-        <el-form :label-position="labelPosition" label-width="150px" style="overflow-y: scroll" :model="formLabelAlign"  v-model="labelPosition">
-          <el-form-item label="提报单位名称">
-            <el-input v-model="formLabelAlign.unitName" type="text" placeholder="请填写" ></el-input>
-          </el-form-item>
-          <el-form-item label="协会名称-委员会">
-            <el-input v-model="formLabelAlign.totalName" type="text" placeholder="请填写" ></el-input>
-          </el-form-item>
-          <el-form-item label="协会名称-分表委">
-            <el-input v-model="formLabelAlign.branchName" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="协会名称-工作组">
-            <el-input v-model="formLabelAlign.workName" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="本届入会时间">
-            <el-input v-model="formLabelAlign.thisTime" placeholder="日期选择" type="text" ></el-input>
-          </el-form-item>
-          <el-form-item label="会员角色">
-            <el-select v-model="formLabelAlign.vipRole" placeholder="请选择会员角色" style="width: 433px">
-              <el-option label="1" value="one"></el-option>
-              <el-option label="2" value="two"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="参与人">
-            <el-select v-model="formLabelAlign.players" placeholder="请选择参与人" style="width: 433px">
-              <el-option label="1" value="one"></el-option>
-              <el-option label="2" value="two"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="职务">
-            <el-input v-model="formLabelAlign.post" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="所在部门">
-            <el-input v-model="formLabelAlign.partment" placeholder="请填写" >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系方式">
-            <el-input v-model="formLabelAlign.num" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="任期">
-            <el-input v-model="formLabelAlign.timeOffice" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="证书">
-            <el-input v-model="formLabelAlign.certificate" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="账号">
-            <el-input v-model="formLabelAlign.account" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="密码">
-            <el-input v-model="formLabelAlign.passWord" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="formLabelAlign.remarks" type="text" placeholder="请填写"></el-input>
-          </el-form-item>
-        </el-form>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;"></div>
+      <el-form label-width="150px" style="overflow-y: scroll" :model="formShowData" :rules="formRules">
+        <el-form-item label="提报单位名称">
+          <el-input v-model="formShowData.unitName" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="协会名称-委员会">
+          <el-input v-model="formShowData.totalName" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="协会名称-分表委">
+          <el-input v-model="formShowData.branchName" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="协会名称-工作组">
+          <el-input v-model="formShowData.workName" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="本届入会时间">
+          <el-input v-model="formShowData.thisTime" placeholder="日期选择" type="text"></el-input>
+        </el-form-item>
+        <el-form-item label="会员角色">
+          <el-select v-model="formShowData.vipRole" placeholder="请选择会员角色">
+            <el-option label="1" value="one"></el-option>
+            <el-option label="2" value="two"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="参与人">
+          <el-select v-model="formShowData.players" placeholder="请选择参与人">
+            <el-option label="1" value="one"></el-option>
+            <el-option label="2" value="two"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-input v-model="formShowData.post" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="所在部门">
+          <el-input v-model="formShowData.partment" placeholder="请填写">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系方式">
+          <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="任期">
+          <el-input v-model="formShowData.timeOffice" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="证书">
+          <el-input v-model="formShowData.certificate" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="账号">
+          <el-input v-model="formShowData.account" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input v-model="formShowData.passWord" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="formShowData.remarks" type="text" placeholder="请填写"></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit">提交</el-button>
+      </div>
+    </el-drawer>
     <div>
       <!-- 导入弹框 -->
       <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
+        title="导入文件"
+        :visible.sync="dialogVisible1"
+        width="30%"
       >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+        <el-button class="leading-in">点击或拖拽上传文件</el-button>
       </el-dialog>
       <!--   导出弹框 -->
       <el-dialog
-          title="导出文件"
-          :visible.sync="dialogVisible2"
-          width="30%"
+        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 label="名称">
+            <el-input v-model="formInlineOut.name"></el-input>
           </el-form-item>
-          <el-form-item label="序号" >
-            <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
+          <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" style="width:350px"></el-input>
+          <el-form-item label="备注">
+            <el-input v-model="formInlineOut.remarks"></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -273,21 +273,9 @@
       </span>
       </el-dialog>
     </div>
-    <!-- 页脚分页 -->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
   </div>
 
 
-
 </template>
 
 <script>
@@ -295,34 +283,28 @@ export default {
   name: "child2",
   data() {
     return {
-      formInline1: {
+      // 表格加载
+      loading: false,
+      formQuery: {
         name: '',
         meeting: '',
         role: '',
-        part: ''
+        part: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        unitName: '',
-        totalName: '',
-        branchName: '',
-        workName: '',
-        thisTime: '',
-        vipRole: '',
-        players: '',
-        post: '',
-        department: '',
-        num: '',
-        timeOffice: '',
-        certificate: '',
-        account: '',
-        passWord: '',
-        remarks: ''
-      }],
+      tableData: [],
+
       multipleSelection: [],
-      drawer: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+
+      // 新增、编辑抽屉
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
+
+      formShowData: {
         unitName: '',
         totalName: '',
         branchName: '',
@@ -339,6 +321,7 @@ export default {
         passWord: '',
         remarks: ''
       },
+
       dialogVisible1: false,
       dialogVisible2: false,
       formInlineOut: {
@@ -352,7 +335,7 @@ export default {
   },
 
   created() {
-    this.getTableData()
+    console.log(1)
   },
 
   methods: {
@@ -360,79 +343,58 @@ export default {
       this.multipleSelection = val;
     },
     //增加方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          unitName:this.formLabelAlign.unitName,
-          totalName: this.formLabelAlign.totalName,
-          branchName: this.formLabelAlign.branchName,
-          workName: this.formLabelAlign.workName,
-          thisTime: this.formLabelAlign.thisTime,
-          vipRole: this.formLabelAlign.vipRole,
-          players: this.formLabelAlign.players,
-          post: this.formLabelAlign.post,
-          department: this.formLabelAlign.department,
-          num: this.formLabelAlign.num,
-          timeOffice: this.formLabelAlign.timeOffice,
-          certificate: this.formLabelAlign.certificate,
-          account: this.formLabelAlign.account,
-          passWord: this.formLabelAlign.passWord,
-          remarks: this.formLabelAlign.remarks
-
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    formDataAdd() {},
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
+    /** 查询 */
+    queryForm() {},
     //清空
-    resetForm(formName) {
-      this[formName] = {};
-
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    resetForm() {
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
+    },
+    editRowOne() {},
+    deleteRowOne() {},
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    }
-
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child2{
+<style lang="less" scoped>
+.child2 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -441,19 +403,14 @@ export default {
     width: 100%;
     height: calc(100% - 110px) !important;
 
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
index 5027f2c43..2177a9d05 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
@@ -2,21 +2,21 @@
 <template>
   <div id="listOfSociety" class="child1">
     <!--   查询框   -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+    <el-form :inline="true" :model="formQuery">
       <el-form-item label="协会名称:">
-        <el-input v-model="formQuery.name" size="small" placeholder="请填写协会名称" style="width: 170px"></el-input>
+        <el-input v-model="formQuery.name" size="small" placeholder="请填写协会名称"></el-input>
       </el-form-item>
       <el-form-item label="会员角色:">
-        <el-input v-model="formQuery.role" size="small" placeholder="请输入会员角色" style="width: 170px"></el-input>
+        <el-input v-model="formQuery.role" size="small" placeholder="请输入会员角色"></el-input>
       </el-form-item>
       <el-form-item label="协会性质:">
-        <el-select v-model="formQuery.nature" size="small" placeholder="请输入协会性质" style="width: 170px">
+        <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>
       <el-form-item label="协会状态:">
-        <el-select v-model="formQuery.state" size="small" placeholder="请选择协会状态" style="width: 170px">
+        <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>
@@ -25,11 +25,12 @@
         <el-button type="primary" size="small" @click="queryForm">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
-      <div style="float: right;padding-right: 10px">
-        <el-button type="primary" size="small" @click="drawer = true">新增</el-button>
+      <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="danger" size="small" @click="deleteDetail($index,tableData)" icon="el-icon-delete">
+        <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">
           批量删除
         </el-button>
         <el-button type="primary" size="small" onclick="">模板下载</el-button>
@@ -44,7 +45,7 @@
         style="width: auto"
         border
         height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :header-cell-style="{background: '#f5f1f1', color: '#333333',padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="50"/>
@@ -93,14 +94,14 @@
           </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="currentPage"
-        :total="tableTotal"
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-    <div class="society-drawer">
       <el-drawer
         :title="drawerTitle"
         :visible.sync="drawerTable">
@@ -116,13 +117,13 @@
             <el-input v-model="formShowData.workName" type="text"></el-input>
           </el-form-item>
           <el-form-item label="会员角色">
-            <el-select v-model="formShowData.vipRole" placeholder="请选择会员角色" style="width: 433px">
+            <el-select v-model="formShowData.vipRole" placeholder="请选择会员角色">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="参与人">
-            <el-select v-model="formShowData.players" placeholder="请选择参与人" style="width: 433px">
+            <el-select v-model="formShowData.players" placeholder="请选择参与人">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
@@ -131,13 +132,13 @@
             <el-input v-model="formShowData.standard" type="text"></el-input>
           </el-form-item>
           <el-form-item label="标准负责人">
-            <el-select v-model="formShowData.standardLeader" placeholder="请选择标准负责人" style="width: 433px">
+            <el-select v-model="formShowData.standardLeader" placeholder="请选择标准负责人">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="责任领导">
-            <el-select v-model="formShowData.leader" placeholder="请选择责任领导" style="width: 433px">
+            <el-select v-model="formShowData.leader" placeholder="请选择责任领导">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
@@ -152,7 +153,7 @@
             <el-input v-model="formShowData.costStandard" type="text"></el-input>
           </el-form-item>
           <el-form-item label="费用列支">
-            <el-select v-model="formShowData.cost" placeholder="请选择费用列支" style="width: 433px">
+            <el-select v-model="formShowData.cost" placeholder="请选择费用列支">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
@@ -167,7 +168,7 @@
             <el-input v-model="formShowData.cost2017" type="text"></el-input>
           </el-form-item>
           <el-form-item label="2018年缴费">
-            <el-select v-model="formShowData.cost2018" placeholder="请选择2018年缴费" style="width: 433px">
+            <el-select v-model="formShowData.cost2018" placeholder="请选择2018年缴费">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
@@ -182,25 +183,25 @@
             <el-input v-model="formShowData.cost2021" type="text"></el-input>
           </el-form-item>
           <el-form-item label="经办人">
-            <el-select v-model="formShowData.person" placeholder="请选择经办人" style="width: 433px">
+            <el-select v-model="formShowData.person" placeholder="请选择经办人">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="部门">
-            <el-select v-model="formShowData.partment" placeholder="请选择部门" style="width: 433px">
+            <el-select v-model="formShowData.partment" placeholder="请选择部门">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="协会性质">
-            <el-select v-model="formShowData.nature" placeholder="请选择协会性质" style="width: 433px">
+            <el-select v-model="formShowData.nature" placeholder="请选择协会性质">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="协会状态">
-            <el-select v-model="formShowData.state" placeholder="请选择协会性质" style="width: 433px">
+            <el-select v-model="formShowData.state" placeholder="请选择协会性质">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
@@ -220,17 +221,14 @@
           <el-button size="small" type="primary" @click="submit()">提交</el-button>
         </div>
       </el-drawer>
-    </div>
-
     <!-- 导入弹框 -->
-    <el-dialog
+<!--    <el-dialog
       title="导入文件"
       :visible.sync="dialogVisible1"
       width="30%"
     >
       <el-button class="leading-in">点击或拖拽上传文件</el-button>
     </el-dialog>
-    <!--   导出弹框 -->
     <el-dialog
       title="导出文件"
       :visible.sync="dialogVisible2"
@@ -251,7 +249,7 @@
         <el-button @click="dialogVisible2 = false">取 消</el-button>
         <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog>-->
     <!--  删除提示弹框  -->
   </div>
 
@@ -264,13 +262,18 @@ export default {
   name: "child1",
   data() {
     return {
+      // 表格加载loading
+      loading: false,
       formQuery: {
         name: '',
         role: '',
         nature: '',
-        state: ''
+        state: '',
+        currentPage: 1,
+        tableTotal: 0,
+        page: 1,
+        pageSize: 10,
       },
-      formInline2: {},
       tableData: [],
       multipleSelection: [],
       drawer: false,
@@ -302,7 +305,7 @@ export default {
         state: '',
         linkMan: '',
         num: '',
-        email: ''
+        email: '',
       },
       dialogVisible1: false,
       dialogVisible2: false,
@@ -313,16 +316,12 @@ export default {
         remarks: ''
       },
       dialogVisible3: false,
-      // 分页有关
-      currentPage: 1,
-      tableTotal: 0,
-      page: 1,
-      pageSize: 10,
+
       // 新增，编辑框
       drawerTitle: '',
       drawerTable: false,
 
-      formRules: [],
+      formRules: {},
     }
 
   },
@@ -332,6 +331,7 @@ export default {
   methods: {
     /** 获取该页面内的列表数据 */
     getData() {
+      console.log(2)
     },
     //新增方法
     submit() {
@@ -340,6 +340,8 @@ export default {
     //删除方法
     deleteDetail(index, rows) {
     },
+    /** 查询 */
+    queryForm() {},
     //清空
     resetForm() {
       this.formQuery = {};
@@ -347,6 +349,9 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+
+    /** 新增 */
+    formDataAdd() {},
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
@@ -412,10 +417,11 @@ export default {
   flex-direction: column;
 
   .el-form-item {
-    margin-bottom: 10px;
+    margin-bottom: 0px;
   }
 
   .el-divider--horizontal {
+    height: 0.5px;
     margin: 10px 0;
   }
 
@@ -427,13 +433,6 @@ export default {
     width: 100%;
     height: calc(100% - 110px) !important;
 
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
 
   .leading-in {
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
index 6600a6f72..8cd836781 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue
@@ -2,383 +2,383 @@
 <template>
   <div id="listOfStandard" class="child4">
     <!-- 第一第二行表单 -->
-    <div class="Standard">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="标准编号">
-          <el-input v-model="formInline1.num" size="small" placeholder="请输入标准编号"  style="width: 170px"></el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-select v-model="formInline1.name" size="small" placeholder="请选择标准名称"    style="width: 170px"></el-select>
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="标准编号">
+        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准编号"></el-input>
+      </el-form-item>
+      <el-form-item label="标准名称">
+        <el-select v-model="formQuery.name" size="small" placeholder="请选择标准名称"></el-select>
+        <el-option label="1" value="one"></el-option>
+        <el-option label="2" value="two"></el-option>
+      </el-form-item>
+      <el-form-item label="标准制/修订">
+        <el-select v-model="formQuery.revise" size="small" placeholder="请选择标准制/修订">
           <el-option label="1" value="one"></el-option>
           <el-option label="2" value="two"></el-option>
-        </el-form-item>
-        <el-form-item label="标准制/修订">
-          <el-select v-model="formInline1.revise" size="small" placeholder="请选择标准制/修订"    style="width: 170px">
-            <el-option label="1" value="one"></el-option>
-            <el-option label="2" value="two"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="主持/参与">
-          <el-input v-model="formInline1.directPartner" size="small" placeholder="请选择主持/参与" style="width: 170px" >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="primary" size="small" @click="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--        handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主持/参与">
+        <el-input v-model="formQuery.directPartner" size="small" placeholder="请选择主持/参与">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+
     <!-- 表格 -->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
+          align="center"
+          type="index"
+          label="序号"
+          width="50"
         >
 
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="stage"
-            label="所处阶段"
-            width="150"
+          align="center"
+          prop="stage"
+          label="所处阶段"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="standardNum"
-            label="标准号"
-            width="150"
+          align="center"
+          prop="standardNum"
+          label="标准号"
+          width="150"
         >
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="standardName"
-            label="标准名称"
-            width="150"
+          align="center"
+          prop="standardName"
+          label="标准名称"
+          width="150"
         >
 
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="codeNum"
-            label="项目代号"
-            width="150"
+          align="center"
+          prop="codeNum"
+          label="项目代号"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="codeName"
-            label="项目名称"
-            width="150"
+          align="center"
+          prop="codeName"
+          label="项目名称"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="standardType"
-            label="标准类型"
-            width="150"
+          align="center"
+          prop="standardType"
+          label="标准类型"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="directPartner"
-            label="主持或参与"
-            width="150"
+          align="center"
+          prop="directPartner"
+          label="主持或参与"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="startTime"
-            label="发布日期"
-            width="150"
+          align="center"
+          prop="startTime"
+          label="发布日期"
+          width="150"
         >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="putTime"
-            label="实施日期"
-            width="150"
+          align="center"
+          prop="putTime"
+          label="实施日期"
+          width="150"
         >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="organ"
-            label="颁布机构"
-            width="150"
+          align="center"
+          prop="organ"
+          label="颁布机构"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="headDraft"
-            label="牵头起草单位"
-            width="150"
+          align="center"
+          prop="headDraft"
+          label="牵头起草单位"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="recordTime"
-            label="备案时间"
-            width="150"
+          align="center"
+          prop="recordTime"
+          label="备案时间"
+          width="150"
         >
           <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="putUnit"
-            label="提报单位名称"
-            width="150"
+          align="center"
+          prop="putUnit"
+          label="提报单位名称"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="partner"
-            label="参与人"
-            width="150"
+          align="center"
+          prop="partner"
+          label="参与人"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="writer"
-            label="署名人"
-            width="150"
+          align="center"
+          prop="writer"
+          label="署名人"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="standardCost"
-            label="制标费用"
-            width="150"
+          align="center"
+          prop="standardCost"
+          label="制标费用"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="elseCost"
-            label="其他费用"
-            width="150"
+          align="center"
+          prop="elseCost"
+          label="其他费用"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="revise"
-            label="标准制/修订"
-            width="150"
+          align="center"
+          prop="revise"
+          label="标准制/修订"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="prize"
-            label="获奖情况"
-            width="150"
+          align="center"
+          prop="prize"
+          label="获奖情况"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="writerSort"
-            label="署名排序"
-            width="150"
+          align="center"
+          prop="writerSort"
+          label="署名排序"
+          width="150"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="remarks"
-            label="备注"
-            width="150"
+          align="center"
+          prop="remarks"
+          label="备注"
+          width="150"
         >
         </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-    <div class="standard-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer">
-        <div style="margin: 10px;"></div>
-        <el-form :label-position="labelPosition" label-width="150px" style="overflow-y: scroll" :model="formLabelAlign"  v-model="labelPosition">
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;">
+        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
           <el-form-item label="所处阶段">
-            <el-select v-model="formLabelAlign.stage" type="text" placeholder="请填写"  style="width: 433px">
+            <el-select v-model="formShowData.stage" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="标准号">
-            <el-input v-model="formLabelAlign.standardNum" type="text" placeholder="请填写" ></el-input>
+            <el-input v-model="formShowData.standardNum" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="标准名称">
-            <el-input v-model="formLabelAlign.standardName" type="text" placeholder="请填写" >
+            <el-input v-model="formShowData.standardName" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="标准类型">
-            <el-select v-model="formLabelAlign.standardType" type="text" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.standardType" type="text" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="主持或参与">
-            <el-select v-model="formLabelAlign.directPartner" placeholder="请选择" type="text" style="width: 433px">
+            <el-select v-model="formShowData.directPartner" placeholder="请选择" type="text">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="发布日期">
-            <el-select v-model="formLabelAlign.startTime" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.startTime" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="实施日期">
-            <el-select v-model="formLabelAlign.putTime" placeholder="请选择" style="width: 433px">
+            <el-select v-model="formShowData.putTime" placeholder="请选择">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="颁布机构">
-            <el-input v-model="formLabelAlign.organ" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.organ" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="牵头起草单位">
-            <el-input v-model="formLabelAlign.headDraft" placeholder="请填写" >
+            <el-input v-model="formShowData.headDraft" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="备案时间">
-            <el-input v-model="formLabelAlign.recordTime" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.recordTime" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="提报单位名称">
-            <el-input v-model="formLabelAlign.putUnit" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.putUnit" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="参与人">
-            <el-select v-model="formLabelAlign.partner" type="text" placeholder="请填写"  style="width: 433px">
+            <el-select v-model="formShowData.partner" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="标准制/修订">
-            <el-select v-model="formLabelAlign.revise" type="text" placeholder="请填写"  style="width: 433px">
+            <el-select v-model="formShowData.revise" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="获奖情况">
-            <el-input v-model="formLabelAlign.prize" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.prize" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="署名排序">
-            <el-input v-model="formLabelAlign.writerSort" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.writerSort" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="formLabelAlign.remarks" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.remarks" type="text" placeholder="请填写"></el-input>
           </el-form-item>
         </el-form>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</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" 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>
-      <!--  删除提示弹框  -->
-      <el-dialog
-          :visible.sync="dialogVisible3"
-          width="30%"
-          title="提 示："
-          height="100px"
-      >
-      <span >
-        <div class="icon">
-        <svg t="1628502929427" class="icon" viewBox="0 0 1024 1024" version="1.1"
-             xmlns="http://www.w3.org/2000/svg" p-id="1418" width="200" height="200">
-          <path d="M512 1024A512 512 0 1 1 512 0a512 512 0 0 1 0 1024z m48-784a48 48 0 0 0-96 0v352a48 48 0 0 0 96 0v-352zM512 736A48 48 0 1 0 512 832a48 48 0 0 0 0-96z" p-id="1419" fill="#d81e06">
-          </path>
-        </svg></div>
-        确认删除这些数据？</span>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible3 = false">不用了</el-button>
-        <el-button type="primary" @click="dialogVisible3 = false">好  的</el-button>
-      </span>
-      </el-dialog>
-    </div>
-    <!-- 页脚分页 -->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
+              width="30%"
+          >
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;   导出弹框 &ndash;&gt;
+          <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>
+          &lt;!&ndash;  删除提示弹框  &ndash;&gt;
+          <el-dialog
+              :visible.sync="dialogVisible3"
+              width="30%"
+              title="提 示："
+              height="100px"
+          >
+          <span >
+            <div class="icon">
+            <svg t="1628502929427" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                 xmlns="http://www.w3.org/2000/svg" p-id="1418" width="200" height="200">
+              <path d="M512 1024A512 512 0 1 1 512 0a512 512 0 0 1 0 1024z m48-784a48 48 0 0 0-96 0v352a48 48 0 0 0 96 0v-352zM512 736A48 48 0 1 0 512 832a48 48 0 0 0 0-96z" p-id="1419" fill="#d81e06">
+              </path>
+            </svg></div>
+            确认删除这些数据？</span>
+            <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible3 = false">不用了</el-button>
+            <el-button type="primary" @click="dialogVisible3 = false">好  的</el-button>
+          </span>
+          </el-dialog>
+        </div>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -386,40 +386,21 @@ export default {
   name: "child4",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         num: '',
         name: '',
         revise: '',
-        directPartner: ''
-      },
-      tableData: [{
-        stage: '',
-        standardNum: '',
-        standardName: '',
-        codeNum: '',
-        codeName: '',
-        standardType: '',
         directPartner: '',
-        startTime: '',
-        putTime: '',
-        organ: '',
-        headDraft: '',
-        recordTime: '',
-        putUnit: '',
-        partner: '',
-        writer: '',
-        standardCost: '',
-        elseCost: '',
-        revise: '',
-        prize: '',
-        writerSort: '',
-        remarks: ''
-      }],
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
+      },
+      tableData: [],
       multipleSelection: [],
-      drawer: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+
+      formShowData: {
         stage: '',
         standardNum: '',
         standardName: '',
@@ -442,20 +423,15 @@ export default {
         writerSort: '',
         remarks: ''
       },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-      currentPage: 1
+
+      drawerTitle: '',
+      drawerTable: false,
+      formRules: {}
     }
   },
 
   created() {
-    this.getTableData()
+    console.log(3)
   },
 
   methods: {
@@ -463,82 +439,54 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          stage:this.formLabelAlign.stage,
-          standardNum: this.formLabelAlign.standardNum,
-          standardName: this.formLabelAlign.standardName,
-          codeNum: this.formLabelAlign.codeNum,
-          codeName: this.formLabelAlign.codeName,
-          standardType: this.formLabelAlign.standardType,
-          directPartner: this.formLabelAlign.directPartner,
-          startTime: this.formLabelAlign.startTime,
-          putTime: this.formLabelAlign.putTime,
-          organ: this.formLabelAlign.organ,
-          headDraft: this.formLabelAlign.organ,
-          recordTime: this.formLabelAlign.recordTime,
-          putUnit: this.formLabelAlign.putUnit,
-          partner: this.formLabelAlign.partner,
-          writer: this.formLabelAlign.writer,
-          standardCost: this.formLabelAlign.standardCost,
-          elseCost: this.formLabelAlign.elseCost,
-          revise: this.formLabelAlign.revise,
-          prize: this.formLabelAlign.prize,
-          writerSort: this.formLabelAlign.writerSort,
-          remarks: this.formLabelAlign.remarks
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
-    },
+    submit: function () {},
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
-    },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    },
+    deleteDetail: function (index, rows) {},
+
     //清空
-    resetForm(formName) {
-      this[formName] = {};
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
-    }
+    resetForm(formName) {},
+
+
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
+    },
+    editRowOne() {},
+    deleteRowOne() {},
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
+    },
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child4{
+<style lang="less" scoped>
+.child4 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
   .container {
     display: flex;
     flex-direction: column;
@@ -547,19 +495,14 @@ export default {
     width: 100%;
     height: calc(100% - 110px) !important;
 
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
index b8c468edb..8680db3a1 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
@@ -2,209 +2,156 @@
 <template>
   <div id="reviseCost" class="child3">
     <!-- 第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="标准号">
-          <el-input v-model="formInline1.标准号" size="small" placeholder="请输入标准号" style="width:170px"  ></el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-input v-model="formInline1.standardName" size="small" placeholder="请输入标准名称" style="width:170px"  ></el-input>
-        </el-form-item>
-        <el-form-item label="项目代号">
-          <el-input v-model="formInline1.codeNum" size="small" placeholder="根据项目代号搜索" style="width:170px"  >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" @click="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--        handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery">
+      <el-form-item label="标准号">
+        <el-input v-model="formQuery.standardId" size="small" placeholder="请输入标准号"></el-input>
+      </el-form-item>
+      <el-form-item label="标准名称">
+        <el-input v-model="formQuery.standardName" size="small" placeholder="请输入标准名称"></el-input>
+      </el-form-item>
+      <el-form-item label="项目代号">
+        <el-input v-model="formQuery.codeNum" size="small" placeholder="根据项目代号搜索">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left;">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+
+
     <!-- 表格 -->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
+          align="center"
+          type="index"
+          label="序号"
+          width="50"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="type"
-            label="类型"
-
-        >
+          align="center"
+          prop="type"
+          label="类型">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="num"
-            label="项目编号"
-
-        >
+          align="center"
+          prop="num"
+          label="项目编号">
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="name"
-            label="项目名称"
-
-        >
-
+          align="center"
+          prop="name"
+          label="项目名称">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="costList"
-            label="费用列支项"
-
-        >
+          align="center"
+          prop="costList"
+          label="费用列支项">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="cost"
-            label="费用支出"
-
-        >
+          align="center"
+          prop="cost"
+          label="费用支出">
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign"  v-model="labelPosition">
-            <el-form-item label="类型">
-              <el-select v-model="formLabelAlign.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="项目编号">
-              <el-input v-model="formLabelAlign.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="项目名称">
-              <el-input v-model="formLabelAlign.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用列支项">
-              <el-input v-model="formLabelAlign.costList" placeholder="请选择"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用支出">
-              <el-input v-model="formLabelAlign.cost" placeholder="请选择" style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <!--  编辑抽屉  -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2"  v-model="labelPosition">
-            <el-form-item label="类型">
-              <el-select v-model="formLabelAlign2.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="项目编号">
-              <el-input v-model="formLabelAlign2.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="项目名称">
-              <el-input v-model="formLabelAlign2.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用列支项">
-              <el-input v-model="formLabelAlign2.costList" placeholder="请选择"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用支出">
-              <el-input v-model="formLabelAlign2.cost" placeholder="请选择" style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <div>
-      <!-- 导入弹框 -->
-      <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
-      >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--  删除提示弹框  -->
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="类型">
+            <el-select v-model="formShowData.type" type="text" placeholder="请填写">
+              <el-option label="1" value="one"></el-option>
+              <el-option label="2" value="two"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="项目编号">
+            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="项目名称">
+            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="费用列支项">
+            <el-input v-model="formShowData.costList" placeholder="请选择">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="费用支出">
+            <el-input v-model="formShowData.cost" placeholder="请选择">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
+    </el-drawer>
 
-    </div>
-    <!-- 页脚分页 -->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
+              width="30%"
+          >
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;  删除提示弹框  &ndash;&gt;
+
+        </div>-->
   </div>
-
-
-
 </template>
 
 <script>
@@ -212,42 +159,30 @@ export default {
   name: "child3",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         standardNum: '',
         standardName: '',
-        codeNum: ''
+        codeNum: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        type: '',
-        num: '',
-        name: '',
-        costList: '',
-        cost: ''
-      }],
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
-        type: '',
-        num: '',
-        name: '',
-        costList: '',
-        cost: ''
-      },
-      formLabelAlign2: {
-        type: '',
-        num: '',
-        name: '',
-        costList: '',
-        cost: ''
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
 
-      dialogVisible3: false,
-      currentPage: 1
+      formShowData: {
+        type: '',
+        num: '',
+        name: '',
+        costList: '',
+        cost: ''
+      },
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
+
     }
   },
 
@@ -260,72 +195,56 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          type:this.formLabelAlign.type,
-          num:this.formLabelAlign.num,
-          name: this.formLabelAlign.name,
-          cost: this.formLabelAlign.cost,
-          costList: this.formLabelAlign.costList
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
     //清空
-    resetForm(formName) {
-      this[formName] = {};
-
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    resetForm() {
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    editRowOne() {
     },
-    addUser (){
-      this.$message.success('添加信息成功！')
-      this.dialogVisible2=false
+    deleteRowOne() {
+    },
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
       this.getTableData()
-    }
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
+    },
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child3{
+<style lang="less" scoped>
+.child3 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
   .container {
     display: flex;
     flex-direction: column;
@@ -333,20 +252,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
index c9d88e1a0..6bc9f253e 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue
@@ -2,229 +2,187 @@
 <template>
   <div id="attendCost" class="child4">
     <!--     第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="标准类型">
-          <el-input v-model="formInline1.type" size="small" placeholder="请输入标准类型" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="标准代号">
-          <el-input v-model="formInline1.num" size="small" placeholder="请输入标准代号" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入标准名称" style="width:170px"  >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--            handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="标准类型">
+        <el-input v-model="formQuery.type" size="small" placeholder="请输入标准类型"></el-input>
+      </el-form-item>
+      <el-form-item label="标准代号">
+        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准代号"></el-input>
+      </el-form-item>
+      <el-form-item label="标准名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
     <!--     表格-->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
+          align="center"
+          type="index"
+          label="序号"
+          width="50"
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="type"
-            label="标准类型"
+          align="center"
+          prop="type"
+          label="标准类型"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="num"
-            label="标准代号"
+          align="center"
+          prop="num"
+          label="标准代号"
 
         >
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="name"
-            label="标准名称"
+          align="center"
+          prop="name"
+          label="标准名称"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="pages"
-            label="页数"
+          align="center"
+          prop="pages"
+          label="页数"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="cost"
-            label="费用"
+          align="center"
+          prop="cost"
+          label="费用"
 
         >
         </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!--     新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign"  v-model="labelPosition">
-            <el-form-item label="标准类型">
-              <el-select v-model="formLabelAlign.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="标准代号">
-              <el-input v-model="formLabelAlign.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="页数">
-              <el-input v-model="formLabelAlign.pages" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用">
-              <el-input v-model="formLabelAlign.cost" placeholder="请填写"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <!--     编辑抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2"  v-model="labelPosition">
-            <el-form-item label="标准类型">
-              <el-select v-model="formLabelAlign2.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="标准代号">
-              <el-input v-model="formLabelAlign2.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign2.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="页数">
-              <el-input v-model="formLabelAlign2.pages" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用">
-              <el-input v-model="formLabelAlign2.cost" placeholder="请选择"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <div>
-      <!-- 导入弹框 -->
-      <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
-      >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--      导出弹框 -->
-      <!--       <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="标准类型">
+            <el-select v-model="formShowData.type" type="text" placeholder="请填写">
+              <el-option label="1" value="one"></el-option>
+              <el-option label="2" value="two"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准代号">
+            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="标准名称">
+            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="页数">
+            <el-input v-model="formShowData.pages" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="费用">
+            <el-input v-model="formShowData.cost" placeholder="请选择">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
+    </el-drawer>
+
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
               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>
-    <!--     页脚分页-->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;      导出弹框 &ndash;&gt;
+                 <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>
+          &lt;!&ndash; 删除提示弹框  &ndash;&gt;
+        </div>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -232,41 +190,23 @@ export default {
   name: "child4",
   data() {
     return {
-      formInline1: {
-        type: '',
-        num: '',
-        name: ''
-      },
-      tableData: [{
+      loading: false,
+      formQuery: {
         type: '',
         num: '',
         name: '',
-        pages: '',
-        cost: ''
-      }],
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
+      },
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
-        type: '',
-        num: '',
-        name: '',
-        pages: '',
-        cost: ''
-      },
-      formLabelAlign2: {
-        type: '',
-        num: '',
-        name: '',
-        pages: '',
-        cost: ''
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      dialogVisible3: false,
-      currentPage: 1
+
+      formShowData: {},
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {}
     }
   },
 
@@ -279,68 +219,57 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          type:this.formLabelAlign.type,
-         num: this.formLabelAlign.num,
-          name: this.formLabelAlign.name,
-          pages: this.formLabelAlign.pages,
-          cost: this.formLabelAlign.cost
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
     //清空
-    resetForm(formName) {
-      this[formName] = {};
-
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    resetForm() {
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
+    },
+    editRowOne() {
+    },
+    deleteRowOne() {
+    },
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    }
-
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child4{
+<style lang="less" scoped>
+.child4 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -348,20 +277,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
index 095f3912a..326dfc6ed 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
@@ -1,248 +1,200 @@
 <!--标法规-工作组-项目费用统计信息-参会费用信息统计-->
 <template>
   <div id="attendCost" class="child2">
-<!--     第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="标准类型">
-          <el-input v-model="formInline1.type" size="small" placeholder="请输入标准类型" style="width:170px"></el-input>
-        </el-form-item>
-        <el-form-item label="标准代号">
-          <el-input v-model="formInline1.num" size="small" placeholder="请输入标准代号" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="请输入标准名称" style="width:170px"  >
-          </el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-<!--            handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-<!--     表格-->
+    <!--     第一第二行表单 -->
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="标准类型">
+        <el-input v-model="formQuery.type" size="small" placeholder="请输入标准类型"></el-input>
+      </el-form-item>
+      <el-form-item label="标准代号">
+        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准代号"></el-input>
+      </el-form-item>
+      <el-form-item label="标准名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称">
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+    <!--     表格-->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            width="100"
-            label="序号"
+          align="center"
+          type="index"
+          width="50"
+          label="序号"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="holdUnit"
-            label="主办单位"
+          align="center"
+          prop="holdUnit"
+          label="主办单位"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="meetingName"
-            label="会议名称"
+          align="center"
+          prop="meetingName"
+          label="会议名称"
 
         >
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="meetingTime"
-            label="会议时间"
-
-        >
-<!--          <template slot-scope="scope">{{ scope.row.date }}</template>-->
-
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="costStandard"
-            label="会费标准"
+          align="center"
+          prop="meetingTime"
+          label="会议时间"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="reality"
-            label="实际发生"
+          align="center"
+          prop="costStandard"
+          label="会费标准"
 
         >
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="costList"
-            label="费用列支"
+          align="center"
+          prop="reality"
+          label="实际发生"
 
         >
         </el-table-column>
+        <el-table-column
+          align="center"
+          prop="costList"
+          label="费用列支"
+
+        >
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
-<!--     新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign"  v-model="labelPosition">
-            <el-form-item label="主办单位">
-              <el-select v-model="formLabelAlign.holdUnit" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="会议名称">
-              <el-input v-model="formLabelAlign.meetingName" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="会议时间">
-              <el-input v-model="formLabelAlign.meetingTime" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="会费标准">
-              <el-input v-model="formLabelAlign.costStandard" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="实际发生">
-              <el-input v-model="formLabelAlign.reality" placeholder="请选择"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用列支">
-              <el-input v-model="formLabelAlign.costList" placeholder="请选择" style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-<!--     编辑抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2"  v-model="labelPosition">
-            <el-form-item label="主办单位">
-              <el-select v-model="formLabelAlign2.holdUnit" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="会议名称">
-              <el-input v-model="formLabelAlign2.meetingName" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="会议时间">
-              <el-input v-model="formLabelAlign2.meetingTime" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="会费标准">
-              <el-input v-model="formLabelAlign2.costStandard" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="实际发生">
-              <el-input v-model="formLabelAlign2.reality" placeholder="请选择"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用列支">
-              <el-input v-model="formLabelAlign2.costList" placeholder="请选择" style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <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" 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>-->
+    <!--     新增抽屉 -->
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="主办单位">
+            <el-select v-model="formShowData.holdUnit" type="text" placeholder="请填写">
+              <el-option label="1" value="one"></el-option>
+              <el-option label="2" value="two"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="会议名称">
+            <el-input v-model="formShowData.meetingName" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="会议时间">
+            <el-input v-model="formShowData.meetingTime" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="会费标准">
+            <el-input v-model="formShowData.costStandard" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="实际发生">
+            <el-input v-model="formShowData.reality" placeholder="请选择">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="费用列支">
+            <el-input v-model="formShowData.costList" placeholder="请选择">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
+    </el-drawer>
 
-    </div>
-<!--     页脚分页-->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+    <!--    <div>
+    &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
+              width="30%"
+          >
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+    &lt;!&ndash;      导出弹框 &ndash;&gt;
+           <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>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -250,44 +202,23 @@ export default {
   name: "child2",
   data() {
     return {
-      formInline1: {
+      loading: false,
+      formQuery: {
         type: '',
         num: '',
-        name: ''
+        name: '',
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
       },
-      tableData: [{
-        holdUnit: '',
-        meetingName: '',
-        meetingTime: '',
-        costStandard: '',
-        reality: '',
-        costList: ''
-      }],
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
-        holdUnit: '',
-        meetingName: '',
-        meetingTime: '',
-        costStandard: '',
-        reality: '',
-        costList: ''
-      },
-      formLabelAlign2: {
-        holdUnit: '',
-        meetingName: '',
-        meetingTime: '',
-        costStandard: '',
-        reality: '',
-        costList: ''
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      dialogVisible3: false,
-      currentPage: 1
+
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
+      formShowData: {}
     }
   },
 
@@ -300,68 +231,55 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          holdUnit:this.formLabelAlign.holdUnit,
-          meetingName: this.formLabelAlign.meetingName,
-          meetingTime: this.formLabelAlign.meetingTime,
-          costStandard: this.formLabelAlign.costStandard,
-          reality: this.formLabelAlign.reality,
-          costList: this.formLabelAlign.costList
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
     //清空
-    resetForm(formName) {
-      this[formName] = {};
+    resetForm() {
+    },
 
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    editRowOne() {},
+    deleteRowOne() {},
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    }
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.child2{
+<style lang="less" scoped>
+.child2 {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
   .container {
     display: flex;
     flex-direction: column;
@@ -369,20 +287,14 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
index 49115eccd..52f1a7402 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
@@ -23,7 +23,7 @@
         <el-button type="primary" size="small" @click="queryForm">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
-      <div style="padding-right: 10px;float: left">
+      <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>
@@ -40,7 +40,7 @@
         style="width: auto"
         border
         height="100%"
-        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="50"/>
@@ -399,6 +399,7 @@ export default {
   }
 
   .el-divider--horizontal {
+    height: 0.5px;
     margin: 10px 0;
   }
 
@@ -410,13 +411,6 @@ export default {
     width: 100%;
     height: calc(100% - 110px) !important;
 
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
 
   .leading-in {
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
index 196585903..70b971847 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/subsidyCost.vue
@@ -35,9 +35,7 @@ export default {
     TreblingClick(tab) {
       if (tab.name === 'first') {
         this.isChildUpdate1 = true
-        this.isChildUpdate2 = false
       } else if (tab.name === 'second') {
-        this.isChildUpdate1 = false
         this.isChildUpdate2 = true
       }
     }
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
index d8fa5d16c..d335d2afc 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue
@@ -2,261 +2,194 @@
 <template>
   <div id="translateCost" class="children">
     <!--     第一第二行表单 -->
-    <div class="revise">
-      <el-form :inline="true" :model="formInline1" class="demo-form-inline">
-        <el-form-item label="标准类型">
-          <el-input v-model="formInline1.type" size="small" placeholder="根据标准类型搜索" style="width:170px" ></el-input>
-        </el-form-item>
-        <el-form-item label="标准代号">
-          <el-input v-model="formInline1.num" size="small" placeholder="根据标准代号搜索" style="width:170px"  ></el-input>
-        </el-form-item>
-        <el-form-item label="标准名称">
-          <el-input v-model="formInline1.name" size="small" placeholder="根据标准名称搜索" style="width:170px"  ></el-input>
-        </el-form-item>
-        <el-form-item class="search-item btn-box" >
-          <el-button type="primary" size="small" onclick="" >查询</el-button>
-        </el-form-item>
-        <el-form-item class="search-item btn-box">
-          <el-button type="" size="small"  @click="resetForm('formInline1')" >清空</el-button>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" :model="formInline2">
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer1 = true" >新增</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="drawer2 = true" >编辑</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible1 = true" >导入</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="dialogVisible2 = true" >导出</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="" size="small" @click="deleteDetail" icon="el-icon-delete"  icon-color="red">批量删除</el-button>
-          <!--            handleDelete(scope.$index, scope.row)-->
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" onclick="" >模板下载</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+      <el-form-item label="标准类型">
+        <el-input v-model="formQuery.type" size="small" placeholder="根据标准类型搜索"></el-input>
+      </el-form-item>
+      <el-form-item label="标准代号">
+        <el-input v-model="formQuery.num" size="small" placeholder="根据标准代号搜索"></el-input>
+      </el-form-item>
+      <el-form-item label="标准名称">
+        <el-input v-model="formQuery.name" size="small" placeholder="根据标准名称搜索"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+      </el-form-item>
+      <el-divider/>
+      <div style="float: left">
+        <el-button type="primary" size="small" @click="drawer1 = 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>
+      </div>
+    </el-form>
+    <el-divider/>
+
     <!--     表格-->
     <div class="container">
       <el-table
-          :data="tableData"
-          tooltip-effect="dark"
-          style="width: auto"
-          border
-          height="100%"
-          :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: auto"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', padding: 0, fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-          @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange">
         <el-table-column
-            type="selection"
-            width="50">
+          align="center"
+          type="selection"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="100"
-        >
+          align="center"
+          type="index"
+          label="序号"
+          width="50">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="type"
-            label="标准类型"
-
-        >
+          align="center"
+          prop="type"
+          label="标准类型">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="num"
-            label="标准代号"
-
-        >
+          align="center"
+          prop="num"
+          label="标准代号">
         </el-table-column>
 
         <el-table-column
-            align="center"
-            prop="name"
-            label="标准名称"
-
-        >
-<!--          <template slot-scope="scope">{{ scope.row.date }}</template>-->
-
+          align="center"
+          prop="name"
+          label="标准名称">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="translateType"
-            label="翻译类型"
-
-        >
+          align="center"
+          prop="translateType"
+          label="翻译类型">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="pages"
-            label="页数"
-
-        >
+          align="center"
+          prop="pages"
+          label="页数">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="cost"
-            label="费用"
-
-        >
+          align="center"
+          prop="cost"
+          label="费用">
         </el-table-column>
         <el-table-column
-            align="center"
-            prop="completeTime"
-            label="翻译完成时间"
-
-        >
+          align="center"
+          prop="completeTime"
+          label="翻译完成时间">
+        </el-table-column>
+        <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>
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
         </el-table-column>
       </el-table>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+        :page="formQuery.page"
+        :total="formQuery.tableTotal"
+        @pageChange="pageChange"
+        @pageSizeChange="pageSizeChange"/>
     </div>
     <!--     新增抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="新增"
-          :visible.sync="drawer1">
-        <div style="margin: 10px;height: inherit;">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign"  v-model="labelPosition">
-            <el-form-item label="标准类型">
-              <el-select v-model="formLabelAlign.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="标准代号">
-              <el-input v-model="formLabelAlign.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="翻译类型">
-              <el-input v-model="formLabelAlign.translateType" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
+    <el-drawer
+      size="50%"
+      :title="drawerTitle"
+      :visible.sync="drawerTable">
+      <div style="margin: 10px;height: inherit">
+        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+          <el-form-item label="标准类型">
+            <el-select v-model="formShowData.type" type="text" placeholder="请填写">
+              <el-option label="1" value="one"></el-option>
+              <el-option label="2" value="two"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准代号">
+            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+          </el-form-item>
+          <el-form-item label="标准名称">
+            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="翻译类型">
+            <el-input v-model="formShowData.translateType" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
 
-            <el-form-item label="页数">
-              <el-input v-model="formLabelAlign.pages" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用">
-              <el-input v-model="formLabelAlign.cost" placeholder="请填写"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="翻译完成时间">
-              <el-input v-model="formLabelAlign.completeTime" placeholder="请填写"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <!--     编辑抽屉 -->
-    <div class="meeting-drawer">
-      <el-drawer
-          :size="size"
-          title="编辑"
-          :visible.sync="drawer2">
-        <div style="margin: 10px;height: inherit">
-          <el-form :label-position="labelPosition" label-width="150px" :model="formLabelAlign2"  v-model="labelPosition">
-            <el-form-item label="标准类型">
-              <el-select v-model="formLabelAlign2.type" type="text" placeholder="请填写" style="width: 433px" >
-                <el-option label="1" value="one"></el-option>
-                <el-option label="2" value="two"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="标准代号">
-              <el-input v-model="formLabelAlign2.num" type="text" placeholder="请填写" style="width: 433px"></el-input>
-            </el-form-item>
-            <el-form-item label="标准名称">
-              <el-input v-model="formLabelAlign2.name" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="翻译类型">
-              <el-input v-model="formLabelAlign2.translateType" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
+          <el-form-item label="页数">
+            <el-input v-model="formShowData.pages" type="text" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="费用">
+            <el-input v-model="formShowData.cost" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="翻译完成时间">
+            <el-input v-model="formShowData.completeTime" placeholder="请填写">
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+      </div>
+    </el-drawer>
 
-            <el-form-item label="页数">
-              <el-input v-model="formLabelAlign2.pages" type="text" placeholder="请填写" style="width: 433px" >
-              </el-input>
-            </el-form-item>
-            <el-form-item label="费用">
-              <el-input v-model="formLabelAlign2.cost" placeholder="请填写"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="翻译完成时间">
-              <el-input v-model="formLabelAlign2.completeTime" placeholder="请填写"  style="width: 433px">
-              </el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="demo-drawer-footer">
-          <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-          <el-button size="small" type="primary" @click="submit()">提交</el-button>
-        </div>
-      </el-drawer>
-    </div>
-    <div>
-      <!-- 导入弹框 -->
-      <el-dialog
-          title="导入文件"
-          :visible.sync="dialogVisible1"
-          width="30%"
-      >
-        <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--      导出弹框 -->
-      <!--       <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
+    <!--    <div>
+          &lt;!&ndash; 导入弹框 &ndash;&gt;
+          <el-dialog
+              title="导入文件"
+              :visible.sync="dialogVisible1"
               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>
-    <!--     页脚分页-->
-    <div class="block">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="100">
-      </el-pagination>
-    </div>
+            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
+          </el-dialog>
+          &lt;!&ndash;      导出弹框 &ndash;&gt;
+                 <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>-->
   </div>
 
 
-
 </template>
 
 <script>
@@ -264,26 +197,19 @@ export default {
   name: "children",
   data() {
     return {
-      formInline1: {
-        type: '',
-        num: '',
-        name: ''
-      },
-      tableData: [{
+      loading: false,
+      formQuery: {
         type: '',
         num: '',
         name: '',
-        translateType: '',
-        pages: '',
-        cost: '',
-        completeTime: ''
-      }],
+        current: 1,
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        tableTotal: 0
+      },
+      tableData: [],
       multipleSelection: [],
-      drawer1: false,
-      drawer2: false,
-      size: '600px',
-      labelPosition: 'center',
-      formLabelAlign: {
+      formShowData: {
         type: '',
         num: '',
         name: '',
@@ -292,19 +218,9 @@ export default {
         cost: '',
         completeTime: ''
       },
-      formLabelAlign2: {
-        type: '',
-        num: '',
-        name: '',
-        translateType: '',
-        pages: '',
-        cost: '',
-        completeTime: ''
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      dialogVisible3: false,
-      currentPage: 1
+      drawerTable: false,
+      drawerTitle: '',
+      formRules: {},
     }
   },
 
@@ -317,69 +233,58 @@ export default {
       this.multipleSelection = val;
     },
     //新增方法
-    submit: function(){
-      this.$confirm('确认进行添加','是否继续？','提示',{
-        confirmButtonText: '确定',
-       cancelButtonText: '取消',
-      }).then(()=>{
-        this.tableData.push({
-          type:this.formLabelAlign.type,
-          num: this.formLabelAlign.num,
-          name: this.formLabelAlign.name,
-          translateType: this.formLabelAlign.translateType,
-          pages: this.formLabelAlign.pages,
-          cost: this.formLabelAlign.cost,
-          completeTime: this.formLabelAlign.completeTime
-        }),
-            this.$message({
-              type: 'success',
-              message: '添加成功'
-            })
-      })
+    submit() {
     },
     //删除方法
-    deleteDetail: function(index,rows) {
-      this.$confirm('此操作将删除数据,','是否继续?','提示',{
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
-      }).then(()=>{
-        this.tableData.splice(index,1)
-        this.$message({
-          type: 'success',
-          message:'删除成功',
-        })
-      }).catch((err) =>{
-        this.$message({
-          type:'error',
-          message:err
-        })
-      })
+    deleteDetail() {
     },
     //清空
-    resetForm(formName) {
-      this[formName] = {};
+    resetForm() {
+    },
 
-      this.$nextTick(() => {
-        this.$refs[formName].resetFields()
-      });
+    // 列表更多按钮
+    handleCommand(command) {
+      switch (command[1]) {
+        case "编辑":
+          this.editRowOne(command[0]);
+          break;
+        case "删除":
+          this.deleteRowOne("delOne", command[0].id);
+          break;
+      }
     },
-    /*增加行和删除行*/
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    editRowOne() {
+    },
+    deleteRowOne() {
+    },
+    /** 分页  */
+    pageChange(page) {
+      this.formQuery.page = page
+      this.getTableData()
+    },
+    pageSizeChange(pageSize) {
+      this.formQuery.pageSize = pageSize
+      this.getTableData()
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    }
   }
 }
 </script>
 
-<style  lang="less" scoped>
-.children{
+<style lang="less" scoped>
+.children {
   height: 100%;
   display: flex;
   flex-direction: column;
+
+  .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .el-divider--horizontal {
+    height: 0.5px;
+    margin: 10px 0;
+  }
+
   .container {
     display: flex;
     flex-direction: column;
@@ -388,19 +293,14 @@ export default {
     width: 100%;
     height: calc(100% - 110px) !important;
 
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
-      }
-    }
   }
-  .leading-in{
+
+  .leading-in {
     width: 400px;
     height: 200px
   }
-  .icon{
+
+  .icon {
     width: 20px;
     height: 20px;
   }
diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue
index f82c570dd..5b35e123e 100644
--- a/src/pages/regulatoryRepository/partCodeApply/index.vue
+++ b/src/pages/regulatoryRepository/partCodeApply/index.vue
@@ -19,13 +19,13 @@
 
           </el-input>
         </el-form-item>
-        <el-form-item>
+
           <el-button type="primary" size="mini" v-btn-permission="'02424c2bc370ee846aa5a6d60c49a6a5'"
                      class="common-button-primary" @click="getTableByPageBtn">
             查询
           </el-button>
         </el-form-item>
-        <el-form-item>
+
           <el-button size="mini" v-btn-permission="'c5b873fcb659afb230db133e7e4706c8'" class="common-button-default"
                      @click="clearAllSearch">
             清空
diff --git a/src/router/index.js b/src/router/index.js
index d279f17dc..78653f5fb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1411,6 +1411,81 @@ const routes = [
           title: '加入标准化协会信息提报流程'
         }
       },
+      //企标复审流程
+      {
+        path: '/qbfsStep1',
+        name: 'qbfsStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
+      {
+        path: '/qbfsStep2',
+        name: 'qbfsStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
+      {
+        path: '/qbfsStep3',
+        name: 'qbfsStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
+      {
+        path: '/qbfsStep4',
+        name: 'qbfsStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
+      //企标废止流程
+      {
+        path: '/qbfzStep1',
+        name: 'qbfzStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标废止流程'
+        }
+      },
+      {
+        path: '/qbfzStep2',
+        name: 'qbfzStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标废止流程'
+        }
+      },
+      {
+        path: '/qbfzStep3',
+        name: 'qbfzStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标废止流程'
+        }
+      },
+      //企标制修订计划管控流程
+      {
+        path: '/qbzxdjhgkStep1',
+        name: 'qbzxdjhgkStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
       // 外部标准化协会入会流程
       {
         path: '/bzrhStep1',