From 541477a752fe33f0d0fb7a2b554bfb1d9479daf1 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 17 Nov 2021 16:02:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/statisticsApi.js                      | 130 ++++++++-
 .../dataStatis/pages/attendCost.vue           | 194 +++++++++++--
 .../dataStatis/pages/reviseCost.vue           | 255 ++++++++++++++----
 .../dataStatis/pages/societyCost.vue          |  14 +-
 4 files changed, 496 insertions(+), 97 deletions(-)

diff --git a/src/api/statisticsApi.js b/src/api/statisticsApi.js
index 2fa1d3442..d82d71915 100644
--- a/src/api/statisticsApi.js
+++ b/src/api/statisticsApi.js
@@ -1,5 +1,7 @@
 import axios from '@/common/axiosV2'
 
+
+/** 协会费用信息统计接口 */
 // 获取所有统计数据
 export function statisticsAll (data) {
   return axios({
@@ -12,7 +14,7 @@ export function statisticsAll (data) {
 export function queryStatistics (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts',
-    method: 'post',
+    method: 'get',
     params: data
   })
 }
@@ -21,7 +23,7 @@ export function queryStatistics (data) {
 export function queryStatistics (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/getAssocCostById',
-    method: 'post',
+    method: 'get',
     params: data
   })
 }
@@ -30,7 +32,7 @@ export function queryStatistics (data) {
 export function statisticsEdit (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/modAssocCost',
-    method: 'post',
+    method: 'put',
     params: data
   })
 }
@@ -42,18 +44,124 @@ export function statisticsAdd (data) {
     params: data
   })
 }
-// 单个数据删除
-export function delOnlyOne (data) {
-  return axios({
-    url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCost',
-    method: 'get',
-    params: data
-  })
-}
 // 多数据删除
 export function delMore (data) {
   return axios({
     url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCosts',
+    method: 'delete',
+    params: data
+  })
+}
+/** 参会费用信息统计  */
+// 查询
+export function meetAll (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/queryAllMeetCosts',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function meetEdit (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/modMeetCost',
+    method: 'put',
+    params: data
+  })
+}
+// 新增
+export function meetAdd (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/addMeetCost',
+    method: 'post',
+    params: data
+  })
+}
+// 删除
+export function meetDel (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-meet-cost/delMeetCosts',
+    method: 'delete',
+    params: data
+  })
+}
+/** 参与外部标准制修订费用统计 */
+// 数据查询
+export function reviseAll (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function reviseEdit (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/modExReviseCost',
+    method: 'put',
+    params: data
+  })
+}
+// 新增
+export function reviseAdd (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/addExReviseCost',
+    method: 'post',
+    params: data
+  })
+}
+export function reviseDel (data) {
+  return axios({
+    url: 'api/wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts',
+    method: 'delete',
+    params: data
+  })
+}
+/** 采购费用信息统计接口 */
+// 查询
+export function CgfysAll (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/queryAllCgfys',
+    method: 'get',
+    params: data
+  })
+}
+/*// 查询详情
+export function CgfyDetail(data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/getCgfyById',
+    method: 'get',
+    params: data
+  })
+}*/
+// 编辑接口
+export function CgfysEdit (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/modCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 新增接口
+export function CgfysAdd (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/addCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 单条删除
+export function CgfysDelOne (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/delCgfy',
+    method: 'get',
+    params: data
+  })
+}
+// 批量删除
+export function CgfysDelMore (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-cgfy/delCgfys',
     method: 'get',
     params: data
   })
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
index df1fa0010..c7a6cdbcf 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue
@@ -4,22 +4,28 @@
     <!-- 第一第二行表单 -->
     <el-form :inline="true" :model="formQuery">
       <el-form-item label="标准号">
-        <el-input v-model="formQuery.standardId" size="small" placeholder="请输入标准号"></el-input>
+        <el-input v-model="formQuery.proId" size="small" placeholder="请输入标准号"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
-        <el-input v-model="formQuery.standardName" size="small" placeholder="请输入标准名称"></el-input>
+        <el-input v-model="formQuery.proName" 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 label="项目类型">
+        <el-select v-model="formQuery.type" size="small" placeholder="请选择类型">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="dataQuery">查询</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="tableAdd">新增</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>
@@ -59,18 +65,18 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="proId"
           label="项目编号">
         </el-table-column>
 
         <el-table-column
           align="center"
-          prop="name"
+          prop="proName"
           label="项目名称">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
+          prop="costOutlay"
           label="费用列支项">
         </el-table-column>
         <el-table-column
@@ -109,22 +115,26 @@
       :title="drawerTitle"
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
-        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+        <el-form label-width="100px" 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-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="项目编号">
-            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="项目名称">
-            <el-input v-model="formShowData.name" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.proName" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="费用列支项">
-            <el-input v-model="formShowData.costList" placeholder="请选择">
+            <el-input v-model="formShowData.costOutlay" placeholder="请选择">
             </el-input>
           </el-form-item>
           <el-form-item label="费用支出">
@@ -134,8 +144,8 @@
         </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>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -155,15 +165,16 @@
 </template>
 
 <script>
+import { reviseAll, reviseEdit, reviseAdd, reviseDel } from '@/api/statisticsApi'
 export default {
   name: "child3",
   data() {
     return {
       loading: false,
       formQuery: {
-        standardNum: '',
-        standardName: '',
-        codeNum: '',
+        proId: '',
+        proName: '',
+        type: '',
         current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
@@ -173,16 +184,23 @@ export default {
       multipleSelection: [],
 
       formShowData: {
+        id: '',
         type: '',
-        num: '',
-        name: '',
-        costList: '',
+        proId: '',
+        proName: '',
+        costOutlay: '',
         cost: ''
       },
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
 
+      submitLoading: false,
+      typeOptions: [
+        { label: '类型1', value: '0' },
+        { label: '类型2', value: '1' },
+        { label: '类型3', value: '2' },
+      ]
     }
   },
 
@@ -191,17 +209,103 @@ export default {
   },
 
   methods: {
+    /** 查询数据 */
+    getTableData() {
+      reviseAll(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    tableAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
+    // 提交按钮
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            reviseAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            reviseEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          reviseDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = []
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+    // 查询
+    dataQuery() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
     // 列表更多按钮
     handleCommand(command) {
@@ -210,13 +314,49 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        type: item.type,
+        proId: item.proId,
+        proName: item.proName,
+        costOutlay: item.costOutlay,
+        cost: item.cost
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(res) {
+      let delId = {
+        ids: res
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        reviseDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = ''
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
index 389367554..2797a907f 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue
@@ -3,23 +3,39 @@
   <div id="attendCost" class="child2">
     <!--     第一第二行表单 -->
     <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 label="主办单位">
+        <el-input v-model="formQuery.unit" 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 label="会议名称">
+        <el-input v-model="formQuery.meetName" 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 label="费用列支">
+        <el-select size="small" v-model="formQuery.costOutlay">
+          <el-option
+            v-for="item in costOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会议时间">
+        <el-date-picker
+          size="small"
+          v-model="formQuery.meetTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</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="tableAdd">新增</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>
@@ -47,52 +63,41 @@
           align="center"
           type="index"
           width="50"
-          label="序号"
-
-        >
+          label="序号">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="holdUnit"
-          label="主办单位"
-
-        >
+          prop="unit"
+          label="主办单位">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingName"
-          label="会议名称"
-
-        >
+          prop="meetName"
+          label="会议名称">
         </el-table-column>
 
         <el-table-column
           align="center"
-          prop="meetingTime"
-          label="会议时间"
-
-        >
+          prop="meetTime"
+          label="会议时间">
+          <template slot-scope="scope">
+            {{ scope.row.meetTime ? $moment(scope.row.meetTime).format("YYYY-MM-DD HH:mm:ss") : '' }}
+          </template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costStandard"
-          label="会费标准"
-
-        >
+          prop="payStandard"
+          label="会费标准">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="reality"
-          label="实际发生"
-
-        >
+          prop="payReality"
+          label="实际发生">
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
-          label="费用列支"
-
-        >
+          prop="costOutlay"
+          label="费用列支">
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -125,37 +130,42 @@
       :title="drawerTitle"
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
-        <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
+        <el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
           <el-form-item label="主办单位">
-            <el-select v-model="formShowData.holdUnit" type="text" placeholder="请填写">
+            <el-select v-model="formShowData.unit" 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-input v-model="formShowData.meetName" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="会议时间">
-            <el-input v-model="formShowData.meetingTime" type="text" placeholder="请填写">
-            </el-input>
+            <el-date-picker
+              v-model="formShowData.meetTime"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="会费标准">
-            <el-input v-model="formShowData.costStandard" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="实际发生">
-            <el-input v-model="formShowData.reality" placeholder="请选择">
+            <el-input v-model="formShowData.payReality" placeholder="请选择">
             </el-input>
           </el-form-item>
           <el-form-item label="费用列支">
-            <el-input v-model="formShowData.costList" placeholder="请选择">
+            <el-input v-model="formShowData.costOutlay" 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>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -198,19 +208,21 @@
 </template>
 
 <script>
+import { meetAll, meetEdit, meetAdd, meetDel } from '@/api/statisticsApi'
 export default {
   name: "child2",
   data() {
     return {
       loading: false,
       formQuery: {
-        type: '',
-        num: '',
-        name: '',
+        unit: '',
+        meetName: '',
+        meetTime: '',
         current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
       },
+      submitLoading: false,
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
@@ -218,7 +230,20 @@ export default {
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
-      formShowData: {}
+      formShowData: {
+        id: '',
+        unit: '',
+        meetName: '',
+        meetTime: '',
+        payStandard: '',
+        payReality: '',
+        costOutlay: ''
+      },
+      costOptions: [
+        { label: '列支1', value: '0' },
+        { label: '列支2', value: '1' },
+        { label: '列支2', value: '3' },
+      ]
     }
   },
 
@@ -227,17 +252,102 @@ export default {
   },
 
   methods: {
+    getTableData () {
+      meetAll(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    tableAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            meetAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            console.log(this.formShowData.meetTime)
+            meetEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          meetDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = []
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+    // 查询
+    queryData() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
 
     // 列表更多按钮
@@ -247,12 +357,51 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        unit: item.unit,
+        meetName: item.meetName,
+        meetTime: this.$moment(item.meetTime).format('YYYY-MM-DD HH:mm:ss'),
+        payStandard: item.payStandard,
+        payReality: item.payReality,
+        costOutlay: item.costOutlay
+      }
+      this.drawerTable = true
+    },
+    deleteRowOne(res) {
+      let delId = {
+        ids: res
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        meetDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = ''
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     /** 分页  */
     pageChange(page) {
       this.formQuery.page = page
diff --git a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
index a1845f941..d433b3747 100644
--- a/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
+++ b/src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue
@@ -23,6 +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>
+      <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>
@@ -164,8 +165,7 @@
 <script>
 import {
   statisticsAll,statisticsAdd,
-  statisticsEdit, delOnlyOne,
-  delMore,queryStatistics } from '@/api/statisticsApi'
+  statisticsEdit, delMore,queryStatistics } from '@/api/statisticsApi'
 
 export default {
   name: "child1",
@@ -241,6 +241,7 @@ export default {
                   this.getTableData()
                 } else {
                   this.$message.warning('新增失败')
+                  this.submitLoading = false
                 }
                 this.drawerTable = false
               }, e => {
@@ -253,6 +254,7 @@ export default {
                   this.getTableData()
                 } else {
                   this.$message.warning('编辑失败')
+                  this.submitLoading = false
                 }
                 this.drawerTable = false
               },e => {
@@ -284,7 +286,7 @@ export default {
             if (res.ok) {
               this.$message.success('删除成功')
               this.pageNo = 1
-              this.multipleSelection = ''
+              this.multipleSelection = []
               this.getTableData()
             } else {
               this.$message.warning('删除失败')
@@ -327,7 +329,7 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
@@ -349,7 +351,7 @@ export default {
     // 行内删除
     deleteRowOne(val) {
       let delId = {
-        id: val
+        ids: val
       }
       this.$confirm('确定删除这些数据?', '提示', {
         confirmButtonText: this.$t('m.determine'),
@@ -358,7 +360,7 @@ export default {
         confirmButtonClass: 'common-button-primary',
         roundButton: true
       }).then(() => {
-        delOnlyOne(delId).then(res => {
+        delMore(delId).then(res => {
           if (res.ok) {
             this.$message.success('删除成功')
             this.pageNo = 1

From facd564f6a4cf645161c48122df83cb4578f991a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 17 Nov 2021 16:22:04 +0800
Subject: [PATCH 2/8] commit

---
 .../regulatoryRepository/dataStatis/index.vue |   10 +-
 .../dataStatis/page/listOfMember.vue          | 1017 ++++++++++-------
 .../dataStatis/page/listOfSociety.vue         |  469 +++++---
 .../enterpriseStandardPlan/index.vue          |   18 +-
 4 files changed, 919 insertions(+), 595 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue
index 1995d18cd..b40ef5269 100644
--- a/src/pages/regulatoryRepository/dataStatis/index.vue
+++ b/src/pages/regulatoryRepository/dataStatis/index.vue
@@ -2,19 +2,19 @@
   <div class="data-statis">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="协会信息数据统计" name="listOfSociety">
-        <list-of-society></list-of-society>
+        <list-of-society v-if="activeName === 'listOfSociety'"></list-of-society>
       </el-tab-pane>
       <el-tab-pane label="委员信息数据统计" name="listOfMember">
-        <list-of-member></list-of-member>
+        <list-of-member v-if="activeName === 'listOfMember'"></list-of-member>
       </el-tab-pane>
       <el-tab-pane label="参与外部协会会议统计" name="listOfMeeting">
-        <list-of-meeting></list-of-meeting>
+        <list-of-meeting v-if="activeName === 'listOfMeeting'"></list-of-meeting>
       </el-tab-pane>
       <el-tab-pane label="参与外部标准制修订信息统计" name="listOfStandard">
-        <list-of-standard></list-of-standard>
+        <list-of-standard v-if="activeName === 'listOfStandard'"></list-of-standard>
       </el-tab-pane>
       <el-tab-pane label="标准法规研究项目费用统计信息" name="listOfCost">
-        <list-of-cost></list-of-cost>
+        <list-of-cost v-if="activeName === 'listOfCost'"></list-of-cost>
       </el-tab-pane>
     </el-tabs>
   </div>
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
index 205c00722..4653fb06c 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
@@ -1,421 +1,636 @@
 <!--标准法规库--标准法规工作组数据统计--委员信息数据统计-->
 <template>
-  <div id="listOfMember" class="child2">
-    <!-- 第一第二行表单 -->
-    <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',padding: 0, fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-        @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="50"/>
-        <el-table-column align="center" type="index" label="序号" width="50"/>
-        <el-table-column align="center" prop="unitName" label="提报单位名称" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.unitName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="totalName"
-          label="协会名称-标委会"
-          width="auto"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="branchName"
-          label="协会名称-分标委"
-          width="auto"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="workName"
-          label="协会名称-工作组"
-          width="auto"
-        >
-        </el-table-column>
-        <el-table-column
-          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="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="players"
-          label="参与人"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="post"
-          label="职务"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="department"
-          label="所在部门"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="num"
-          label="联系方式"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="timeOffice"
-          label="任期"
-          width="120"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.date }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="certificate"
-          label="证书"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="account"
-          label="账号"
-          width="120">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="passWord"
-          label="密码"
-          width="120"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.date || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          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 id="listOfMember" class="child2">
+        <!-- 第一第二行表单 -->
+        <el-form :inline="true" :model="form" class="demo-form-inline">
+            <el-form-item label="提报单位名称">
+                <el-input v-model="form.unit" size="small" placeholder="请输入提报单位"></el-input>
+            </el-form-item>
+            <el-form-item label="协会名称">
+                <el-input v-model="form.scName" size="small" placeholder="请输入协会名称"></el-input>
+            </el-form-item>
+            <el-form-item label="会员角色">
+                <el-input v-model="form.role" size="small" placeholder="请输入会员角色"></el-input>
+                <!--        <el-select v-model="form.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-input v-model="form.department" size="small" placeholder="请输入所在部门"></el-input>
+                <!--        <el-select v-model="form.department" 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('form')">清空</el-button>
+            </el-form-item>
+            <el-divider/>
+            <div style="float: left">
+                <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
+                <!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
+                <!--        <el-button type="primary" size="small" @click="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>
-          </template>
-        </el-table-column>
-      </el-table>
-      <loading :loading="loading">加载中...</loading>
-      <pagination
-        :page="formQuery.page"
-        :total="tableTotal"
-        @pageChange="pageChange"
-        @pageSizeChange="pageSizeChange"/>
-    </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%"
-      >
-        <el-button class="leading-in">点击或拖拽上传文件</el-button>
-      </el-dialog>
-      <!--   导出弹框 -->
-      <el-dialog
-        title="导出文件"
-        :visible.sync="dialogVisible2"
-        width="30%"
-      >
-        <el-form :model="formInlineOut">
-          <el-form-item label="名称">
-            <el-input v-model="formInlineOut.name"></el-input>
-          </el-form-item>
-          <el-form-item label="序号">
-            <el-input v-model="formInlineOut.num"></el-input>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="formInlineOut.remarks"></el-input>
-          </el-form-item>
         </el-form>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible2 = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-      </span>
-      </el-dialog>
+        <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',padding: 0, fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                    @selection-change="handleSelectionChange">
+                <el-table-column align="center" type="selection" width="50"/>
+                <el-table-column align="center" prop="unit" label="提报单位名称" width="120">
+                    <template slot-scope="scope">
+                        {{ scope.row.unit || '-' }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="scName"
+                        label="协会名称-标委会"
+                        width="160"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="sscName"
+                        label="协会名称-分标委"
+                        width="160"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="wgName"
+                        label="协会名称-工作组"
+                        width="160"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="curTime"
+                        label="本届入会时间"
+                        width="220"
+                >
+                    <template slot-scope="scope"><span>{{ scope.row.curTime ? $moment(scope.row.curTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span></template>
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="role"
+                        label="会员角色"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="attend"
+                        label="参与人"
+                        width="120"
+                >
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="job"
+                        label="职务"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="department"
+                        label="所在部门"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="tel"
+                        label="联系方式"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="term"
+                        label="任期"
+                        width="120"
+                >
+                    <template slot-scope="scope">
+                        {{ scope.row.term }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="certificate"
+                        label="证书"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="account"
+                        label="账号"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="password"
+                        label="密码"
+                        width="120"
+                >
+                    <template slot-scope="scope">
+                        {{ scope.row.password || '-' }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        align="center"
+                        prop="remark"
+                        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, '编辑']">
+                                        编辑
+                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="[scope.row, '删除']">
+                                        删除
+                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="[scope.row, '查看']">
+                                        查看
+                                    </el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <loading :loading="loading">加载中...</loading>
+            <pagination
+                    :page="form.page"
+                    :total="tableTotal"
+                    @pageChange="pageChange"
+                    @pageSizeChange="pageSizeChange"/>
+        </div>
+        <!-- 新增抽屉 -->
+        <el-drawer
+                size="1000px"
+                :before-close="addDrawerClose"
+                :title="drawerTitle"
+                :visible.sync="drawerTable">
+            <div class="demo-drawer-content" v-if="drawerTable">
+                <div class="content">
+                    <div class="standard-table-search">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
+                                    <el-form-item prop="unit" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.unit"
+                                                placeholder="请输入提报单位名称"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.scName"
+                                                placeholder="请输入协会名称-委员会"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.sscName"
+                                                placeholder="请输入协会名称-分标委"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.wgName"
+                                                placeholder="请输入协会名称-工作组"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.role"
+                                                placeholder="请输入会员角色"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.attend"
+                                                placeholder="请输入参与人"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-date-picker
+                                                v-model="addForm.curTime"
+                                                :disabled="DrawerType === 'see'"
+                                                value-format="yyyy-MM-dd HH:mm:ss"
+                                                type="datetime"
+                                                placeholder="请选择本届入会时间">
+                                        </el-date-picker>
+                                    </el-form-item>
+                                    <el-form-item prop="job" label="职务" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.job"
+                                                placeholder="请输入职务"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="department" label="所在部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.department"
+                                                placeholder="请输入所在部门"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="tel" label="联系方式" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.tel"
+                                                placeholder="请输入联系方式"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="term" label="任期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.term"
+                                                placeholder="请输入任期"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="certificate" label="证书" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.certificate"
+                                                placeholder="请输入证书"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="account" label="账号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.account"
+                                                placeholder="请输入账号"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="password" label="密码" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.password"
+                                                placeholder="请输入密码"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                    <el-form-item prop="remark" label="备注" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                                :disabled="DrawerType === 'see'"
+                                                v-model="addForm.remark"
+                                                placeholder="请输入备注"
+                                                :maxlength="500"/>
+                                    </el-form-item>
+                                </el-form>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </div>
+            </div>
+            <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
+                <el-button
+                        size="mini"
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        :loading="subLoading"
+                        @click="submit">提交
+                </el-button>
+                <el-button
+                        size="mini"
+                        class="common-button-default"
+                        icon="el-icon-close"
+                        @click="addDrawerClose">取消</el-button>
+            </div>
+        </el-drawer>
     </div>
-  </div>
 
 
 </template>
 
 <script>
-export default {
-  name: "child2",
-  data() {
-    return {
-      // 表格加载
-      loading: false,
-      formQuery: {
-        name: '',
-        meeting: '',
-        role: '',
-        part: '',
-        current: 1,
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-      },
-      tableTotal: 0,
-      tableData: [],
-
-      multipleSelection: [],
-
-      // 新增、编辑抽屉
-      drawerTable: false,
-      drawerTitle: '',
-      formRules: {},
-
-      formShowData: {
-        unitName: '',
-        totalName: '',
-        branchName: '',
-        workName: '',
-        thisTime: '',
-        vipRole: '',
-        players: '',
-        post: '',
-        department: '',
-        num: '',
-        timeOffice: '',
-        certificate: '',
-        account: '',
-        passWord: '',
-        remarks: ''
-      },
-
-      dialogVisible1: false,
-      dialogVisible2: false,
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-      currentPage: 1
+    export default {
+        name: "child2",
+        data() {
+            return {
+                subLoading: false,
+                loading: false,
+                form: {
+                    unit: '',
+                    scName: '',
+                    role: '',
+                    department: '',
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                },
+                tableTotal: 0,
+                tableData: [],
+                multipleSelection: [],
+                // 新增、编辑抽屉
+                drawerTable: false,
+                drawerTitle: '',
+                formRules: {
+                    unit: [
+                        {required: true, message: '请输入提报单位名称', trigger: 'blur'},
+                    ],
+                    scName: [
+                        {required: true, message: '请输入协会名称-标委会', trigger: 'blur'},
+                    ],
+                    sscName: [
+                        {required: true, message: '请输入协会名称-分标委', trigger: 'blur'},
+                    ],
+                    wgName: [
+                        {required: true, message: '请输入协会名称-工作组', trigger: 'blur'},
+                    ],
+                    role: [
+                        {required: true, message: '请输入会员角色', trigger: 'blur'},
+                    ],
+                    attend: [
+                        {required: true, message: '请输入参与人', trigger: 'blur'},
+                    ],
+                    curTime: [
+                        {required: true, message: '请选择本届入会时间', trigger: 'change'},
+                    ],
+                    job: [
+                        {required: true, message: '请输入职务', trigger: 'blur'},
+                    ],
+                    department: [
+                        {required: true, message: '请输入所在部门', trigger: 'blur'},
+                    ],
+                    tel: [
+                        {required: true, message: '请输入联系方式', trigger: 'blur'},
+                    ],
+                    term: [
+                        {required: true, message: '请输入任期', trigger: 'blur'},
+                    ],
+                    certificate: [
+                        {required: true, message: '请输入证书', trigger: 'blur'},
+                    ],
+                    account: [
+                        {required: true, message: '请输入账号', trigger: 'blur'},
+                    ],
+                    password: [
+                        {required: true, message: '请输入密码', trigger: 'blur'},
+                    ],
+                    remark: [
+                        {required: true, message: '请输入备注', trigger: 'blur'},
+                    ]
+                },
+                addForm: {
+                    unit: '',
+                    scName: '',
+                    sscName: '',
+                    wgName: '',
+                    role: '',
+                    attend: '',
+                    curTime: '',
+                    job: '',
+                    department: '',
+                    tel: '',
+                    term: '',
+                    certificate: '',
+                    account: '',
+                    password: '',
+                    remark: ''
+                },
+                DrawerType: '',
+            }
+        },
+        created() {
+        },
+        mounted() {
+            this.getTableData()
+        },
+        methods: {
+            getTableData () {
+                this.$http.get('wgdCensusZ/wgd-commi-info/queryAllCommiInfos',this.form, {
+                    _this: this
+                }, res => {
+                    if (res.ok) {
+                        this.tableData = res.data.list
+                        this.tableTotal = res.data.count
+                    }
+                })
+            }, // 获取数据
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            formDataAdd() {
+                this.DrawerType = 'add'
+                this.drawerTitle = '新增'
+                this.drawerTable = true
+            },// 新增
+            addDrawerClose () {
+                this.addForm = {}
+                this.drawerTable = false
+            }, // 关闭新增drawer
+            submit() {
+                this.$refs['addForm'].validate((valid) => {
+                    if (valid) {
+                        this.subLoading = true
+                        let url = ''
+                        let tips = ''
+                        if (this.DrawerType === 'edit') {
+                            url = 'wgdCensusZ/wgd-commi-info/modCommiInfo'
+                            tips = '编辑'
+                        }else if (this.DrawerType === 'add') {
+                            url = 'wgdCensusZ/wgd-commi-info/addCommiInfo'
+                            tips = '添加'
+                        }
+                        this.$http.post(url, this.addForm, {
+                            _this: this
+                        }, res => {
+                            this.subLoading = false
+                            if (res.ok) {
+                                this.drawerTable = false
+                                this.$message.success(tips + '成功')
+                                this.getTableData()
+                            } else {
+                                this.$message.warning(tips + '失败')
+                            }
+                        })
+                    } else {
+                        this.$message.warning('请检查表单是否填写正确')
+                    }
+                })
+            }, // 提交
+            deleteDetail() {
+                if (this.multipleSelection.length) {
+                    this.$confirm('您是否确认删除选中数据?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                        confirmButtonClass: 'common-button-primary',
+                        roundButton: true
+                    }).then(() => {
+                        let ids = ''
+                        this.multipleSelection.forEach(item => {
+                            if (ids.length > 0) {
+                                ids += ','
+                                ids += item.id
+                            } else {
+                                ids = item.id
+                            }
+                        })
+                        this.$http.post('wgdCensusZ/wgd-commi-info/delCommiInfos', {
+                            ids: ids
+                        }, {
+                            _this: this
+                        }, res => {
+                            if (res.ok) {
+                                this.$message.success('删除成功')
+                                this.form.page = 1
+                                this.getTableData()
+                            } else {
+                                this.$message.warning('删除失败')
+                            }
+                        })
+                    }).catch(() => {})
+                } else {
+                    this.$message.warning('请选择要删除的数据')
+                }
+            },//删除方法
+            /** 查询 */
+            queryForm() {
+                this.form.page = 1
+                this.getTableData()
+            }, // 查询
+            resetForm() {
+                this.form.unit = ''
+                this.form.scName = ''
+                this.form.role = ''
+                this.form.department = ''
+                this.form.page = 1
+                this.getTableData()
+            },// 清空
+            // 列表更多按钮
+            handleCommand(command) {
+                switch (command[1]) {
+                    case '查看':
+                        this.drawerTitle = '查看'
+                        this.DrawerType = 'see'
+                        this.drawerTable = true
+                        this.addForm = command[0]
+                        break
+                    case "编辑":
+                        this.DrawerType = 'edit'
+                        this.drawerTitle = '编辑'
+                        this.drawerTable = true
+                        this.addForm = {
+                            id: command[0].id,
+                            unit: command[0].unit,
+                            scName: command[0].scName,
+                            sscName: command[0].sscName,
+                            wgName: command[0].wgName,
+                            role: command[0].role,
+                            attend: command[0].attend,
+                            curTime: this.$moment(command[0].curTime).format("YYYY-MM-DD HH:mm:ss"),
+                            job: command[0].job,
+                            department: command[0].department,
+                            tel: command[0].tel,
+                            term: command[0].term,
+                            certificate: command[0].certificate,
+                            account: command[0].account,
+                            password: command[0].password,
+                            remark: command[0].remark,
+                        }
+                        break;
+                    case "删除":
+                        this.$confirm('您是否确认删除选中数据?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning',
+                            confirmButtonClass: 'common-button-primary',
+                            roundButton: true
+                        }).then(() => {
+                            this.$http.post('wgdCensusZ/wgd-commi-info/delCommiInfos', {
+                                ids: command[0].id
+                            }, {
+                                _this: this
+                            }, res => {
+                                if (res.ok) {
+                                    this.$message.success('删除成功')
+                                    this.form.page = 1
+                                    this.getTableData()
+                                } else {
+                                    this.$message.warning('删除失败')
+                                }
+                            })
+                        }).catch(() => {})
+                        break;
+                }
+            },
+            /** 分页  */
+            pageChange(page) {
+                this.form.page = page
+                this.getTableData()
+            },
+            pageSizeChange(pageSize) {
+                this.form.pageSize = pageSize
+                this.getTableData()
+            },
+        }
     }
-  },
-
-  created() {
-    console.log(1)
-  },
-
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //增加方法
-    formDataAdd() {},
-    submit() {
-    },
-    //删除方法
-    deleteDetail() {
-    },
-    /** 查询 */
-    queryForm() {},
-    //清空
-    resetForm() {
-    },
-    // 列表更多按钮
-    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>
-.child2 {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
+    .child2 {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        .add-form-item {
+            /deep/.el-form-item__content {
+                width: calc(~'100% - 180px');
+            }
+        }
+        .pagination {
+            position: inherit!important;
+        }
+        .el-form-item {
+            margin-bottom: 10px;
+        }
 
-  .pagination {
-    position: inherit!important;
-  }
-  .el-form-item {
-    margin-bottom: 10px;
-  }
+        .el-divider--horizontal {
+            height: 0.5px;
+            margin: 10px 0;
+        }
 
-  .el-divider--horizontal {
-    height: 0.5px;
-    margin: 10px 0;
-  }
+        .container {
+            display: flex;
+            flex-direction: column;
+            position: relative;
+            flex: auto;
+            width: 100%;
+            height: calc(100% - 110px) !important;
 
-  .container {
-    display: flex;
-    flex-direction: column;
-    position: relative;
-    flex: auto;
-    width: 100%;
-    height: calc(100% - 110px) !important;
+        }
 
-  }
+        .leading-in {
+            width: 400px;
+            height: 200px
+        }
 
-  .leading-in {
-    width: 400px;
-    height: 200px
-  }
-
-  .icon {
-    width: 20px;
-    height: 20px;
-  }
-}
+        .icon {
+            width: 20px;
+            height: 20px;
+        }
+    }
 </style>
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
index 28d40f8a0..0f39e58eb 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue
@@ -102,155 +102,291 @@
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
-      <el-drawer
-        :title="drawerTitle"
-        :visible.sync="drawerTable">
-        <div style="margin: 10px;"></div>
-        <el-form style="overflow-y: scroll" label-width="150px" :model="formShowData" :rules="formRules">
-          <el-form-item label="协会名称-委员会">
-            <el-input v-model="formShowData.totalName" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="协会名称-分表委">
-            <el-input v-model="formShowData.branchName" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="协会名称-工作组">
-            <el-input v-model="formShowData.workName" 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.standard" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="标准负责人">
-            <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="请选择责任领导">
-              <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.startTime" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="本届入会时间">
-            <el-input v-model="formShowData.thisTime" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="会费标准">
-            <el-input v-model="formShowData.costStandard" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="费用列支">
-            <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>
-          </el-form-item>
-          <el-form-item label="上次缴纳时间">
-            <el-input v-model="formShowData.lastTime" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="缴纳年限">
-            <el-input v-model="formShowData.costYears" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="2017年缴费">
-            <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年缴费">
-              <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="2019年缴费">
-            <el-input v-model="formShowData.cost2019" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="2020年缴费">
-            <el-input v-model="formShowData.cost2020" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="2021年缴费">
-            <el-input v-model="formShowData.cost2021" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="经办人">
-            <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="请选择部门">
-              <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="请选择协会性质">
-              <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="请选择协会性质">
-              <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.linkMan" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="协会联络人电话">
-            <el-input v-model="formShowData.num" type="text"></el-input>
-          </el-form-item>
-          <el-form-item label="协会联络人邮箱">
-            <el-input v-model="formShowData.email" type="text"></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>
-    <!-- 导入弹框 -->
-<!--    <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-drawer
+            size="1000px"
+            :before-close="addDrawerClose"
+            :title="drawerTitle"
+            :visible.sync="drawerTable">
+      <div style="margin: 10px;"></div>
+      <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
+        <el-form-item prop="unit" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.unit"
+                  placeholder="请输入提报单位名称"
+                  :maxlength="500"/>
         </el-form-item>
-        <el-form-item label="序号">
-          <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
+        <el-form-item prop="scName" label="协会名称-委员会" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.scName"
+                  placeholder="请输入协会名称-委员会"
+                  :maxlength="500"/>
         </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
+        <el-form-item prop="sscName" label="协会名称-分标委" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.sscName"
+                  placeholder="请输入协会名称-分标委"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="wgName" label="协会名称-工作组" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.wgName"
+                  placeholder="请输入协会名称-工作组"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="role" label="会员角色" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.role"
+                  placeholder="请输入会员角色"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="attend" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.attend"
+                  placeholder="请输入参与人"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="standard" label="标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.standard"
+                  placeholder="请输入标准"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="charge" label="标准负责人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.charge"
+                  placeholder="请输入标准负责人"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="leader" label="责任领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.leader"
+                  placeholder="请输入责任领导"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item label="初始入会时间" style="width: 100%; margin-right:10px" prop="iniTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-date-picker
+                  v-model="addForm.iniTime"
+                  :disabled="DrawerType === 'see'"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="请选择初始入会时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="本届入会时间" style="width: 100%; margin-right:10px" prop="curTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-date-picker
+                  v-model="addForm.curTime"
+                  :disabled="DrawerType === 'see'"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="请选择本届入会时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item prop="costStandard" label="费用标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.costStandard"
+                  placeholder="请输入费用标准"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="costOutlay" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.costOutlay"
+                  placeholder="请输入费用列支"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item label="上次缴纳时间" style="width: 100%; margin-right:10px" prop="lastPayTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-date-picker
+                  v-model="addForm.lastPayTime"
+                  :disabled="DrawerType === 'see'"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="请选择上次缴纳时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item prop="payPeriod" label="缴费年限" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.payPeriod"
+                  placeholder="请输入缴费年限"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="handler" label="经办人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.handler"
+                  placeholder="请输入经办人"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="department" label="部门" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.department"
+                  placeholder="请输入部门"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="asProper" label="协会性质" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.asProper"
+                  placeholder="请输入协会性质"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="asStatus" label="协会状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.asStatus"
+                  placeholder="请输入协会状态"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="asContact" label="协会联络人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.asContact"
+                  placeholder="请输入协会联络人"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="tel" label="协会联络人电话" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.tel"
+                  placeholder="请输入协会联络人电话"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="mail" label="协会联络人邮箱" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.mail"
+                  placeholder="请输入协会联络人邮箱"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p17" label="2017缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p17"
+                  placeholder="请输入2017缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p18" label="2018缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p18"
+                  placeholder="请输入2018缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p19" label="2019缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p19"
+                  placeholder="请输入2019缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p20" label="2020缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p20"
+                  placeholder="请输入2020缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p21" label="2021缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p21"
+                  placeholder="请输入2021缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p22" label="2022缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p22"
+                  placeholder="请输入2022缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p23" label="2023缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p23"
+                  placeholder="请输入2023缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p24" label="2024缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p24"
+                  placeholder="请输入2024缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p25" label="2025缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p25"
+                  placeholder="请输入2025缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p26" label="2026缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p26"
+                  placeholder="请输入2026缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p27" label="2027缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p27"
+                  placeholder="请输入2027缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p28" label="2028缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p28"
+                  placeholder="请输入2028缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p29" label="2029缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p29"
+                  placeholder="请输入2029缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p30" label="2030缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p30"
+                  placeholder="请输入2030缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p31" label="2031缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p31"
+                  placeholder="请输入2031缴费"
+                  :maxlength="500"/>
+        </el-form-item>
+        <el-form-item prop="p32" label="2032缴费" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+          <el-input
+                  :disabled="DrawerType === 'see'"
+                  v-model="addForm.p32"
+                  placeholder="请输入2032缴费"
+                  :maxlength="500"/>
         </el-form-item>
       </el-form>
-      <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 class="demo-drawer-footer">
+        <el-button size="small" @click="addDrawerClose">取消</el-button>
+        <el-button size="small" type="primary" @click="submit">提交</el-button>
+      </div>
+    </el-drawer>
   </div>
 
 
@@ -279,49 +415,13 @@ export default {
       drawer: false,
       size: '600px',
       // 新增的集合
-      formShowData: {
-        totalName: '',
-        branchName: '',
-        workName: '',
-        vipRole: '',
-        players: '',
-        standard: '',
-        standardLeader: '',
-        leader: '',
-        startTime: '',
-        thisTime: '',
-        costStandard: '',
-        cost: '',
-        lastTime: '',
-        costYears: '',
-        cost2017: '',
-        cost2018: '',
-        cost2019: '',
-        cost2020: '',
-        cost2021: '',
-        person: '',
-        partment: '',
-        nature: '',
-        state: '',
-        linkMan: '',
-        num: '',
-        email: '',
-      },
-      dialogVisible1: false,
-      dialogVisible2: false,
-      // 文件导入
-      formInlineOut: {
-        name: '',
-        num: '',
-        remarks: ''
-      },
-      dialogVisible3: false,
-
+      addForm: {},
       // 新增，编辑框
       drawerTitle: '',
       drawerTable: false,
-
+      DrawerType: '',
       formRules: {},
+
     }
 
   },
@@ -337,6 +437,7 @@ export default {
     submit() {
 
     },
+    addDrawerClose () {},
     //删除方法
     deleteDetail(index, rows) {
     },
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index fd9e116ff..6260aec5a 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -378,7 +378,7 @@
                                 this.$message.success(tips + '成功')
                                 this.getData()
                             } else {
-                                this.$message.warning(tips + '添加失败')
+                                this.$message.warning(tips + '失败')
                             }
                         })
                     } else {
@@ -449,8 +449,14 @@
                 this.form.reviseStatus = ''
                 this.getData()
             },
-            pageChange (page) {},
-            pageSizeChange (pageSize) {},
+            pageChange (page) {
+                this.form.page = page
+                this.getData()
+            },
+            pageSizeChange (pageSize) {
+                this.form.pageSize = pageSize
+                this.getData()
+            },
             handleCommand (command) {
                 switch (command[1]) {
                     case '编辑':
@@ -530,8 +536,10 @@
                 height: calc(~'100% - 20px') !important;
             }
         }
-        /deep/.el-form-item__content {
-            width: calc(~'100% - 180px');
+        .add-form-item {
+            /deep/.el-form-item__content {
+                width: calc(~'100% - 180px');
+            }
         }
         display: flex;
         flex-direction: column;

From 3216b93621e714b309c7922b1054fdd6c7245102 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 17 Nov 2021 16:27:17 +0800
Subject: [PATCH 3/8] commit

---
 .../regulatoryRepository/dataStatis/page/listOfMember.vue     | 4 ++--
 .../regulatoryRepository/enterpriseStandardPlan/index.vue     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
index 4653fb06c..c3b483243 100644
--- a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
+++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue
@@ -414,16 +414,16 @@
                 DrawerType: '',
             }
         },
-        created() {
-        },
         mounted() {
             this.getTableData()
         },
         methods: {
             getTableData () {
+                this.loading = true
                 this.$http.get('wgdCensusZ/wgd-commi-info/queryAllCommiInfos',this.form, {
                     _this: this
                 }, res => {
+                    this.loading = false
                     if (res.ok) {
                         this.tableData = res.data.list
                         this.tableTotal = res.data.count
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 6260aec5a..f9eefc43b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -171,6 +171,7 @@
                             </template>
                         </el-table-column>
                     </el-table>
+                    <loading :loading="loading">加载中...</loading>
                 </div>
             </div>
             <div class="footer">
@@ -294,6 +295,7 @@
         components: {},
         data() {
             return {
+                loading: false,
                 submitLoading: false,
                 addDrawerTitle: '',
                 addDrawer: false,
@@ -508,9 +510,11 @@
                 }
             },
             getData () {
+                this.loading = true
                 this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.form, {
                     _this: this
                 }, res => {
+                    this.loading = false
                     if (res.ok) {
                         this.data = res.data.list
                         this.total = res.data.count

From eacb62407a0bc04f8c224fb19af9b056d4c762c8 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 17 Nov 2021 16:47:34 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B9=B4=E6=A0=87=E5=87=86=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E5=BF=85=E9=A1=BB=E4=B8=BA=E6=95=B0=E5=AD=97=E5=80=BC?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index eba192c04..cd65405ea 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1457,7 +1457,7 @@ export default {
         ],
         standYear: [
           { required: true, message: '请输入标准年份'},
-          { type: 'number', message: '年标准年份必须为数字值'}
+          // { type: 'number', message: '年标准年份必须为数字值'}
         ],
         standName: [
           { required: true, message: '请输入标准名称', trigger: 'blur' },

From bb8edab3ab5a6d3105545f2a847f4dafa5406de4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 17 Nov 2021 16:59:48 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index cd65405ea..af8352887 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -45,7 +45,7 @@
 
 
                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.standSort" placeholder="请选择标准类别">
+                  <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
                     <el-option
                         v-for="item in standSortOptions"
                         placeholder="请选择"

From 0ade0c4312a4baea0a3f7d9e5a9cd65beb25a1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 17 Nov 2021 17:50:00 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue            | 361 ++++++++++++
 .../qbzxdjhgk/component/delay.vue             | 382 +++++++++++++
 .../qbzxdjhgk/component/establish.vue         | 169 ++++++
 .../qbzxdjhgk/component/merge.vue             | 470 ++++++++++++++++
 .../qbzxdjhgk/component/rename.vue            | 371 ++++++++++++
 .../pages/creatProcess/qbzxdjhgk/step1.vue    | 433 +++++++++++++-
 .../pages/creatProcess/qbzxdjhgk/step2.vue    | 532 ++++++++++++++++++
 .../tabComponents/processCenter/index.vue     |  37 ++
 src/router/index.js                           |   9 +
 9 files changed, 2761 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
new file mode 100644
index 000000000..f4c7b265a
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -0,0 +1,361 @@
+<template>
+  <div>
+    <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"
+    >
+      <div >
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <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 v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.type"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.esName"
+                placeholder="请输入企标名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="未制定" value="未制定"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.resPerson"
+                placeholder="请输入评审责任人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.draftTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择初稿完成时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.cancelReason"
+                placeholder="请输入取消原因"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+                <el-option label="制定" value="制定"></el-option>
+                <el-option label="修订" value="修订"></el-option>
+                <el-option label="完成" value="完成"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafter"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.wgLeader"
+                placeholder="请输入工作组组长"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.releaseTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择标准发布时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.unit"
+                placeholder="请输入起草责任单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <!-- 选择企标计划抽屉-->
+    <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.standName"
+                    placeholder="根据企标名称查找"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="制修订状态" class="search-item search-item-last">
+                  <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
+                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="未制定" value="未制定"></el-option>
+                  </el-select>
+                </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
+                prop="esName"
+                label="企标名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="planStatus"
+                label="计划状态"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="reviseStatus"
+                align="center"
+                label="制修订状态">
+              </el-table-column>
+              <el-table-column
+                prop="drafter"
+                align="center"
+                label="起草人">
+              </el-table-column>
+              <el-table-column
+                prop="resPerson"
+                align="center"
+                label="评审责任人">
+              </el-table-column>
+              <el-table-column
+                prop="wgLeader"
+                align="center"
+                label="工作组组长">
+              </el-table-column>
+              <el-table-column
+                prop="draftTime"
+                align="center"
+                label="计划标准初稿完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="releaseTime"
+                align="center"
+                label="计划标准发布时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="unit"
+                label="起草责任单位">
+              </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>
+  </div>
+</template>
+
+<script>
+import ProcessTitle from "process/components/ProcessTitle";
+
+export default {
+  name: "cancel",
+  components: {
+    ProcessTitle
+  },
+  data(){
+    return{
+      formRules: {
+        cancelReason: [
+          {required: true, message: '请输入延期原因', trigger:'blur'},
+        ]
+
+      },
+      ListModel: false,
+      standinfoList: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      standardSearch: {
+        reviseStatus: "",
+        standName: "",
+      },
+      qbfsForm: {
+        type:'3',
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+
+    }
+  },
+  methods: {
+    validateForm () {
+      let flag = null
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          flag = true
+        } else {
+          flag = false
+        }
+      })
+      return flag
+    },
+    choiceShow(){
+      this.getStandDataBtn()
+      this.ListModel = true
+    },
+    //企业标准查询
+    getStandDataBtn(){
+      this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
+        reviseStatus: this.standardSearch.reviseStatus,
+        esName: 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()
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //带入标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.qbfsForm.esName = this.selectList[0].esName
+        this.qbfsForm.draftTime = this.selectList[0].draftTime
+        this.qbfsForm.drafter = this.selectList[0].drafter
+        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.releaseTime = this.selectList[0].releaseTime
+        this.qbfsForm.resPerson = this.selectList[0].resPerson
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.wgLeader = this.selectList[0].wgLeader
+        this.ListModel = false
+      }
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
new file mode 100644
index 000000000..c7bb5d770
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -0,0 +1,382 @@
+<template>
+ <div>
+   <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"
+   >
+     <div >
+       <el-row :gutter="24">
+         <el-col :span="12">
+           <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 v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
+             <el-input
+               v-model="qbfsForm.type"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.esName"
+               placeholder="请输入企标名称"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+               <el-option label="制定完成" value="制定完成"></el-option>
+               <el-option label="制定中" value="制定中"></el-option>
+               <el-option label="未制定" value="未制定"></el-option>
+             </el-select>
+           </el-form-item>
+           <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.resPerson"
+               placeholder="请输入评审责任人"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
+             <el-date-picker
+               v-model="qbfsForm.draftTime"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="请选择初稿完成时间">
+             </el-date-picker>
+           </el-form-item>
+           <el-form-item label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+             <el-date-picker
+               v-model="qbfsForm.yqDraftTime"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="请选择延期后初稿完成时间">
+             </el-date-picker>
+           </el-form-item>
+           <el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+             <el-input
+               type="textarea"
+               v-model="qbfsForm.delayReason"
+               placeholder="请输入延期原因"
+               clearable
+             ></el-input>
+           </el-form-item>
+         </el-col>
+         <el-col :span="12">
+           <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+               <el-option label="制定" value="制定"></el-option>
+               <el-option label="修订" value="修订"></el-option>
+               <el-option label="完成" value="完成"></el-option>
+             </el-select>
+           </el-form-item>
+           <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.drafter"
+               placeholder="请输入起草人"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.wgLeader"
+               placeholder="请输入工作组组长"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+             <el-date-picker
+               v-model="qbfsForm.releaseTime"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="请选择标准发布时间">
+             </el-date-picker>
+           </el-form-item>
+           <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.unit"
+               placeholder="请输入起草责任单位"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+             <el-date-picker
+               v-model="qbfsForm.yqReleaseTime"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="请选择延期后标准发布时间">
+             </el-date-picker>
+           </el-form-item>
+         </el-col>
+       </el-row>
+     </div>
+   </el-form>
+   <!-- 选择企标计划抽屉-->
+   <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.standName"
+                   placeholder="根据企标名称查找"
+                 ></el-input>
+               </el-form-item>
+               <el-form-item label="制修订状态" class="search-item search-item-last">
+                 <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
+                   <el-option label="制定完成" value="制定完成"></el-option>
+                   <el-option label="制定中" value="制定中"></el-option>
+                   <el-option label="未制定" value="未制定"></el-option>
+                 </el-select>
+               </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
+               prop="esName"
+               label="企标名称"
+               align="center">
+             </el-table-column>
+             <el-table-column
+               prop="planStatus"
+               label="计划状态"
+               align="center">
+             </el-table-column>
+             <el-table-column
+               prop="reviseStatus"
+               align="center"
+               label="制修订状态">
+             </el-table-column>
+             <el-table-column
+               prop="drafter"
+               align="center"
+               label="起草人">
+             </el-table-column>
+             <el-table-column
+               prop="resPerson"
+               align="center"
+               label="评审责任人">
+             </el-table-column>
+             <el-table-column
+               prop="wgLeader"
+               align="center"
+               label="工作组组长">
+             </el-table-column>
+             <el-table-column
+               prop="draftTime"
+               align="center"
+               label="计划标准初稿完成时间">
+               <template slot-scope="scope">
+                 <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+               </template>
+             </el-table-column>
+             <el-table-column
+               prop="releaseTime"
+               align="center"
+               label="计划标准发布时间">
+               <template slot-scope="scope">
+                 <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+               </template>
+             </el-table-column>
+             <el-table-column
+               align="center"
+               prop="unit"
+               label="起草责任单位">
+             </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>
+ </div>
+</template>
+
+<script>
+import ProcessTitle from "process/components/ProcessTitle";
+
+export default {
+  name: "delay",
+  components: {
+    ProcessTitle
+  },
+  data(){
+    return{
+      formRules: {
+        yqDraftTime: [
+          { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
+        ],
+        yqReleaseTime: [
+          { required: true, message: '请选择延期后标准发布时间', trigger: 'blur' },
+        ],
+        delayReason: [
+          {required: true, message: '请输入延期原因', trigger:'blur'},
+        ]
+
+      },
+      ListModel: false,
+      standinfoList: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      standardSearch: {
+        reviseStatus: "",
+        standName: "",
+      },
+      qbfsForm: {
+        type: '2',
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+
+    }
+  },
+  methods: {
+    validateForm () {
+      let flag = null
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          flag = true
+        } else {
+          flag = false
+        }
+      })
+      return flag
+    },
+    choiceShow(){
+      this.getStandDataBtn()
+      this.ListModel = true
+    },
+    //企业标准查询
+    getStandDataBtn(){
+      this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
+        reviseStatus: this.standardSearch.reviseStatus,
+        esName: 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()
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //带入标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.qbfsForm.esName = this.selectList[0].esName
+        this.qbfsForm.draftTime = this.selectList[0].draftTime
+        this.qbfsForm.drafter = this.selectList[0].drafter
+        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.releaseTime = this.selectList[0].releaseTime
+        this.qbfsForm.resPerson = this.selectList[0].resPerson
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.wgLeader = this.selectList[0].wgLeader
+        this.ListModel = false
+      }
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
new file mode 100644
index 000000000..c2dddc143
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -0,0 +1,169 @@
+<template>
+<div>
+  <process-title>
+    <template slot="title">立项信息</template>
+  </process-title>
+  <el-form :model="qbfsForm" class="label-input-form prc-content-border"
+           label-width="150px" :rules="qbfsFormRules" ref="qbfsForm">
+    <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.type"
+        clearable
+      ></el-input>
+    </el-form-item>
+    <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.esName"
+        placeholder="请输入企标名称"
+        :maxlength="500"/>
+    </el-form-item>
+    <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+        <el-option label="制定" value="制定"></el-option>
+        <el-option label="修订" value="修订"></el-option>
+        <el-option label="完成" value="完成"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+        <el-option label="制定完成" value="制定完成"></el-option>
+        <el-option label="制定中" value="制定中"></el-option>
+        <el-option label="未制定" value="未制定"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.drafter"
+        placeholder="请输入起草人"
+        :maxlength="500"/>
+    </el-form-item>
+    <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.resPerson"
+        placeholder="请输入评审责任人"
+        :maxlength="500"/>
+    </el-form-item>
+    <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.wgLeader"
+        placeholder="请输入工作组组长"
+        :maxlength="500"/>
+    </el-form-item>
+    <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+      <el-date-picker
+        v-model="qbfsForm.draftTime"
+        value-format="yyyy-MM-dd"
+        type="date"
+        placeholder="请选择计划标准初稿完成时间">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+      <el-date-picker
+        v-model="qbfsForm.releaseTime"
+        value-format="yyyy-MM-dd"
+        type="date"
+        placeholder="请选择计划标准发布时间">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+      <el-input
+        v-model="qbfsForm.unit"
+        placeholder="请输入起草责任单位"
+        :maxlength="500"/>
+    </el-form-item>
+    <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+      <el-input
+        type="textarea"
+        v-model="qbfsForm.newReason"
+        placeholder="请输入新增原因"
+        :maxlength="500"/>
+    </el-form-item>
+    <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+    <!--                                            <el-input-->
+    <!--                                                    v-model="qbfsForm.remarks"-->
+    <!--                                                    placeholder="请输入备注"-->
+    <!--                                                    :maxlength="500"/>-->
+    <!--                                        </el-form-item>-->
+  </el-form>
+</div>
+</template>
+
+<script>
+import ProcessTitle from "process/components/ProcessTitle";
+
+
+export default {
+  name: "establish",
+  components: {
+    ProcessTitle
+  },
+  data(){
+    return {
+      qbfsForm: {
+        type: '5',
+        unit: '', // 单位
+        esName: '', // 企标名称
+        planStatus: '', // 计划状态
+        reviseStatus: '', // 制修订状态
+        resPerson: '', // 评审责任人
+        wgLeader: '', // 工作组组长
+        draftTime: '', // 计划标准初稿完成时间
+        releaseTime: '', // 计划标准发布时间
+        drafter: '', // 起草人
+        newReason: '', //新增原因
+        // remarks: '', // 备注
+      },
+      qbfsFormRules: {
+        unit: [
+          {required: true, message: '请输入单位', trigger: 'blur'},
+        ],
+        esName: [
+          {required: true, message: '请输入企标名称', trigger: 'blur'},
+        ],
+        planStatus: [
+          {required: true, message: '请选择计划状态', trigger: 'change'},
+        ],
+        reviseStatus: [
+          {required: true, message: '请选择制修订状态', trigger: 'change'},
+        ],
+        resPerson: [
+          {required: true, message: '请输入评审责任人', trigger: 'blur'},
+        ],
+        wgLeader: [
+          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+        ],
+        draftTime: [
+          {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+        ],
+        releaseTime: [
+          {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
+        ],
+        drafter: [
+          {required: true, message: '请输入起草人', trigger: 'blur'},
+        ],
+        newReason: [
+          {required: true, message: '请输入新增原因', trigger: 'blur'},
+        ],
+      },
+
+    }
+  },
+  methods: {
+    validateForm () {
+      let flag = null
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          flag = true
+        } else {
+          flag = false
+        }
+      })
+      return flag
+    }
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
new file mode 100644
index 000000000..ca9777f95
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -0,0 +1,470 @@
+<template>
+  <div class="merge">
+    <process-title>
+      <template slot="title">合并企标信息</template>
+    </process-title>
+    <el-form
+      ref="qbzxdForm"
+      :model="qbzxdForm"
+      :rules="formRules"
+      class="label-input-form prc-content-border"
+      label-width="150px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="选择合并标准1" 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="esName" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm.esName"
+              placeholder="请输入企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm.planStatus"
+              placeholder="请输入计划状态"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm.reviseStatus"
+              placeholder="请输入制修订状态"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
+            <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
+          </el-form-item>
+          <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm2.esName"
+              placeholder="请输入企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm2.planStatus"
+              placeholder="请输入计划状态"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
+            <el-input
+              readonly
+              v-model="qbzxdForm2.reviseStatus"
+              placeholder="请输入制修订状态"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <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"
+    >
+      <div v-if="foldFormFlag">
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.type"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.esName"
+                placeholder="请输入企标名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="未制定" value="未制定"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.resPerson"
+                placeholder="请输入评审责任人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.draftTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择初稿完成时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.unit"
+                placeholder="请输入起草责任单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+                <el-option label="制定" value="制定"></el-option>
+                <el-option label="修订" value="修订"></el-option>
+                <el-option label="完成" value="完成"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.drafter"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.wgLeader"
+                placeholder="请输入工作组组长"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.releaseTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择标准发布时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.mergeReason"
+                placeholder="请输入合并原因"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <!-- 选择企标计划抽屉-->
+    <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.standName"
+                    placeholder="根据企标名称查找"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="制修订状态" class="search-item search-item-last">
+                  <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
+                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="未制定" value="未制定"></el-option>
+                  </el-select>
+                </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
+                prop="esName"
+                label="企标名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="planStatus"
+                label="计划状态"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="reviseStatus"
+                align="center"
+                label="制修订状态">
+              </el-table-column>
+              <el-table-column
+                prop="drafter"
+                align="center"
+                label="起草人">
+              </el-table-column>
+              <el-table-column
+                prop="resPerson"
+                align="center"
+                label="评审责任人">
+              </el-table-column>
+              <el-table-column
+                prop="wgLeader"
+                align="center"
+                label="工作组组长">
+              </el-table-column>
+              <el-table-column
+                prop="draftTime"
+                align="center"
+                label="计划标准初稿完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="releaseTime"
+                align="center"
+                label="计划标准发布时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="unit"
+                label="起草责任单位">
+              </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>
+  </div>
+</template>
+
+<script>
+import ProcessTitle from "process/components/ProcessTitle";
+
+export default {
+  name: "merge",
+  components: {
+    ProcessTitle
+  },
+  data(){
+    return {
+      standShow: false,
+      standShow2: false,
+      ListModel: false,
+      foldFormFlag: true,
+      showType: '',
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      selectList: [],
+      formRules: {},
+      standinfoList: [],
+      standardSearch: {
+        reviseStatus: "",
+        standName: "",
+      },
+      qbfsForm: {
+        type: '1',
+        standName: "",
+        nextStatus: "",
+        reviewer: "",
+        draftTime: "",
+        isSubTime: "",
+        mergeReason: "",
+        company: "",
+        groupLeader: "",
+        drafterPeople: "",
+        formulateStatus: "",
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      },  {
+        value: "有效",
+        label: "有效"
+      }],
+      qbzxdForm: {
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+      qbzxdForm2: {
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+    }
+  },
+  mounted() {
+    this.getStandDataBtn()
+  },
+  methods: {
+    validateForm () {
+      let flag = null
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          flag = true
+        } else {
+          flag = false
+        }
+      })
+      return flag
+    },
+    choiceShow(){
+      this.showType = 'one'
+      this.getStandDataBtn()
+      this.ListModel = true;
+    },
+    choiceShow2(){
+      this.showType = 'two'
+      this.getStandDataBtn()
+      this.ListModel = true;
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //带入标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        if(this.showType === 'one'){
+          this.qbzxdForm.esName = this.selectList[0].esName || '--'
+          this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--'
+          this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--'
+          this.standShow = true
+        }else{
+          this.qbzxdForm2.esName = this.selectList[0].esName || '--'
+          this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--'
+          this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--'
+          this.standShow2 = true
+        }
+        this.ListModel = false
+      }
+    },
+    //企业标准查询
+    getStandDataBtn(){
+      this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
+        reviseStatus: this.standardSearch.reviseStatus,
+        esName: 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()
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.merge {
+
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
new file mode 100644
index 000000000..0c85ac74d
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -0,0 +1,371 @@
+<template>
+  <div>
+    <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"
+    >
+      <div >
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <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 v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.type"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.esName"
+                placeholder="请输入企标名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item prop="reviseStatus"  label="制修订状态" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+              <el-select   v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="未制定" value="未制定"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.resPerson"
+                placeholder="请输入评审责任人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.draftTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择初稿完成时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="qbfsForm.renameEs"
+                placeholder="请输入更名后企标名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+                <el-option label="制定" value="制定"></el-option>
+                <el-option label="修订" value="修订"></el-option>
+                <el-option label="完成" value="完成"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafter"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.wgLeader"
+                placeholder="请输入工作组组长"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                v-model="qbfsForm.releaseTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择标准发布时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.unit"
+                placeholder="请输入起草责任单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.renameReason"
+                placeholder="请输入更名原因"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <!-- 选择企标计划抽屉-->
+    <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.standName"
+                    placeholder="根据企标名称查找"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="制修订状态" class="search-item search-item-last">
+                  <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
+                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="未制定" value="未制定"></el-option>
+                  </el-select>
+                </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
+                prop="esName"
+                label="企标名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="planStatus"
+                label="计划状态"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="reviseStatus"
+                align="center"
+                label="制修订状态">
+              </el-table-column>
+              <el-table-column
+                prop="drafter"
+                align="center"
+                label="起草人">
+              </el-table-column>
+              <el-table-column
+                prop="resPerson"
+                align="center"
+                label="评审责任人">
+              </el-table-column>
+              <el-table-column
+                prop="wgLeader"
+                align="center"
+                label="工作组组长">
+              </el-table-column>
+              <el-table-column
+                prop="draftTime"
+                align="center"
+                label="计划标准初稿完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="releaseTime"
+                align="center"
+                label="计划标准发布时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="unit"
+                label="起草责任单位">
+              </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>
+  </div>
+</template>
+
+<script>
+import ProcessTitle from "process/components/ProcessTitle";
+
+export default {
+  name: "rename",
+  components: {
+    ProcessTitle
+  },
+  data(){
+    return{
+      formRules: {
+        renameEs: [
+          {required: true, message: '请输入更名后企标名称', trigger:'blur'},
+        ],
+        cancelReason: [
+          {required: true, message: '请输入更名原因', trigger:'blur'},
+        ]
+
+      },
+      ListModel: false,
+      standinfoList: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      standardSearch: {
+        reviseStatus: "",
+        standName: "",
+      },
+      qbfsForm: {
+        type: '4',
+        standCode: "",
+        standName: "",
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        abolishCause:'',
+      },
+
+    }
+  },
+  methods: {
+    validateForm () {
+      let flag = null
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          flag = true
+        } else {
+          flag = false
+        }
+      })
+      return flag
+    },
+    choiceShow(){
+      this.getStandDataBtn()
+      this.ListModel = true
+    },
+    //企业标准查询
+    getStandDataBtn(){
+      this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
+        reviseStatus: this.standardSearch.reviseStatus,
+        esName: 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()
+    },
+    // 取消带入
+    closeDrawer(){
+      this.ListModel = false
+    },
+    //带入标准
+    OkDrawer(){
+      if(this.selectList.length > 1){
+        this.$message.warning('您只能带入一条标准')
+      }else if(this.selectList.length < 1){
+        this.$message.warning('请至少选择一条数据进行带入')
+      }else{
+        this.qbfsForm.esName = this.selectList[0].esName
+        this.qbfsForm.draftTime = this.selectList[0].draftTime
+        this.qbfsForm.drafter = this.selectList[0].drafter
+        this.qbfsForm.planStatus = this.selectList[0].planStatus
+        this.qbfsForm.releaseTime = this.selectList[0].releaseTime
+        this.qbfsForm.resPerson = this.selectList[0].resPerson
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
+        this.qbfsForm.unit = this.selectList[0].unit
+        this.qbfsForm.wgLeader = this.selectList[0].wgLeader
+        this.ListModel = false
+      }
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStandDataBtn();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStandDataBtn();
+    },
+    //企业标准选中项改变
+    selectListChange(data){
+      console.log(data);
+      this.selectList = data
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 27af71037..4e6ff3250 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -1,13 +1,440 @@
 <template>
-
+  <div class="qbzxd-jhgk">
+    <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
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="调整类型" class="add-form-item form-item-disabled">
+                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('merge')">合并</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('delay')">延期</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('cancel')">取消</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('rename')">更名</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('establish')">立项</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <component ref="childForm" :is="comName" ></component>
+      </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"
+            :roleMessage="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-timeline-item timestamp="选择标准法规部工程师抄送" placement="top"
+                              :color="roleForm.engineer ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="engineerName" style="margin-bottom: 0">
+                  <h4>标准法规部工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.engineer" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.engineerName" placeholder="选择标准法规部工程师"
+                              @click.native="choiceZRR('engineer', '选择标准法规部工程师', roleForm.engineer)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <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 merge from "process/creatProcess/qbzxdjhgk/component/merge";
+import rename from "process/creatProcess/qbzxdjhgk/component/rename";
+import establish from "process/creatProcess/qbzxdjhgk/component/establish";
+import delay from "process/creatProcess/qbzxdjhgk/component/delay";
+import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
+import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
+
 export default {
-  name: "qbzxdjhgkStep1"
+  name: "qbzxdjhgkStep1",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle,
+    merge,
+    rename,
+    establish,
+    delay,
+    cancel,
+  },
+  data(){
+    return{
+       active: '1',
+      commentText: '',
+      comName: 'merge',
+      drawerTitle: '',
+      nodeList: [],
+      nodeList2: [],
+      isSubmit: false,
+      saveLoading: false,
+      modalshowflag: false,
+      modalshowflag2: false,
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: '',
+        dockUserName: '',
+        countersigner: '',
+        countersignerName: '',
+        approver: '',
+        approverName: '',
+        engineer: "",
+        engineerName: "",
+        examine: '',
+        examineName: '',
+      },
+      //必填人员校验规则
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择工作组组长", trigger: "change"}
+        ],
+      },
+    }
+  },
+  methods: {
+    handleTabs(name){
+        this.active = name
+    },
+    toggleComName(name){
+       this.comName = name
+    },
+    //流程保存
+    handleSave(){
+
+    },
+    //流程提交
+    handleSubmit(){
+      let flag = this.$refs['childForm'].validateForm()
+      let qbzxdFrom = this.$refs["childForm"].qbfsForm
+       if(flag){
+         this.$refs['roleForm'].validate((valid) => {
+           if(valid){
+             this.isSubmit = true
+             var json = Object.assign(qbzxdFrom, this.roleForm)
+             this.$http.get('lawss/activiti/startProcess', {type: '25'}, {
+               _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('请完善基础信息')
+       }
+
+    },
+    // 流程阶段负责人选择
+    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;
+      }else if(this.type === 'engineer'){
+        this.roleForm.engineer = data[0].id;
+        this.roleForm.engineerName = 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;
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.qbzxd-jhgk {
+  /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/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
new file mode 100644
index 000000000..9309fe961
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="qbzxd-jhgk">
+    <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 :model="qbfsForm" class="label-input-form prc-content-border"
+                 label-width="150px">
+          <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esName"
+              placeholder="请输入企标名称"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
+              <el-option label="制定" value="制定"></el-option>
+              <el-option label="修订" value="修订"></el-option>
+              <el-option label="完成" value="完成"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+              <el-option label="制定完成" value="制定完成"></el-option>
+              <el-option label="制定中" value="制定中"></el-option>
+              <el-option label="未制定" value="未制定"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafter"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.resPerson"
+              placeholder="请输入评审责任人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.wgLeader"
+              placeholder="请输入工作组组长"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.draftTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.releaseTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unit"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              disabled
+              v-model="qbfsForm.newReason"
+              placeholder="请输入新增原因"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.mergeReason"
+              placeholder="请输入合并原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqDraftTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqReleaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.delayReason"
+              placeholder="请输入延期原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.cancelReason"
+              placeholder="请输入取消原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.renameReason"
+              placeholder="请输入更名原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+          <!--                                            <el-input-->
+          <!--                                                    v-model="qbfsForm.remarks"-->
+          <!--                                                    placeholder="请输入备注"-->
+          <!--                                                    :maxlength="500"/>-->
+          <!--                                        </el-form-item>-->
+        </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"
+          :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="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: "qbzxdjhgkStep2",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      type: '',
+      commentText: '',
+      qbfsForm: {},
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      nodeList:[],
+      drawerTitle: '',
+      detailData: [],
+
+    }
+  },
+  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))
+        this.type = item.type
+      })
+    },
+    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)
+      })
+    },
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.passFlag = '0'
+      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 => {
+      });
+    },
+    beforeBack(){
+      this.isSubmit = true
+      this.qbfsForm.passFlag = '1'
+      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 => {
+      });
+    },
+
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxd-jhgk {
+  /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/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index bd6066b13..e617fa4f6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1640,6 +1640,43 @@ export default {
             })
           }
           break
+        case '25':
+          if (row.taskInfo === '部门高级经理审批') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep2',
+              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/router/index.js b/src/router/index.js
index 1a20dec60..96f5825ff 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1522,6 +1522,15 @@ const routes = [
           title: '企标制修订计划管控流程'
         }
       },
+      {
+        path: '/qbzxdjhgkStep2',
+        name: 'qbzxdjhgkStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
       // 外部标准化协会入会流程
       {
         path: '/bzrhStep1',

From 99ef40f420c7cd3d2b846bed4eb72dda0032e2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 17 Nov 2021 18:01:54 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step3.vue    | 532 ++++++++++++++++++
 .../pages/creatProcess/qbzxdjhgk/step4.vue    | 532 ++++++++++++++++++
 .../pages/creatProcess/qbzxdjhgk/step5.vue    | 532 ++++++++++++++++++
 .../tabComponents/processCenter/index.vue     |  56 +-
 src/router/index.js                           |  27 +
 5 files changed, 1656 insertions(+), 23 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
new file mode 100644
index 000000000..1ecb8b369
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="qbzxd-jhgk">
+    <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 :model="qbfsForm" class="label-input-form prc-content-border"
+                 label-width="150px">
+          <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esName"
+              placeholder="请输入企标名称"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
+              <el-option label="制定" value="制定"></el-option>
+              <el-option label="修订" value="修订"></el-option>
+              <el-option label="完成" value="完成"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+              <el-option label="制定完成" value="制定完成"></el-option>
+              <el-option label="制定中" value="制定中"></el-option>
+              <el-option label="未制定" value="未制定"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafter"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.resPerson"
+              placeholder="请输入评审责任人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.wgLeader"
+              placeholder="请输入工作组组长"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.draftTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.releaseTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unit"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              disabled
+              v-model="qbfsForm.newReason"
+              placeholder="请输入新增原因"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.mergeReason"
+              placeholder="请输入合并原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqDraftTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqReleaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.delayReason"
+              placeholder="请输入延期原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.cancelReason"
+              placeholder="请输入取消原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.renameReason"
+              placeholder="请输入更名原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+          <!--                                            <el-input-->
+          <!--                                                    v-model="qbfsForm.remarks"-->
+          <!--                                                    placeholder="请输入备注"-->
+          <!--                                                    :maxlength="500"/>-->
+          <!--                                        </el-form-item>-->
+        </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"
+          :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="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: "qbzxdjhgkStep3",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      type: '',
+      commentText: '',
+      qbfsForm: {},
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      nodeList:[],
+      drawerTitle: '',
+      detailData: [],
+
+    }
+  },
+  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))
+        this.type = item.type
+      })
+    },
+    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)
+      })
+    },
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.deptCenterFlag = '0'
+      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 => {
+      });
+    },
+    beforeBack(){
+      this.isSubmit = true
+      this.qbfsForm.deptCenterFlag = '1'
+      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 => {
+      });
+    },
+
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxd-jhgk {
+  /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/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
new file mode 100644
index 000000000..9a3df7276
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="qbzxd-jhgk">
+    <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 :model="qbfsForm" class="label-input-form prc-content-border"
+                 label-width="150px">
+          <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esName"
+              placeholder="请输入企标名称"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
+              <el-option label="制定" value="制定"></el-option>
+              <el-option label="修订" value="修订"></el-option>
+              <el-option label="完成" value="完成"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+              <el-option label="制定完成" value="制定完成"></el-option>
+              <el-option label="制定中" value="制定中"></el-option>
+              <el-option label="未制定" value="未制定"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafter"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.resPerson"
+              placeholder="请输入评审责任人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.wgLeader"
+              placeholder="请输入工作组组长"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.draftTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.releaseTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unit"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              disabled
+              v-model="qbfsForm.newReason"
+              placeholder="请输入新增原因"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.mergeReason"
+              placeholder="请输入合并原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqDraftTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqReleaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.delayReason"
+              placeholder="请输入延期原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.cancelReason"
+              placeholder="请输入取消原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.renameReason"
+              placeholder="请输入更名原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+          <!--                                            <el-input-->
+          <!--                                                    v-model="qbfsForm.remarks"-->
+          <!--                                                    placeholder="请输入备注"-->
+          <!--                                                    :maxlength="500"/>-->
+          <!--                                        </el-form-item>-->
+        </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"
+          :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="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: "qbzxdjhgkStep4",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      type: '',
+      commentText: '',
+      qbfsForm: {},
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      nodeList:[],
+      drawerTitle: '',
+      detailData: [],
+
+    }
+  },
+  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))
+        this.type = item.type
+      })
+    },
+    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)
+      })
+    },
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.bzFlag = '0'
+      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 => {
+      });
+    },
+    beforeBack(){
+      this.isSubmit = true
+      this.qbfsForm.bzFlag = '1'
+      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 => {
+      });
+    },
+
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxd-jhgk {
+  /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/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
new file mode 100644
index 000000000..d23f72d5a
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -0,0 +1,532 @@
+<template>
+  <div class="qbzxd-jhgk">
+    <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 :model="qbfsForm" class="label-input-form prc-content-border"
+                 label-width="150px">
+          <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esName"
+              placeholder="请输入企标名称"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
+              <el-option label="制定" value="制定"></el-option>
+              <el-option label="修订" value="修订"></el-option>
+              <el-option label="完成" value="完成"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+              <el-option label="制定完成" value="制定完成"></el-option>
+              <el-option label="制定中" value="制定中"></el-option>
+              <el-option label="未制定" value="未制定"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafter"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.resPerson"
+              placeholder="请输入评审责任人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.wgLeader"
+              placeholder="请输入工作组组长"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.draftTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.releaseTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unit"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              disabled
+              v-model="qbfsForm.newReason"
+              placeholder="请输入新增原因"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.mergeReason"
+              placeholder="请输入合并原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqDraftTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqReleaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.delayReason"
+              placeholder="请输入延期原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.cancelReason"
+              placeholder="请输入取消原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.renameReason"
+              placeholder="请输入更名原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+          <!--                                            <el-input-->
+          <!--                                                    v-model="qbfsForm.remarks"-->
+          <!--                                                    placeholder="请输入备注"-->
+          <!--                                                    :maxlength="500"/>-->
+          <!--                                        </el-form-item>-->
+        </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"
+          :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="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: "qbzxdjhgkStep5",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      type: '',
+      commentText: '',
+      qbfsForm: {},
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      nodeList:[],
+      drawerTitle: '',
+      detailData: [],
+
+    }
+  },
+  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))
+        this.type = item.type
+      })
+    },
+    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)
+      })
+    },
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.bzfgbzFlag = '0'
+      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 => {
+      });
+    },
+    beforeBack(){
+      this.isSubmit = true
+      this.qbfsForm.bzfgbzFlag = '1'
+      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 => {
+      });
+    },
+
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxd-jhgk {
+  /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/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index e617fa4f6..3c3adaadb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1652,30 +1652,40 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if(row.taskInfo === '部门中心主任会签') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规工作组组长审定') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长审批') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep5',
+              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
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 96f5825ff..950677be7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1531,6 +1531,33 @@ const routes = [
           title: '企标制修订计划管控流程'
         }
       },
+      {
+        path: '/qbzxdjhgkStep3',
+        name: 'qbzxdjhgkStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
+      {
+        path: '/qbzxdjhgkStep4',
+        name: 'qbzxdjhgkStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
+      {
+        path: '/qbzxdjhgkStep5',
+        name: 'qbzxdjhgkStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
       // 外部标准化协会入会流程
       {
         path: '/bzrhStep1',

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

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

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