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

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -84,7 +84,7 @@
                             ref="Form"
                             :model="roleForm"
                             :rules="roleFormRules"
-                            class="label-input-form">
+                            class="label-input-form myForm">
                         <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -430,6 +430,11 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzdyStep1-1 {
+        .myForm {
+            /deep/.el-form-item__content {
+                line-height: 10px;
+            }
+        }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -84,7 +84,7 @@
                   ref="Form"
                   :model="roleForm"
                   :rules="roleFormRules"
-                  class="label-input-form">
+                  class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -419,6 +419,11 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 .bzdyStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -78,7 +78,7 @@
             ref="Form"
             :model="roleForm"
             :rules="roleFormRules"
-            class="label-input-form">
+            class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -534,6 +534,11 @@ export default {
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
 .bzzqyjStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -355,7 +355,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
-                        this.data = data.info
+                        this.data = data.info || []
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -318,6 +318,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -270,11 +270,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
                },
             handleTabs(name) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -88,7 +88,7 @@ export default {
     this.tabValue = this.list[0].name;
   },
   beforeRouteLeave(to, from, next) {
-    const toName = ["ListOfStandardsAndRegulationsDetails", "Details", "ProjectAddEit", "OtherAddEit"];
+    const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"];
     // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
     if (toName.includes(to.name)) {
       this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);

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

@@ -237,7 +237,7 @@
           >
           </el-table-column>
           <el-table-column
-              prop="standNumber"
+              prop="code"
               show-overflow-tooltip
               fixed="left"
               width="180px"
@@ -370,13 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
-            prop="standNumber"
+            prop="code"
             show-overflow-tooltip
             width="180px"
             fixed="left"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -561,6 +561,7 @@
             <el-date-picker
               v-model.trim="editRowData.putTime"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -568,6 +569,7 @@
             <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -575,6 +577,7 @@
             <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -676,6 +679,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
+        standSortShow:'',
         standEnName: '',
         typeApplicable: '',
         nylx: '',
@@ -715,7 +719,7 @@ export default {
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -740,7 +744,7 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        //{value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
         {value: 'TEMP', label: '标准法规清单 '}
       ],
@@ -877,6 +881,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -897,6 +902,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -1322,7 +1328,7 @@ export default {
     editTghisRow(row) {
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
+      this.editRowData.standNumber = this.rowList.standNumber
       this.drawerEdit = true
     },
     // 抽屉取消按钮
@@ -1452,7 +1458,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
+                //this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1908,12 +1914,12 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview (data) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
+          id: data.id,
           pageType: this.sarAccessInfoSearch.dataSource
         }
       })

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

@@ -15,10 +15,9 @@
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
-          <span class="transition-box-span"  v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo  > 0">
+          <span class="transition-box-span">
-              <span>{{ sarAccessEO.countryArea }}</span>
+             {{ sarAccessEO.countryArea }}
             </span>
-          <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
         <p v-else></p>
         <p class="transition-box-p">
@@ -71,26 +70,6 @@
                 :label="item.label"
               />
             </el-select>
-<!--            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
-            <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
-              <el-input
-                v-model="standardForm.responseUnit"
-                placeholder="请选择部门"
-                readonly
-                id="depBtnsAuth"
-                slot="reference"
-              />
-              <div class="api">
-                <laws-tree :zNodes="depNode"
-                           deptSelect
-                           treeDivId="depTreeAuth"
-                           @treeDblClick="(treeId, treeNode) => treeDblAuthDepartClick(treeId, treeNode)"
-                           :editable="false"
-                           ref="depTreeAuth"
-                           class="ztree" style="height: 300px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -142,7 +121,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="能源类型"  >
+            <el-form-item label="能源类型" label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.nylx"
@@ -158,7 +137,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任部门"  >
+            <el-form-item label="责任部门"  label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.zrbm"
@@ -174,7 +153,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="适用产品线"  >
+            <el-form-item label="适用产品线"  label-width="86px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.sycpx"
@@ -212,14 +191,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
+            prop="code"
             fixed="left"
             width="180px"
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
-              <span v-else>{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,12 +205,18 @@
             label="中文名称"
             width="180px"
           >
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standEnName"
             align="center"
             width="180px"
             label="英文名称">
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
@@ -459,7 +443,7 @@ export default {
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false
+      isShow: false,
     };
   },
   methods: {
@@ -514,25 +498,7 @@ export default {
     },
 
     back() {
-      this.$router.push({
+      this.$router.push({name: 'AccessStandardsAndRegulations'})
-        name: 'AccessStandardsAndRegulations',
-      })
-     /* if (this.sarAccessEO.sortKey === '1') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '国家/地区清单'
-        })
-      } else if(this.sarAccessEO.sortKey === '2') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '项目类清单'
-        })
-      } else {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '其他清单'
-        })
-      }*/
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
@@ -656,12 +622,13 @@ export default {
       window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(data) {
+      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.resId,
+          id: data.id,
-          pageType: item.sarType
+          pageType: data.sarType
         }
       });
       window.open(routeUrl.href, "_blank");
@@ -768,7 +735,6 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
-      console.log(this.sarAccessEO)
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();

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

@@ -577,11 +577,11 @@ export default {
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
         detailedList: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '清单类别不能为空', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,

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

@@ -572,11 +572,11 @@ export default {
         ],
         projectName: [
           {required: true, message: '项目名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '项目名称不能超过100个字符', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,