Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!66

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

@@ -286,7 +286,7 @@ export default {
       if (this.currentEditSuggestion.id) {
         await this.update()
       }
-      else if (this.currentEditSuggestion.spyj) {
+      else if (this.currentEditSuggestion.spyj && this.currentEditSuggestion.spyj.trim()) {
         await this.add()
       }
       this.currentEditSuggestion = {}

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.less

+
+.rbc-basedata-popover {
+  padding: 0px;
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

 <template>
   <div class="rbc-basedata">
-    <el-popover ref="popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
+    <el-popover ref="popover" popper-class="rbc-basedata-popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
       <div class="select-box" slot="reference">
         <Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
           <Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
@@ -24,6 +24,7 @@
 import EditModal from './edit-modal.vue'
 import baseDataMixin from './baseDataMixin'
 import indexMixin from './indexMixin'
+import './index.less'
 import { addResizeListener } from 'element-ui/src/utils/resize-event'
 
 export default {
@@ -423,7 +424,7 @@ export default {
     position: static;
     z-index: 999;
     margin: 0;
-    padding: 6px 0;
+    padding: 18px 12px;
     box-sizing: border-box;
     background-color: #fff;
     list-style: none;