diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 4844aa217..8e3caa019 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -102,7 +102,7 @@
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -110,7 +110,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -121,7 +121,8 @@
             <template slot-scope="scope,text" v-if="showColumn">
               <div>
                 <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">
-                  {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer }}
+                  {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
+                  }}
                 </div>
               </div>
             </template>
@@ -269,6 +270,7 @@ export default {
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
       processType: 1,
+      sarFlag: true,
       loading: false,
       // dataList: [],//清单里的标准数据
       active: "1",
@@ -402,8 +404,8 @@ export default {
             qualityEngineerName: item.pepdtos[i].qualityEngineerName,
             standNumber: item.pepdtos[i].standNumber,
             standName: item.pepdtos[i].standName,
-            xCXSSRQ:  item.pepdtos[i].xCXSSRQ,
-            zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
+            xCXSSRQ: item.pepdtos[i].xCXSSRQ,
+            zCCSSRQ: item.pepdtos[i].zCCSSRQ
           });
         }
       }
@@ -417,7 +419,7 @@ export default {
               this.listForm.breakdownList[index].implementerId = this.roleRow.id;
               this.listForm.breakdownList[index].implementer = this.roleRow.name;
             }
-          })
+          });
         } else {
           this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
           this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
@@ -453,33 +455,37 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.breakdownList.forEach(item => {
-        if(item.implementer === null || item.implementer === '' || item.implementer === undefined){
-          this.$message.warning('请选择落实人')
+        if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
+          this.sarFlag = false;
         } else {
-          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.approvalOpinion = "";
-          this.listForm.signFlag = "";
-          const json = JSON.stringify(this.listForm.breakdownList);
-          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 => {
-
-          });
+          this.sarFlag = true;
         }
-      })
+      });
+      if (this.sarFlag === true) {
+        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.approvalOpinion = "";
+        this.listForm.signFlag = "";
+        const json = JSON.stringify(this.listForm.breakdownList);
+        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 => {
+        });
+      } else {
+        this.$message.warning("请选择落实人");
+      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -492,7 +498,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = data.map(item => item.itemId)
+      this.selectList = data.map(item => item.itemId);
     },
     selectThree() {
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 2807b8dcb..a0d0d502b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -108,7 +108,7 @@
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -117,7 +117,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -273,7 +273,7 @@
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
-          height="100%"
+          height="800px"
           ref="selection"
           :data="detailData"
           tooltip-effect="dark"
@@ -306,7 +306,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -314,7 +314,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -322,7 +322,7 @@
             label="审批意见"
             align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.commentText}}</span>
+              <span>{{ scope.row.commentText }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -330,7 +330,7 @@
             label="状态"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -365,7 +365,6 @@ export default {
   },
   data() {
     return {
-
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -373,7 +372,7 @@ export default {
       loading: false,
       dataList: [],//清单里的标准数据
       active: "1",
-      userId:this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       listType: "country",  //选择的清单类型
@@ -388,30 +387,30 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-          standNumber: "", //标准编号
-          standName: "",//标准名称
+        standNumber: "", //标准编号
+        standName: "",//标准名称
         certifiedEngineerName: "", //认证工程师
         qualityEngineerName: "", //质量工程师
         dataList: [{
-          projectManager: '',
-          itemsName: '',
-          uname: '',
-          projectNumber: '',
-          implementer: '',
-          implementerId: '',
-          productLine: '',
-          itemNum:'',
-          distributePerson:'',
-          projectName:'',
-          distributePersonId:'',
-          complianceReasons:'', //在研合规原因
-          noCompliance:'', //在研不合规项目
-          countermeasures:'', //在研应对措施
-          completionTime:'', //在研完成时间
-          zcComplianceReasons: '', //在产的合规原因
-          zcNoCompliance:'', //在产不合规项目
-          zcCountermeasures:'', //在产的应对措施
-          zcCompletionTime:'', //在产的完成时间
+          projectManager: "",
+          itemsName: "",
+          uname: "",
+          projectNumber: "",
+          implementer: "",
+          implementerId: "",
+          productLine: "",
+          itemNum: "",
+          distributePerson: "",
+          projectName: "",
+          distributePersonId: "",
+          complianceReasons: "", //在研合规原因
+          noCompliance: "", //在研不合规项目
+          countermeasures: "", //在研应对措施
+          completionTime: "", //在研完成时间
+          zcComplianceReasons: "", //在产的合规原因
+          zcNoCompliance: "", //在产不合规项目
+          zcCountermeasures: "", //在产的应对措施
+          zcCompletionTime: "" //在产的完成时间
         }]
       },
       // listForm: {
@@ -455,17 +454,18 @@ export default {
     };
   },
   methods: {
-    processTable () {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : '',
+        sortWord: this.shunxu ? this.paixu : "",
         shunxu: this.shunxu
       }, {
-        loading: 'loading',
+        loading: "loading",
         _this: this
       }, res => {
-        this.detailData = res
-      }, e => {})
+        this.detailData = res;
+      }, e => {
+      });
     },
     //tab发生变化
     handleTabs(name) {
@@ -479,37 +479,42 @@ export default {
         }).then(res => {
           console.log(res.mesg);
           if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
           }
         }).catch(e => {
-        })
-      })
+        });
+      });
     },
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(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.dataList = item.step3DTOS
-        this.listForm.standName = item.step3DTOS[0].standName
-        this.listForm.standNumber = item.step3DTOS[0].standNumber
-        this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
-        this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName
-        this.listForm.itemsName = item.step3DTOS[0].itemsName
-        this.listForm.itemNum = item.step3DTOS[0].itemNum
-        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit
-        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer
-      })
+        this.listForm = JSON.parse(JSON.stringify(item));
+        console.log(item.fenFlag);
+        if (item.fenFlag === undefined ) {
+          this.dataList = item.step3DTOS;
+        } else {
+          this.dataList = item.dataList;
+        }
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.standName = item.step3DTOS[0].standName;
+        this.listForm.standNumber = item.step3DTOS[0].standNumber;
+        this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
+        this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
+        this.listForm.itemsName = item.step3DTOS[0].itemsName;
+        this.listForm.itemNum = item.step3DTOS[0].itemNum;
+        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
+        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
+      });
     },
 
 
     //保存事件
-    handleSave () {
+    handleSave() {
     },
     //提交事件
     handleSubmit() {
@@ -517,18 +522,18 @@ export default {
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
       this.listForm.signFlag = "";
-      this.listForm.dataList = this.dataList
+      this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
-      this.$http.post('lawss/activiti/completeTask', {
+      this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
-        json: json,
+        json: json
       }, {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
         }
       }, e => {
 
@@ -554,13 +559,13 @@ export default {
     }
   },
   computed: {
-    listNoDataText () {
-      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
-    },
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
   },
   mounted() {
-    this.processTable()
-    this.getData()
+    this.processTable();
+    this.getData();
     // console.log(this.$store.getters.getHandleInfo);
   }
 };
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index c07965369..60b351613 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -345,7 +345,7 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-        fenFlag: '1',  //1为通过 其他为驳回
+        fenFlag: " ",  //1为驳回 2为通过
         standNumber: "", //标准编号
         standName: "",//标准名称
         certifiedEngineerName: "", //认证工程师
@@ -419,6 +419,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)
@@ -447,14 +448,31 @@ export default {
     },
     //驳回事件
     beforeBack () {
-      this.listForm.fenFlag = '2'
-      this.handleSubmit()
-    },
-    //提交事件
-    handleSubmit() {
       this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
       this.listForm.dataList = this.dataList
+      this.listForm.fenFlag = '1'
+      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 => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
+      this.listForm.commentText = this.commentText;
+      this.listForm.dataList = this.dataList
+      this.listForm.fenFlag = '2'
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
@@ -468,7 +486,6 @@ export default {
           this.$router.push('/processCenter')
         }
       }, e => {
-
       });
     },
     //标准表格选择框改变
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 2f49323fa..b49eeec52 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.1.108'
+const devIp = '192.168.1.102'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'