Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

develop/@gms/gms-plugin-billexpand/src/actions/showDetailAction.js

@@ -30,6 +30,7 @@ export default {
         c.billId = obj[BILLID];
         c.subBillData = obj.BILLDETAILOBJ;
         c.modal_visible = true;
+        c.state = 'readOnly'
         c.$nextTick(()=>{
           component.addListener({
 						close: function() {

develop/@gms/gms-plugin-billexpand/src/components-control/add-info-modal.vue

@@ -760,11 +760,11 @@ export default {
     },
   },
   watch: {
-    state: {
-      handler(newVal, oldVal) {
-        this.state = newVal;
-      },
-    },
+    // state: {
+    //   handler(newVal, oldVal) {
+    //     this.state = newVal;
+    //   },
+    // },
     subBillData: {
       handler(newVal, oldVal) {
         this.subBillData = newVal;

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

@@ -10,7 +10,19 @@
         </li>
       </ul>
       <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" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
+        <Input 
+          ref="searchInput" 
+          v-model="selectValue" 
+          :disabled="disabled" 
+          :readonly="readonly || multiple" 
+          :class="{'multiple-input': multiple && !readonly}" 
+          @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" />
           <Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
         </Input>
@@ -198,6 +210,9 @@ export default {
       this.hasFocus = true
       this.getBaseDataList()
     },
+    handleBlur() {
+      this.dataListShow = false
+    },
     // 输入查询时
     handleChange() {
       if (this.selectValue === '' || this.selectValue === null) {

develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue

@@ -102,6 +102,7 @@ export default {
               size: 'default',
               text: '关闭',
               type: 'text',
+              leftIcon: ''
             },
             layout: {},
             name: 'ButtonControl_1',
@@ -120,6 +121,10 @@ export default {
                 ACTIONS[item].title.indexOf('_') + 1,
                 ACTIONS[item].title.indexOf('[')
               )
+        btnConfg.buttonDefine.config.leftIcon =
+          this.define.btnGroupAction &&
+          this.define.btnGroupAction[item] &&
+          this.define.btnGroupAction[item].btnIcon? this.define.btnGroupAction[item].btnIcon: ''
         btnConfg.billStateDisable = this.getBillStateDisable(
           ACTIONS[item].btnDisable, item
         )
@@ -202,6 +207,10 @@ export default {
   .button-group {
     display: flex;
     padding: 0 10px;
+    /deep/ .ivu-divider, .ivu-divider-vertical {
+      height: 1.3em;
+      top: 0;
+    }
   }
 }
 </style>