diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 5a64f5188..371d7977e 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -22,13 +22,23 @@
           v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
       </ul>
       <template style="margin-left: 105px;" v-else>
+        <ul class="file-file__wrap">
+          <li class="file-item"
+              v-for="(file, index) in showFileList"
+              :key="index"
+              :title="file.name"
+              @click="handlePreview(file)">
+            {{ file.name }}
+          </li>
+        </ul>
         <el-button
             size="small"
             @click="clickButtonToUpload('opinionFileList')"
             icon="el-icon-upload"
             class="form-upload-btn"
         >
-          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}
+<!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
+          上传
         </el-button>
       </template>
       <el-dialog
@@ -152,6 +162,7 @@ export default {
     }
   },
   mounted() {
+    this.getShowFileList()
     if (this.showFileModel) {
       this.getShowFileList()
     }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e3641c239..ebfc39406 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -126,7 +126,7 @@
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
-                        <label style=" margin-right: 143px;">{{ child.attrName }}</label>
+                        <label style=" margin-right: 150px;">{{ child.attrName }}</label>
                         <span>{{ child.value || '-' }}</span>
                       </p>
                     </template>
@@ -3282,7 +3282,9 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
-
+/deep/.el-collapse-item__header {
+  border-bottom: none !important;
+}
 /deep/ .decomposition-btn {
   position: absolute;
   top: 6px;
@@ -3294,7 +3296,6 @@ export default {
   color: #07C160;
   border: 1px solid #07C160;
   background: rgba(1, 193, 96, 0.1);
-
   /deep/ .icon-separate {
     display: inline-block;
     margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
         }
 
         & > div:not(.modular-item-more) {
-          border-bottom: 1px solid #E5E5E5;
+          /*border-bottom: 1px solid #E5E5E5;*/
           min-height: 43px;
           line-height: 43px;
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index a098e5bef..16cfd87e2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -142,6 +142,7 @@
               >
               </el-input>
               <el-input
+                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -171,6 +172,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -193,6 +195,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -217,8 +220,10 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
+                  @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>
@@ -582,6 +587,7 @@ export default {
   },
   data() {
     return {
+      comFlag: true,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -640,20 +646,10 @@ export default {
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
-        dataList: [
-          {
-            complianceReasons: "",
-            zcComplianceReasons: ""
-          }
-        ], //项目下的标准数据
+        dataList: [], //项目下的标准数据
         children: [] //标准下的分解单数据
       },
-      dataList: [
-        {
-          complianceReasons: "",
-          zcComplianceReasons: ""
-        }
-      ], //展示的标准数据
+      dataList: [], //展示的标准数据
       commentText: "", //审批意见
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
@@ -716,54 +712,17 @@ export default {
             item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
             item.completionTime = this.batchEditForm.completionTime;
+          }else if(item.standId === items){
+            item.complianceReasons = this.batchEditForm.complianceReasons;
+            //不合规
+            item.noCompliance = this.batchEditForm.noCompliance;
+            //应对措施
+            item.countermeasures = this.batchEditForm.countermeasures;
+            //完成时间
+            item.completionTime = this.batchEditForm.completionTime;
           }
         });
       });
-      // 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() {
@@ -871,6 +830,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -881,6 +841,9 @@ export default {
           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);
@@ -897,6 +860,7 @@ export default {
           dataChildren.forEach((item,index) => {
             dataListChildren = dataListChildren.concat(item)
           })
+          dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
         } else {
@@ -904,6 +868,9 @@ export default {
           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);
@@ -920,6 +887,7 @@ export default {
           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;
@@ -964,31 +932,42 @@ export default {
         this.isSubmit = false;
       });
     },
+    handlePrice(row){
+      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+        this.comFlag = true
+      }else{
+        this.comFlag = false
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
-      this.listForm.commentText = this.commentText;
-      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");
-        }
-        this.isSubmit = false;
-      }, e => {
-      });
+      if(!this.comFlag){
+        this.$message.warning('请填写完整的不符合项信息')
+      }else{
+        this.isSubmit = true;
+        this.listForm.commentText = this.commentText;
+        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");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].id || data[i].standId);
         localStorage.setItem("selectList", JSON.stringify(this.selectList));
       }
     },
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;
+        }
+
       });
     },
     //驳回事件
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index cd6263266..344e5e8cb 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -409,7 +409,7 @@
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
           <el-form
-              v-if="reloadAddForm"
+              v-if="reloadAddForm && modalshowflag"
               ref="sarStandardsInfoForm"
               :model="sarStandardsInfoEO"
               :rules="sarStandardsInfoRules"
@@ -1887,7 +1887,7 @@
         <loading :loading="OCRLoading">数据加载中……</loading>
         <div class="demo-drawer-footer">
           <el-button size="mini" @click="OCRclose">取消</el-button>
-          <el-button type="primary" size="mini" @click="OCRsubmit">转换</el-button>
+          <el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
         </div>
       </div>
     </el-drawer>
@@ -1947,6 +1947,8 @@ export default {
   },
   data() {
     return {
+      OCRSubmitLoading: false,
+      OCRSubmitButton: '',
       OCRType: '',
       OCRoptions: [],
       OCRDatas: [],
@@ -2671,6 +2673,7 @@ export default {
       } else if (this.OCRDatas.length === 0) {
         this.$message.warning('请选择一个文件')
       } else {
+        this.OCRSubmitLoading = true
         if (this.OCRType === '0') {
           let json = {
             standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
@@ -2687,6 +2690,7 @@ export default {
               },
               (res) => {
                 this.OCRModel = false
+                this.OCRSubmitLoading = false
                 if (res.ok) {
                   this.$message.success('OCR实别成功')
                 } else {
@@ -2698,13 +2702,15 @@ export default {
         } else if (this.OCRType === '1') {
           let splitEo = {}
           splitEo.standId = this.OCRDatas[0].standId
-          splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
+          splitEo.fileType = this.OCRDatas[0].standFileClassify
+          // splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
           splitEo.attId = this.OCRDatas[0].attId
           splitEo.fileName = this.OCRDatas[0].fileName
           this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
             _this: this
           }, res => {
             this.OCRModel = false
+            this.OCRSubmitLoading = false
             if (res.ok) {
               this.$message.success('拆分成功')
             } else {
@@ -2720,12 +2726,15 @@ export default {
       if (type === '0') {
         text = 'OCR识别'
         this.OCRTitle = '选择OCR识别文件'
+        this.OCRSubmitButton = '转换'
       } else if (type === '1') {
         text = '拆分'
         this.OCRTitle = '选择拆分文件'
+        this.OCRSubmitButton = '拆分'
       } else if (type === '2') {
         text = '编辑'
         this.OCRTitle = '选择编辑文件'
+
       }
       if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
         this.$message.warning('仅能选择一条数据进行' + text)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4af25a6c3..193910268 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -477,13 +477,12 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarBussionessStandForm"
             :model="sarBussionessStandEO"
             :rules="sarBussionessStandRules"
             class="label-input-form"
           >
-
 <!--            <custom-input-for-standards-->
 <!--              :config="{-->
 <!--                attrName: '代替企标编号',-->
@@ -1212,6 +1211,7 @@
       >
           <div class="demo-drawer-content">
               <el-form :model="productModelAdd"
+                       v-if="productModal"
                        ref="productModelAdd"
                        :rules="productRules"
                        class="label-input-form"
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 266d15605..3eb4b26f4 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -355,7 +355,7 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-                  v-if="reloadAddForm"
+                  v-if="reloadAddForm && modalshowflag"
                   ref="sarLawsStandEO"
                   :model="sarLawsStandEO"
                   :rules="sarLawsStandRules"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index b6a04f46e..abfba54fd 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -770,7 +770,7 @@
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarStandardsInfoForm"
             :model="sarStandardsInfoEO"
             :rules="sarStandardsInfoRules"
@@ -4272,7 +4272,6 @@ export default {
           }
         })
       } else if (this.ocrList.length === 1 && type === '2'){
-        console.log('4228',this.ocrList)
         this.selectStandardPro(this.ocrList[0], 'edit')
       }
     },