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

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

@@ -10,13 +10,13 @@
       <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>
         <el-collapse-transition>
-        <el-form
+          <div class="prc-content-border" v-if="foldFormFlag === false">
-            v-if="foldFormFlag === false"
+         <el-form
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -72,6 +72,7 @@
             </el-col>
           </el-row>
         </el-form>
+          </div>
         </el-collapse-transition>
         <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
         <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
@@ -147,7 +148,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+          :data="breakdownList"
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
           height="48%"
           border
@@ -225,14 +226,14 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination
+<!--        <el-pagination-->
-          layout="total,sizes, prev, pager, next"
+<!--          layout="total,sizes, prev, pager, next"-->
-          background
+<!--          background-->
-          :page-sizes="[20, 40, 60]"
+<!--          :page-sizes="[20, 40, 60]"-->
-          :total="total"
+<!--          :total="total"-->
-          @size-change="handleSizeChange"
+<!--          @size-change="handleSizeChange"-->
-          @current-change="handleCurrentChange"
+<!--          @current-change="handleCurrentChange"-->
-        />
+<!--        />-->
         <!--    选择责任人-->
         <Role-tree
           is-title="选择落实人"
@@ -657,6 +658,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.projectJson = JSON.parse(JSON.stringify(item));
       this.listForm = JSON.parse(JSON.stringify(item));
       if (item.form === undefined) {
@@ -665,9 +667,11 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
         let projectLineList = item.pepdtos[0].dataList;
+        let ids = []
         projectLineList.forEach(item => {
-          this.projectLineId = item.productLine;
+           ids.push(item.productLine);
         });
+        this.projectLineId = ids.join(',')
         this.getProject();
       } else {
         this.listForm = item.form;
@@ -679,7 +683,7 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
         productLine: this.projectLineId,
         current: this.pageNo,
-        pageSize: this.pageSizeNo,
+        PageSize: this.pageSizeNo,
         projectName: this.standardSearch.projectName,
         projectNumber: this.standardSearch.projectNumber
       }, {