Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue

@@ -31,353 +31,8 @@ export default {
       tabValue: 'standInvolveProjectDetail'
     }
   },
-  methods: {
-    /**
-     * 查看项目符合性弹框里面的
-     * 符合性状态列点击事件
-     */
-    handleSarStateClick(row) {
-      if (row.sarState === 8) {
-        return
-      }
-      // console.log(row)
-      this.showSarProStateModal2 = true
-      this.saveClickProductId = row.productId
-      this.queryItemsBySar()
-    },
-    /**
-     * 查看项目  条款 弹框里面的
-     * 符合性状态列点击事件
-     */
-    handleItemClick(row) {
-      const processList = row.process ? row.process.split(',') : []
-      console.log(processList)
-      this.processList = processList.map(item => {
-        return {
-          processNumber: item
-        }
-      })
-      this.processListVisible = true
-    },
-    /**
-     * 查看项目  条款 流程编号弹框里面的
-     * 流程编号点击事件
-     */
-    handleProcessClick(row) {
-      const processNumber = row.processNumber
-      this.$store.commit('setDetailMap', this.$route.path)
-      this.$router.push({
-        name: 'ProcessDetail',
-        query: {
-          prcNum: processNumber
-        }
-      })
-    },
-    // 返回
-    back () {
-      this.$router.push(this.$store.state.detailMap)
-      this.$store.commit('setDetailMap', '')
-    },
-    // 列表操作栏 ...
-    handleCommand (command) {
-      switch (command[1]) {
-        case '查看项目符合性':
-          this.handleProjectCompliance(command[0])
-          break
-      }
-    },
-    // 符合性项目列表操作
-    handleCommandInside (command) {
-      switch (command[1]) {
-        case '编辑':
-          this.handleEdit(command[0])
-          break
-        // case '查看':
-        //   this.handleProjectCompliance(command[0])
-        //   break
-      }
-    },
-    searchStandAndLaws () {
-      this.page = 1
-      this.queryStandAndLaws()
-    },
-    // 分页查询
-    queryStandAndLaws () {
-      this.sarProject.page = this.page
-      this.sarProject.pageSize = this.pageSize
-      this.SarExportSearchEo = this.sarProject
-      this.$http.get('lawss/sarProductStand/queryStandAndLawsByPage', this.sarProject, {
-        _this: this,
-        loading: 'loading',
-      }, res => {
-         console.log(res.data.list)
-        console.log(res.data.count)
-        this.sarProjectListDatas = res.data.list
-        this.total = res.data.count
-      }, e => {
-      })
-    },
-    // 分页查询条目符合性
-    queryItemsBySar () {
-      this.sarItem2.page = this.itemsPage
-      this.sarItem2.pageSize = this.itemsPageSize
-      this.sarItem2.standId = this.saveSarId
-      this.sarItem2.standType = this.saveSarType
-      this.sarItem2.productId = this.saveClickProductId
-      this.$http.get('lawss/sarProductSarState/page', this.sarItem2, {
-        _this: this,
-        loading: 'loading3'
-      }, res => {
-        // this.sarItemListDatas = res.data.list
-        // this.sarItemTotal = res.data.count
-        this.sarProStateListDatas2 = res.data.list
-        this.sarProStateTotal2 = res.data.count
-      }, e => {
-      })
-    },
-    // 外层清空条件查询
-    resetSelect () {
-      this.sarProject.country = ''
-      this.sarProject.standCode=''
-      this.sarProject.standName = ''
-      this.queryStandAndLaws()
-    },
-    // 查看项目符合性
-    handleProjectCompliance (row) {
-      this.saveSarId = row.standId
-      this.saveSarType = row.standType
-      this.exportShowName = row.standName
-      this.sarItem.productCode = ''
-      this.sarItem.productName = ''
-      // this.queryItemsBySar()
-      this.row = row
-
-      // 原方案
-      // if (this.row.isExistItems === 1) {
-      //   this.isExistItems = 1
-      //   this.standNum = this.row.standCode
-      //   // this.querySarProStateFirst()
-      //   this.saveSarId  = this.row.standId
-      //   this.queryItemsBySar()
-      //   this.showSarProStateModal = true
-      // } else {
-      //   this.isExistItems = 0
-      //   this.querySarProStateZero()
-      //   this.showSarProStateModal = true
-      // }
-
-      // 现阶段方案
-      this.isExistItems = 0
-      this.querySarProStateZero()
-      this.showSarProStateModal = true
-
-    },
-    handleProjectPreview (row) {
-      this.saveClickProductId = row.productId
-      this.saveSarProductId = row.id
-      this.queryItemsBySar()
-      this.showSarItemModal = true
-    },
-    // 如果isExistItems === 0查看标准在项目中符合性列表
-    querySarProStateZero () {
-      // let queryUrl = ''
-      this.sarProStateEO.page = this.sarProStatePage
-      this.sarProStateEO.pageSize = this.sarProStatePageSize
-      this.sarProStateEO.standId = this.saveSarId
-      this.sarProStateEO.standType = this.saveSarType
-      this.$http.get('lawss/sarProductStand/queryInvolveProByPage', this.sarProStateEO, {
-        _this: this,
-        loading: 'loading2'
-      }, res => {
-        this.sarProStateListDatas = res.data.list
-        this.sarProStateTotal = res.data.count
-      }, e => {
-      })
-    },
-    // 如果isExistItems === 1 查看标准在项目中符合性列表
-    querySarProStateFirst () {
-      // let queryUrl = ''
-      this.sarProStateEO2.page = this.sarProStatePage2
-      this.sarProStateEO2.pageSize = this.sarProStatePageSize2
-      // this.sarProStateEO.standId = this.saveSarId
-      // this.sarProStateEO.standType = this.saveSarType
-      this.sarProStateEO2.standNum = this.standNum
-      this.$http.get('lawss/sarInconformItem/queryInvolveItems', this.sarProStateEO2, {
-        _this: this,
-        loading: 'loading'
-      }, res => {
-        this.sarProStateListDatas2 = res.data.list
-        this.sarProStateTotal2 = res.data.count
-      }, e => {
-      })
-    },
-    // 列表多选
-    sarProductStateSelect (val) {
-      console.log(val)
-    },
-    // 列表多选
-    sarProductStateSelect2 (val) {
-      console.log(val)
-    },
-    // 清空条件查询
-    clearSearchProState () {
-      this.sarProStateEO.productCode = ''
-      this.sarProStateEO.productName = ''
-      if (this.isExistItems === 0) {
-        this.querySarProStateZero()
-      } else {
-        this.querySarProStateFirst()
-      }
-    },
-    // 清空条件查询
-    clearSearchProState2 () {
-      this.sarProStateEO2.productCode = ''
-      this.sarProStateEO2.productName = ''
-      this.querySarProStateFirst()
-
-    },
-    // 清空查询
-    clearSearchPro () {
-      this.sarProStateEO.productCode = ''
-      this.sarProStateEO.productName = ''
-      this.showSarProStateModal = false
-    },
-    // 清空查询
-    clearSearchPro2 () {
-      this.sarProStateEO2.productCode = ''
-      this.sarProStateEO2.productName = ''
-      this.showSarProStateModal2 = false
-    },
-    // 项目符合性分页
-    pageProStateChange (page) {
-      this.sarProStatePage = page
-      this.querySarProStateZero()
-    },
-    pageProStateSizeChange (pageSize) {
-      this.sarProStatePageSize = pageSize
-      this.querySarProStateZero()
-    },
-    // 项目符合性分页
-    pageProStateChange2 (page) {
-      this.sarProStatePage2 = page
-      this.querySarProStateFirst()
-    },
-    pageProStateSizeChange2 (pageSize) {
-      this.sarProStatePageSize2 = pageSize
-      this.querySarProStateFirst()
-    },
-    // 编辑符合性弹窗打开
-    handleEdit (row) {
-      this.saveSarProductId = row.id
-      this.editSarComEO.sarState = row.sarState
-      this.editSarComModal = true
-    },
-    // 编辑符合性弹窗关闭
-    handleClose () {
-      if (this.isExistItems === 0) {
-        this.editSarComEO = {...this.editSarComEODefault}
-      } else {
-        this.editSarComEO2 = {...this.editSarComEODefault2}
-      }
-      this.$refs['editSarComEO'].clearValidate()
-      this.editSarComModal = false
-    },
-    // 符合性弹窗修改保存
-    updateSarState () {
-      if (this.isExistItems === 0) {
-        const data = {}
-        data.sarType = this.saveSarType
-        data.id = this.saveSarProductId
-        data.sarItemState = this.editSarComEO.sarState
-        this.$http.putData('lawss/sarProductSarState/updateSarState', data, {
-          _this: this
-        }, res => {
-          this.editSarComModal = false
-          this.querySarProStateZero()
-        }, e => {})
-      } else {
-        const data = {}
-        data.sarType = this.saveSarType
-        data.id = this.saveSarProductId
-        data.sarItemState = this.editSarComEO.itemState
-        this.$http.putData('lawss/sarProductSarState/updateState', data, {
-          _this: this
-        }, res => {
-          this.editSarComModal = false
-          this.queryItemsBySar()
-        // const data = {}
-        // data.sarType = this.saveSarType
-        // data.itemState = this.editSarComEO.itemState
-        // data.id = this.saveSarProductId
-        // this.$http.putData('lawss/sarInconformItem/updateItem', data, {
-        //   _this: this
-        // }, res => {
-        //   this.editSarComModal = false
-        //   this.querySarProStateFirst()
-        }, e => {})
-      }
-    },
-    // 导出多选， table列表多选
-    getSelectedDatas (selection) {
-      this.saveSelectedDatas = selection
-    },
-    // 点击导出按钮
-    showExportModal (type) {
-      // 区别是选择导出还是全部导出
-      this.saveExportType = type
-      if (type === 'apart') {
-        if (this.saveSelectedDatas != null && this.saveSelectedDatas.length > 0) {
-          this.exportName = ''
-          this.exportModelFlag = true
-        } else {
-          this.$message.error('请选择要导出的数据')
-        }
-      } else {
-        this.exportName = ''
-        this.exportModelFlag = true
-      }
-    },
-    // 确认导出
-    exportSarProduct () {
-      if (this.exportName === '' || this.exportName === null || this.exportName === 'null') {
-        this.exportName = '标准涉及项目'
-      }
-      let jsonData = ''
-      if (this.saveExportType === 'apart') {
-        jsonData = JSON.stringify(this.saveSelectedDatas)
-      } else if (this.saveExportType === 'all') {
-        let exportEOStr = JSON.stringify(this.SarExportSearchEo)
-        jsonData = exportEOStr.replace(/""/g, null)
-      }
-      window.location.href = '/api/lawss/sarProductLaws/exportSarProduct?jsonData=' + jsonData + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName
-      this.saveSelectedDatas = []
-      this.exportModelFlag = false
-      this.queryStandAndLaws()
-    },
-    // 外层分页方法
-    pageChange (page) {
-      this.page = page
-      this.queryStandAndLaws()
-    },
-    pageSizeChange (pageSize) {
-      this.pageSize = pageSize
-      this.queryStandAndLaws()
-    }
-  },
+  methods: {},
   mounted () {
-    // 分页查询方法
-    this.queryStandAndLaws()
-    //从数据库中查询下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '',{
-         _this:this
-    },res =>{
-      this.countryOptions = res.data.COUNTRY  //国家
-    }, e => {
-    })
-    this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56
-    window.onresize = () => {
-      this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56
-    }
   }
 }
 </script>

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

@@ -22,7 +22,6 @@
           <el-form-item label="" class="search-item btn-box">
             <el-button class="common-button-default" icon="el-icon-refresh-left" @click="resetSelect" size="mini"></el-button>
           </el-form-item>
-<!--          <Button type="primary" @click="showExportModal('all')">全部导出</Button>&ndash;&gt;-->
         </el-form>
       </div>
       <div class="right">

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

@@ -5,7 +5,7 @@
       <div class="left">
         <el-form ref="sarProject" :model="sarProject" inline @keyup.enter.native="searchStandAndLaws">
           <el-form-item label="标准/政策号" class="search-item">
-            <el-input v-model="sarProject.standCode"
+            <el-input v-model="sarProject.standNumber"
                       placeholder="标准/政策号查找"
                       @keyup.enter="searchStandAndLaws"
                       clearable></el-input>
@@ -381,12 +381,9 @@ name: "technologyInvolveProject",
       SarProStateType: '',
       // 条件查询
       sarProject: {
-        // 国家地区
-        country: '',
-        // 标准/政策号
-        standCode: '',
-        // 标准政策名称
-        standName: ''
+        standName: '', // 标准政策名称
+        standNumber: '', // 标准/政策号
+        standApplicationType: 2
       },
       // table数据
       sarProjectListDatas: [],
@@ -593,19 +590,15 @@ name: "technologyInvolveProject",
     },
     // 分页查询
     queryStandAndLaws () {
-      this.sarProject.page = this.page
-      this.sarProject.pageSize = this.pageSize
-      this.SarExportSearchEo = this.sarProject
-      this.$http.get('lawss/sarCompResAssess/page', this.sarProject, {
+      this.sarProject.current = this.page
+      this.sarProject.size = this.pageSize
+      this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, {
         _this: this,
         loading: 'loading',
       }, res => {
-        console.log(res.data.list)
-        console.log(res.data.count)
-        this.sarProjectListDatas = res.data.list
-        this.total = res.data.count
-      }, e => {
-      })
+        this.sarProjectListDatas = res.data.records
+        this.total = res.data.total
+      }, e=> {})
     },
     // 分页查询条目符合性
     queryItemsBySar () {