Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -8,9 +8,9 @@
       <el-tab-pane label="车型类别清单" name="listProject" v-if="project">
         <list-project></list-project>
       </el-tab-pane>
-      <!--<el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
+      <el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
         <list-tracking></list-tracking>
-      </el-tab-pane>-->
+      </el-tab-pane>
       <el-tab-pane label="其他清单" name="listOther" v-if="other">
         <list-other></list-other>
       </el-tab-pane>
@@ -39,7 +39,7 @@ export default {
       library: false,
       list: [],
       tabValue: "",
-      menuName: ["国家/地区清单", "车型类别清单"/*, "重点标准跟踪清单"*/, "其他清单", "项目清单"]
+      menuName: ["国家/地区清单", "车型类别清单","重点标准跟踪清单", "其他清单", "项目清单"]
     };
   },
   methods: {

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

@@ -214,7 +214,7 @@
     </el-dialog>
     <!-- 更新LOG -->
     <el-dialog
-      title="更新LOG"
+      title="更新记录"
       :visible.sync="relateDialog"
       class="relateClass"
       width="60%"

src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue

@@ -20,8 +20,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllZcbs">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -149,18 +149,37 @@
       </div>
 
     </el-drawer>
-
-
-    <!--    <div>
-          &lt;!&ndash; 导入弹框 &ndash;&gt;
-          <el-dialog
-              title="导入文件"
-              :visible.sync="dialogVisible1"
-              width="30%"
-          >
-            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-          </el-dialog>
-        </div>-->
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="dialogVisible1"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
+<!--    <div>-->
+<!--          &lt;!&ndash; 导入弹框 &ndash;&gt;-->
+<!--      <el-dialog-->
+<!--        title="导入文件"-->
+<!--        :visible.sync="dialogVisible1"-->
+<!--        width="30%"-->
+<!--      >-->
+<!--        <el-button  class="leading-in">点击或拖拽上传文件</el-button>-->
+<!--      </el-dialog>-->
+<!--    </div>-->
 
 
   </div>
@@ -170,6 +189,7 @@
 
 <script>
 import { exportQuery, exportEdit, exportAdd, exportDel } from '@/api/statisticsApi'
+import { exportAllSrbs, exportAllZcbs, importAllSrbs, importAllZcbs } from '@/api/process'
 export default {
   name: "child2",
   data() {
@@ -204,6 +224,8 @@ export default {
       acceptShow: false,
       annexDialog: false,
       annexList: [],
+      ids:'',
+      dialogVisible1 : false
 
     }
   },
@@ -221,6 +243,36 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    exportAllZcbs(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllZcbs({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '标准制修订补助资金收支统计支出表' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
     },
     //新增方法
     dataAdd() {
@@ -381,6 +433,42 @@ export default {
       this.acceptShow = true
 
     },*/
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllZcbs(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.dialogVisible1 = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {

src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue

@@ -19,8 +19,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllSrbs">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllSrbs">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -141,6 +141,27 @@
       </div>
 
     </el-drawer>
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
     <!--    <div>
           &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -180,6 +201,7 @@
 
 <script>
 import { inComeQuery, inComeEdit, inComeAdd, inComeDel } from '@/api/statisticsApi'
+import { exportAllFyfys, exportAllSrbs, importAllSrbs, importAssocCosts } from '@/api/process'
 export default {
   name: "child1",
   data() {
@@ -207,7 +229,11 @@ export default {
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
-      submitLoading: false
+      submitLoading: false,
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -264,6 +290,77 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importAllSrbs(){
+      this.visible.uploadData =true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllSrbs(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllSrbs(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllSrbs({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '标准制修订补助资金收支统计收入表' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
     },
     //删除方法
     deleteDetail() {

src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue

@@ -30,8 +30,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllAllWbtjs">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllWbtjs">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -298,10 +298,36 @@
                 @click="addDrawerClose">取消</el-button>
       </div>
     </el-drawer>
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+  import {
+    exportAllWbtjs,
+    importAllAllWbtjs,
+  } from '@/api/process'
+
 export default {
   name: "child3",
   data() {
@@ -378,6 +404,10 @@ export default {
       drawerTitle: '',
       drawerTable: false,
       DrawerType: '',
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
   mounted () {
@@ -407,6 +437,78 @@ export default {
     }, // 获取数据
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importAllAllWbtjs(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllAllWbtjs(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllWbtjs(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllWbtjs({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '参与外部协会会议统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+
+      })
     },
     submit() {
       this.$refs['addForm'].validate((valid) => {

src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue

@@ -30,8 +30,8 @@
             <el-divider/>
             <div style="float: left">
                 <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-                <!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-                <!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+                <el-button type="primary" size="small" @click="importAllCommiInfos">导入</el-button>
+                <el-button type="primary" size="small" @click="exportAllCommiInfos">导出</el-button>
                 <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
                 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
             </div>
@@ -321,12 +321,35 @@
                         @click="addDrawerClose">取消</el-button>
             </div>
         </el-drawer>
+      <!-- 导入 -->
+      <el-dialog
+        width="40%"
+        title="导入"
+        :visible.sync="visible.uploadData"
+        :show-footer="false"
+      >
+        <el-upload
+          class="upload-demo"
+          drag
+          action="string"
+          accept=".xlsx"
+          ref="file"
+          :http-request="uploadBank"
+          :before-upload="onbeforeunload"
+          :on-success="handleSuccess"
+          multiple style="text-align: center">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        </el-upload>
+      </el-dialog>
     </div>
 
 
 </template>
 
 <script>
+  import { exportAllCommiInfos, importAllCommiInfos } from '@/api/process'
+
     export default {
         name: "child2",
         data() {
@@ -412,6 +435,10 @@
                     remark: ''
                 },
                 DrawerType: '',
+                ids:'',
+              visible:{
+                uploadData : false
+              }
             }
         },
         mounted() {
@@ -431,7 +458,16 @@
                 })
             }, // 获取数据
             handleSelectionChange(val) {
-                this.multipleSelection = val;
+              this.multipleSelection = val;
+              this.ids = ''
+              val.forEach(item => {
+                if (this.ids.length < 1) {
+                  this.ids =item.id
+                } else {
+                  this.ids += ','
+                  this.ids += item.id
+                }
+              })
             },
             formDataAdd() {
                 this.DrawerType = 'add'
@@ -508,6 +544,70 @@
                     this.$message.warning('请选择要删除的数据')
                 }
             },//删除方法
+          //导入
+          importAllCommiInfos(){
+            this.visible.uploadData = true
+          },
+          /**
+           * 导入
+           */
+          uploadBank(param){
+            const formData = new FormData()
+            formData.append('file', param.file)
+            importAllCommiInfos(formData).then(res=>{
+              if (res.ok === true){
+                this.$message.success("导入成功")
+                this.visible.uploadData = false
+                this.getTableData()
+                this.$refs.file.clearFiles()
+
+              }else {
+                this.$message.error(res.data)
+              }
+            })
+          },
+          // 导入前验证
+          onbeforeunload(file){
+            if (!file){
+              this.$message.error('请上传文件')
+            }
+            const maxFile = file.size / 1024 / 1024 < 10;
+            const isExcel = file.name.indexOf('.xls') >= 0
+            if (!isExcel){
+              this.$message.error('只能上传Excel文件！')
+            }
+            if (!maxFile){
+              this.$message.error('上传大小不能超过10M')
+            }
+            return maxFile && isExcel
+          },
+          handleSuccess(){
+
+          },
+          //导出
+          exportAllCommiInfos(){
+            const params = this.ids
+            this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(()=> {
+              exportAllCommiInfos({ idList: params }).then(res => {
+                const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+                const downloadElement = document.createElement('a')
+                const href = window.URL.createObjectURL(blob)// 创建下载的链接
+                downloadElement.href = href
+                downloadElement.download = '委员信息数据统计' + '.xlsx' // 下载后文件名
+                document.body.appendChild(downloadElement)
+                downloadElement.click()// 点击下载
+                document.body.removeChild(downloadElement)// 下载完成移除元素
+                window.URL.revokeObjectURL(href)// 释放掉blob对象
+              })
+              this.$message.success('导出信息成功')
+            })
+
+          },
+
             /** 查询 */
             queryForm() {
                 this.form.page = 1

src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue

@@ -22,8 +22,8 @@
       <el-divider/>
       <div style="float: left;">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllAssocInfos">导入</el-button>
+        <el-button type="primary" size="small" @click="exportTestItem">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">
           批量删除
         </el-button>
@@ -419,6 +419,27 @@
                 @click="addDrawerClose">取消</el-button>
       </div>
     </el-drawer>
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 
 
@@ -426,6 +447,9 @@
 
 <script>
 
+import { interfaceUrl } from '@/sysConfig'
+import { exportAssocInfos, importAllAssocInfos } from '@/api/process'
+
 export default {
   name: "child1",
   components: {},
@@ -486,10 +510,16 @@ export default {
         p31: '',
         p32: '',
       },
+      ids:'',
+      exportName: '',
       // 新增，编辑框
       drawerTitle: '',
       drawerTable: false,
       DrawerType: '',
+      visible: {
+        // 导入弹窗是否可见
+        uploadData: false
+      },
       formRules: {
         scName: [
           {required: true, message: '请输入协会名称-标委会', trigger: 'blur'},
@@ -602,6 +632,7 @@ export default {
         p32: [
           {required: true, message: '请输入缴费信息', trigger: 'blur'},
         ],
+
       },
     }
 
@@ -693,6 +724,82 @@ export default {
         this.$message.warning('请选择要删除的数据')
       }
     }, // 删除
+    //导入
+    importAllAssocInfos(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllAssocInfos(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    // 导出确定功能
+    exportTestItem() {
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAssocInfos({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '协会信息数据统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
+
+    },
+
     /** 查询 */
     queryForm() {
       this.form.page = 1
@@ -706,9 +813,7 @@ export default {
       this.form.page = 1
       this.getData()
     }, //清空
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
+
     /** 新增 */
     formDataAdd() {
       this.DrawerType = 'add'

src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue

@@ -22,8 +22,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllWbxds">导入</el-button>
+        <el-button type="primary" size="small" @click="exportExReviseCost">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -408,10 +408,33 @@
                   @click="addDrawerClose">取消</el-button>
         </div>
     </el-drawer>
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+  import { exportAllWbxds, importAllAllWbtjs, importAllWbxds } from '@/api/process'
+
 export default {
   name: "child4",
   data() {
@@ -520,6 +543,10 @@ export default {
         ],
       },
       DrawerType: '',
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
   mounted () {
@@ -549,6 +576,15 @@ export default {
     }, // 查询
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
     },
     submit () {
       this.$refs['addForm'].validate((valid) => {
@@ -584,6 +620,71 @@ export default {
       this.addForm = {}
       this.drawerTable = false
     }, // 关闭
+
+    //导入
+    importAllWbxds(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllWbxds(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportExReviseCost(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllWbxds({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '参与外部标准制修订信息统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+
+      })
+    },
+
     deleteDetail () {
       if (this.multipleSelection.length) {
         this.$confirm('您是否确认删除选中数据?', '提示', {

src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue

@@ -26,8 +26,8 @@
       <el-divider/>
       <div style="float: left;">
         <el-button type="primary" size="small" @click="tableAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importExReviseCost">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllExReviseCost">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -148,7 +148,27 @@
         <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
-
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
     <!--    <div>
           &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -166,6 +186,7 @@
 
 <script>
 import { reviseAll, reviseEdit, reviseAdd, reviseDel } from '@/api/statisticsApi'
+import { exportAllCgfys, exportAllExReviseCost, importAssocCosts, importExReviseCost } from '@/api/process'
 export default {
   name: "child3",
   data() {
@@ -206,7 +227,11 @@ export default {
         { label: '类型1', value: '0' },
         { label: '类型2', value: '1' },
         { label: '类型3', value: '2' },
-      ]
+      ],
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -224,6 +249,77 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importExReviseCost(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importExReviseCost(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllExReviseCost(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllExReviseCost({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '参与外部标准制修订费用统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
     },
     //新增方法
     tableAdd() {

src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue

@@ -20,8 +20,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllCgfys">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllCgfys">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -135,7 +135,27 @@
         <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
-
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
     <!--    <div>
           &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -176,6 +196,7 @@
 
 <script>
 import { CgfysAll, CgfysEdit, CgfysAdd, CgfysDelMore } from '@/api/statisticsApi'
+import { exportAllCgfys, exportAllMeetCosts, importAllCgfys, importExReviseCost } from '@/api/process'
 export default {
   name: "child4",
   data() {
@@ -211,6 +232,10 @@ export default {
         cost: [{ required: true, message: '请填写费用', trigger: 'blur' }],
       },
       submitLoading: false,
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -227,6 +252,77 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importAllCgfys(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllCgfys(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllCgfys(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllCgfys({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '采购费用信息统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
     },
     //新增方法
     formDataAdd() {

src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue

@@ -37,8 +37,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="tableAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importMeetCost">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllMeetCosts">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -172,7 +172,27 @@
         <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
-
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
     <!--    <div>
     &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -213,6 +233,7 @@
 
 <script>
 import { meetAll, meetEdit, meetAdd, meetDel } from '@/api/statisticsApi'
+import { exportAllCommiInfos, exportAllMeetCosts, importAssocCosts, importMeetCost } from '@/api/process'
 export default {
   name: "child2",
   data() {
@@ -254,7 +275,11 @@ export default {
         { label: '列支1', value: '0' },
         { label: '列支2', value: '1' },
         { label: '列支3', value: '3' },
-      ]
+      ],
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -271,6 +296,78 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importMeetCost(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importMeetCost(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllMeetCosts(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllMeetCosts({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '参会费用信息统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
+
     },
     //新增方法
     tableAdd() {

src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue

@@ -26,8 +26,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAssocCosts">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllAssocCosts">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -163,7 +163,27 @@
     >
       <el-button class="leading-in">点击或拖拽上传文件</el-button>
     </el-dialog>
-
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 
 
@@ -173,6 +193,7 @@
 import {
   statisticsAll,statisticsAdd,
   statisticsEdit, delMore,queryStatistics } from '@/api/statisticsApi'
+import { exportAllAssocCosts, importAllCommiInfos, importAssocCosts } from '@/api/process'
 
 export default {
   name: "child1",
@@ -220,7 +241,11 @@ export default {
       payOptions: [
         { label: '已缴费', value: '0'},
         { label: '未缴费', value: '1'},
-      ]
+      ],
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -242,6 +267,78 @@ export default {
     /** 表格多选 */
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importAssocCosts(){
+      this.visible.uploadData =true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAssocCosts(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllAssocCosts(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllAssocCosts({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '协会费用信息统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+
+      })
     },
     // 新增、编辑的提交按钮
     submit() {

src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue

@@ -19,8 +19,8 @@
       <el-divider/>
       <div style="float: left">
         <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
-<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
+        <el-button type="primary" size="small" @click="importAllFyfys">导入</el-button>
+        <el-button type="primary" size="small" @click="exportAllFyfys">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail">批量删除</el-button>
 <!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
@@ -159,7 +159,27 @@
         <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
-
+    <!-- 导入 -->
+    <el-dialog
+      width="40%"
+      title="导入"
+      :visible.sync="visible.uploadData"
+      :show-footer="false"
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        action="string"
+        accept=".xlsx"
+        ref="file"
+        :http-request="uploadBank"
+        :before-upload="onbeforeunload"
+        :on-success="handleSuccess"
+        multiple style="text-align: center">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      </el-upload>
+    </el-dialog>
     <!--    <div>
           &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -199,6 +219,7 @@
 
 <script>
 import { fyQuery, fyDetail, fyEdit, fyAdd, fyDel } from '@/api/statisticsApi'
+import { exportAllExReviseCost, exportAllFyfys, importAllCgfys, importAllFyfys } from '@/api/process'
 export default {
   name: "children",
   data() {
@@ -229,6 +250,10 @@ export default {
       drawerTitle: '',
       formRules: {},
       submitLoading: false,
+      ids:'',
+      visible:{
+        uploadData : false
+      }
     }
   },
 
@@ -245,6 +270,76 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      this.ids = ''
+      val.forEach(item => {
+        if (this.ids.length < 1) {
+          this.ids =item.id
+        } else {
+          this.ids += ','
+          this.ids += item.id
+        }
+      })
+    },
+    //导入
+    importAllFyfys(){
+      this.visible.uploadData = true
+    },
+    /**
+     * 导入
+     */
+    uploadBank(param){
+      const formData = new FormData()
+      formData.append('file', param.file)
+      importAllFyfys(formData).then(res=>{
+        if (res.ok === true){
+          this.$message.success("导入成功")
+          this.visible.uploadData = false
+          this.getTableData()
+          this.$refs.file.clearFiles()
+        }else {
+          this.$message.error(res.data)
+        }
+      })
+    },
+    // 导入前验证
+    onbeforeunload(file){
+      if (!file){
+        this.$message.error('请上传文件')
+      }
+      const maxFile = file.size / 1024 / 1024 < 10;
+      const isExcel = file.name.indexOf('.xls') >= 0
+      if (!isExcel){
+        this.$message.error('只能上传Excel文件！')
+      }
+      if (!maxFile){
+        this.$message.error('上传大小不能超过10M')
+      }
+      return maxFile && isExcel
+    },
+    handleSuccess(){
+
+    },
+    //导出
+    exportAllFyfys(){
+      const params = this.ids
+      this.$confirm('是否确认导出所有类型数据项?', '确认导出数据', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=> {
+        exportAllFyfys({ idList: params }).then(res => {
+          const blob = new Blob([res], {type: 'application/vnd.ms-excel'})
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '翻译费用信息统计' + '.xlsx' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+        this.$message.success('导出信息成功')
+      })
     },
     //新增方法
     dataAdd() {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -597,8 +597,9 @@
                       prop="CYCVPPSBM"
                       label-width="150px"
                       class="add-form-item"
+                      label="关联模块--乘用车VPPS编码"
+                      title="关联模块--乘用车VPPS编码"
                     >
-                      <template slot="label">关联模块--乘用车VPPS编码</template>
                       <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
                                 clearable
                                 @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
@@ -606,16 +607,18 @@
                   </template>
                   <template v-else-if="field.attrField === 'KCCVPPSBM'">
                     <el-form-item
+                            title="关联模块--卡车VPPS编码"
+                            label="关联模块--卡车VPPS编码"
                       prop="KCCVPPSBM"
                       label-width="150px"
                       class="add-form-item"
                     >
-                      <template slot="label">关联模块--卡车VPPS编码</template>
                       <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码"
                                 clearable
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
+
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">
@@ -652,18 +655,19 @@
                   </template>
                   <template v-else-if="field.attrField === 'DYBXH'">
                     <el-form-item
-                            prop="DYBXH"
-                            label-width="150px"
-                            class="add-form-item"
+                      prop="DYBXH"
+                      label-width="150px"
+                      class="add-form-item"
+                      label="模块结构单元变型号(卡车)"
+                      title="模块结构单元变型号(卡车)"
                     >
-                      <template slot="label">模块结构单元变型号(卡车)</template>
                       <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
                                 clearable
                                 @click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYMC'">
-                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
                       <el-input
                         v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
                         v-model="sarStandardsInfoEO.DYMC = ''"
@@ -680,18 +684,19 @@
                   </template>
                   <template v-else-if="field.attrField === 'DYBXHCAR'">
                     <el-form-item
-                            prop="DYBXHCAR"
-                            label-width="150px"
-                            class="add-form-item"
+                      prop="DYBXHCAR"
+                      label-width="150px"
+                      class="add-form-item"
+                      label="模块结构单元变型号(乘用车)"
+                      title="模块结构单元变型号(乘用车)"
                     >
-                      <template slot="label">模块结构单元变型号(乘用车)</template>
                       <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
                                 clearable
                                 @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYMCCAR'">
-                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
                       <el-input
                               v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
                               v-model="sarStandardsInfoEO.DYMCCAR = ''"
@@ -960,8 +965,7 @@
       <el-dialog title="试验项目" :visible.sync="testItemsModel" :close-on-click-modal="false" width="1138px">
         <el-form :modal="testItemsForm" :inline="true" class="label-input-form">
           <el-formItem label="试验项目名称" class="serch-form-item">
-            <el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable
-                      @keyup.enter.native="selectTestItemClassBtn"/>
+            <el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable/>
           </el-formItem>
           <el-button size="mini" class="common-button-primary" type="primary" icon="el-icon-search"
                      @click="getTestItemRow(1)"></el-button>
@@ -1075,19 +1079,18 @@
             <div class="left">
               <el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
-                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
-                             @keyup.enter.native="searchConfiguraStand(true)" clearable>
+                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找" clearable>
                     <el-option v-for="(opt, index) in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
                                :key="index" :label="opt.label">{{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
                 <el-formItem label="标准号" prop="standNumber" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
+                  <el-input v-model="sarConfigStandSearch.standNumber"
                             placeholder="根据标准号查找" clearable/>
                 </el-formItem>
                 <el-formItem label="标准名称" prop="standNumber" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standName" @keyup.enter.native="searchConfiguraStand(true)"
+                  <el-input v-model="sarConfigStandSearch.standName"
                             placeholder="根据标准名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">
@@ -1616,15 +1619,13 @@
                   <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')"
                               clearable
-                              :maxlength="100"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :maxlength="100"></el-input>
                   </el-form-item>
                   <!--            标准名称-->
                   <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')"
                               clearable
-                              :maxlength="500"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :maxlength="500"></el-input>
                   </el-form-item>
                   <!--            标准年份-->
                   <el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
@@ -1636,8 +1637,7 @@
                   <!--            文本状态-->
                   <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
-                               clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                               clearable>
                       <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value" :label="opt.label">{{ opt.label }}
                       </el-option>
@@ -1649,11 +1649,10 @@
                     <el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
                               clearable
                               :maxlength="500"
-                              @click.native="BZTXhandle"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              @click.native="BZTXhandle"></el-input>
 
 <!--                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
-<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                             >-->
 <!--                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
 <!--                                 :key="index"-->
 <!--                                 :label="opt.label">{{ opt.label }}-->
@@ -1676,7 +1675,6 @@
                     <search-select
                       v-model="sarStandardsSearch.standSort"
                       :placeholder="$t('m.standardCategoryTips')"
-                      @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
                       :options="standSortOptions"
                       clearable/>
                   </el-form-item>
@@ -1684,8 +1682,7 @@
                   <el-form-item :label="$t('m.standardEnglishName')" :title="$t('m.standardEnglishName')"
                                 class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standEnName"
-                              :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"></el-input>
                   </el-form-item>
                   <!--            标准发布日期-->
                   <el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
@@ -1701,8 +1698,7 @@
                   </el-form-item>
                   <!--            标准性质-->
                   <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
                       <el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="index" :label="opt.label">{{ opt.label }}
                       </el-option>
@@ -1774,8 +1770,7 @@
                 <el-col :span="12">
                   <!--            归口管理部门-->
                   <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>
                       <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="index" :label="opt.label">{{ opt.label }}
                       </el-option>
@@ -1783,8 +1778,7 @@
                   </el-form-item>
                   <!--            我司参与深度-->
                   <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable>
                       <el-option v-for="(opt, index) in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="index"
                                  :label="opt.label">{{ opt.label }}
@@ -1858,30 +1852,26 @@
                   <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber"
                                 class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
-                              placeholder=" 关联模块--乘用车VPPS编码"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder=" 关联模块--乘用车VPPS编码"></el-input>
                   </el-form-item>
                   <!--           关联模块--乘用车vpps中文名称-->
                   <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber"
                                 class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
-                              placeholder="关联模块--乘用车VPPS中文名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--乘用车VPPS中文名称"></el-input>
                   </el-form-item>
 
                   <!--    模块结构单元名称     -->
                   <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.DYMC" clearable
-                              placeholder="模块结构单元名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="模块结构单元名称"></el-input>
                   </el-form-item>
 
                 </el-col>
                 <el-col :span="12">
                   <!--            起草单位-->
                   <el-form-item label="起草单位" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable>
                       <el-option v-for="(opt, index) in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="index"
                                  :label="opt.label">{{ opt.label }}
@@ -1960,21 +1950,18 @@
                   <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
                                 class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
-                              placeholder="关联模块--卡车VPPS编码"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--卡车VPPS编码"></el-input>
                   </el-form-item>
                   <!--关联模块--卡车vpps中文名称-->
                   <el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber"
                                 class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
-                              placeholder="关联模块--卡车VPPS中文名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--卡车VPPS中文名称"></el-input>
                   </el-form-item>
 
                   <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.DYBXH" clearable
-                              placeholder="模块结构单元变型号"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="模块结构单元变型号"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1989,13 +1976,11 @@
                   <el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.replaceStandNum"
                               :placeholder="$t('m.lookUpByAlternativeCriteria')"
-                              clearable :maxlength="100"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              clearable :maxlength="100"></el-input>
                   </el-form-item>
                   <!--            采标编号-->
                   <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                    <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>
                   </el-form-item>
 
                 </el-col>
@@ -2007,14 +1992,12 @@
                   <!--                  </el-form-item>-->
                   <!--            引用标准-->
                   <el-form-item label="引用标准" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"></el-input>
                   </el-form-item>
                   <!--            被引用标准-->
                   <el-form-item label="被引用标准" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.BYYBJ" clearable
-                              placeholder="根据被引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="根据被引用标准查找"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -2058,9 +2041,9 @@
     <Role-tree
       :is-title="drawerTitle"
       :is-visible.sync="modalShowRoleFlag"
-      @checkedRole="checkedRole2"
       :nodeList="nodeList2"
-    ></Role-tree>
+      @checkedRole="checkedRole2"
+    />
     <Role-tree
       is-title="选择人员信息"
       :is-visible.sync="modalshowflagRole"
@@ -4599,6 +4582,9 @@ export default {
       formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
       formData.issueTime = null
       this.loading = true
+      if(formData.CLLX){
+        formData.applyArctic = formData.CLLX.join(',')
+      }
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
@@ -4659,7 +4645,6 @@ export default {
           }
         }
         this.configStandList = res.data.list
-        console.log(this.configStandList);
         this.configTotal = res.data.count
         this.selectConfigStand = []
       }, e => {
@@ -5815,9 +5800,22 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
-    choiceZRRS(type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
+    choiceZRRS(type, title, nameId) {
+      this.nodeList2 = []
+        console.log(typeof (nameId));
+        console.log(nameId);
+        if (nameId) {
+        let nameId1 = nameId.split(',')
+        let idList = []
+        nameId1.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList2.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag = true
@@ -5889,7 +5887,6 @@ export default {
       } else if (this.drawerTitle === '查询责任部门') {
         this.advanceSearchMapping['ZRBM'] = nameList
       }
-
     },
   },
   computed: {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -72,17 +72,17 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="标准号" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="中文名称" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standName" placeholder="根据标准名称查找" clearable :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.standName" placeholder="根据标准名称查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="英文名称" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standEnName" placeholder="根据英文名称查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.standEnName" placeholder="根据英文名称查找" clearable></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -96,12 +96,12 @@
               <!--              </el-col>-->
               <el-col :span="8">
                 <el-form-item label="代替标准号" class="search-item">
-                  <el-input v-model="sarBussionessSearch.replaceStandNum" placeholder="根据代替标准号查找" clearable :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.replaceStandNum" placeholder="根据代替标准号查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="被代替标准号" class="search-item">
-                  <el-input v-model="sarBussionessSearch.replacedStandNum" placeholder="根据被代替标准号查找" clearable :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.replacedStandNum" placeholder="根据被代替标准号查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -143,7 +143,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="标准状态" class="search-item">
-                  <el-select v-model="sarBussionessSearch.standStatus" placeholder="根据标准状态查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
+                  <el-select v-model="sarBussionessSearch.standStatus" placeholder="根据标准状态查找" clearable>
                     <el-option v-for="(opt,index) in standStateOptions" :value="opt.value" :key="index" :label="opt.label">
                       {{ opt.label }}
                     </el-option>
@@ -152,14 +152,14 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="SVPPS" class="search-item">
-                  <el-input v-model="sarBussionessSearch.SVPPS" placeholder="根据SVPPS查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"></el-input>
+                  <el-input v-model="sarBussionessSearch.SVPPS" placeholder="根据SVPPS查找" clearable></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row style="margin-top: 15px">
               <el-col :span="8">
                 <el-form-item label="密级" class="search-item">
-                  <el-select v-model="sarBussionessSearch.MJ" placeholder="根据密级查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
+                  <el-select v-model="sarBussionessSearch.MJ" placeholder="根据密级查找" clearable>
                     <el-option v-for="(opt,index) in allSelectOptions['MJ']" :value="opt.value" :key="index" :label="opt.label">
                       {{ opt.label }}
                     </el-option>
@@ -168,7 +168,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="授权" class="search-item">
-                  <el-select v-model="sarBussionessSearch.SQ" placeholder="根据授权查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
+                  <el-select v-model="sarBussionessSearch.SQ" placeholder="根据授权查找" clearable>
                     <el-option v-for="(opt,index) in allSelectOptions['SHIFOU']" :value="opt.value" :key="index" :label="opt.label">
                       {{ opt.label }}
                     </el-option>
@@ -188,10 +188,10 @@
                 <!--                  </el-select>-->
                 <!--                </el-form-item>-->
                 <el-formItem label="标准号" prop="numberName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
+                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
                 </el-formItem>
                 <el-formItem label="标准名称" prop="standName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
+                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
                   <el-button
@@ -847,7 +847,7 @@
                 <!--                            placeholder="根据标准名称查找" clearable/>-->
                 <!--                </el-formItem>-->
                 <el-formItem label="企标编号" prop="standCode" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standCode" @keyup.enter.native="searchConfiguraStand"
+                  <el-input v-model="sarConfigStandSearch.standCode"
                             placeholder="根据企标编号查找" clearable/>
                 </el-formItem>
                 <!--                <el-formItem label="企标类别" prop="standSort" class="search-item">-->
@@ -858,7 +858,7 @@
                 <!--                  </el-select>-->
                 <!--                </el-formItem>-->
                 <el-formItem label="企标名称" prop="replaceStandNum" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standName" @keyup.enter.native="searchConfiguraStand" placeholder="根据企标名称查找" clearable :maxlength="100"/>
+                  <el-input v-model="sarConfigStandSearch.standName" placeholder="根据企标名称查找" clearable :maxlength="100"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
                   <el-button
@@ -1125,8 +1125,7 @@
               <el-col :span="12">
                 <el-form-item label="企标编号" class="add-form-item form-item-disabled">
                   <el-input v-model="sarBussionessSearch.standCode" clearable
-                            placeholder="请输入企标编号"
-                            @keyup.enter.native="getDomesticStandardTableBtn(sarBussionessSearch)"></el-input>
+                            placeholder="请输入企标编号"></el-input>
                 </el-form-item>
                 <el-form-item label="标准年份" class="add-form-item form-item-disabled">
                   <el-input v-model.number="sarBussionessSearch.standYear"
@@ -1343,7 +1342,7 @@
       >
           <div class="search-area">
               <div class="left">
-                  <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                  <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                       <el-form-item label="编号/名称" class="search-item">
                           <el-input
                                   v-model="replaceLawsNumForm.standCode"
@@ -2768,7 +2767,7 @@ export default {
     // 查询二级菜单
     selectMenuList() {
       return new Promise((resolve, reject) => {
-        this.$http.get('sarResource/ts-resource/getListStand',  {
+        this.$http.get('sarResource/ts-resource/getListStandLimitData',  {
           sorDivide: 'BUSINESS_STAND',
           userId: this.$store.getters.userInfo.userId
         }, {
@@ -2781,7 +2780,7 @@ export default {
     },
     selectMenu2(res,json) {
       return new Promise((resolve, reject) => {
-        this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, {
+        this.$http.get('lawss/sarMenuStandardLimit/getListStandLimit', {dicId:'9m4qqqaansxmox5e82zm'}, {
           _this: this
         }, res => {
           const history = res;
@@ -4369,6 +4368,7 @@ export default {
         formData.issueTime = null;
       }
       this.SarExportSearchEo = formData
+      formData.isKU = '1'
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
         _this: this, loading: 'loading'
       }, res => {

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -103,7 +103,7 @@
                                 prop="esName"
                                 label="企标名称"
                                 align="center"
-                                width="120">
+                                width="150">
                         </el-table-column>
                         <el-table-column
                                 prop="planStatus"
@@ -160,7 +160,6 @@
                             </template>
                         </el-table-column>
                         <el-table-column
-                                width="180"
                                 align="center"
                                 prop="unitName"
                                 label="起草责任单位">

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -1,4 +1,4 @@
-<!--企业标准库-->
+<!--国内外政策库-->
 <template>
   <div id="foreignRegulationsDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
     <!--左侧树-->
@@ -104,8 +104,7 @@
                           @click="clearAllSearch('lawsStandInfoSearch')">清空
                   </el-button>
                   <el-button size="mini" type="primary" class="common-button-primary"
-                             v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbi'" @click="selectMoreBtn"><i
-                          class="iconfont">&#xe7a5;</i>高级检索
+                             v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbi'" @click="selectMoreBtn">高级检索
                   </el-button>
                 </el-form-item>
               </el-form>
@@ -1477,7 +1476,7 @@
         quoteIdList1: '',
         selectedListRep: [],
         replaceStandNumModelNum: [],
-        sarType: 'LAWS_STAND',
+        sarType: 'FOREIGN_LAWS',
         dynamicFormField: [],
         reloadAddForm: false,
         showRegionOptions: [],
@@ -1512,7 +1511,7 @@
           id: '',
           parentId: '',
           menuName: '',
-          sorDivide: 'LAWS_STAND',
+          sorDivide: 'FOREIGN_LAWS',
           displaySeq: '',
           parentIds: '',
           remarks: ''
@@ -2317,8 +2316,8 @@
       },
       // 查询二级菜单
       selectMenuList () {
-        this.$http.get('sarResource/ts-resource/getList', {
-          sorDivide: 'LAWS_STAND',
+        this.$http.get('sarResource/ts-resource/getListStand', {
+          sorDivide: 'FOREIGN_LAWS',
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.ok) {
@@ -2520,7 +2519,7 @@
             type: 'warning'
           })
         } else {
-          this.personShareEO.resType = 'LAWS_STAND'
+          this.personShareEO.resType = 'FOREIGN_LAWS'
           this.personShareEO.resTitle = this.resPk.standName + '  ( 编号:' + this.resPk.standCode + ' )'
           this.personShareEO.resId = this.resPk.id
           this.personShareEO.recipientId = this.shareStandardSelect.join(',')
@@ -2549,7 +2548,7 @@
             type: 'warning'
           })
         } else {
-          this.personShareEO.resType = 'LAWS_STAND'
+          this.personShareEO.resType = 'FOREIGN_LAWS'
           this.personShareEO.resTitle = this.resPk.standName + '  ( 编号:' + this.resPk.standCode + ' )'
           this.personShareEO.resId = this.resPk.id
           this.personShareEO.recipientId = this.shareStandardSelect.join(',')
@@ -2658,7 +2657,7 @@
         item.isSubmit = true
         this.personCollect.collectResId = item.id
         this.personCollect.collectTitle = '  ( 编号:' + item.lawsNumber + ')'
-        this.personCollect.collectType = 'LAWS_STAND'
+        this.personCollect.collectType = 'FOREIGN_LAWS'
         this.personCollect.userId = this.$store.getters.userInfo.userId
         this.$http.postData('person/personCollect', this.personCollect, {
           _this: this
@@ -2849,7 +2848,7 @@
           name: 'OtherLawsStandDetails',
           params: {
             id: item.id,
-            pageType: 'LAWS_STAND'
+            pageType: 'FOREIGN_LAWS'
           }
         })
         window.open(routeUrl.href, '_blank')
@@ -2860,6 +2859,24 @@
           _this: this
         }, res => {
           const item = res.data || {}
+          this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
+          console.log(this.sarLawsStandEO)
+          this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
+          let subClass = item.standSubclass
+          this.sarLawsStandEO.standSubclass = subClass
+          if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
+            this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
+          }
+          if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
+            this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
+          }
+          Object.keys(item.attrInfoMap || {}).forEach((key) => {
+            if (item.attrInfoMap[key]) {
+              // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
+              this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
+            }
+          })
+          this.sarLawsStandEO['id'] = item.id
           this.drawerTitle = '修改政策标准'
           this.modalshowflag = true
           this.resolveFormFieldList(true)
@@ -2893,23 +2910,6 @@
               this.dynamicFormField = displayLocation
               this.loading = false
             })
-            this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
-            this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
-            let subClass = item.standSubclass
-            this.sarLawsStandEO.standSubclass = subClass
-            if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
-              this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
-            }
-            if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
-              this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
-            }
-            Object.keys(item.attrInfoMap || {}).forEach((key) => {
-              if (item.attrInfoMap[key]) {
-                // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
-                this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
-              }
-            })
-            this.sarLawsStandEO['id'] = item.id
             if (state === 'show') {
               this.formdisableflag = true
             } else {
@@ -2923,6 +2923,7 @@
               this.sarLawsStandEO.orgName = item.responsibleUnitShow
             }
           })
+          console.log(this.sarLawsStandEO)
         })
       },
       // 部门树结构，通过id，查出对应的树节点
@@ -3396,7 +3397,7 @@
               id: '',
               parentId: '',
               menuName: '',
-              sorDivide: 'LAWS_STAND',
+              sorDivide: 'FOREIGN_LAWS',
               displaySeq: '',
               remarks: '',
               parentIds: ''
@@ -3805,7 +3806,7 @@
           name: 'OtherLawsStandDetails',
           params: {
             id: row.id,
-            pageType: 'LAWS_STAND'
+            pageType: 'FOREIGN_LAWS'
           }
         })
         window.open(routeUrl.href, '_blank')
@@ -3813,7 +3814,7 @@
       // 查询二级菜单
       selectMenu () {
         this.countRootId = 0
-        this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'LAWS_STAND'}, {
+        this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_LAWS'}, {
           _this: this
         }, res => {
           let treeNode = []
@@ -3879,7 +3880,7 @@
                 res => {
                   if (res.ok) {
                     const { data = {} } = res
-                    this.formFieldListData = data['LAWS_STAND']
+                    this.formFieldListData = data['FOREIGN_LAWS']
                     // 追加高级查询动态下拉框数据s
                     this.twoOptions = [
                       // {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -67,7 +67,7 @@
         <div slot="left">
           <div class="search-area">
             <div class="left">
-              <el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
+              <el-form :modal="standCommonlySearch" inline class="label-input-form">
                 <!--                <el-form-item label="标准类别" class="search-item">
                                   <el-select v-model="standCommonlySearch.standSort" filterable>
                                     <el-option
@@ -111,7 +111,8 @@
                     @click="clearAllSearch('standCommonlySearch')">清空
                   </el-button>
                   <el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'" @click="selectMoreBtn">
-                    <i class="iconfont">&#xe7a5;</i>高级查询
+<!--                    <i class="iconfont">&#xe7a5;</i>-->
+                    高级检索
                   </el-button>
                 </el-form-item>
               </el-form>
@@ -334,30 +335,27 @@
             </el-table-column>
             <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
-
-                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"
-                     @command="handleCommand"
-                >
-                  <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
-                             v-if="scope.row.collectBtn"
-                             @click="handleCommand([scope.row, '收藏'])"
-                  >收藏
-                  </el-button>
-                  <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
-                             v-else
-                             @click="handleCommand([scope.row, '取消收藏'])"
-                  >取消收藏
-                  </el-button>
-                  <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                             v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑
-                  </el-button>
-                  <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                             v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">删除
-                  </el-button>
-                </div>
-
-                <div v-else>
-
+<!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
+<!--                     @command="handleCommand"-->
+<!--                >-->
+<!--                  <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
+<!--                             v-if="scope.row.collectBtn"-->
+<!--                             @click="handleCommand([scope.row, '收藏'])"-->
+<!--                  >收藏-->
+<!--                  </el-button>-->
+<!--                  <el-button type="text" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
+<!--                             v-else-->
+<!--                             @click="handleCommand([scope.row, '取消收藏'])"-->
+<!--                  >取消收藏-->
+<!--                  </el-button>-->
+<!--                  <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
+<!--                             v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑-->
+<!--                  </el-button>-->
+<!--                  <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
+<!--                             v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">删除-->
+<!--                  </el-button>-->
+<!--                </div>-->
+                <div>
                   <div @click.stop style="display: inline-block">
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
                                v-if="scope.row.collectBtn"
@@ -370,9 +368,7 @@
                     >
                     </el-button>
                   </div>
-
                 </div>
-
               </template>
 
 
@@ -387,7 +383,7 @@
       <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
         <el-form :inline="true" class="label-input-form search-area">
           <el-form-item label="导出名称" class="search-item">
-            <el-input v-model="exportName" @keyup.native="btKeyUp" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+            <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
           </el-form-item>
         </el-form>
         <span slot="footer" class="demo-drawer-footer">
@@ -477,14 +473,12 @@
                   <!--            标准号-->
                   <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
-                              :maxlength="100"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :maxlength="100"></el-input>
                   </el-form-item>
                   <!--            标准名称-->
                   <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
-                              :maxlength="500"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :maxlength="500"></el-input>
                   </el-form-item>
                   <!--            标准年份-->
                   <el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
@@ -507,8 +501,7 @@
                   </el-form-item>
                   <!--            标准性质-->
                   <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
                       <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value" :label="opt.label">{{ opt.label }}
                       </el-option>
@@ -531,20 +524,17 @@
                     <search-select
                       v-model="sarStandardsSearch.standSort"
                       :placeholder="$t('m.standardCategoryTips')"
-                      @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
                       :options="standSortOptions"
                       clearable/>
                   </el-form-item>
                   <!--            标准英文名称-->
                   <el-form-item :label="$t('m.standardEnglishName')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.standEnName"
-                              :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"></el-input>
                   </el-form-item>
                   <!--            文本状态-->
                   <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable>
                       <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value" :label="opt.label">{{ opt.label }}
                       </el-option>
@@ -561,8 +551,7 @@
                   <!--            标签-->
                   <el-form-item label="标签" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.GXHBQ" clearable
-                              placeholder="根据被标签查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="根据被标签查找"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -698,20 +687,17 @@
                   <!--           关联模块--乘用车vpps中文名称-->
                   <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
-                              placeholder="关联模块--乘用车VPPS中文名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--乘用车VPPS中文名称"></el-input>
                   </el-form-item>
                   <!--关联模块--卡车vpps中文名称-->
                   <el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
-                              placeholder="关联模块--卡车VPPS中文名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--卡车VPPS中文名称"></el-input>
                   </el-form-item>
                   <!--    模块结构单元名称     -->
                   <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.DYMC" clearable
-                              placeholder="模块结构单元名称"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="模块结构单元名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -782,20 +768,17 @@
                   <!--            关联模块--乘用车VPPS编码-->
                   <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
-                              placeholder=" 关联模块--乘用车VPPS编码"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder=" 关联模块--乘用车VPPS编码"></el-input>
                   </el-form-item>
                   <!--关联模块--卡车VPPS编码-->
                   <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
-                              placeholder="关联模块--卡车VPPS编码"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="关联模块--卡车VPPS编码"></el-input>
                   </el-form-item>
                   <!-- 模块结构单元变型号 -->
                   <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.DYBXH" clearable
-                              placeholder="模块结构单元变型号"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="模块结构单元变型号"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -810,13 +793,11 @@
                   <!--            代替标准号-->
                   <el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
                     <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
-                              clearable :maxlength="100"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              clearable :maxlength="100"></el-input>
                   </el-form-item>
                   <!--            引用标准-->
                   <el-form-item label="引用标准" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -828,8 +809,7 @@
                   <!--            被引用标准-->
                   <el-form-item label="被引用标准" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.BYYBJ" clearable
-                              placeholder="根据被引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                              placeholder="根据被引用标准查找"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -1051,7 +1031,6 @@
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
                   <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
                     <custom-input-for-standards
-
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -1344,8 +1323,7 @@
       <el-dialog title="试验项目" :visible.sync="testItemsModel" :close-on-click-modal="false" width="1138px">
         <el-form :modal="testItemsForm" :inline="true" class="label-input-form">
           <el-formItem label="试验项目名称" class="serch-form-item">
-            <el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable
-                      @keyup.enter.native="selectTestItemClassBtn"/>
+            <el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable/>
           </el-formItem>
           <el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="getTestItemRow(1)"></el-button>
           <el-button class="common-button-default" icon="el-icon-refresh-left" @click="getTestItemRow('')" size="mini"></el-button>
@@ -1457,15 +1435,14 @@
             <div class="left">
               <el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
-                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
-                             @keyup.enter.native="searchConfiguraStand" clearable>
+                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找" clearable>
                     <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
                       {{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
                 <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand"
+                  <el-input v-model="sarConfigStandSearch.standNumber"
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -204,6 +204,7 @@
             @pageSizeChange="pageProStateSizeChange"></pagination>
         </div>
       </div>
+      <loading :loading="loading2">数据处理中</loading>
     </el-drawer>
   </div>
 </template>
@@ -213,6 +214,7 @@ export default {
   name: "standInvolveProjectDetail",
   data() {
     return {
+      loading2: false,
       sarProject: {
         standName: "", // 标准政策名称
         standNumber: "", // 标准/政策号
@@ -310,7 +312,8 @@ export default {
       form.current = this.sarProStateTotalPage;
       form.size = this.sarProStatePageSize;
       this.$http.get("sarStandardComplianceAssessResult/productNew", form, {
-        _this: this
+        _this: this,
+        loading: 'loading2'
       }, res => {
         if (res.ok) {
           // res.data.records.forEach((item)=>{

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -239,6 +239,7 @@
                   @pageSizeChange="pageProStateSizeChange"></pagination>
         </div>
       </div>
+      <loading :loading="loading2">数据处理中</loading>
     </el-drawer>
     <el-dialog width='400px' :visible.sync="riskDegreeModal" title="修改技术储备情况">
       <el-select v-model="riskDegree" placeholder="请选择">
@@ -260,6 +261,7 @@
     name: "technologyInvolveProject",
     data () {
       return {
+        loading2: false,
         itemType: false,
         interpretationTime: '',
         riskDegreeModal: false,
@@ -413,7 +415,7 @@
         form.interpretationTime = this.interpretationTime
         this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
           _this: this,
-          loading: 'loading'
+          loading: 'loading2'
         }, res => {
           if (res.ok) {
             this.sarProStateListDatas = res.data.records

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

@@ -460,7 +460,7 @@
                       <el-option
                         v-for="item in ProjectDatas"
                         :key="item.id"
-                        :label="item.projectName"
+                        :label="item.projectName.substring(0, 42) "
                         :value="item"
                       ></el-option>
                     </el-select>

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -735,7 +735,6 @@
                         <el-table-column
                                 v-if="itemType !== '3'"
                                 prop="xcxssrq"
-                                sortable="custom"
                                 width="150"
                                 label="新车型实施日期">
                             <template slot-scope="scope">
@@ -745,7 +744,6 @@
                         <el-table-column
                                 v-if="itemType !== '3'"
                                 prop="zccssrq"
-                                sortable="custom"
                                 width="150"
                                 label="在产车实施日期">
                             <template slot-scope="scope">