Merge branch 'develop' into FOTON

# Conflicts:
#	src/sysConfig/index.js

src/pages/details/complianceDetails/index.vue

@@ -22,7 +22,7 @@
         </el-table-column>
         <el-table-column
           prop="researchNonCompliance"
-          label="不合规项目"
+          label="不合规项"
           align="center"
         >
         </el-table-column>

src/pages/details/otherBussStandardDetails/index.vue

@@ -369,7 +369,6 @@
                               v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
                             <i
                               title="下载带水印"
-                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                               @click="downloadFileByWater(file.id, file.fileSuffix)"
                               class="icon-download2"
                               v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
@@ -2543,14 +2542,30 @@ export default {
       })
     },
     downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       this.$http.get('lawss/sarBussionessStand/logBussDownload2', {
         standCode: this.sarStandardsInfoEO.standCode,

src/pages/details/otherBussStandardExternalDetails/index.vue

@@ -369,7 +369,6 @@
                             />
                             <i
                               title="下载带水印"
-                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                               @click="downloadFileByWater(file.id, file.fileSuffix)"
                               class="icon-download2"
                               v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
@@ -2545,14 +2544,30 @@ export default {
       })
     },
     downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       this.$http.get('lawss/sarBussionessStand/logBussDownload2', {
         standCode: this.sarStandardsInfoEO.standCode,

src/pages/details/otherStandardDetails/index.vue

@@ -898,20 +898,20 @@
             label="责任工程师"
             width="100">
           </el-table-column>
-          <el-table-column
+<!--          <el-table-column-->
-            show-overflow-tooltip
+<!--            show-overflow-tooltip-->
-            label="符合性状态"
+<!--            label="符合性状态"-->
-            width="100">
+<!--            width="100">-->
-            <template slot-scope="scope">
+<!--            <template slot-scope="scope">-->
-              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
+<!--              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}-->
-            </template>
+<!--            </template>-->
-          </el-table-column>
+<!--          </el-table-column>-->
-          <el-table-column
+<!--          <el-table-column-->
-            show-overflow-tooltip
+<!--            show-overflow-tooltip-->
-            prop="complianceState"
+<!--            prop="complianceState"-->
-            label="合规性分析"
+<!--            label="合规性分析"-->
-            width="100">
+<!--            width="100">-->
-          </el-table-column>
+<!--          </el-table-column>-->
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
               <div @click.stop>
@@ -1082,30 +1082,30 @@
         <!--              clearable-->
         <!--          />-->
         <!--        </el-form-item>-->
-        <el-form-item
+<!--        <el-form-item-->
-          label="符合性状态"
+<!--          label="符合性状态"-->
-          class="add-form-item"
+<!--          class="add-form-item"-->
-        >
+<!--        >-->
-          <template>
+<!--          <template>-->
-            <el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
+<!--            <el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>-->
-            <el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
+<!--            <el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>-->
-          </template>
+<!--          </template>-->
-          <!--          <el-input-->
+<!--          &lt;!&ndash;          <el-input&ndash;&gt;-->
-          <!--              style="width: 45%"-->
+<!--          &lt;!&ndash;              style="width: 45%"&ndash;&gt;-->
-          <!--              v-model="resolveListForm.complianceRequire"-->
+<!--          &lt;!&ndash;              v-model="resolveListForm.complianceRequire"&ndash;&gt;-->
-          <!--              clearable-->
+<!--          &lt;!&ndash;              clearable&ndash;&gt;-->
-          <!--          />-->
+<!--          &lt;!&ndash;          />&ndash;&gt;-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item
+<!--        <el-form-item-->
-          label="合规性分析"
+<!--          label="合规性分析"-->
-          class="add-form-item"
+<!--          class="add-form-item"-->
-        >
+<!--        >-->
-          <el-input
+<!--          <el-input-->
-            style="width: 45%"
+<!--            style="width: 45%"-->
-            v-model="resolveListForm.complianceState"
+<!--            v-model="resolveListForm.complianceState"-->
-            clearable
+<!--            clearable-->
-          />
+<!--          />-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-form>
       <div id="roleFormButton" class="demo-drawer-footer" style="margin-top: 8%">
         <el-button
@@ -1360,19 +1360,19 @@
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
-        <div class="see-drawer-div">
+<!--        <div class="see-drawer-div">-->
-          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
+<!--          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>-->
-          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
+<!--          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">-->
-              {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
+<!--              {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}-->
-          </span>
+<!--          </span>-->
 
-        </div>
+<!--        </div>-->
 
-        <div class="see-drawer-div">
+<!--        <div class="see-drawer-div">-->
-          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
+<!--          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>-->
-          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
+<!--          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">-->
-            {{ standShowItemEO.complianceState }}</span>
+<!--            {{ standShowItemEO.complianceState }}</span>-->
-        </div>
+<!--        </div>-->
         <!--        <div class="see-drawer-div">-->
         <!--          <label class="see-drawer-name" title="FO">FO</label>-->
         <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
@@ -3199,14 +3199,30 @@ export default {
 
     },
     downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       if(this.$route.params.pageType === 'INLAND_STAND'){
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber

src/pages/details/otherStandardExternalDetails/index.vue

@@ -3210,14 +3210,30 @@ export default {
 
     },
     downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       if(this.$route.params.pageType === 'INLAND_STAND'){
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber

src/pages/details/process/ruku/index.vue

@@ -134,12 +134,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -150,12 +144,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
@@ -224,12 +212,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -240,12 +222,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>

src/pages/knowledgeGraph/index.vue

@@ -2241,18 +2241,6 @@ export default {
         this.$message.error('请选择要下载的文件')
       }
     },
-    downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
-
     // 查看详情
     getMenuDetail(menuId) {
       return new Promise((resolve, reject) => {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -2073,17 +2073,6 @@ export default {
         this.$message.error('请选择要下载的文件')
       }
     },
-    downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     showReferStandDetials (standNum) {
       // 验证标准号在系统中是否存在
       this.$http.post('lawss/sarTestItem/validateStandNumber', {

src/pages/phone/domesticDetails.vue

@@ -85,24 +85,12 @@
                                 <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
                                    @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                    :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                                <i title="下载" @click="downloadFile(file.id)" class="icon-download"
-                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                                />
-                                <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
-                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                                />
                               </span>
                               <!--多个文件时-->
                               <div v-else-if="child.value && child.value.length > 0">
                                 <span style="display: flex; align-items: center;">
                                   <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                      :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"
-                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                                  />
-                                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
-                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                                  />
                                 </span>
                               </div>
                             </div>
@@ -2786,36 +2774,6 @@
         }
 
       },
-      downloadFileByWater(attId, fileSuffix) {
-        if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-          this.$message.error('水印下载仅支持PDF,pdf格式文件')
-        } else {
-          if (attId != null && attId !== '') {
-            window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-          } else {
-            this.$message.error('请选择要下载的文件')
-          }
-        }
-        if(this.$route.query.pageType === 'INLAND_STAND'){
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standName
-          }, {
-            _this: this
-          }, res => {
-          })
-        }else{
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standEnName
-          }, {
-            _this: this
-          }, res => {
-          })
-        }
-      },
       /**
        * @Description: 跳转流程
        */

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="24">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="24">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -210,7 +210,6 @@
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 :show-submit="submitShow"
-                :show-confirm="acceptShow"
                 :show-transfer="submitShow"
                 @transfer="handleTransfer"
                 @save="handleSave"

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="24">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -25,14 +25,14 @@
                     <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">-->
-                                    <el-input
+<!--                                    <el-input-->
-                                            v-model="form.processName"
+<!--                                            v-model="form.processName"-->
-                                            placeholder="请输入流程名称"
+<!--                                            placeholder="请输入流程名称"-->
-                                            disabled
+<!--                                            disabled-->
-                                            clearable
+<!--                                            clearable-->
-                                    ></el-input>
+<!--                                    ></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled

src/pages/processCenter/pages/creatProcess/bzpg/step5.vue

@@ -266,14 +266,14 @@
                 v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
                 disabled
                 v-model="dataList[scope.$index].noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
               <el-input
                 v-else
                 :disabled="acceptShow"
                 v-model="dataList[scope.$index].noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
             </template>
@@ -475,14 +475,14 @@
               v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
             <el-input
               v-else
               :disabled="acceptShow"
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
           </el-form-item>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -610,18 +610,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 删除上传的文件
     delFileInfo (file, fileList) {
       this.fileInfoList.forEach((item, index) => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -423,18 +417,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -383,17 +377,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     //确认转办
     checkedRole (data) {
       this.assigneeNewLoading = true

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -724,18 +724,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 删除上传的文件
     delFileInfo (file, fileList) {
       this.fileInfoList.forEach((item, index) => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -452,17 +446,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -91,27 +91,51 @@
           previewShow(attId) {
             this.iframeLoading = true
             return new Promise((resolve, reject) => {
-              getBusStandFileByAttId({
+              this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-                attId
+                attId: attId
-              }).then(res => {
+              }, {
-                if(res){
+                _this: this
-                  const history = res;
+              }, res => {
-                  const editFileInfo = res.data
+                if (res.data) {
-                  if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+                  let fileObj = {}
-                    this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+                  fileObj.fileId = res.data.attId
-                  }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+                  fileObj.fileName = res.data.fileOldName
-                    this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+                  let fileList = []
-                  }else {
+                  let repeatData = 0
-                    const nowTime = new Date().getTime()
+                  if (sessionStorage.getItem('fileInfo')) {
-                    // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                    fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                    this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
+                    if (fileList != null && fileList.length > 0) {
+                      for (let i = 0; i < fileList.length; i++) {
+                        if (fileList[i].fileId === res.data.attId) {
+                          repeatData = 1
+                          break
+                        }
+                      }
+                      if (repeatData === 0) {
+                        fileList.push(fileObj)
+                        fileList = JSON.stringify(fileList)
+                        sessionStorage.setItem('fileInfo', fileList)
+                      }
+                    }
+                  } else {
+                    fileList.push(fileObj)
+                    fileList = JSON.stringify(fileList)
+                    sessionStorage.setItem('fileInfo', fileList)
                   }
-                  this.iframeLoading = false
+                  this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId)
-                  this.$forceUpdate()
+                } else {
-                  resolve(history)
+                  this.$message.error('文档未转换成功或该文档无法读取')
                 }
-              }).catch(e => {
+                this.iframeLoading = false
+                this.$forceUpdate()
+                resolve(history)
+              }, e => {
+                this.iframeLoading = false
+                this.$forceUpdate()
+                resolve(history)
+                this.$message.error('文档未转换成功或该文档无法读取')
               })
+
             })
             console.log(this.iframeUrl);
           },

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -536,18 +530,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //流程转办
     handleTransfer(){
         this.drawerModal = true

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -522,18 +516,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //流程转办
     handleTransfer(){
       this.drawerModal = true

src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue

@@ -117,12 +117,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -473,18 +467,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue

@@ -104,12 +104,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -414,19 +408,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue

@@ -117,12 +117,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -484,18 +478,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfs/step1.vue

@@ -1335,19 +1335,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
 };
 </script>

src/pages/processCenter/pages/creatProcess/qbfs/step2.vue

@@ -449,19 +449,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step3.vue

@@ -695,19 +695,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step4.vue

@@ -665,19 +665,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step5.vue

@@ -760,19 +760,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue

@@ -661,18 +661,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue

@@ -756,19 +756,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -447,18 +447,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step1.vue

@@ -810,19 +810,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
 };
 </script>

src/pages/processCenter/pages/creatProcess/qbfz/step4.vue

@@ -448,18 +448,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step5.vue

@@ -478,18 +478,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step6.vue

@@ -476,18 +476,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step7.vue

@@ -476,18 +476,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -1071,9 +1071,9 @@
                     QCRBUSS: [
                         { required: true, message: '请选择起草人', trigger: 'change' }
                     ],
-                    DTQBBHBUSS: [
+                    // DTQBBHBUSS: [
-                        { required: true, message: '请选择代替企标编号', trigger: 'change' }
+                    //     { required: true, message: '请选择代替企标编号', trigger: 'change' }
-                    ],
+                    // ],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断

src/pages/processCenter/pages/creatProcess/qbrk/step6.vue

@@ -1334,9 +1334,9 @@
                     QCRBUSS: [
                         { required: true, message: '请选择起草人', trigger: 'change' }
                     ],
-                    DTQBBHBUSS: [
+                    // DTQBBHBUSS: [
-                        { required: true, message: '请选择代替企标编号', trigger: 'change' }
+                    //     { required: true, message: '请选择代替企标编号', trigger: 'change' }
-                    ],
+                    // ],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断

src/pages/processCenter/pages/creatProcess/qbrk/step7.vue

@@ -82,7 +82,8 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
+<!--                                             :disabled="form.fsRejectStatus === 1"-->
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -105,7 +106,8 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input  v-model="scope.row.reason" placeholder="请填写扣分理由" />
+<!--                                            :disabled="form.fsRejectStatus === 1"-->
                                         </el-form-item>
                                     </template>
                                 </el-table-column>

src/pages/processCenter/pages/creatProcess/qbrk/step9.vue

@@ -91,7 +91,8 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input  v-model.number="scope.row.score" placeholder="请填写分值" />
+<!--                                            :disabled="form.fsRejectStatus === 1"-->
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -114,7 +115,8 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input  v-model="scope.row.reason" placeholder="请填写扣分理由" />
+<!--                                            :disabled="form.fsRejectStatus === 1"-->
                                         </el-form-item>
                                     </template>
                                 </el-table-column>

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue

@@ -33,12 +33,6 @@
                   class="icon-download"
                   v-btn-permission="''"
                 />
-                <i
-                  title="下载带水印"
-                  @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                  class="icon-download2"
-                  v-btn-permission="''"
-                />
               </p>
             </div>
             <div v-else>
@@ -959,17 +953,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     choiceLeader(){
       this.workModel = true
     },

src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue

@@ -33,12 +33,6 @@
                   class="icon-download"
                   v-btn-permission="''"
                 />
-                <i
-                  title="下载带水印"
-                  @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                  class="icon-download2"
-                  v-btn-permission="''"
-                />
               </p>
             </div>
             <div v-else>
@@ -996,17 +990,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     choiceLeader(){
       this.workModel = true
     },

src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue

@@ -131,7 +131,7 @@
               prop="noCompliance"
               align="center"
               width="170"
-              label="不合规项目">
+              label="不合规项">
             </el-table-column>
             <el-table-column
               prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -165,14 +165,14 @@
               prop="researchNonCompliance"
               align="center"
               width="200"
-              label="不合规项目">
+              label="不合规项">
               <template slot-scope="scope">
                 <el-input
                   v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0
                     || scope.row.remarks && scope.row.remarks.length>0"
                   disabled
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
                 <el-input
@@ -180,7 +180,7 @@
                   clearable
                   :disabled="acceptShow"
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
               </template>
@@ -406,20 +406,20 @@
             >
             </el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item">
+          <el-form-item label="不合规项" class="add-form-item">
             <el-input
               v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
                   || batchEditForm.remarks && batchEditForm.remarks.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
             <el-input
               v-else
               :disabled="acceptShow"
               v-model="batchEditForm.noCompliance"
-              placeholder="请输入不合规项目"
+              placeholder="请输入不合规项"
             >
             </el-input>
           </el-form-item>

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -140,7 +140,7 @@
               prop="noCompliance"
               align="center"
               width="170"
-              label="不合规项目">
+              label="不合规项">
             </el-table-column>
             <el-table-column
               prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -140,7 +140,7 @@
               prop="noCompliance"
               align="center"
               width="170"
-              label="不合规项目">
+              label="不合规项">
             </el-table-column>
             <el-table-column
               prop="countermeasures"
@@ -451,6 +451,36 @@ export default {
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.dataList = item.dataList;
+        let titleList = [];
+        let ordelTitleList = [];
+
+        this.dataList.forEach(data=>{
+          data.title = data.standSort + data.standNumber + data.standYear
+          let isReal = ""
+          // if (titleList !== []){
+            titleList.forEach(tl => {
+              if (tl === data.title){
+                isReal = data.title
+              }
+            })
+          // }
+          if (isReal === ""){
+            titleList.push(data.title);
+          }
+        })
+        console.log(titleList,"titleList!!!!")
+        console.log(this.dataList,"dataList   进入方法前 !!!!")
+        titleList.forEach(tl => {
+          this.dataList.forEach(data=>{
+            if (data.title === tl){
+              console.log(data.title,"方法中的title !!!!")
+              ordelTitleList.push(data)
+            }
+          })
+        })
+        this.dataList = ordelTitleList
+
+
         this.dataList.forEach(item =>{
           if(item.children){
             item.children.forEach(items =>{

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -125,7 +125,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -131,7 +131,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -131,7 +131,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -131,7 +131,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -154,20 +154,20 @@
               prop="researchNonCompliance"
               align="center"
               width="170"
-              label="不合规项目">
+              label="不合规项">
               <template slot-scope="scope">
                 <el-input
                   v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
                   disabled
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
                 <el-input
                   v-else
                   :disabled="acceptShow"
                   v-model="scope.row.noCompliance"
-                  placeholder="请输入不合规项目"
+                  placeholder="请输入不合规项"
                 >
                 </el-input>
               </template>
@@ -363,19 +363,19 @@
             >
             </el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item">
+          <el-form-item label="不合规项" class="add-form-item">
               <el-input
                 v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
                 disabled
                 v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
               <el-input
                 v-else
                 :disabled="acceptShow"
                 v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+                placeholder="请输入不合规项"
               >
               </el-input>
           </el-form-item>

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -127,7 +127,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -131,7 +131,7 @@
                       prop="noCompliance"
                       align="center"
                       width="170"
-                      label="不合规项目">
+                      label="不合规项">
               </el-table-column>
               <el-table-column
                       prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -131,7 +131,7 @@
                 prop="noCompliance"
                 align="center"
                 width="170"
-                label="不合规项目">
+                label="不合规项">
               </el-table-column>
               <el-table-column
                 prop="countermeasures"

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -821,14 +821,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -423,6 +423,21 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="适用认证" class="search-item">
+            <el-select :disabled="disabledXX"
+              v-model="handleSelectForm.syzd"
+              @change="isRelateAccessChange"
+              :popper-append-to-body="false"
+              placeholder="请选择标准状态">
+              <el-option
+                v-for="(item, index) in syzdSelect"
+                :key="index"
+                :value="item.value"
+                :label="item.label"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button :disabled="disabledXX"
               size="small"
@@ -775,6 +790,8 @@ export default {
   },
   data() {
     return {
+      syzd: '', // 标准名称/政策名称
+      syzdSelect: [], // 标准名称/政策名称
       replaceLoading: false,
       disabledXX:!!this.$route.query.disabledXX,
       //折叠的标志，true为折叠，false为不折叠
@@ -931,14 +948,26 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
+
     },
     dataSourceChange() {
       this.handleSelectForm.page = 1
@@ -1443,6 +1472,7 @@ export default {
       loading: "loading"
     }, res => {
       this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.syzdSelect = res.data.SYRZCLASS; //认证类型
       this.setMap(res.data.WBZTCLASS);// 文本状态
       this.setMap(res.data.TEXTSTATUSBUSS);//企标文本状态
       this.textState = res.data.WBZTCLASS // 文本状态

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -845,14 +845,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -845,14 +845,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue

@@ -836,14 +836,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -34,12 +34,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -385,18 +379,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/phone/jrbzhxh/step3.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -472,18 +466,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //转办按钮
     handleTransfer() {
       this.phoneshowflag = true;

src/pages/processCenter/pages/phone/jrbzhxh/step4.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -458,18 +452,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //转办按钮
     handleTransfer(){
       this.phoneshowflag = true

src/pages/processCenter/pages/phone/qbfs/step5.vue

@@ -779,19 +779,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/phone/qbfz/step5.vue

@@ -339,18 +339,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -333,18 +333,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/phone/qbfz/step7.vue

@@ -339,18 +339,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -1080,18 +1080,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //
     changeState(row) {
       let routeUrl = this.$router.resolve({

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -158,7 +158,7 @@
             <el-table-column
               prop="reason"
               width="180"
-              label="不合规项目">
+              label="不合规项">
             </el-table-column>
             <el-table-column
               prop="responsibleUnit"
@@ -235,7 +235,7 @@
                 <el-form-item class="add-form-item" label="项目名称:">
                   <div class="seeItem">{{ historySeeForm.productName }}</div>
                 </el-form-item>
-                <el-form-item class="add-form-item" label="不合规项目:">
+                <el-form-item class="add-form-item" label="不合规项:">
                   <div class="seeItem">{{ historySeeForm.reason }}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="责任部门:">
@@ -482,11 +482,11 @@
 <!--                      @click.native="choiceZRBM"-->
 <!--                    />-->
 <!--                  </el-form-item>-->
-                  <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
+                  <el-form-item prop="reason" label="不合规项" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
                       v-model="addForm.reason"
-                      placeholder="请输入不合规项目"
+                      placeholder="请输入不合规项"
                       :maxlength="500" />
                   </el-form-item>
                   <el-form-item prop="dutyEngineerName" label="责任工程师" style="width: 100%; margin-right:10px"
@@ -768,7 +768,7 @@ export default {
           { required: true, message: "请输入项目编号", trigger: "change" }
         ],
         reason: [
-          { required: true, message: "请输入不合规项目", trigger: "change" }
+          { required: true, message: "请输入不合规项", trigger: "change" }
         ],
         // responsibleUnit: [
         //   { required: true, message: "请输入责任部门", trigger: "change" }

src/pages/searchCenter/pages/standardSearch.vue

@@ -2039,6 +2039,9 @@
                     } else if (type === 6) {
                         this.goProcess(item)
                     }
+                    if (item.nameshow === '' || item.nameshow === null){
+                        item.nameshow = item.standEnName
+                    }
 
                     // 先不加判断
                     // if (type === 1) {