diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 7e4958433..16cfd87e2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -223,6 +223,7 @@
                   @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择日期">
                 </el-date-picker>
               </template>
@@ -940,10 +941,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      // complianceReasons  合规原因
-      // noCompliance  不合规项
-      // countermeasures 应对措施
-      //completionTime  完成时间
       if(!this.comFlag){
         this.$message.warning('请填写完整的不符合项信息')
       }else{
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 9a1d4bcef..806cb6bc4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -468,36 +468,70 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       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.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
-        this.listForm.dataList.forEach(item => {
-          item.children.forEach(items=> {
-            if(items.key === item.standId){
-              this.$set(items, "standName", item.standName);
-              this.$set(items, "standEnName", item.standEnName);
-              this.$set(items, "standYear", item.standYear);
-              this.$set(items, "standSort", item.standSort);
-              this.$set(items, "standNumber", item.standNumber);
+        if (item.form === undefined) {
+          let dataChildren = []
+          let dataListChildren = []
+          this.listForm.prcNum = this.prcNum;
+          this.listForm.prcName = this.prcName;
+          this.listForm["id"] = item.id;
+          this.listForm.dataList = item.dataList;
+          this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
             }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
           })
-        })
-        this.listForm.dataList.forEach(item => {
-          dataChildren.push(item.children)
-        })
-        dataChildren.forEach((item,index) => {
-          dataListChildren = dataListChildren.concat(item)
-        })
-        this.dataList = dataListChildren
-        this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          dataListChildren = this.dataList.concat(dataListChildren)
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+        } else {
+          this.listForm = item.form;
+          let dataChildren = []
+          let dataListChildren = []
+          this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
+            }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
+          })
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          dataListChildren = this.dataList.concat(dataListChildren)
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+          // this.dataList = item.form.dataList[0].children;
+          // this.total = item.form.dataList[0].children.length;
+        }
+
       });
     },
     //驳回事件