Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

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

 <template>
   <div class="rbc-basedata">
-    <el-popover ref="popover" popper-class="rbc-basedata-popover"   placement="top" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
+    <el-popover 
+      ref="popover" 
+      popper-class="rbc-basedata-popover" 
+      placement="top" 
+      trigger="manual" 
+      v-model="dataListShow" 
+      :visible-arrow="false" 
+      :width="searchPopperMinWidth"
+    >
       <ul ref="searchList" class="acct-search-list" :class="{'is-focus': hasFocus}"   @mouseleave="onResultList = false" @mouseenter="onResultList = true">
-        <li :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)">
+        <li 
+          :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" 
+          v-for="(item,index) in baseDataList" 
+          :key="item.code" 
+          :value="item.code" 
+          @click="handleMainSearchSelectClick(item)"
+        >
           <span class="acct-search-label">{{ getLable(item) }}</span>
         </li>
         <li v-if="baseDataList.length === 0">
@@ -29,7 +43,34 @@
       </div>
     </el-popover>
     <!-- 弹框 -->
-    <EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" />
+    <EditModal 
+      v-if="showModal" 
+      v-model="showModal" 
+      :title="title" 
+      :selection="selection" 
+      :table-name="tableName" 
+      :multiple="multiple" 
+      :tableKey="tableKey" 
+      :treeKey="treeKey" 
+      :tableColumns="tableColumns" 
+      :searchPlaceholder="searchPlaceholder" 
+      :authType="authType" 
+      :versionDate="versionDate" 
+      :modalWidth="modalWidth" 
+      :isLeaf="isLeaf" 
+      :hideSelected="hideSelected" 
+      :structtype="structtype" 
+      :groupTableName="groupTableName" 
+      :treeTableName="treeTableName" 
+      :filterFormular="filterFormular" 
+      :filterFormularSP="filterFormularSP" 
+      :billdefineName="billdefineName" 
+      :billId="billId" 
+      :bill="bill" 
+      :isFilter="isFilter" 
+      :rowIndex="rowIndex" 
+      @on-ok="onSelectOk" 
+    />
   </div>
 </template>
 <script>
@@ -211,7 +252,10 @@ export default {
       this.getBaseDataList()
     },
     handleBlur() {
+      if (!this.onResultList) {
+        this.hasFocus = false
         this.dataListShow = false
+      }
     },
     // 输入查询时
     handleChange() {

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

@@ -14,9 +14,9 @@ const iconMap = {
   'CW_createBill': '#icon-16_GJ_A_NW_xinzeng',
   'CW_editBill': '#icon-18_T_A_NW_bianji',
   'CW_deleteBill': '#icon-16_GJ_A_NW_shanchu',
-  'CW_tempSave': '',
+  'CW_tempSave': '#icon-a-16_GJ_A_rbc_zancun',
   'CW_saveAction': '#icon-16_GJ_A_NW_baocun',
-  'CW_submitAction': '',
+  'CW_submitAction': '#icon-a-16_GJ_A_rbc_tijiao',
   'first': '#icon-shouzhang',
   'upward': '#icon-shangyizhang',
   'down': '#icon-xiayizhang',
@@ -24,7 +24,7 @@ const iconMap = {
   'CW_printAction': '#icon-16_DH_A_NR_piliangdayin',
   'CW_rejectAction': '#icon-_GJZquhui',
   'CW_agreeAction': '#icon-_GJZtongyi',
-  'CW_closeAction': ''
+  'CW_closeAction': '#icon-a-16_GJ_A_rbc_guanbi'
 }
 export default {
   inject: ['tmpBill'],