Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend…

Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi

develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue

@@ -3,7 +3,7 @@
     <div class="suggestion-wrapper">
       <div class="label">{{this.define.title}}</div>
       <div class="input-wrapper">
-        <Input v-model="value" type="textarea" :placeholder="define.config.placeholder" />
+        <Input v-model="value" type="textarea" :placeholder="define.config.placeholder" :maxlength="120" />
         <div class="suggestion-button-wrapper">
           <ConfirmPopover
             v-for="suggestion in suggestionOption"
@@ -84,6 +84,7 @@
             :ref="'input-' + row.code"
             @on-blur="handleInputBlur(row)"
             type="textarea"
+            :maxlength="120"
           />
         </template>
         <template slot-scope="{ row, index }" slot="action">

develop/@rbc/bill-runner-query/src/views/query-runner.vue

@@ -4,6 +4,8 @@
     v-if="config.name && visible"
     :extrCondition="extrCondition"
     :tableHeight="tableHeight"
+    @tabChange="tabChange"
+    :defaultGroup="currentTabTitle"
   ></gms-query>
   <p v-else>没有查询模板定义！</p>
 </template>
@@ -30,6 +32,7 @@ export default {
       extrCondition: [],
       tableHeight: height,
       visible: true,
+      currentTabTitle: null,
     };
   },
   mounted() {
@@ -45,6 +48,9 @@ export default {
     this.$root.$off('updated', this.refresh)
   },
   methods: {
+    tabChange(o) {
+      this.currentTabTitle = o.title
+    },
     refresh(visible) {
       if (visible == 'show') {
         this.visible = false