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

src/assets/styles/newStyle.less

@@ -1,4 +1,18 @@
 // 设置查询区域
+.itemsTextBox {
+  min-height: 300px;
+  max-height: 500px;
+  overflow: auto;
+  line-height: 20px;
+  td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+  /deep/ td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+}
 .search-area{
   display: flex;
   justify-content: space-between;

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

@@ -144,7 +144,7 @@
                                     <h4>责任部门对接人</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
+                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS('1')">
                                         </el-input>
                                     </div>
                                 </el-form-item>
@@ -167,7 +167,7 @@
                                     <h4>技术管理中心主任</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRRS('2')"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -196,7 +196,7 @@
         >
         </ProcessFooter>
         <Role-tree
-                is-title="选择责任部门对接人"
+                :is-title="drawerTitle2"
                 :is-visible.sync="modalshowflag2"
                 @checkedRole="checkedRole2"
                 :nodeList="nodeList2"
@@ -261,6 +261,8 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                drawerTitle2: '',
+                type2: '',
                 foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
@@ -370,8 +372,13 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.roleForm.dockUserList = idList
-                this.roleForm.dockUserName = nameList
+                if (this.type2 === '1') {
+                    this.roleForm.dockUserList = idList
+                    this.roleForm.dockUserName = nameList
+                } else {
+                    this.roleForm.directorUser = idList
+                    this.roleForm.directorUserName = nameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 'dockUser') {
@@ -389,9 +396,18 @@
                 }
             },
             choiceZRRS () {
+                this.type2 = type
                 this.nodeList2 = []
-                if ( this.roleForm.dockUserList.length > 0) {
-                    this.nodeList2 = this.roleForm.dockUserList.split(',')
+                if (type === '1') {
+                    this.drawerTitle2 = '选择责任部门对接人'
+                    if ( this.roleForm.dockUserList.length > 0) {
+                        this.nodeList2 = this.roleForm.dockUserList.split(',')
+                    }
+                } else {
+                    this.drawerTitle2 = '选择技术管理中心主任'
+                    if ( this.roleForm.directorUser.length > 0) {
+                        this.nodeList2 = this.roleForm.directorUser.split(',')
+                    }
                 }
                 this.modalshowflag2 = true
             },

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

@@ -144,7 +144,7 @@
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任人" readonly="readonly" @click.native="choiceZRRS">
+                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -167,7 +167,8 @@
                   <h4>技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+<!--                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRRS('2')"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -197,7 +198,7 @@
     >
     </ProcessFooter>
     <Role-tree
-            is-title="选择责任部门对接人"
+            :is-title="drawerTitle2"
             :is-visible.sync="modalshowflag2"
             @checkedRole="checkedRole2"
             :nodeList="nodeList2"
@@ -262,6 +263,8 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      drawerTitle2: '',
+      type2: '',
       bpnId: '',
       foldFormFlag: false,
       fileMadel2: false,
@@ -362,8 +365,13 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.roleForm.dockUserList = idList
-      this.roleForm.dockUserName = nameList
+      if (this.type2 === '1') {
+        this.roleForm.dockUserList = idList
+        this.roleForm.dockUserName = nameList
+      } else {
+        this.roleForm.directorUser = idList
+        this.roleForm.directorUserName = nameList
+      }
     },
     checkedRole (data) {
       if (this.type === 'dockUser') {
@@ -380,10 +388,19 @@ export default {
         this.roleForm.presidentUserName = data[0].name
       }
     },
-    choiceZRRS () {
+    choiceZRRS (type) {
+      this.type2 = type
       this.nodeList2 = []
-      if ( this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      if (type === '1') {
+        this.drawerTitle2 = '选择责任部门对接人'
+        if ( this.roleForm.dockUserList.length > 0) {
+          this.nodeList2 = this.roleForm.dockUserList.split(',')
+        }
+      } else {
+        this.drawerTitle2 = '选择技术管理中心主任'
+        if ( this.roleForm.directorUser.length > 0) {
+          this.nodeList2 = this.roleForm.directorUser.split(',')
+        }
       }
       this.modalshowflag2 = true
     },

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

@@ -420,7 +420,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -323,7 +323,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
       </div>

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

@@ -424,7 +424,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
         </el-button>

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

@@ -260,7 +260,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

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

@@ -417,7 +417,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

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

@@ -272,7 +272,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

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

@@ -277,7 +277,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

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

@@ -276,7 +276,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4324,7 +4324,6 @@ export default {
       formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
       formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
       formData.issueTime = null
-
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -271,7 +271,6 @@
       </div>
         <!--表格-->
       <div class="content">
-
         <el-table
           ref="selection"
           :data="standinfoList"