Merge branch 'develop' into 'test'

Develop

See merge request !93

src/pages/details/otherStandardDetails/index.vue

@@ -425,7 +425,7 @@
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
     </div>
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
-    <!--查看标准条款列表-->
+    <!--查看分解单-->
     <el-drawer
         title="查看分解单"
         :wrapperClosable="false"
@@ -628,18 +628,18 @@
           @pageSizeChange="pageSizeChange7"></pagination>
 
 
-<!--      <el-pagination-->
+      <!--      <el-pagination-->
-<!--          @size-change="pageSizeChange"-->
+      <!--          @size-change="pageSizeChange"-->
-<!--          @current-change="pageChange"-->
+      <!--          @current-change="pageChange"-->
-<!--          :current-page="1"-->
+      <!--          :current-page="1"-->
-<!--          :page-sizes="[10, 20, 30, 50]"-->
+      <!--          :page-sizes="[10, 20, 30, 50]"-->
-<!--          :page-size="100"-->
+      <!--          :page-size="100"-->
-<!--          layout="sizes, prev, pager, next, jumper"-->
+      <!--          layout="sizes, prev, pager, next, jumper"-->
-<!--          :total="standitemTotal">-->
+      <!--          :total="standitemTotal">-->
-<!--      </el-pagination>-->
+      <!--      </el-pagination>-->
 
-<!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
+      <!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
-<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
+      <!--                  @pageSizeChange="pageSizeChange"></pagination>-->
 
     </el-drawer>
     <!--新增标准条款-->
@@ -819,9 +819,9 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
-                :title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
+                :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
-              standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
+              standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
 
@@ -852,51 +852,51 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任工程师">责任工程师</label>
           <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
-            {{standShowItemEO.dutyEngineer }}</span>
+            {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
           <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
-            {{standShowItemEO.comparedWithPrevious }}</span>
+            {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
-            {{standShowItemEO.complianceRequire }}</span>
+            {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceState">
-            {{standShowItemEO.complianceState }}</span>
+            {{ standShowItemEO.complianceState }}</span>
         </div>
-<!--        <div class="see-drawer-div">-->
+        <!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="FO">FO</label>-->
+        <!--          <label class="see-drawer-name" title="FO">FO</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
-<!--        </div>-->
+        <!--        </div>-->
-<!--        <div class="see-drawer-div">-->
+        <!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+        <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
-<!--              standShowItemEO.dutyEngineerShow-->
+        <!--              standShowItemEO.dutyEngineerShow-->
-<!--            }}</span>-->
+        <!--            }}</span>-->
-<!--        </div>-->
+        <!--        </div>-->
-<!--        <div class="see-drawer-div">-->
+        <!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+        <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
-<!--        </div>-->
+        <!--        </div>-->
 
-<!--        <div class="see-drawer-div">-->
+        <!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+        <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
-<!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
-<!--        </div>-->
+        <!--        </div>-->
-<!--        <div class="see-drawer-div">-->
+        <!--        <div class="see-drawer-div">-->
-<!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+        <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
-<!--          <span class="see-drawer-val"-->
+        <!--          <span class="see-drawer-val"-->
-<!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+        <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
-<!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+        <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
-<!--            }}</span>-->
+        <!--            }}</span>-->
-<!--        </div>-->
+        <!--        </div>-->
       </div>
     </el-drawer>
     <!-- 更新LOG -->
@@ -1251,6 +1251,7 @@ export default {
       knowIdList: '',
       total7: 0,
       page7: 1,
+      pageSize7: this.$store.getters.userInfo.configContent,
       addForm: {
         title: '',
         content: '',
@@ -1772,7 +1773,7 @@ export default {
       this.page7 = page
       this.selectSarStandItems()
     },
-    pageSizeChange7(pageSize){
+    pageSizeChange7(pageSize) {
       this.pageSize7 = pageSize
       this.selectSarStandItems()
     },
@@ -2099,7 +2100,7 @@ export default {
       console.log("pageSize");
       console.log(pageSize);
       // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.standItemSearch.pageSize =pageSize;
+      this.standItemSearch.pageSize = pageSize;
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
@@ -2331,12 +2332,15 @@ export default {
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        ...this.standItemSearch,
+        pageSize: this.pageSize7, page: this.page7,
+      }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          this.standItemList = res.data;
+          this.standItemList = res.data.list;
           console.log(res.data);
-          this.total7 = res.data.length // 分页需要
+          this.total7 = res.data.count // 分页需要
         }
       }, e => {
       })

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

@@ -1264,27 +1264,38 @@ export default {
             })
             sarAccessEO.fileIds = relateFile.join(',')
           }
+
+
           if (!sarAccessEO.id) {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
-            this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+            if (this.sarAccessInfoList.length !== 0) {
-              _this: this,
+              this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
-              loading: 'loadData'
+                _this: this,
-            }, res => {
+                loading: 'loadData'
-              if (this.sarAccessInfoList.length !== 0) {
+              }, res => {
                 if (res.ok) {
-                  this.$message.success('新增成功')
+                  if (res.data === "数据库为空，添加成功") {
-                  this.isNext = true
+                    this.$message.success('新增成功')
-                  this.$router.push({
+                    this.isNext = true
-                    name: 'AccessStandardsAndRegulations'
+                    this.$router.push({
-                  })
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "其他清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  }
                 }
-              }else {
+              }, e => {
-                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+                console.log(e)
-              }
+              })
-            }, e => {
+            } else {
-            })
+              this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+            }
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1305,6 +1316,92 @@ export default {
         }
       })
     },
+    // 提交按钮 事件
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           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 = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               this.$message.success('新增成功')
+    //               this.isNext = true
+    //               this.$router.push({
+    //                 name: 'AccessStandardsAndRegulations'
+    //               })
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     pageInfo() {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list

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

@@ -1246,27 +1246,42 @@ export default {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
-            this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+            if (this.sarAccessInfoList.length !== 0) {
-              _this: this,
+              this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
-              loading: 'loadData'
+                _this: this,
-            }, res => {
+                loading: 'loadData'
-              if (this.sarAccessInfoList.length !== 0) {
+              }, res => {
                 if (res.ok) {
-                  if (res.data === "车型类别清单添加成功") {
+                  if (res.data === "数据库为空，添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
-                  }else{
+                  } else if (res.data === "车型类别清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "车型类别清单添加失败") {
                     this.$message.error('已存在此车型类别清单，新增失败')
+                  } else if (res.data === "国家/地区清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "国家/地区清单添加失败") {
+                    this.$message.error('已存在此国家/地区清单，新增失败')
                   }
                 }
-              }else {
+              }, e => {
-                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+                console.log(e)
-              }
+              })
-            }, e => {
+            } else {
-            })
+              this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+            }
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1287,6 +1302,95 @@ export default {
         }
       })
     },
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           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 = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               if (res.data === "车型类别清单添加成功") {
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else{
+    //                 this.$message.error('已存在此车型类别清单，新增失败')
+    //               }
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     // 字段转化
     changeText(val) {
       val.forEach(item => {