Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -197,7 +197,8 @@
                   align="center"
                   label="联络人">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.tel_name" placeholder="请填写联络人"/>
+                    <el-input v-model="scope.row.tel_nameId" style="display: none" placeholder="请填写联络人"/>
+                    <el-input v-model="scope.row.tel_name" readonly @click.native="choiceTel('tel_nameId', '选择联络人', scope.row)"  placeholder="请填写联络人"/>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -407,6 +408,13 @@
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
     />
+    <Role-tree
+      check-box
+      is-title="选择联络人"
+      :is-visible.sync="telShowflag"
+      :nodeList="nodeListTel"
+      @checkedRole="drawerCheckTel"
+    />
   </div>
 </template>
 
@@ -517,8 +525,10 @@ export default {
       },
       roleShowflag: false,
       roleShowflagOne: false,
+      telShowflag: false,
       nodeList: [],
       nodeListOne: [],
+      nodeListTel: [],
       isSubmit: false,
       saveLoading: false,
 
@@ -724,6 +734,21 @@ export default {
       this.deleteDataList = val
     },
 
+    // 列表选人
+    choiceTel(type, title, val,id) {
+      this.choiceTelList = val
+      this.nodeListTel = []
+      this.nodeListTel.push(id)
+      this.type = type
+      this.telShowflag = true
+    },
+    drawerCheckTel(data) {
+      if(data.length > 0) {
+        this.choiceTelList.tel_nameId = data[0].id
+        this.choiceTelList.tel_name = data[0].name
+      }
+      this.telShowflag = false
+    },
     // 流程阶段负责人选择
     choiceZRR(type, title, id) {
       this.nodeList = []

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -112,10 +112,11 @@
               <template slot="title">选择人员</template>
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
+              <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
                 style="width: 50%"
-                @click.native="choiceRole"
+                @click.native="choiceRole('','请选择入会成员',rh_pageData.comityOpRoleId,)"
                 v-model="rh_pageData.comityOpRole"
               />
             </el-form-item>
@@ -380,7 +381,7 @@ export default {
     },
 
     /** 选择入会人员 */
-    choiceRole(id) {
+    choiceRole(type,title,id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.roleShowflag = true

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -431,7 +431,7 @@ export default {
         this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
         this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
         this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
-        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
         if (this.rh_pageData.fillFile !== undefined) {
           this.fillFileList = this.rh_pageData.fillFile
         }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -138,11 +138,16 @@
             </el-form-item>
             <el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
               <div class="myPart_btn">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="add_partForm">
+                  新增
+                </el-button>
                 <el-button
                   type="danger"
                   size="small"
-                  icon="el-icon-delete"
+                  @click="del_partForm">
-                  @click="del_paryForm">
                   批量删除
                 </el-button>
               </div>
@@ -156,18 +161,53 @@
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="selection" width="55"/>
-                <el-table-column prop="fillPeople" align="center" label="参与人"/>
+                <el-table-column prop="fillPeople" align="center" label="参与人">
-                <el-table-column prop="fillUnit" align="center" label="单位"/>
-                <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
-                <el-table-column prop="fillTel" align="center" label="电话"/>
-                <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    {{ scope.row.fillPeople || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillUnit" align="center" label="单位">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillUnit || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillDept" align="center" label="部门">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillDept || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillPost" align="center" label="身份">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillPost || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillTel" align="center" label="电话">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillTel || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillMail" align="center" label="邮箱">
+                  <template slot-scope="scope">
+                    {{ scope.row.fillMail || '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fillFile" width="120" align="center" label="资料">
+                  <template slot-scope="scope">
+                    <el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">点击上传</el-button>
+                    <el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
+<!--                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
-                   </span>
+                   </span>-->
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  align="center"
+                  width="100">
+                  <template slot-scope="scope">
+                    <el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -256,6 +296,88 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <el-drawer
+      title="编辑人员信息"
+      :visible.sync="editFlag"
+      size="500px"
+    >
+      <div class="content_form">
+        <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
+        <el-form-item class="add-form-item" label="参与人员:">
+          <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
+          <el-input
+            placeholder="请选择参与人员"
+            style="width: 50%"
+            @click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
+            v-model="editForm.fillPeople"
+          />
+        </el-form-item>
+        <el-form-item class="add-form-item" label="单位:">
+          <el-input v-model="editForm.fillUnit" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="部门:">
+          <el-input v-model="editForm.fillDept" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="身份:">
+          <el-input v-model="editForm.fillPost" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="电话:">
+          <el-input v-model="editForm.fillTel" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="邮箱:">
+          <el-input v-model="editForm.fillMail" placeholder=""></el-input>
+        </el-form-item>
+        <el-form-item class="add-form-item" label="资料:">
+          <el-upload
+            :disabled="acceptShow"
+            multiple
+            ref="uploadFile"
+            :action="actionPath"
+            name="file"
+            :file-list="reData"
+            accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+            :before-upload="handleBeforeUpload"
+            :before-remove="handleBeforeRemove"
+            :on-success="handleOnsuccess"
+          >
+            <el-button type="primary" size="small">
+              上传文件
+            </el-button>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="falseDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
+      </div>
+    </el-drawer>
+
+    <!--  标准号table上传弹框  -->
+    <el-dialog
+      :visible.sync="upDialog"
+      width='400px'
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        class="upload-demo"
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        drag
+        :file-list="reData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        :before-upload="handleBeforeUpload"
+        :before-remove="handleBeforeRemove"
+        :on-success="handleOnsuccess"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
     <ProcessFooter
       show-submit
       show-save
@@ -265,6 +387,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -333,7 +462,25 @@ export default {
       deleteDataList: [],
 
       infoSourcesLength: '',
-      commentText: ''
+      commentText: '',
+
+      editFlag: false,
+      editForm: {
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+      },
+
+      // 上传文件储存
+      reData: [],
+      upDialog: false,
+      actionPath: 'api/att/attFile/upload',
+      acceptShow: false,
+      roleShowflag: false,
+      nodeList: [],
     }
   },
   computed: {
@@ -382,8 +529,123 @@ export default {
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
+    /** 我司参与人员新增 */
+    add_partForm() {
+      var list = {
+        fillPeople: this.fillPeople,
+        fillUnit: this.fillUnit,
+        fillDept: this.fillDept,
+        fillPost: this.fillPost,
+        fillTel: this.fillTel,
+        fillMail: this.fillMail,
+        fillFile: this.fillFile = []
+      }
+      this.rh_pageData.myPartRole.push(list)
+    },
+
+    fillFile_up(row) {
+      this.fileListData = row
+      this.reData = this.fileListData.fillFile
+      this.upDialog = true
+    },
+    // 文件上传成功
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.reData !== undefined) {
+          this.newDataList = this.reData
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.name
+          })
+        }
+
+        this.fileListData.fillFile = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.newDataList = []
+        this.fileMadel = false
+      }
+    },
+    // 文件上传限制条件
+    handleBeforeUpload(file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 移除上传的文件
+    handleBeforeRemove(file, fileList) {
+      this.reData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.reData.splice(index, 1)
+        }
+      })
+      this.fileListData.fillFile = this.reData
+    },
+
+    handleClose() {
+      this.upDialog = false
+    },
+    // 编辑按钮
+    edit_partForm(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
+      this.reData = this.fileListData.fillFile
+      this.editForm = row
+      this.editFlag = true
+    },
+    // 编辑框确认按钮
+    OkDrawer() {
+      this.editFlag = false
+    },
+    falseDrawer() {
+      let item = JSON.parse(localStorage.getItem('obj'))
+      this.editForm = item
+      this.editFlag = false
+    },
+    // 编辑框选人
+    choiceRole(type, title,id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      if(data.length > 0) {
+        this.fileListData.fillPeopleId = data[0].id
+        this.fileListData.fillPeople = data[0].name
+      }
+      this.roleShowflag = false
+    },
     /** 批量删除 */
-    del_paryForm() {
+    del_partForm() {
       if (this.deleteDataList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step2.vue

@@ -115,7 +115,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step3.vue

@@ -124,7 +124,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step4.vue

@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step5.vue

@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step6.vue

@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/qbfz/step7.vue

@@ -159,7 +159,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"

src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style=" overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -149,6 +149,8 @@
             </el-col>
           </el-row>
         </el-form>
+
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -162,7 +164,7 @@
         :data="dataList"
         border
         ref="selection"
-          height="49%"
+        height="100%"
         style="width: 100%;"
         @selection-change="selectStandChange"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -202,9 +204,6 @@
           <!--            </template>-->
         </el-table-column>
       </el-table>
-      </div>
-    </div>
-    <div>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
@@ -219,6 +218,8 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+    <div>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>

src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue

@@ -11,7 +11,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -132,6 +132,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -254,8 +255,6 @@
           label="责任人">
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
@@ -269,6 +268,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>
 

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style=" overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -163,6 +163,8 @@
             </el-col>
           </el-row>
         </el-form>
+
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -176,7 +178,7 @@
         :data="dataList"
         border
         ref="selection"
-          height="49%"
+        height="100%"
         style="width: 100%;"
         @selection-change="selectStandChange"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -204,9 +206,6 @@
           </template>
         </el-table-column>
       </el-table>
-      </div>
-    </div>
-    <div>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
@@ -221,6 +220,8 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+    <div>
+    </div>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,6 +131,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -138,7 +139,7 @@
         :data="dataList"
         border
         ref="selection"
-          height="49%"
+        height="100%"
         style="width: 100%;"
         @selection-change="selectStandChange"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -165,8 +166,6 @@
           label="分发责任人">
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
@@ -180,6 +179,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>
 

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -15,7 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-collapse-transition>
-          <div class="prc-content-border" v-if="foldFormFlag === false">
+          <div  v-if="foldFormFlag === false">
          <el-form
           :model="listForm"
           class="label-input-form prc-content-border"
@@ -132,6 +132,15 @@
             </el-col>
           </el-row>
         </el-form>
+
+        <!--    选择责任人-->
+        <Role-tree
+          is-title="选择落实人"
+          :is-visible.sync="modalshowflag"
+          @checkedRole="checkedRole"
+          :nodeList="nodeList"
+        ></Role-tree>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -150,7 +159,7 @@
         ref="multipleTable"
         :data="breakdownList"
         style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          height="48%"
+        height="100%"
         border
         highlight-current-row
         @selection-change="selectStandChange"
@@ -234,14 +243,6 @@
       <!--          @size-change="handleSizeChange"-->
       <!--          @current-change="handleCurrentChange"-->
       <!--        />-->
-        <!--    选择责任人-->
-        <Role-tree
-          is-title="选择落实人"
-          :is-visible.sync="modalshowflag"
-          @checkedRole="checkedRole"
-          :nodeList="nodeList"
-        ></Role-tree>
-      </div>
     </div>
 
     <div class="content" v-show="active === '3'">
@@ -341,7 +342,7 @@
                     type="primary"
                     class="common-button-primary"
                     size="small"
-                    @click="getProject">
+                    @click="getProjectBtn">
                     查询
                   </el-button>
                 </el-form-item>
@@ -360,7 +361,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -679,6 +680,10 @@ export default {
       }
 
     },
+    getProjectBtn(){
+      this.pageNo = 1,
+      this.getProject()
+    },
     getProject() {
       this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
         productLine: this.projectLineId,
@@ -967,16 +972,14 @@ export default {
       padding: 0 20px 0;
     }
   }
-
+  position: relative;
+  height: 100%;
   .choiceBtn {
     .el-button--primary {
       width: 150px;
     }
   }
 
-  position: relative;
-  height: 100%;
-
   .headerTabs {
     height: 52px;
     display: flex;
@@ -1035,6 +1038,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,6 +131,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -148,7 +149,7 @@
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-          height="48%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
@@ -311,8 +312,6 @@
           </el-table-column>
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
@@ -326,6 +325,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>
 

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,6 +131,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -143,7 +144,7 @@
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-          height="55%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
@@ -253,8 +254,6 @@
           label="责任人">
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>
 

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,6 +131,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -143,7 +144,7 @@
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-          height="55%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
@@ -253,8 +254,6 @@
           label="责任人">
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>
 

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -10,7 +10,7 @@
       <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">
+      <div style="overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
@@ -131,6 +131,7 @@
             </el-col>
           </el-row>
         </el-form>
+      </div>
       <process-title>
         <template slot="title">填写信息</template>
       </process-title>
@@ -143,7 +144,7 @@
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-          height="52%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
@@ -253,8 +254,6 @@
           label="责任人">
         </el-table-column>
       </el-table>
-      </div>
-      <div>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
@@ -268,6 +267,7 @@
           </div>
         </el-collapse-item>
       </el-collapse>
+      <div>
       </div>
     </div>