Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -203,6 +203,7 @@
           >
             <el-date-picker
                 v-model="attributeEO.implTime"
+                value-format="yyyy-MM-dd"
                 type="dates"
                 prefix-icon="none"
                 placeholder="请选择实施时间">
@@ -896,7 +897,6 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log('539',item)
       if (item.standType === "INLAND"){
         let routeUrlINLAND = this.$router.resolve({
           name: 'OtherStandardDetails',
@@ -967,14 +967,12 @@ export default {
         this.$message.warning('请选择一条数据')
       }
       else {
-        console.log('619',this.handleSelectForm.dataSource)
         this.attributeEO.dataSource = this.handleSelectForm.dataSource
         this.attributeEO.lawId = this.handleSelectTableList[0].id
         this.attributeEO.lawCode =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
         this.attributeEO.lawName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName
         this.selectModal = false
       }
-      console.log('确定',this.handleSelectTableList)
     },
     //手动查找的清空按钮
     clearLawBtn(){
@@ -995,12 +993,10 @@ export default {
     //手动查找的查询按钮
     searchLawBtn(){
       this.lawInfoTableLoading = true
-      console.log('533',this.handleSelectForm.dataSource)
       if (this.handleSelectForm.dataSource === 'INLAND'){
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
           _this: this
         },res=>{
-          console.log('国内标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectForm.total = res.data.count
@@ -1018,12 +1014,10 @@ export default {
           this.lawInfoTable = []
           this.handleSelectForm.total = 0
         })
-        console.log('国内标准库')
       }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
           _this: this
         },res=>{
-          console.log('海外标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectForm.total = res.data.count
@@ -1041,12 +1035,10 @@ export default {
           this.lawInfoTable = []
           this.handleSelectForm.total = 0
         })
-        console.log('海外标准库')
       }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
         this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{
           _this: this
         },res=>{
-          console.log('国内外政策库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectForm.total = res.data.count
@@ -1064,12 +1056,10 @@ export default {
           this.lawInfoTable = []
           this.handleSelectForm.total = 0
         })
-        console.log('国内外政策库')
       }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
         this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
           _this: this
         },res=>{
-          console.log('企业标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectForm.total = res.data.count
@@ -1087,7 +1077,6 @@ export default {
           this.lawInfoTable = []
           this.handleSelectForm.total = 0
         })
-        console.log('企业标准库')
       }else {
         this.$message.warning('请先选择标准/政策来源')
       }
@@ -1095,19 +1084,16 @@ export default {
     handleSelectPageChange(page){
       this.lawInfoTableLoading = true
       this.handleSelectForm.page = page
-      console.log(this.handleSelectForm.page)
       this.searchLawBtn()
     },
     handleSelectPageSizeChange(pageSize){
       this.lawInfoTableLoading = true
       this.handleSelectForm.pageSize = pageSize
-      console.log(this.handleSelectForm.pageSize)
       this.searchLawBtn()
     },
     // 手动查找 table选择事件
     handleSelectTableChange (row) {
       this.handleSelectTableList = row
-      console.log('我选的',this.handleSelectTableList)
     },
     //点击手动查找按钮
     handleSelect() {
@@ -1121,6 +1107,7 @@ export default {
       this.$refs['attributeEO'].validate((valid) => {
         if (valid) {
             if (this.addOrEdit === 'add') {
+              this.attributeEO.implTime = this.attributeEO.implTime.join(',')
               this.submitLoading = true
               this.$http.putData(
                   'sarIssueTrack/issueTrack',
@@ -1143,6 +1130,9 @@ export default {
                   }
               )
             } else {
+              if (typeof (this.attributeEO.implTime) === 'object'){
+                this.attributeEO.implTime = this.attributeEO.implTime.join(',')
+              }
               this.$http.postData(
                   'sarIssueTrack/issueTrack',
                   this.attributeEO,
@@ -1218,6 +1208,7 @@ export default {
         this.attributeTitle = '编辑'
         this.getDictionarySelList(null)
         this.attributeEO = JSON.parse(JSON.stringify(row))
+        this.attributeEO.implTime = row.implTime.split(',')
         this.showInfoModal = true
       }
     },
@@ -1268,14 +1259,12 @@ export default {
           });
         }).catch(() => {
           // 取消删除，清空选择
-          // console.log(this.selectedList)
           // this.selectedList = [];
         })
       }
     },
     // 更多
     handleCommand (command) {
-      console.log('536',command)
       switch (command[1]) {
         case '编辑':
           this.showAddModel(2, command[0])
@@ -1292,7 +1281,6 @@ export default {
     },
     //分页查询
     searchSarAccess (advanceSearch) {
-      console.log('准备开始分页查询')
       this.tableLoading = true
       this.$http.get("sarIssueTrack/issueTrack", {
         current: this.sarSarAccessEOSearch.page,
@@ -1303,13 +1291,11 @@ export default {
         _this: this
       }, res => {
         let arr = res.data;
-        console.log('分页查询中',arr)
         this.sarAccessListDatas = arr.records
         this.sarAccessListTotal = res.data.total
         this.tableLoading = false
       }, e => {
       });
-      console.log('分页查询完毕')
     },
     pageChange (page) {
       this.sarSarAccessEOSearch.page = page
@@ -1367,7 +1353,6 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      console.log(res.data.WBZTCLASS)
       this.setMap(res.data.WBZTCLASS)
     }, e => {
     })