Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -843,6 +843,7 @@
             <el-upload
                     multiple
                     drag
+                    :file-list="fileList"
                     :action="fileUrl"
                     ref="importfile"
                     name="file"
@@ -1162,6 +1163,7 @@
         },
         data () {
             return {
+              fileList: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1967,10 +1969,11 @@
             importFileSuccess (response, file,fileList) {
               // 上传成功后判断是否是两条数据是的话替换掉旧数据
               if (fileList.length > 1) {
-                fileList.splice(0, 1)
+                this.fileList = fileList.splice(0, 1)
               }
                 if (response.ok) {
                     this.fileMadel = false
+                    this.fileList = []
                     if(this.fileType === 'fbgbjbd'){
                         this.form.fbgbjbd = response.data.id;
                         this.form.fbgbjbdName = response.data.name;

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -387,6 +392,7 @@ export default {
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json)
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -335,6 +340,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+            console.log(res.mesg)
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue

@@ -312,42 +312,50 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      this.listForm.BZFlag = "2";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('审批意见不能为空')
+      }else{
+        this.listForm.BZFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.listForm.BZFlag = "1";
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-      }, e => {
-      });
-    }
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('审批意见不能为空')
+      }else{
+        this.listForm.BZFlag = "1";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+      }
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -46,7 +46,6 @@
                         row-key="standId"
                         height="70%"
                         border
-                        @selection-change="selectStandChange"
                         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
                 >
@@ -175,6 +174,12 @@
                             </el-table-column>
                         </el-table-column>
                     </el-table-column>
+                    <el-table-column
+                            prop="workPeople"
+                            align="center"
+                            width="200"
+                            label="责任人">
+                    </el-table-column>
                 </el-table>
             </div>
             <div>
@@ -335,6 +340,7 @@
                         taskIds: this.taskIds,
                         pId: this.pId
                     }).then(res => {
+                        console.log(res.mesg)
                         if (res) {
                             const processForm = JSON.parse(res.mesg);
                             this.getFormFieldList(processForm);

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -298,9 +298,6 @@
           align="center"
           width="210px"
           label="标准实施日期">
-          <template slot-scope="scope">
-            <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -310,7 +307,9 @@
           align="center"
           label="在产车实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -320,7 +319,9 @@
           width="210px"
           label="新车型实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -873,7 +874,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -889,6 +889,7 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.selectLawsStands()
       this.showSelectBox = !this.showSelectBox
       this.showTableFlag = false
       if (!this.showSelectBox) {
@@ -985,6 +986,7 @@ export default {
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1171,7 +1173,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-              this.$message.warning('请勿添加重复数据')
               // this.$refs.accessTypeSelect.clearSelection()
               this.$refs.entryTable.clearSelection()
               this.$refs.searchTable.clearSelection()
@@ -1182,6 +1183,7 @@ export default {
               this.$refs.searchTable.clearSelection()
             }
         })
+        this.$message.warning('请勿添加重复数据')
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }
@@ -1292,25 +1294,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            if (this.sarAccessInfoList[i].putTime === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.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 = JSON.stringify(rowlist)
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist = rowlist
+          sarAccessEO.inforlist1 = rowlist1
+          sarAccessEO.inforlist2 = rowlist2
+          sarAccessEO.inforlist3 = rowlist3
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1391,8 +1399,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1433,8 +1441,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1469,8 +1477,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1571,7 +1579,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
@@ -1984,7 +1992,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -2003,8 +2011,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

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

@@ -223,24 +223,12 @@
             align="center"
             width="180px"
             label="适用车型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',')  > 0">
-              {{ scope.row.typeApplicable }}
-              </span>
-              <span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="nylx"
             align="center"
             width="180px"
             label="能源类型">
-            <template slot-scope="scope">
-              <span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',')  > 0">
-              {{ scope.row.nylx }}
-              </span>
-              <span v-else>{{ nylxMap[scope.row.nylx] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="putTime"
@@ -282,12 +270,6 @@
             width="210px"
             align="center"
             label="责任部门">
-            <template slot-scope="scope">
-              <span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',')  > 0">
-              {{ scope.row.zrbm }}
-              </span>
-              <span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -295,12 +277,6 @@
             width="180px"
             align="center"
             label="适用产品线">
-            <template slot-scope="scope">
-              <span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',')  > 0">
-              {{ scope.row.sycpx }}
-              </span>
-              <span>{{ sycpxMap[scope.row.sycpx] }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -490,7 +466,8 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.standinfoList = res.data;
+        this.standinfoList = res.data.records;
+        this.standardFormTotal = res.data.total
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -498,7 +475,6 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
-        this.total = res.data.total;
       }, e => {
 
       });

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

@@ -290,9 +290,11 @@
           width="210px"
           align="center"
           label="在产车实施日期">
-            <template slot-scope="scope">
-                <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
-            </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -300,9 +302,11 @@
           align="center"
           width="210px"
           label="新车型实施日期">
-            <template slot-scope="scope">
-                <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
-            </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -851,7 +855,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
       return true
     },
     moreSearch () {
+      this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1137,7 +1142,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1148,6 +1152,7 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
+        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1258,25 +1263,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            if (this.sarAccessInfoList[i].putTime === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.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 = JSON.stringify(rowlist)
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist = rowlist
+          sarAccessEO.inforlist1 = rowlist1
+          sarAccessEO.inforlist2 = rowlist2
+          sarAccessEO.inforlist3 = rowlist3
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1315,7 +1326,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1357,8 +1367,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1400,8 +1410,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,8 +1446,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1538,7 +1548,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
@@ -1953,7 +1963,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1972,8 +1982,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

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

@@ -291,7 +291,9 @@
           align="center"
           label="在产车实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -301,7 +303,9 @@
           width="210px"
           label="新车型实施日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
+            </span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -851,7 +855,6 @@ export default {
     }
   },
   created() {
-    this.selectLawsStands()
     dicTypeData().then(res => {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
       return true
     },
     moreSearch () {
+      this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
     isShowTable () {
+      this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
@@ -1136,7 +1141,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1147,6 +1151,7 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
+        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1257,25 +1262,31 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime)
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            if (this.sarAccessInfoList[i].putTime === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.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 = JSON.stringify(rowlist)
-          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
-          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
-          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
+          sarAccessEO.inforlist = rowlist
+          sarAccessEO.inforlist1 = rowlist1
+          sarAccessEO.inforlist2 = rowlist2
+          sarAccessEO.inforlist3 = rowlist3
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1314,7 +1325,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1356,8 +1366,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1399,8 +1409,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1435,8 +1445,8 @@ export default {
           this.$set(item, 'kccvppsbm', '')
           this.$set(item, 'kccvppscn', '')
         }else {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1537,7 +1547,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
@@ -1954,7 +1964,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessInfoList = res.data
+        this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1975,8 +1985,8 @@ export default {
             this.$set(item, 'kccvppsbm', '')
             this.$set(item, 'kccvppscn', '')
           }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4,7 +4,7 @@
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
         <el-input
-            placeholder="输入国内标准法规"
+            placeholder="输入树状图体系"
             v-model="filterText">
         </el-input>
         <el-tree

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -4,7 +4,7 @@
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
         <el-input
-            placeholder="输入海外标准法规"
+            placeholder="输入树状图体系"
             v-model="filterText">
         </el-input>
         <el-tree