Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!248

src/pages/home2/components/todoList/index.vue

@@ -9,10 +9,14 @@
     </div>
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
-         <div style="height: 30px">
+        <div style="height: 30px">
-           <span @click="dealWith(item)" v-if="item.prcName.length<25" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+          <span @click="dealWith(item)" v-if="item.prcName.length<24"
-           <span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
+                style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
-         </div>
+          <el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
+            <span @click="dealWith(item)"
+                  style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0, 24) + '...' }}</span>
+          </el-tooltip>
+        </div>
       </li>
     </ul>
   </div>

src/pages/localTool/standCalendar/index.vue

@@ -520,7 +520,6 @@ export default {
       localStorage.setItem('objs', JSON.stringify(item))
       this.fileListData = item
       this.reData = item.files
-      console.log(item)
       this.editMeetForm = item
       this.editMeetForm.contents = []
       if (this.editMeetForm.content !== '') {

src/pages/processCenter/pages/components/ProcessHeaderPhone.vue

@@ -2,9 +2,9 @@
 <template>
     <div class="prc-header-wrap">
         <div class="process-header">
-            <span class="process-title">
+            <span class="process-title van-ellipsis" :title="proName + '(' + proNode + ')'">
-                <slot name="proName"></slot>
+                <span>{{ proName }}</span>
-                <a>(<slot name="proNode"></slot>)</a>
+                <span class="smallText">( {{ proNode }})</span>
             </span>
         </div>
         <el-divider></el-divider>
@@ -27,7 +27,9 @@
             return {
                 activeName: '',
                 opacityStyle: {},
-                headerFixed: false
+                headerFixed: false,
+                proName: '',
+                proNode: '',
             }
         },
         methods: {
@@ -53,6 +55,8 @@
         },
         watch: {},
         mounted () {
+            this.proName = this.$slots.proName[0].text
+            this.proNode = this.$slots.proNode[0].text
         }
     }
 </script>
@@ -65,15 +69,17 @@
     .process-header {
         position: relative;
         padding-top: 10px;
+        width: 100%;
     }
     .process-title {
+        width: 100%;
         margin-left: 10px;
         font-size: 18px;
         font-weight: bold;
         display: inline-block;
         height: 30px;
         line-height: 30px;
-        a {
+        .smallText {
             font-size: 14px;
             margin-left: 5px;
             cursor: default;

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

@@ -361,10 +361,8 @@
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        // this.form.model = data.model || data.form.model
+                        this.form.responUserList = data.form?  data.form.responUserList : ''
-                        // this.form.modelName = data.modelName || data.form.modelName
+                        this.form.responUserListName = data.form?  data.form.responUserListName : ''
-                        this.form.responUserList = data.form.responUserList
-                        this.form.responUserListName = data.form.responUserListName
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -63,6 +63,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityRole"
                     placeholder="请选择会员角色">
                     <el-option
@@ -76,6 +77,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityState"
                     placeholder="选择协会状态">
                     <el-option
@@ -89,6 +91,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   <el-select
+                    clearable
                     v-model="rh_pageData.comityKind"
                     placeholder="请选择入会性质">
                     <el-option

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -34,6 +34,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="协会名称:">
                   <el-select
+                    clearable
                     @change="comityChange"
                     v-model="ch_pageData.associaName"
                     placeholder="请选择标委会">
@@ -48,6 +49,7 @@
               <el-col :span="8" v-if="ch_pageData.associaName !== ''">
                 <el-form-item class="add-form-item">
                   <el-select
+                    clearable
                     @change="comityChangeOne"
                     v-model="ch_pageData.associaNameOne"
                     placeholder="请选择分标委">
@@ -62,6 +64,7 @@
               <el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
                 <el-form-item class="add-form-item">
                   <el-select
+                    clearable
                     v-model="ch_pageData.associaNameTwo"
                     placeholder="请选择工作组">
                     <el-option

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

@@ -404,9 +404,9 @@ export default {
         cname: [
           {required: true, message: '请输入标准名称', trigger: 'change'},
         ],
-        // fjListId: [
+        fjListId: [
-        //   {required: true, message: '请选择附件', trigger: 'change'},
+          {required: true, message: '请选择附件', trigger: 'change'},
-        // ]
+        ]
       },
       // 标准征求意见数据可库
       standCommonlySearch: {

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

@@ -412,9 +412,9 @@ export default {
         endTime: [
           {required: true, message: '请输入标准结束日期', trigger: 'change'},
         ],
-        // fjListId: [
+        fjListId: [
-        //   {required: true, message: '请选择附件', trigger: 'change'},
+          {required: true, message: '请选择附件', trigger: 'change'},
-        // ]
+        ]
       },
       // 标准征求意见数据可库
       standCommonlySearch: {

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -307,10 +307,8 @@
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        // this.form.model = data.model || data.form.model
+                        this.form.responUserList = data.form?  data.form.responUserList : ''
-                        // this.form.modelName = data.modelName || data.form.modelName
+                        this.form.responUserListName = data.form?  data.form.responUserListName : ''
-                        this.form.responUserList = data.form.responUserList
-                        this.form.responUserListName = data.form.responUserListName
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -514,33 +514,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 52px;
+  //  top: 52px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue

@@ -428,33 +428,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 75px;
+  //  top: 75px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 180px');
+    //height: calc(~'100% - 180px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue

@@ -428,33 +428,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 75px;
+  //  top: 75px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 180px');
+    //height: calc(~'100% - 180px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue

@@ -428,33 +428,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 75px;
+  //  top: 75px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 180px');
+    //height: calc(~'100% - 180px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/jrbzhxh/step3.vue

@@ -588,33 +588,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 52px;
+  //  top: 52px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/jrbzhxh/step4.vue

@@ -570,33 +570,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 52px;
+  //  top: 52px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbfs/step4.vue

@@ -436,33 +436,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 52px;
+  //  top: 52px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 180px');
+    //height: calc(~'100% - 180px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbfz/step2.vue

@@ -376,33 +376,33 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
+  //.headerTabs {
-    height: 52px;
+  //  height: 52px;
-    display: flex;
+  //  display: flex;
-    align-items: center;
+  //  align-items: center;
-    position: absolute;
+  //  position: absolute;
-    top: 52px;
+  //  top: 52px;
-    right: 10px;
+  //  right: 10px;
-    .headerTabsItem {
+  //  .headerTabsItem {
-      border: 1px solid #c1c1c1;
+  //    border: 1px solid #c1c1c1;
-      padding: 0 5px;
+  //    padding: 0 5px;
-      height: 30px;
+  //    height: 30px;
-      line-height: 30px;
+  //    line-height: 30px;
-      cursor: pointer;
+  //    cursor: pointer;
-    }
+  //  }
-    .active {
+  //  .active {
-      border: 1px solid #E6A23C;
+  //    border: 1px solid #E6A23C;
-      color: #fff;
+  //    color: #fff;
-      background: #E6A23C;
+  //    background: #E6A23C;
-    }
+  //  }
-  }
+  //}
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbfz/step5.vue

@@ -532,33 +532,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -532,33 +532,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbfz/step7.vue

@@ -532,33 +532,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue

@@ -386,33 +386,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue

@@ -379,33 +379,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue

@@ -379,33 +379,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue

@@ -379,33 +379,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/wbsm/step3.vue

@@ -429,33 +429,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/wbsm/step4.vue

@@ -429,33 +429,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/wbsm/step5.vue

@@ -429,33 +429,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 75px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/xmpg/step2.vue

@@ -502,33 +502,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/xmpg/step5.vue

@@ -606,33 +606,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/xmpg/step6.vue

@@ -593,33 +593,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/xmpg/step7.vue

@@ -589,33 +589,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -524,33 +524,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -499,33 +499,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -524,33 +524,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -426,33 +426,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -523,33 +523,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -524,33 +524,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

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

@@ -523,33 +523,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/xmqdqr/step5.vue

@@ -642,33 +642,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step4.vue

@@ -351,33 +351,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step5.vue

@@ -523,33 +523,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step6.vue

@@ -388,33 +388,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step7.vue

@@ -389,33 +389,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step8.vue

@@ -388,33 +388,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/phone/zczqyj/step9.vue

@@ -388,33 +388,13 @@ export default {
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }
-  .headerTabs {
-    height: 52px;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    top: 52px;
-    right: 10px;
-    .headerTabsItem {
-      border: 1px solid #c1c1c1;
-      padding: 0 5px;
-      height: 30px;
-      line-height: 30px;
-      cursor: pointer;
-    }
-    .active {
-      border: 1px solid #E6A23C;
-      color: #fff;
-      background: #E6A23C;
-    }
-  }
   .content {
     border-top: 1px solid #DCDFE6;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-top: 52px;
-    height: calc(~'100% - 155px');
+    //height: calc(~'100% - 155px');
     overflow: auto;
     .tableTitle {
       margin-bottom: 10px;

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -492,7 +492,7 @@ export default {
         case '2':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
-              name: 'phoneBzdyStep2',
+              name: 'bzdyStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

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

@@ -1267,7 +1267,6 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
-      console.log(row);
       // 用来储存取消时原来的数据，防止取消时修改
       localStorage.setItem("obj", JSON.stringify(row));
 
@@ -1300,14 +1299,13 @@ export default {
     },
     // 抽屉提交按钮
     saveInfo() {
-      console.log(this.editRowData);
+      if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
-      if (this.editRowData.ssrq !== '') {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== ''){
+      if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null){
         this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
       }
-      if (this.editRowData.zccssrqgj !== ''){
+      if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null){
         this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
       }
       this.drawerEdit = false
@@ -2127,8 +2125,6 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      console.log('能源类型',res.data.NYLXCLASS);
-      console.log('适用车型',res.data.ENERGYTYPES);
       this.allSelectOptions = res.data || {}
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.NYLXCLASS // 能源类型

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

@@ -331,34 +331,6 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-<!--        <el-table-column
-          show-overflow-tooltip
-          prop="cycvppsbm"
-          width="210px"
-          align="center"
-          label="乘用车VPPS编码">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="cycvppscn"
-          width="210px"
-          align="center"
-          label="乘用车VPPS中文名称">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="kccvppsbm"
-          align="center"
-          width="210px"
-          label="卡车VPPS编码">
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="kccvppscn"
-          align="center"
-          width="210px"
-          label="卡车VPPS中文名称">
-        </el-table-column>-->
         <el-table-column width="160" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -373,12 +345,6 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
-<!--            <el-button-->
-<!--              size="small"-->
-<!--              @click="editTghisRow(scope.row)"-->
-<!--              class="common-button-default"-->
-<!--              type="warning"-->
-<!--            >编辑</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -415,91 +381,6 @@
         </div>
       </el-upload>
     </el-dialog>
-    <!--编辑-->
-    <el-drawer
-      title="编辑清单条目"
-      :visible.sync="drawerEdit"
-      :wrapperClosable="false"
-      :before-close='cancelInfo'
-      size="800px"
-    >
-      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
-        <el-form-item label="标准号">
-          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准名称" prop="standName">
-          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="英文名称" prop="standEnName">
-          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用车型" prop="typeApplicable">
-          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="能源类型" prop="nylx">
-          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准实施日期" prop="ssrq">
-          <el-date-picker
-            v-model.trim="editRowData.ssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrq">
-          <el-date-picker
-            v-model.trim="editRowData.zccssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrq">
-          <el-date-picker
-            v-model.trim="editRowData.xcxssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="责任部门" prop="zrbm">
-          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用产品线" prop="sycpx">
-          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
-        </el-form-item>
-<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>-->
-      </el-form>
-      <div class="demo-drawer-footer">
-        <el-button
-          type="primary"
-          class="common-button-primary"
-          size="mini"
-          icon="el-icon-check"
-          @click="saveInfo"
-        >提交</el-button
-        >
-        <el-button
-          size="mini"
-          icon="el-icon-close"
-          class="common-button-default"
-          @click="cancelInfo"
-        >取消</el-button
-        >
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
@@ -555,26 +436,6 @@ export default {
       zrbmMap: {},
       sycpxMap: {},
       selectSearch : [],
-      // 编辑抽屉状态
-      drawerEdit: false,
-      // 编辑框数据
-      editRowData: {
-        id: '',
-        standName: '',
-        standSortShow:'',
-        standEnName: '',
-        typeApplicable: '',
-        nylx: '',
-        ssrq: '',
-        zccssrq: '',
-        xcxssrq: '',
-        zrbm: '',
-        sycpx: '',
-        cycvppsbm: '',
-        cycvppscn: '',
-        kccvppsbm: '',
-        kccvppscn: ''
-      },
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -1217,45 +1078,6 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
-    // 编辑按钮
-    editTghisRow(row) {
-      // 用来储存取消时原来的数据，防止取消时修改
-      localStorage.setItem('obj', JSON.stringify(row))
-
-      this.rowList = row
-      this.editRowData = this.rowList
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
-      }
-      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
-      }
-      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
-      }
-      this.drawerEdit = true
-    },
-    // 抽屉取消按钮
-    cancelInfo() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrq = Item.zccssrq
-      this.drawerEdit = false
-    },
-    // 抽屉提交按钮
-    saveInfo() {
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
-      }
-      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
-      }
-      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
-      }
-      this.drawerEdit = false
-    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true

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

@@ -405,13 +405,6 @@
                 v-if="!disabledFlag"
             >下移
             </el-button>
-<!--            <el-button-->
-<!--                size="small"-->
-<!--                @click="editTghisRow(scope.row)"-->
-<!--                class="common-button-default"-->
-<!--                type="warning"-->
-<!--            >编辑-->
-<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -453,92 +446,6 @@
         </div>
       </el-upload>
     </el-dialog>
-    <el-drawer
-        title="编辑清单条目"
-        :visible.sync="drawerEdit"
-        :before-close='cancelInfo'
-        :wrapperClosable="false"
-        size="800px"
-    >
-      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
-        <el-form-item label="标准号">
-          <el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准名称" prop="standName">
-          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="英文名称" prop="standEnName">
-          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用车型" prop="typeApplicable">
-          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="能源类型" prop="nylx">
-          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="标准实施日期" prop="ssrq">
-          <el-date-picker
-              v-model.trim="editRowData.ssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrq">
-          <el-date-picker
-              v-model.trim="editRowData.zccssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrq">
-          <el-date-picker
-              v-model.trim="editRowData.xcxssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="责任部门" prop="zrbm">
-          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="适用产品线" prop="sycpx">
-          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
-        </el-form-item>
-<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>-->
-      </el-form>
-      <div class="demo-drawer-footer">
-        <el-button
-            type="primary"
-            class="common-button-primary"
-            size="mini"
-            icon="el-icon-check"
-            @click="saveInfo"
-        >提交
-        </el-button
-        >
-        <el-button
-            size="mini"
-            icon="el-icon-close"
-            class="common-button-default"
-            @click="cancelInfo"
-        >取消
-        </el-button
-        >
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
@@ -609,27 +516,6 @@ export default {
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
-      // 编辑抽屉状态
-      drawerEdit: false,
-      // 编辑框数据
-      editRowData: {
-        id: '',
-        standName: '',
-        standSortShow: '',
-        standEnName: '',
-        typeApplicable: '',
-        syrz: '',
-        nylx: '',
-        ssrq: '',
-        zccssrq: '',
-        xcxssrq: '',
-        zrbm: '',
-        sycpx: '',
-        cycvppsbm: '',
-        cycvppscn: '',
-        kccvppsbm: '',
-        kccvppscn: ''
-      },
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
         type: [
@@ -1188,44 +1074,6 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
-    // 编辑按钮
-    editTghisRow(row) {
-      // 用来储存取消时原来的数据，防止取消时修改
-      localStorage.setItem('obj', JSON.stringify(row))
-      this.rowList = row
-      this.editRowData = this.rowList
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
-      }
-      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
-      }
-      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
-      }
-      this.drawerEdit = true
-    },
-    // 抽屉取消按钮
-    cancelInfo() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrq = Item.zccssrq
-      this.drawerEdit = false
-    },
-    // 抽屉提交按钮
-    saveInfo() {
-      if (this.editRowData.ssrq !== null) {
-        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
-      }
-      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
-      }
-      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
-      }
-      this.drawerEdit = false
-    },
     // 点击清单条目导入按钮事件
     importmodalFlags() {
       this.importmodalFlag = true

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -29,7 +29,7 @@
           <div class="file-box" v-if="fileList.length > 0">
             <p v-for="item in fileList"
                :key="item.id">
-              <a @click="openFileInPdf(item.id, item.name)" target="_blank">{{ item.name }}</a>
+              <a @click="openFileInPdf(item.id, item.name)" target="_blank" style="color: #409eff">{{ item.name }}</a>
               <i
                   title="下载"
                   @click="downloadFile(item.id)"
@@ -257,12 +257,14 @@ export default {
 
       .transition-box-label {
         display: inline-block;
+        font-weight: bolder;
         width: 200px;
         vertical-align: top;
       }
 
       .transition-box-span {
         display: inline-block;
+        color: #7e8083;
         width: calc(~'100% - 100px');
       }
 

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -11,7 +11,7 @@
       <div class="left">
         <el-form :modal="historySearch" :inline="true" class="label-input-form" >
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="historySearch.standId"
+            <el-input v-model="historySearch.standSerialNumber"
                       placeholder="请输入"
                       clearable
                       @keyup.enter="getTableBtn"
@@ -25,39 +25,9 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+            <el-input v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
-              <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+            </el-input>
-                {{ opt.label}}</el-option>
-            </el-select>
           </el-form-item>
-<!--          <el-form-item label="责任部门" class="search-item">-->
-<!--            <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
-<!--            <el-popover-->
-<!--              placement="bottom"-->
-<!--              popper-class="user-dept-popper"-->
-<!--              trigger="click"-->
-<!--              :value="false"-->
-<!--            >-->
-<!--              <el-input-->
-<!--                slot="reference"-->
-<!--                v-model="historySearch.responseUnitShow"-->
-<!--                placeholder="根据责任部门查找"-->
-<!--                readonly-->
-<!--                clearable-->
-<!--                id="searchResp"-->
-<!--              />-->
-<!--              <div class="api">-->
-<!--                <laws-tree-->
-<!--                  :zNodes="zNodesSItem"-->
-<!--                  treeDivId="zNodesSItemSearch"-->
-<!--                  deptSelect-->
-<!--                  showRMenu-->
-<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
-<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
-<!--                </laws-tree>-->
-<!--              </div>-->
-<!--            </el-popover>-->
-<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -144,7 +114,7 @@
           label="责任部门">
         </el-table-column>
         <el-table-column
-          prop="dutyEngineer"
+          prop="dutyEngineerName"
           width="150"
           align="center"
           label="责任工程师">
@@ -666,8 +636,6 @@ export default {
       _this: this
     }, res => {
       this.allSelectOptions = res.data || {}
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {