diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 1ce002bf2..ac5dba73c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -492,10 +492,10 @@ export default {
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.step3DTOS
-        // this.listForm.standName = item.step3DTOS[0].standName
-        // this.listForm.standNumber = item.step3DTOS[0].standNumber
-        // this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
-        // this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        this.listForm.standName = item.step3DTOS[0].standName
+        this.listForm.standNumber = item.step3DTOS[0].standNumber
+        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 26afeda56..d9b691b9c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -3,7 +3,7 @@
   <div class="xmpg-step5">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
-      <template slot="proNode">审批评估反馈</template>
+      <template slot="proNode">分发责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -103,13 +103,13 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="XCXSSRQ"
+            prop="xCXSSRQ"
             width="200"
             align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
-            prop="ZCCSSRQ"
+            prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
@@ -146,6 +146,9 @@
                 align="center"
                 width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -179,6 +182,9 @@
                 align="center"
                 width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -440,15 +446,13 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
       this.listForm.standId = this.listForm.standId;
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
+      console.log(json);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 5055d7ae2..8d126d1f9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -1,13 +1,581 @@
+<!--评估流程 - 产品线责任人审批 -->
 <template>
+  <div class="xmpg-step6">
+    <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="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </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-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep6"
+  name: "xmpgStep6",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  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 => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step6 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .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%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 54c131391..58902008e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -1,13 +1,581 @@
+<!--评估流程 - 标准法规部领导审批 -->
 <template>
+  <div class="xmpg-step7">
+    <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="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </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-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep7"
+  name: "xmpgStep7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  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 => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step7 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .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%;
+      }
+    }
+  }
+
+  .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 0ac07ba53..5d55a3700 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -518,6 +518,28 @@ export default {
                 prcType: row.prcType
               }
             })
+          // }else if(row.taskInfo === '标准法规部领导审核'){
+          //   this.$router.push({
+          //     name: 'xmpgStep6',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          }else if(row.taskInfo === '标准法规部领导审核'){
+            this.$router.push({
+              name: 'xmpgStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         //未符合项整改流程