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

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

@@ -267,16 +267,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.countryArea = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {

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

@@ -283,16 +283,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.detailedList = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {

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

@@ -283,17 +283,17 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     //清空
     clearSearch() {
       this.sarSarAccessEOSearch.projectName = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess()
+      // this.searchSarAccess()
 
     },
     // 新增相关

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1176,6 +1176,7 @@ export default {
               // this.$refs.accessTypeSelect.clearSelection()
               this.$refs.entryTable.clearSelection()
               this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
             } else{
               this.sarAccessInfoList.push(item)
               // this.$refs.accessTypeSelect.clearSelection()
@@ -1183,7 +1184,6 @@ export default {
               this.$refs.searchTable.clearSelection()
             }
         })
-        this.$message.warning('请勿添加重复数据')
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }
@@ -1295,17 +1295,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
            }else {
              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
            }
            if (this.sarAccessInfoList[i].zccssrqgj === null) {
-             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
            }else {
              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
            }

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

@@ -381,7 +381,7 @@ export default {
       heightShow: true,
       dataLoading: false,
       standardForm: {
-
+        zrbm: '',
         standNumber: "",
         standName: "",
         responseUnit: "",
@@ -389,6 +389,10 @@ export default {
         Size: this.$store.getters.userInfo.configContent
       },
       standardFormList: {
+        zrbm: '',
+        typeApplicable: '',
+        nylx: '',
+        sycpx: '',
         standNumber: '',
         standName: '',
         responseUnit: '',
@@ -493,8 +497,14 @@ export default {
     },
     // 重置搜索
     resetSelect() {
+      this.standardForm.zrbm = ''
       this.standardForm.standName = ''
       this.standardForm.responseUnit = ''
+      this.standardFormList.standName = ''
+      this.standardFormList.typeApplicable = ''
+      this.standardFormList.nylx = ''
+      this.standardFormList.zrbm = ''
+      this.standardFormList.sycpx = ''
       this.selectInfobyAccid()
     },
     exportStandard() {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1145,6 +1145,7 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1152,7 +1153,6 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
-        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1264,17 +1264,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             }else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1144,6 +1144,7 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1151,7 +1152,6 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
-        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1263,17 +1263,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             }else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -448,6 +448,7 @@
                       :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
+                      @popoverHide="popoverHideQuery"
                     ></custom-input-for-standards>
                   </template>
                   <template v-else-if="field.attrField === 'CYCVPPSBM'">
@@ -1698,6 +1699,8 @@ export default {
         svpps: '', // 关联模块-VPPS编码
         replaceStandNum: '', // 代替标准号
         replacedStandNum: '',  // 	被代替标准号
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         citeStand: '',  // 	引用标准
         citedStand: '',  // 	被引用标准
         synopsis: '', // 内容摘要
@@ -1744,6 +1747,8 @@ export default {
         standNature: '',
         replaceStandNum: '',
         replacedStandNum: '',
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -1814,10 +1819,12 @@ export default {
         standState: '',
         standNature: '',
         replaceStandNum: '',
+        replacePartStandNum: '',
         replaceStandNumId: '',
         // replaceStandNumCope: '',
         replaceStandNumList: [],
         replacedStandNum: '',
+        replacedPartStandNum: '',
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -2161,6 +2168,8 @@ export default {
         synopsis: '',
         // replaceStandNumCope: '',
         replacedStandNum: '',
+          replacePartStandNum: '', // 代替标准号
+          replacedPartStandNum: '',  // 	被代替标准号
         orderBy:'',
         nowOrder: '',
         nowOrderBy: '',
@@ -2223,6 +2232,11 @@ export default {
           this.url="sarModelTree/list"
           this.urlChild="sarModelTree/childByList"
       },
+      popoverHideQuery(ids,attrField){
+          console.log(ids)
+          console.log("-----------------------------")
+          console.log(attrField)
+      },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {
               if(checkedData.length > 0){
@@ -2742,6 +2756,8 @@ export default {
         this.sarStandardsSearch.applyArctic = ''
         this.sarStandardsSearch.replaceStandNum = ''
         this.sarStandardsSearch.replacedStandNum = ''
+        this.sarStandardsSearch.replacePartStandNum = ''
+        this.sarStandardsSearch.replacedPartStandNum = ''
         this.sarStandardsSearch.synopsis = ''
         this.sarStandardsSearch.category = ''
         this.pageChange(1)
@@ -4035,6 +4051,8 @@ export default {
               this.sarConfigStandSearch.applyArctic = ''
               this.sarConfigStandSearch.replaceStandNum = ''
               this.sarConfigStandSearch.replacedStandNum = ''
+              this.sarStandardsSearch.replacePartStandNum = ''
+              this.sarStandardsSearch.replacedPartStandNum = ''
               this.selectConfiguraStand()
             }
           }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -94,7 +94,7 @@
               width="190px"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -103,7 +103,7 @@
               width="190px"
               label="在产车实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -111,6 +111,11 @@
               label="责任部门"
               width="180px"
           >
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">
+                {{zrbmMap[scope.row.zrbm]}}
+              </span>
+            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -231,16 +236,31 @@
               <el-table-column
                   prop="xcxssrq"
                   label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{scope.row.attrInfoCaseMap.xcxssrq ? $moment(scope.row.attrInfoCaseMap.xcxssrq).format('YYYY-MM-DD') : '-'}}
+                  </span>
+                </template>
               </el-table-column>
               <el-table-column
                   show-overflow-tooltip
                   prop="zccssrq"
                   label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{scope.row.attrInfoCaseMap.zccssrq ? $moment(scope.row.attrInfoCaseMap.zccssrq).format('YYYY-MM-DD') : '-'}}
+                  </span>
+                </template>
               </el-table-column>
               <el-table-column
                   show-overflow-tooltip
                   prop="textStatus"
                   label="文本状态">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{textStatusMap[scope.row.textStatus]}}
+                  </span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -312,6 +332,8 @@ export default {
       standList1:[],//调取添加的数据
       id:'',//批量删除.
       saveExportType: '',// 导出文件模态框控制，和文件名称
+      zrbmMap: {},
+      textStatusMap: {} // 文本状态id与name对应
     }
   },
   methods: {
@@ -596,17 +618,21 @@ export default {
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
         let ids = ''
-        if (this.selectList.length === 0) {
-          ids='\''+this.dataList[0].standId+'\''
-          for(let i=1;i<this.dataList.length;i++){
-            ids+=',\''+this.dataList[i].standId+'\''
+        if (this.dataList.length === 0) {
+          this.$message.error('暂无导出数据')
+        }else{
+          if (this.selectList.length === 0) {
+            ids='\''+this.dataList[0].standId+'\''
+            for(let i=1;i<this.dataList.length;i++){
+              ids+=',\''+this.dataList[i].standId+'\''
+            }
           }
-        }
-        const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
+          const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
             'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
-        console.log(exportURL)
-        window.open(exportURL)
-        this.$message.success('导出信息成功')
+          console.log(exportURL)
+          window.open(exportURL)
+          this.$message.success('导出信息成功')
+        }
       }
       this.exportModelFlag = false
     },
@@ -625,6 +651,12 @@ export default {
     standSelectChange(val) {
       this.selectList = val;
     },//选项值发生改变
+    // 将文本状态的id与name对应
+    setMap(key,data){
+      data.forEach(item => {
+        this.$set(key, item.value, item.label)
+      })
+    }
   },
   computed: {
     ...mapGetters(['getLocalPro'])
@@ -645,6 +677,8 @@ export default {
         loading: 'loading'
       }, res => {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
+        this.setMap(this.textStatusMap,res.data.WBZTCLASS)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })