diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 779a2bd7a..c42bee374 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -515,6 +515,11 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
+        res.data.records.forEach(item => {
+          if(item.zrbm === "[]"){
+            item.zrbm = ''
+          }
+        })
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         let ids = [];
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index b192d5f89..fbf732ac1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -525,6 +525,11 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
+        res.data.records.forEach(item => {
+          if(item.zrbm === "[]"){
+            item.zrbm = ''
+          }
+        })
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         this.listForm.dataList.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 842ceab23..4e770b15a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -337,7 +337,6 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log(item);
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -400,6 +399,11 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.dataList = item.dataList;
+          this.dataList.forEach(item => {
+            if(item.zrbm === "[]"){
+              item.zrbm = ''
+            }
+          })
           this.dataList.distributePerson = item.dataList[0].distributePerson;
           this.listForm.breakdownList = item.breakdownList;
         } else {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 2b1b5616d..141206bc9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -407,6 +407,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -472,6 +473,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
+      console.log(this.dataList);
       this.listForm.commentText = this.commentText;
       this.listForm.children = this.dataList[0].children
       this.listForm.dataList = this.dataList
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 3fff5346e..376ac71f1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -44,7 +44,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
+            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
+                       @click="batchEdit">批量编辑
             </el-button>
           </div>
         </div>
@@ -121,206 +122,206 @@
               <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
-            <el-table-column
-              prop="researchCompliance"
-              align="center"
-              width="160"
-              label="合规">
-              <template slot-scope="scope">
-                <el-input
-                    v-if="scope.row.noCompliance && scope.row.noCompliance.length>0
+          <!--          <el-table-column-->
+          <!--            prop="productType"-->
+          <!--            align="center"-->
+          <!--            label="在研产品">-->
+          <el-table-column
+            prop="researchCompliance"
+            align="center"
+            width="160"
+            label="合规">
+            <template slot-scope="scope">
+              <el-input
+                v-if="scope.row.noCompliance && scope.row.noCompliance.length>0
                     || scope.row.countermeasures && scope.row.countermeasures.length>0
                     || scope.row.completionTime && scope.row.completionTime !== null"
-                    disabled
-                  v-model="scope.row.complianceReasons"
-                  placeholder="请输入合规原因"
+                disabled
+                v-model="scope.row.complianceReasons"
+                placeholder="请输入合规原因"
+              >
+              </el-input>
+              <el-input
+                v-else
+                :disabled="acceptShow"
+                v-model="scope.row.complianceReasons"
+                placeholder="请输入合规原因"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="160"
+            prop="researchNonCompliance"
+            label="不合规">
+            <el-table-column
+              prop="researchNonCompliance"
+              align="center"
+              width="170"
+              label="不合规项目">
+              <template slot-scope="scope">
+                <el-input
+                  v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                  disabled
+                  v-model="scope.row.noCompliance"
+                  placeholder="请输入不合规项目"
                 >
                 </el-input>
                 <el-input
-                    v-else
-                    :disabled="acceptShow"
-                    v-model="scope.row.complianceReasons"
-                    placeholder="请输入合规原因"
+                  v-else
+                  :disabled="acceptShow"
+                  v-model="scope.row.noCompliance"
+                  placeholder="请输入不合规项目"
                 >
                 </el-input>
               </template>
             </el-table-column>
             <el-table-column
+              prop="researchCountermeasures"
               align="center"
               width="160"
-              prop="researchNonCompliance"
-              label="不合规">
-              <el-table-column
-                prop="researchNonCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-                <template slot-scope="scope">
-                  <el-input
-                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
-                      disabled
-                    v-model="scope.row.noCompliance"
-                    placeholder="请输入不合规项目"
-                  >
-                  </el-input>
-                  <el-input
-                      v-else
-                      :disabled="acceptShow"
-                      v-model="scope.row.noCompliance"
-                      placeholder="请输入不合规项目"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="researchCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-                <template slot-scope="scope">
-                  <el-input
-                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
-                      disabled
-                    v-model="scope.row.countermeasures"
-                    placeholder="请输入应对措施"
-                  >
-                  </el-input>
-                  <el-input
-                      v-else
-                      :disabled="acceptShow"
-                      v-model="scope.row.countermeasures"
-                      placeholder="请输入应对措施"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="researchCompletionTime"
-                align="center"
-                width="140"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <el-date-picker
-                      v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
-                      disabled
-                    v-model="scope.row.completionTime"
-                    type="date"
-                    placeholder="请选择日期">
-                  </el-date-picker>
-                  <el-date-picker
-                      v-else
-                      :disabled="acceptShow"
-                      class="datePickLen"
-                      clearable
-                      v-model="scope.row.completionTime"
-                      type="date"
-                      placeholder="请选择日期">
-                  </el-date-picker>
-                </template>
-              </el-table-column>
+              label="应对措施">
+              <template slot-scope="scope">
+                <el-input
+                  v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                  disabled
+                  v-model="scope.row.countermeasures"
+                  placeholder="请输入应对措施"
+                >
+                </el-input>
+                <el-input
+                  v-else
+                  :disabled="acceptShow"
+                  v-model="scope.row.countermeasures"
+                  placeholder="请输入应对措施"
+                >
+                </el-input>
+              </template>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="productionCompliance"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-input-->
-<!--                    v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
-<!--                    || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
-<!--                    || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
-<!--                    disabled-->
-<!--                  v-model="scope.row.zcComplianceReasons"-->
-<!--                  placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--                <el-input-->
-<!--                    v-else-->
-<!--                    v-model="scope.row.zcComplianceReasons"-->
-<!--                    placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="productionNonCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="scope.row.zcNoCompliance"-->
-<!--                    placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="scope.row.zcNoCompliance"-->
-<!--                      placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="scope.row.zcCountermeasures"-->
-<!--                    placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="scope.row.zcCountermeasures"-->
-<!--                      placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCompletionTime"-->
-<!--                align="center"-->
-<!--                width="140"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-date-picker-->
-<!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="scope.row.zcCompletionTime"-->
-<!--                    type="date"-->
-<!--                    placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                  <el-date-picker-->
-<!--                      v-else-->
-<!--                      class="datePickLen"-->
-<!--                      clearable-->
-<!--                      v-model="scope.row.zcCompletionTime"-->
-<!--                      type="date"-->
-<!--                      placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
+            <el-table-column
+              prop="researchCompletionTime"
+              align="center"
+              width="140"
+              label="完成时间">
+              <template slot-scope="scope">
+                <el-date-picker
+                  v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
+                  disabled
+                  v-model="scope.row.completionTime"
+                  type="date"
+                  placeholder="请选择日期">
+                </el-date-picker>
+                <el-date-picker
+                  v-else
+                  :disabled="acceptShow"
+                  class="datePickLen"
+                  clearable
+                  v-model="scope.row.completionTime"
+                  type="date"
+                  placeholder="请选择日期">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            align="center"-->
+          <!--            label="在产产品">-->
+          <!--            <el-table-column-->
+          <!--              prop="productionCompliance"-->
+          <!--              align="center"-->
+          <!--              width="160"-->
+          <!--              label="合规(具体情况)">-->
+          <!--              <template slot-scope="scope">-->
+          <!--                <el-input-->
+          <!--                    v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
+          <!--                    || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
+          <!--                    || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
+          <!--                    disabled-->
+          <!--                  v-model="scope.row.zcComplianceReasons"-->
+          <!--                  placeholder="请输入合规原因"-->
+          <!--                >-->
+          <!--                </el-input>-->
+          <!--                <el-input-->
+          <!--                    v-else-->
+          <!--                    v-model="scope.row.zcComplianceReasons"-->
+          <!--                    placeholder="请输入合规原因"-->
+          <!--                >-->
+          <!--                </el-input>-->
+          <!--              </template>-->
+          <!--            </el-table-column>-->
+          <!--            <el-table-column-->
+          <!--              align="center"-->
+          <!--              width="160"-->
+          <!--              label="不合规">-->
+          <!--              <el-table-column-->
+          <!--                prop="productionNonCompliance"-->
+          <!--                align="center"-->
+          <!--                width="170"-->
+          <!--                label="不合规项目">-->
+          <!--                <template slot-scope="scope">-->
+          <!--                  <el-input-->
+          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
+          <!--                      disabled-->
+          <!--                    v-model="scope.row.zcNoCompliance"-->
+          <!--                    placeholder="请输入不合规项目"-->
+          <!--                  >-->
+          <!--                  </el-input>-->
+          <!--                  <el-input-->
+          <!--                      v-else-->
+          <!--                      v-model="scope.row.zcNoCompliance"-->
+          <!--                      placeholder="请输入不合规项目"-->
+          <!--                  >-->
+          <!--                  </el-input>-->
+          <!--                </template>-->
+          <!--              </el-table-column>-->
+          <!--              <el-table-column-->
+          <!--                prop="productionCountermeasures"-->
+          <!--                align="center"-->
+          <!--                width="160"-->
+          <!--                label="应对措施">-->
+          <!--                <template slot-scope="scope">-->
+          <!--                  <el-input-->
+          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
+          <!--                      disabled-->
+          <!--                    v-model="scope.row.zcCountermeasures"-->
+          <!--                    placeholder="请输入应对措施"-->
+          <!--                  >-->
+          <!--                  </el-input>-->
+          <!--                  <el-input-->
+          <!--                      v-else-->
+          <!--                      v-model="scope.row.zcCountermeasures"-->
+          <!--                      placeholder="请输入应对措施"-->
+          <!--                  >-->
+          <!--                  </el-input>-->
+          <!--                </template>-->
+          <!--              </el-table-column>-->
+          <!--              <el-table-column-->
+          <!--                prop="productionCompletionTime"-->
+          <!--                align="center"-->
+          <!--                width="140"-->
+          <!--                label="完成时间">-->
+          <!--                <template slot-scope="scope">-->
+          <!--                  <el-date-picker-->
+          <!--                      v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
+          <!--                      disabled-->
+          <!--                    v-model="scope.row.zcCompletionTime"-->
+          <!--                    type="date"-->
+          <!--                    placeholder="请选择日期">-->
+          <!--                  </el-date-picker>-->
+          <!--                  <el-date-picker-->
+          <!--                      v-else-->
+          <!--                      class="datePickLen"-->
+          <!--                      clearable-->
+          <!--                      v-model="scope.row.zcCompletionTime"-->
+          <!--                      type="date"-->
+          <!--                      placeholder="请选择日期">-->
+          <!--                  </el-date-picker>-->
+          <!--                </template>-->
+          <!--              </el-table-column>-->
+          <!--            </el-table-column>-->
+          <!--          </el-table-column>-->
           <!--          以后全选可能用-->
           <!--          <el-table-column-->
           <!--              prop="productionCompletionTime"-->
@@ -455,63 +456,107 @@
       size="800px">
       <div class="demo-drawer-content">
         <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
-          <el-divider><span><b>在研产品</b></span></el-divider>
+<!--          <el-divider><span><b>在研产品</b></span></el-divider>-->
           <el-formItem label="合规原因" class="add-form-item">
             <el-input
+              v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
+                    || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null"
+              disabled
               v-model="batchEditForm.complianceReasons"
               placeholder="请输入合规原因"
-            ></el-input>
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
           </el-formItem>
           <el-form-item label="不合规项目" class="add-form-item">
-            <el-input
-              v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
-            ></el-input>
+              <el-input
+                v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+                disabled
+                v-model="batchEditForm.noCompliance"
+                placeholder="请输入不合规项目"
+              >
+              </el-input>
+              <el-input
+                v-else
+                :disabled="acceptShow"
+                v-model="batchEditForm.noCompliance"
+                placeholder="请输入不合规项目"
+              >
+              </el-input>
           </el-form-item>
           <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
               v-model="batchEditForm.countermeasures"
               placeholder="请输入不合规应对措施"
-            ></el-input>
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
+            >
+            </el-input>
           </el-form-item>
           <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
               v-model="batchEditForm.completionTime"
               type="date"
-              placeholder="选择日期">
+              placeholder="请选择日期">
+            </el-date-picker>
+            <el-date-picker
+              v-else
+              :disabled="acceptShow"
+              class="datePickLen"
+              clearable
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
           <br>
-          <el-divider><span><b>在产产品</b></span></el-divider>
-          <el-formItem label="合规原因" class="add-form-item">
-            <el-input
-              v-model="batchEditForm.zcComplianceReasons"
-              placeholder="请输入合规原因"
-            ></el-input>
-          </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item">
-            <el-input
-              v-model="batchEditForm.zcNoCompliance"
-              placeholder="请输入不合规项目"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="不合规应对措施" class="add-form-item">
-            <el-input
-              v-model="batchEditForm.zcCountermeasures"
-              placeholder="请输入不合规应对措施"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="完成时间" class="add-form-item">
-            <el-date-picker
-              v-model="batchEditForm.zcCompletionTime"
-              type="date"
-              placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
+<!--          <el-divider><span><b>在产产品</b></span></el-divider>-->
+<!--          <el-formItem label="合规原因" class="add-form-item">-->
+<!--            <el-input-->
+<!--              v-model="batchEditForm.zcComplianceReasons"-->
+<!--              placeholder="请输入合规原因"-->
+<!--            ></el-input>-->
+<!--          </el-formItem>-->
+<!--          <el-form-item label="不合规项目" class="add-form-item">-->
+<!--            <el-input-->
+<!--              v-model="batchEditForm.zcNoCompliance"-->
+<!--              placeholder="请输入不合规项目"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="不合规应对措施" class="add-form-item">-->
+<!--            <el-input-->
+<!--              v-model="batchEditForm.zcCountermeasures"-->
+<!--              placeholder="请输入不合规应对措施"-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="完成时间" class="add-form-item">-->
+<!--            <el-date-picker-->
+<!--              v-model="batchEditForm.zcCompletionTime"-->
+<!--              type="date"-->
+<!--              placeholder="选择日期">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                   @click="saveBatchEditForm">
           确定
         </el-button>
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
@@ -525,7 +570,8 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask} from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew, execTask } from "api/process";
+import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
   name: "xmpg2Step6",
@@ -546,23 +592,23 @@ export default {
       batchEditForm: {
         // 在研产品
         // 合规
-        complianceReasons: '',
+        complianceReasons: "",
         // 不合规
-        noCompliance: '',
+        noCompliance: "",
         // 应对措施
-        countermeasures: '',
+        countermeasures: "",
         // 完成时间
-        completionTime: '',
+        completionTime: "",
 
         // 在产产品
         // 合规
-        zcComplianceReasons: '',
+        zcComplianceReasons: "",
         // 不合规
-        zcNoCompliance: '',
+        zcNoCompliance: "",
         // 应对措施
-        zcCountermeasures: '',
+        zcCountermeasures: "",
         // 完成时间
-        zcCompletionTime: ''
+        zcCompletionTime: ""
       },
       hasChildren: true,
       active: "1",
@@ -573,7 +619,7 @@ export default {
       saveLoading: false,
       submitShow: false,
       acceptShow: false,
-      todoId: '',
+      todoId: "",
       showColumn: true,
       drawerTitle: "", //drawer标题
       modalshowflag: false, // drawer开关
@@ -618,120 +664,135 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole(data) {
-      this.assigneeNewLoading = true
+      this.assigneeNewLoading = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isTransfer = false;
         if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
+          this.drawerModal = false;
+          this.$message.success("调整成功");
           this.$router.push("/processCenter");
-          this.processNum()
+          this.processNum();
         } else {
-          this.$message.warning(res.message)
+          this.$message.warning(res.message);
         }
-      })
+      });
     },
     // 请求转换流程图
     processNum(row) {
       axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
+        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+        responseType: "blob",
+        method: "get",
         params: {
           prcNum: this.$route.query.prcNum
         }
       }).then(res => {
         // let blob = new Blob([res.data], {type: 'image/jpg'})
         // let url = window.URL.createObjectURL(res.data)
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
     },
     //转办事件
     handleTransfer() {
-      this.drawerModal = true
-      this.drawerTitle = '转办处理人'
-      this.selectPeople = row
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
     },
     //批量编辑确定按钮事件
     saveBatchEditForm() {
-
-      // console.log(this.selectList)
-      for (let a = 0; a < this.dataList.length; a++) {
-        for (let b = 0; b < this.selectList.length; b++) {
-          if (this.dataList[a].id === this.selectList[b]) {
-            //合规
-            this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
+      this.selectList = JSON.parse(localStorage.getItem("selectList"));
+      console.log("datalist", this.dataList);
+      console.log("select", this.selectList);
+      this.dataList.forEach(item => {
+        this.selectList.forEach(items => {
+          if (item.id === items) {
+            item.complianceReasons = this.batchEditForm.complianceReasons;
             //不合规
-            this.dataList[a].noCompliance = this.batchEditForm.noCompliance
+            item.noCompliance = this.batchEditForm.noCompliance;
             //应对措施
-            this.dataList[a].countermeasures = this.batchEditForm.countermeasures
+            item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
-            this.dataList[a].completionTime = this.batchEditForm.completionTime
-            //合规
-            this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-            //不合规
-            this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
-            //应对措施
-            this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
-            //完成时间
-            this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
-          } else {
-            for (let i = 0; i < this.dataList[a].children.length; i++) {
-              if (this.dataList[a].children[i].id === this.selectList[b]) {
-                //合规
-                this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
-                //不合规
-                this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
-                //应对措施
-                this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
-                //完成时间
-                this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
-                //合规
-                this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-                //不合规
-                this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
-                //应对措施
-                this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
-                //完成时间
-                this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
-              }
-            }
+            item.completionTime = this.batchEditForm.completionTime;
           }
-
-        }
-      }
-      this.modalshowflag = false
+        });
+      });
+      // for (let a = 0; a < this.dataList.length; a++) {
+      //   for (let b = 0; b < this.selectList.length; b++) {
+      //     if (this.dataList[a].id === this.selectList[b]) {
+      //       console.log('11');
+      //       //合规
+      //       this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
+      //       //不合规
+      //       this.dataList[a].noCompliance = this.batchEditForm.noCompliance
+      //       //应对措施
+      //       this.dataList[a].countermeasures = this.batchEditForm.countermeasures
+      //       //完成时间
+      //       this.dataList[a].completionTime = this.batchEditForm.completionTime
+      //       //合规
+      //       this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+      //       //不合规
+      //       this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
+      //       //应对措施
+      //       this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
+      //       //完成时间
+      //       this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
+      //     } else {
+      //       for (let i = 0; i < this.dataList[a].children.length; i++) {
+      //         if (this.dataList[a].children[i].id === this.selectList[b]) {
+      //           //合规
+      //           this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
+      //           //不合规
+      //           this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
+      //           //应对措施
+      //           this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
+      //           //完成时间
+      //           this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
+      //           //合规
+      //           this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+      //           //不合规
+      //           this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
+      //           //应对措施
+      //           this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
+      //           //完成时间
+      //           this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
+      //         }
+      //       }
+      //     }
+      //
+      //   }
+      // }
+      this.modalshowflag = false;
     },
     cancelBatchEditForm() {
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
     //批量编辑
     batchEdit() {
       if (this.selectList.length > 0) {
         //合规
-        this.batchEditForm.complianceReasons = ''
+        this.batchEditForm.complianceReasons = "";
         //不合规
-        this.batchEditForm.noCompliance = ''
+        this.batchEditForm.noCompliance = "";
         //应对措施
-        this.batchEditForm.countermeasures = ''
+        this.batchEditForm.countermeasures = "";
         //完成时间
-        this.batchEditForm.completionTime = ''
+        this.batchEditForm.completionTime = "";
         //合规
-        this.batchEditForm.zcComplianceReasons = ''
+        this.batchEditForm.zcComplianceReasons = "";
         //不合规
-        this.batchEditForm.zcNoCompliance = ''
+        this.batchEditForm.zcNoCompliance = "";
         //应对措施
-        this.batchEditForm.zcCountermeasures = ''
+        this.batchEditForm.zcCountermeasures = "";
         //完成时间
-        this.batchEditForm.zcCompletionTime = ''
-        this.modalshowflag = true
+        this.batchEditForm.zcCompletionTime = "";
+        this.modalshowflag = true;
       } else {
-        this.$message.warning('请选择要编辑的数据')
+        this.$message.warning("请选择要编辑的数据");
       }
     },
     // 点击查看
@@ -795,15 +856,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
-            let commitStatus = res.commitStatus
-            if(commitStatus && commitStatus > 0){
-              this.acceptShow = true
-              this.submitShow = false
-            }else {
-              this.acceptShow = false
-              this.submitShow = true
+            let commitStatus = res.commitStatus;
+            if (commitStatus && commitStatus > 0) {
+              this.acceptShow = true;
+              this.submitShow = false;
+            } else {
+              this.acceptShow = false;
+              this.submitShow = true;
             }
-            this.todoId = res.id
+            this.todoId = res.id;
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -819,18 +880,18 @@ export default {
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
-          this.dataList = this.listForm.dataList[0].children
+          this.dataList = this.listForm.dataList[0].children;
           this.dataList.map(item => {
-            this.$set(item, 'standName', this.listForm.dataList[0].standName)
-            this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
-            this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
-            this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
-            this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
-          })
+            this.$set(item, "standName", this.listForm.dataList[0].standName);
+            this.$set(item, "standEnName", this.listForm.dataList[0].standEnName);
+            this.$set(item, "standYear", this.listForm.dataList[0].standYear);
+            this.$set(item, "standSort", this.listForm.dataList[0].standSort);
+            this.$set(item, "standNumber", this.listForm.dataList[0].standNumber);
+          });
           this.total = this.listForm.dataList[0].children.length;
         } else {
           this.listForm = item.form;
-          this.dataList = item.form.dataList[0].children
+          this.dataList = item.form.dataList[0].children;
           this.total = item.form.dataList[0].children.length;
         }
 
@@ -860,17 +921,17 @@ export default {
       });
     },
     // 接受按钮
-    handleAccept(){
-      this.isSubmit = true
+    handleAccept() {
+      this.isSubmit = true;
       execTask({
         todoId: this.todoId // 当前节点ID
       }).then(res => {
-        if (res.sign && res.sign === '0') {
-          this.$message.success('接收成功')
-          this.$router.push('/processCenter')
+        if (res.sign && res.sign === "0") {
+          this.$message.success("接收成功");
+          this.$router.push("/processCenter");
         }
-        this.isSubmit = false
-      })
+        this.isSubmit = false;
+      });
     },
     //提交事件
     handleSubmit() {
@@ -897,8 +958,8 @@ export default {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
         this.selectList.push(data[i].id);
+        localStorage.setItem("selectList", JSON.stringify(this.selectList));
       }
-
     },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 2ad37bfa7..66fd6aece 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -382,21 +382,34 @@
       </div>
     </el-drawer>
     <ProcessFooter
-      :show-save="submitShow"
-      :show-transfer="submitShow"
-      :show-affirm="submitShow"
-      :show-submit="submitShow"
-      :show-confirm="acceptShow"
+      show-save
+      show-transfer
+      show-affirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
       @transfer="handleTransfer"
       @save="handleSave"
-      @accept="handleAccept"
       :approval="true"
     >
     </ProcessFooter>
+<!--    <ProcessFooter-->
+<!--      :show-save="submitShow"-->
+<!--      :show-transfer="submitShow"-->
+<!--      :show-affirm="submitShow"-->
+<!--      :show-submit="submitShow"-->
+<!--      :show-confirm="acceptShow"-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      @submit="handleSubmit"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @save="handleSave"-->
+<!--      @accept="handleAccept"-->
+<!--      :approval="true"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
         check-box