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

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

@@ -6,7 +6,6 @@
       <span class="title borderRight">友情链接</span>
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
-      <div>
       <el-row>
         <span v-for="(item, index) in linkListFirst" :key="index">
               <el-col :span="4">
@@ -15,7 +14,8 @@
                   :src="item.icon"
                   v-if="index < 5">
                 <a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
-                  {{ item.name }}
+                  <a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
+                  <a v-else>{{ item.name }}</a>
                 </a>
               </el-col>
                <el-col :span="1" v-if="index < 4" v-show="true">
@@ -26,9 +26,7 @@
               </el-col>
             </span>
       </el-row>
-      </div>
+      <el-row style="margin-bottom: 10px;">
-      <div>
-        <el-row>
         <span v-for="(item, index) in linkListSecond" :key="index">
               <el-col :span="4">
                 <img
@@ -36,7 +34,8 @@
                   :src="item.icon"
                   v-if="index < 5">
                 <a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
-                  {{ item.name }}
+                   <a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
+                  <a v-else>{{ item.name }}</a>
                 </a>
               </el-col>
                <el-col :span="1" v-if="index < 4" v-show="true">
@@ -48,7 +47,6 @@
             </span>
       </el-row>
     </div>
-    </div>
     <div style="display: inline-block;width: 15%;">
       <span class="borderLeft"></span>
       <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
@@ -61,6 +59,15 @@ import {getImg} from '@/api/linkApi.js'
 
 export default {
   name: 'Empennage',
+  filters: {
+    snippet: function (value) {
+      if (value && value.length > 8) {
+        return value.slice(0, 8) + '...'
+      } else {
+        return value
+      }
+    }
+  },
   components: {},
   mixins: [],
   data() {
@@ -168,6 +175,7 @@ export default {
 
 <style lang="less" scoped>
 .link {
+  background-color: #fff;
   margin-right: 10px;
   display: flex;
   border-radius: 3px;
@@ -206,6 +214,10 @@ export default {
     color: #0068B7;
   }
 
+  .el-col-1 {
+    margin-top: 10px;
+  }
+
   .el-col-4 {
     white-space: nowrap;
     text-overflow: ellipsis;

src/pages/home2/index.vue

@@ -29,9 +29,7 @@
     </div>
   </div>
   <div calss="home_footer" style="padding: 0">
-    <el-card class="footer">
       <Empennage></Empennage>
-    </el-card>
   </div>
 </div>
 </template>
@@ -185,7 +183,7 @@ export default {
   /deep/.el-card__body {
     padding: 0;
   }
-  .footer {
+  .home_footer {
     height: 70px;
     line-height: 33px;
     //margin-top: 0.3vh;

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

@@ -693,9 +693,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入回执说明')
-      } else {
       let json = {
         prcCreateUser: this.$store.getters.userInfo.userId,
         prcCreateUserName: this.$store.getters.userInfo.userName,
@@ -735,7 +732,6 @@ export default {
     }
   }
 }
-}
 </script>
 
 <style lang="less" scoped>

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

@@ -346,9 +346,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         roleList: this.roleForm,
         memberId: this.$store.getters.userInfo.userId,
@@ -375,7 +372,6 @@ export default {
     }
   }
 }
-}
 </script>
 
 <style lang="less" scoped>
@@ -448,12 +444,15 @@ export default {
     .comityTel_btn {
       text-align: right;
     }
+
     /deep/ .el-input.is-disabled .el-input__inner {
       background-color: #fff;
     }
+
     /deep/ .el-textarea.is-disabled .el-textarea__inner {
       background-color: #fff;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }

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

@@ -433,9 +433,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入回执说明')
-      } else {
       let json = {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
@@ -458,7 +455,6 @@ export default {
           });
         }
       })
-      }
 
     },
     /** 点击对应附件进行下载*/
@@ -474,15 +470,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep3 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -490,6 +489,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -497,21 +497,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -519,6 +523,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -526,17 +531,22 @@ export default {
       }
     }
   }
+
   .content_form {
     padding: 15px;
+
     .comityTel_btn {
       text-align: right;
     }
+
     /deep/ .el-input.is-disabled .el-input__inner {
       background-color: #fff;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

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

@@ -218,6 +218,7 @@ import {
   saveTaskForPub,
   changeAssigneeNew
 } from "@/api/process.js"
+
 export default {
   components: {
     ProcessHeader,
@@ -365,9 +366,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if(this.textarea === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         member: this.selfUser,
         passFlag: '1',
@@ -392,7 +390,6 @@ export default {
           });
         }
       })
-      }
     },
     /** 点击对应附件进行下载*/
     previews(val) {
@@ -407,15 +404,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep4 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -423,6 +423,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -430,21 +431,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -452,6 +457,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -459,17 +465,22 @@ export default {
       }
     }
   }
+
   .content_form {
     padding: 15px;
+
     .comityTel_btn {
       text-align: right;
     }
+
     /deep/ .el-textarea.is-disabled .el-textarea__inner {
       background-color: #fff;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

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

@@ -256,6 +256,7 @@ import {
   saveTaskForPub,
   changeAssigneeNew
 } from "@/api/process.js"
+
 export default {
   components: {
     ProcessHeader,
@@ -408,9 +409,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入回执说明')
-      } else {
       let json = {
         leader: this.roleForm.leaderUserId,
         rh_pageData: this.rh_pageData,
@@ -433,7 +431,6 @@ export default {
           });
         }
       })
-      }
 
     },
 
@@ -450,15 +447,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzrhStep5 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -466,6 +466,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -473,21 +474,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -495,6 +500,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -505,15 +511,19 @@ export default {
 
   .content_form {
     padding: 15px;
+
     .comityTel_btn {
       text-align: right;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     .myPart_btn {
       text-align: right;
     }

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

@@ -390,13 +390,6 @@ export default {
 
     // 提交按钮
     handleSubmit() {
-      if (this.textarea === '') {
-        if (this.taskInfo === '标准法规工程师汇总修订完毕') {
-          this.$message.warning('请输入回执说明')
-        } else {
-          this.$message.warning('请输入反馈意见')
-        }
-      } else {
       let json = {
         passFlag: '1',
         rh_pageData: this.rh_pageData,
@@ -435,7 +428,6 @@ export default {
     }
   }
 }
-}
 </script>
 
 <style lang="less" scoped>
@@ -516,6 +508,7 @@ export default {
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     .myPart_btn {
       text-align: right;
     }

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

@@ -605,9 +605,6 @@ export default {
     },
     /** 提交按钮*/
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入回执说明')
-      } else {
       let json = {
         prcCreateUser: this.$store.getters.userInfo.userId,
         prcCreateUserName: this.$store.getters.userInfo.userName,
@@ -643,7 +640,6 @@ export default {
         }
       })
     }
-    }
 
   }
 }

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

@@ -201,6 +201,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -310,9 +311,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         roleList: this.roleForm,
         memberId: this.$store.getters.userInfo.userId,
@@ -336,7 +334,6 @@ export default {
           });
         }
       })
-      }
 
     }
   }
@@ -345,15 +342,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzchStep2 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -361,6 +361,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -368,21 +369,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -390,6 +395,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -397,40 +403,51 @@ export default {
       }
     }
   }
+
   .content_form {
     padding-top: 15px;
     padding-left: 30px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
+
     /deep/ .el-input.is-disabled .el-input__inner {
       background-color: #fff;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     .meeting_table {
       /deep/ .el-input__inner {
         text-align: center;
       }
     }
+
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     /deep/ .el-upload {
       display: unset;
     }
+
     /deep/ .el-upload-list__item-status-label {
       font-size: 0;
     }
+
     /deep/ .el-upload-list__item {
       .el-icon-close {
         font-size: 0;
       }
+
       .el-icon-close-tip {
         font-size: 0;
       }
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

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

@@ -394,9 +394,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入回执说明')
-      } else {
       let json = {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
@@ -420,7 +417,6 @@ export default {
           });
         }
       })
-      }
 
     }
   }
@@ -498,6 +494,7 @@ export default {
     /deep/ .el-input.is-disabled .el-input__inner {
       background-color: #fff;
     }
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
@@ -507,6 +504,7 @@ export default {
         text-align: center;
       }
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
@@ -518,9 +516,11 @@ export default {
     /deep/ .el-upload {
       display: unset;
     }
+
     /deep/ .el-upload-list__item-status-label {
       font-size: 0;
     }
+
     /deep/ .el-upload-list__item {
       .el-icon-close {
         font-size: 0;
@@ -530,6 +530,7 @@ export default {
         font-size: 0;
       }
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

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

@@ -206,6 +206,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -324,9 +325,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.textarea === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         member: this.selfUser,
         passFlag: '1',
@@ -354,20 +352,22 @@ export default {
     }
   }
 }
-}
 </script>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzchStep4 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -375,6 +375,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -382,21 +383,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -404,6 +409,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -411,29 +417,37 @@ export default {
       }
     }
   }
+
   .content_form {
     padding-top: 15px;
     padding-left: 30px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
+
     .meeting_table {
       /deep/ .el-input__inner {
         text-align: center;
       }
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     /deep/ .el-upload {
       display: unset;
     }
+
     /deep/ .el-upload-list__item-status-label {
       font-size: 0;
     }
+
     /deep/ .el-upload-list__item {
       .el-icon-close {
         font-size: 0;
@@ -443,6 +457,7 @@ export default {
         font-size: 0;
       }
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

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

@@ -224,6 +224,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import {startProcess, saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -353,9 +354,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.commentText === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         leader: this.roleForm.leaderUserId,
         ch_pageData: this.ch_pageData,
@@ -378,7 +376,6 @@ export default {
           });
         }
       })
-      }
 
     }
   }
@@ -387,15 +384,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzchStep5 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -403,6 +403,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -410,21 +411,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -432,6 +437,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -439,37 +445,47 @@ export default {
       }
     }
   }
+
   .content_form {
     padding-top: 15px;
     padding-left: 30px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
+
     .meeting_table {
       /deep/ .el-input__inner {
         text-align: center;
       }
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     .meeting_table {
       /deep/ .el-input__inner {
         text-align: center;
       }
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }
+
     /deep/ .el-upload {
       display: unset;
     }
+
     /deep/ .el-upload-list__item-status-label {
       font-size: 0;
     }
+
     /deep/ .el-upload-list__item {
       .el-icon-close {
         font-size: 0;
@@ -479,6 +495,7 @@ export default {
         font-size: 0;
       }
     }
+
     .myPart_btn {
       text-align: right;
     }

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

@@ -215,6 +215,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -376,9 +377,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.textarea === '') {
-        this.$message.warning('请输入审批意见')
-      } else {
       let json = {
         passFlag: '1',
         ch_pageData: this.ch_pageData,
@@ -415,7 +413,6 @@ export default {
           });
         }
       })
-      }
 
     }
   }
@@ -424,15 +421,18 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzchStep6 {
   position: relative;
   height: 100%;
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -440,6 +440,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -447,21 +448,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -469,6 +474,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -476,29 +482,37 @@ export default {
       }
     }
   }
+
   .content_form {
     padding-top: 15px;
     padding-left: 30px;
+
     .el-divider--horizontal {
       margin-top: 0px;
     }
+
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
+
     .meeting_table {
       /deep/ .el-input__inner {
         text-align: center;
       }
     }
+
     /deep/ .el-upload {
       display: unset;
     }
+
     /deep/ .el-upload-list__item-status-label {
       font-size: 0;
     }
+
     /deep/ .el-upload-list__item {
       .el-icon-close {
         font-size: 0;
@@ -508,6 +522,7 @@ export default {
         font-size: 0;
       }
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -305,7 +305,7 @@ export default {
     //企业标准查询
     getStandDataBtn(){
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
-        reviseStatus: this.standardSearch.reviseStatus,
+        reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
         page: this.page,
         pageSize: this.pageSize,
@@ -336,6 +336,7 @@ export default {
       }else if(this.selectList.length < 1){
         this.$message.warning('请至少选择一条数据进行带入')
       }else{
+        this.qbfsForm.esId = this.selectList[0].id
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafter = this.selectList[0].drafter

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -327,7 +327,7 @@ export default {
     //企业标准查询
     getStandDataBtn(){
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
-        reviseStatus: this.standardSearch.reviseStatus,
+        reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
         page: this.page,
         pageSize: this.pageSize,
@@ -358,6 +358,7 @@ export default {
       }else if(this.selectList.length < 1){
         this.$message.warning('请至少选择一条数据进行带入')
       }else{
+        this.qbfsForm.esId = this.selectList[0].id
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafter = this.selectList[0].drafter

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -31,23 +31,22 @@
           <el-option label="未制定" value="未制定"></el-option>
         </el-select>
       </el-form-item>
-    <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-      <el-input
+        <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-        v-model="qbfsForm.drafter"
+        <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
-        placeholder="请输入起草人"
+                  @click.native="choiceZRRS('1')">
-        :maxlength="500"/>
+        </el-input>
       </el-form-item>
-    <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-      <el-input
+        <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
-        v-model="qbfsForm.resPerson"
+        <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
-        placeholder="请输入评审责任人"
+                  @click.native="choiceZRRS('2')">
-        :maxlength="500"/>
+        </el-input>
       </el-form-item>
-    <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-      <el-input
+        <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
-        v-model="qbfsForm.wgLeader"
+        <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
-        placeholder="请输入工作组组长"
+                  @click.native="choiceZRR"></el-input>
-        :maxlength="500"/>
       </el-form-item>
       <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
         <el-date-picker
@@ -66,10 +65,15 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
-      <el-input
+        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
-        v-model="qbfsForm.unit"
+          <el-option
-        placeholder="请输入起草责任单位"
+            v-for="item in qcdwOptions"
-        :maxlength="500"/>
+            placeholder="请选择起草责任单位"
+            :key="item.value"
+            :value="item.value"
+            :label="item.label"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
@@ -85,6 +89,20 @@
       <!--                                                    :maxlength="500"/>-->
       <!--                                        </el-form-item>-->
     </el-form>
+    <!--    多选择责任人-->
+    <Role-tree
+      :is-title="drawerTitle2"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -100,6 +118,14 @@ export default {
   props: ['message'],
   data(){
     return {
+      drawerTitle2: '',
+      drawerTitle: '',
+      roleType: '',
+      modalshowflag2: false,
+      modalshowflag: false,
+      nodeList2: [],
+      nodeList: [],
+      qcdwOptions: [],
       qbfsForm: {
         type: '5',
         unit: '', // 单位
@@ -107,10 +133,13 @@ export default {
         planStatus: '', // 计划状态
         reviseStatus: '', // 制修订状态
         resPerson: '', // 评审责任人
+        resPersonName: '',
         wgLeader: '', // 工作组组长
+        wgLeaderName: '',
         draftTime: '', // 计划标准初稿完成时间
         releaseTime: '', // 计划标准发布时间
         drafter: '', // 起草人
+        drafterName: '',
         newReason: '', //新增原因
         // remarks: '', // 备注
       },
@@ -127,10 +156,10 @@ export default {
         reviseStatus: [
           {required: true, message: '请选择制修订状态', trigger: 'change'},
         ],
-        resPerson: [
+        resPersonName: [
           {required: true, message: '请输入评审责任人', trigger: 'blur'},
         ],
-        wgLeader: [
+        wgLeaderName: [
           {required: true, message: '请输入工作组组长', trigger: 'blur'},
         ],
         draftTime: [
@@ -139,7 +168,7 @@ export default {
         releaseTime: [
           {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
         ],
-        drafter: [
+        drafterName: [
           {required: true, message: '请输入起草人', trigger: 'blur'},
         ],
         newReason: [
@@ -158,7 +187,62 @@ export default {
       }
     }
   },
+  mounted(){
+    //查询下拉框数据
+     this.$http.get('sys/dictype/getDicTypeListCode', '',{
+       _this: this
+     }, res => {
+       console.log(res);
+       this.qcdwOptions = res.data.QCDW // 起草单位
+     })
+  },
   methods: {
+    choiceZRR() {
+      this.nodeList = [];
+      this.drawerTitle = '请选择工作组组长';
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      this.qbfsForm.wgLeader = data[0].id;
+      this.qbfsForm.wgLeaderName = data[0].name;
+      this.modalshowflag = false;
+    },
+    choiceZRRS(type) {
+      this.roleType = type
+      if(type === '1' ){
+        this.drawerTitle2 = '请选择起草人'
+        this.nodeList2 = [];
+        if (this.qbfsForm.drafter !== undefined) {
+          this.nodeList2 = this.qbfsForm.drafter.split(",");
+        }
+      }else if(type === '2'){
+        this.drawerTitle2 = '请选择评审责任人'
+        this.nodeList2 = [];
+        if (this.qbfsForm.resPerson !== undefined) {
+          this.nodeList2 = this.qbfsForm.resPerson.split(",");
+        }
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      if(this.roleType === '1'){
+        this.qbfsForm.drafter = idList;
+        this.qbfsForm.drafterName = nameList;
+      }else if(this.roleType === '2'){
+        this.qbfsForm.resPerson = idList;
+        this.qbfsForm.resPersonName = nameList;
+      }
+    },
     validateForm () {
       let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
@@ -170,7 +254,7 @@ export default {
       })
       return flag
     }
-  }
+  },
 };
 </script>
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -4,85 +4,47 @@
       <template slot="title">合并企标信息</template>
     </process-title>
     <el-form
-      ref="qbzxdForm"
+      ref="qbfsForm"
-      :model="qbzxdForm"
+      :model="qbfsForm"
-      :rules="formRules"
+      :rules="qbfsFormRules"
       class="label-input-form prc-content-border"
       label-width="150px"
     >
+      <div v-if="foldFormFlag">
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
               <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
             </el-form-item>
 
-          <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+            <el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input>
-              readonly
-              v-model="qbzxdForm.esName"
-              placeholder="请输入企标名称"
-              clearable
-            ></el-input>
             </el-form-item>
-          <el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
+            <el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
-              readonly
-              v-model="qbzxdForm.planStatus"
-              placeholder="请输入计划状态"
-              clearable
-            ></el-input>
             </el-form-item>
-          <el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
+            <el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
-              readonly
-              v-model="qbzxdForm.reviseStatus"
-              placeholder="请输入制修订状态"
-              clearable
-            ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
               <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
             </el-form-item>
-          <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
+            <el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input>
-              readonly
-              v-model="qbzxdForm2.esName"
-              placeholder="请输入企标名称"
-              clearable
-            ></el-input>
             </el-form-item>
-          <el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
+            <el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
-              readonly
-              v-model="qbzxdForm2.planStatus"
-              placeholder="请输入计划状态"
-              clearable
-            ></el-input>
             </el-form-item>
-          <el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
+            <el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
-            <el-input
+              <el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
-              readonly
-              v-model="qbzxdForm2.reviseStatus"
-              placeholder="请输入制修订状态"
-              clearable
-            ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-    </el-form>
         <process-title>
           <template slot="title">合并后企标信息</template>
         </process-title>
-    <el-form
-      ref="qbfsForm"
-      :model="qbfsForm"
-      :rules="formRules"
-      class="label-input-form prc-content-border"
-      label-width="150px"
-    >
-      <div v-if="foldFormFlag">
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
@@ -106,11 +68,10 @@
               </el-select>
             </el-form-item>
             <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
-              <el-input
+              <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
-                v-model="qbfsForm.resPerson"
+              <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
-                placeholder="请输入评审责任人"
+                        @click.native="choiceZRRS('2')">
-                clearable
+              </el-input>
-              ></el-input>
             </el-form-item>
             <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
               <el-date-picker
@@ -121,11 +82,15 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-input
+              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
-                v-model="qbfsForm.unit"
+                <el-option
-                placeholder="请输入起草责任单位"
+                  v-for="item in qcdwOptions"
-                clearable
+                  placeholder="请选择起草责任单位"
-              ></el-input>
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -137,18 +102,15 @@
               </el-select>
             </el-form-item>
             <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
-              <el-input
+              <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-                v-model="qbfsForm.drafter"
+              <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
-                placeholder="请输入起草人"
+                        @click.native="choiceZRRS('1')">
-                clearable
+              </el-input>
-              ></el-input>
             </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
-              <el-input
+              <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
-                v-model="qbfsForm.wgLeader"
+              <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
-                placeholder="请输入工作组组长"
+                        @click.native="choiceZRR"></el-input>
-                clearable
-              ></el-input>
             </el-form-item>
             <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
               <el-date-picker
@@ -296,6 +258,20 @@
         <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
       </div>
     </el-drawer>
+    <!--    多选择责任人-->
+    <Role-tree
+      :is-title="drawerTitle2"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -310,6 +286,14 @@ export default {
   props: ['message'],
   data(){
     return {
+      drawerTitle2: '',
+      drawerTitle: '',
+      type: '',
+      modalshowflag2: false,
+      modalshowflag: false,
+      nodeList2: [],
+      nodeList: [],
+      qcdwOptions: [],
       standShow: false,
       standShow2: false,
       ListModel: false,
@@ -319,7 +303,44 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       selectList: [],
-      formRules: {},
+      qbfsFormRules: {
+        esName1: [
+          {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
+        ],
+        esName2: [
+          {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
+        ],
+        unit: [
+          {required: true, message: '请输入单位', trigger: 'blur'},
+        ],
+        esName: [
+          {required: true, message: '请输入企标名称', trigger: 'blur'},
+        ],
+        planStatus: [
+          {required: true, message: '请选择计划状态', trigger: 'change'},
+        ],
+        reviseStatus: [
+          {required: true, message: '请选择制修订状态', trigger: 'change'},
+        ],
+        resPerson: [
+          {required: true, message: '请输入评审责任人', trigger: 'blur'},
+        ],
+        wgLeader: [
+          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+        ],
+        draftTime: [
+          {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+        ],
+        releaseTime: [
+          {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
+        ],
+        drafter: [
+          {required: true, message: '请输入起草人', trigger: 'blur'},
+        ],
+        mergeReason: [
+          {required: true, message: '请输入合并原因', trigger: 'blur'},
+        ],
+      },
       standinfoList: [],
       standardSearch: {
         reviseStatus: "",
@@ -334,6 +355,9 @@ export default {
         isSubTime: "",
         mergeReason: "",
         company: "",
+        resPersonName: '',
+        drafterName: '',
+        wgLeaderName:'',
         groupLeader: "",
         drafterPeople: "",
         formulateStatus: "",
@@ -357,21 +381,16 @@ export default {
         reviewDate: '',
         abolishCause:'',
       },
-      qbzxdForm2: {
-        standCode: "",
-        standName: "",
-        enName: '',
-        entCategory: '',
-        replaceNumber: '',
-        replacedNumber: '',
-        releaseDate: '',
-        implementDate: '',
-        reviewDate: '',
-        abolishCause:'',
-      },
     }
   },
   mounted() {
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      console.log(res);
+      this.qcdwOptions = res.data.QCDW // 起草单位
+    })
     this.getStandDataBtn()
 
   },
@@ -385,6 +404,52 @@ export default {
     }
   },
   methods: {
+    choiceZRR() {
+      this.nodeList = [];
+      this.drawerTitle = '请选择工作组组长';
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+        this.qbfsForm.wgLeader = data[0].id;
+        this.qbfsForm.wgLeaderName = data[0].name;
+      this.modalshowflag = false;
+    },
+    choiceZRRS(type) {
+      this.type = type
+      if(type === '1' ){
+        this.drawerTitle2 = '请选择起草人'
+        this.nodeList2 = [];
+        if (this.qbfsForm.drafter !== undefined) {
+          this.nodeList2 = this.qbfsForm.drafter.split(",");
+        }
+      }else if(type === '2'){
+        this.drawerTitle2 = '请选择评审责任人'
+        this.nodeList2 = [];
+        if (this.qbfsForm.resPerson !== undefined) {
+          this.nodeList2 = this.qbfsForm.resPerson.split(",");
+        }
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      if(this.type === '1'){
+        this.qbfsForm.drafter = idList;
+        this.qbfsForm.drafterName = nameList;
+      }else if(this.type === '2'){
+        this.qbfsForm.resPerson = idList;
+        this.qbfsForm.resPersonName = nameList;
+      }
+    },
     validateForm () {
       let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
@@ -418,14 +483,16 @@ export default {
         this.$message.warning('请至少选择一条数据进行带入')
       }else{
         if(this.showType === 'one'){
-          this.qbzxdForm.esName = this.selectList[0].esName || '--'
+          this.qbfsForm.esId1 = this.selectList[0].id || '--'
-          this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--'
+          this.qbfsForm.esName1 = this.selectList[0].esName || '--'
-          this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--'
+          this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
+          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
           this.standShow = true
         }else{
-          this.qbzxdForm2.esName = this.selectList[0].esName || '--'
+          this.qbfsForm.esId2 = this.selectList[0].id || '--'
-          this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--'
+          this.qbfsForm.esName2 = this.selectList[0].esName || '--'
-          this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--'
+          this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
+          this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
           this.standShow2 = true
         }
         this.ListModel = false
@@ -434,7 +501,7 @@ export default {
     //企业标准查询
     getStandDataBtn(){
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
-        reviseStatus: this.standardSearch.reviseStatus,
+        reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
         page: this.page,
         pageSize: this.pageSize,

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -315,7 +315,7 @@ export default {
     //企业标准查询
     getStandDataBtn(){
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
-        reviseStatus: this.standardSearch.reviseStatus,
+        reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
         page: this.page,
         pageSize: this.pageSize,

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

@@ -268,6 +268,7 @@ export default {
   },
   data() {
     return {
+      comFlag: 0,
       active: "1",
       commentText: "",
       comName: "merge",
@@ -414,8 +415,27 @@ export default {
         this.saveLoading = false
       })
     },
+    repeatName(){
+      let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+      this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
+        _this: this
+      }, res => {
+        let dataList = res.data
+        dataList.forEach(item => {
+          if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
+            this.comFlag++
+          }else{
+            this.comFlag = 0
+          }
+        })
+      })
+    },
     //流程提交
     handleSubmit() {
+      this.repeatName()
+      if(this.comFlag   === '0'){
+          this.$message.warning('请更改企标名称')
+      }else {
           if (this.$route.query.prcNum === undefined) {
             let flag = this.$refs["childForm"].validateForm();
             let qbzxdFrom = this.$refs["childForm"].qbfsForm;
@@ -479,8 +499,7 @@ export default {
               this.$message.warning("请完善基础信息");
             }
           }
-
+        }
-
     },
     // 流程阶段负责人选择
     choiceZRR(type, title, id) {

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

@@ -36,21 +36,21 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.drafter"
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.resPerson"
               placeholder="请输入评审责任人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.wgLeader"
@@ -148,7 +148,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -391,6 +391,9 @@ export default {
       });
     },
     beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.isSubmit = true
         this.qbfsForm.passFlag = '1'
         this.qbfsForm.commentText = this.commentText
@@ -409,8 +412,8 @@ export default {
           this.isSubmit = false
         }, e => {
         });
+      }
     },
-
   },
 };
 </script>

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

@@ -148,7 +148,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -391,6 +391,9 @@ export default {
       });
     },
     beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.isSubmit = true
         this.qbfsForm.deptCenterFlag = '1'
         this.qbfsForm.commentText = this.commentText
@@ -409,8 +412,8 @@ export default {
           this.isSubmit = false
         }, e => {
         });
+      }
     },
-
   },
 };
 </script>

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

@@ -148,7 +148,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -391,6 +391,9 @@ export default {
       });
     },
     beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.isSubmit = true
         this.qbfsForm.bzFlag = '1'
         this.qbfsForm.commentText = this.commentText
@@ -409,6 +412,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
+      }
     },
 
   },

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

@@ -148,7 +148,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -391,6 +391,9 @@ export default {
       });
     },
     beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
         this.isSubmit = true
         this.qbfsForm.bzfgbzFlag = '1'
         this.qbfsForm.commentText = this.commentText
@@ -409,6 +412,7 @@ export default {
           this.isSubmit = false
         }, e => {
         });
+      }
     },
 
   },