Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -127,7 +127,9 @@
             <div class="cost-haed">
                 <div class="ser-btn">
                     <div class="ser-btn-li Cost_topFlex" style="display: flex;">
-                        <el-select size="small" v-model="diid" filterable placeholder="请选择" @change="groupChange">
+                        <el-select @focus="GroupSelectFocus" remote :loading="selectLoading"
+                            :remote-method="remoteMethod" size="small" v-model="diid" filterable placeholder="请选择"
+                            @change="groupChange">
                             <el-option v-for="item in options" :key="item.id" :label="item.groupName" :value="item.id">
                                 <span v-if="item.isTrue == 'True'" style="color:#409EFF">{{ item.groupName }}</span>
                                 <span v-else style="color:gray">{{ item.groupName }}</span>
@@ -721,12 +723,12 @@
                                                                 <!-- :content="itemsheetone.tips" -->
                                                                 <div v-if="itemsheetone.tips != '暂无！'">
                                                                     <span style="color:green">{{ itemsheetone.tips
-                                                                    }}</span>
+                                                                        }}</span>
                                                                     元/人
                                                                 </div>
                                                                 <div v-else>
                                                                     <span style="color:red">{{ itemsheetone.tips
-                                                                    }}</span>
+                                                                        }}</span>
                                                                 </div>
                                                                 <el-input-number slot="reference"
                                                                     v-model="AGroupCostParameter[itemsheetone.prop]"
@@ -873,7 +875,7 @@
                                                                     }}元/人</span>
                                                                 <span v-else style="color: red">暂无!</span>
                                                                 <span slot="reference">{{ scope.row[itemcabinone.prop]
-                                                                }}</span>
+                                                                    }}</span>
                                                             </el-popover>
                                                         </span>
                                                         <span v-else>
@@ -881,7 +883,7 @@
                                                                 :title="itemcabinone.title" width="200" trigger="hover">
                                                                 <span style="color: red">暂无!</span>
                                                                 <span slot="reference">{{ scope.row[itemcabinone.prop]
-                                                                }}</span>
+                                                                    }}</span>
                                                             </el-popover>
                                                         </span>
                                                     </span>
@@ -906,7 +908,7 @@
                                                     }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
                                                     scope.row[itemcabinone.prop]
-                                                    }}</span>
+                                                }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -955,7 +957,7 @@
                                                     }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
                                                     scope.row[itemcabinone.prop]
-                                                    }}</span>
+                                                }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -3292,6 +3294,7 @@ export default {
             rollcallarr: [],
             blackCodeListSeLect: [],
             blackCodeSelect: '',
+            selectLoading: false,
         };
     },
     watch: {
@@ -6583,6 +6586,40 @@ export default {
                     that.$message.error("此行程代码有误！");
                 }
             })
+        },
+        remoteMethod(query) {
+            if (true) {
+                this.selectLoading = true;
+
+                this.$axios.post('/api/Groups/SearchGroupByKeyword', {
+                    Keyword: query,
+                }, {
+                    headers: {
+                        'Authorization': this.token,
+                    },
+                }).then(resp => {
+                    if (resp.data.code == 200) {
+                        this.options = resp.data.data;
+                    } else if (resp.data.code == 201) {
+                        this.options = [];
+                    } else {
+                        //js抛异常
+                        throw new Error(resp.data.msg);
+                    }
+                }).catch(err => {
+                    this.$message.error('网络异常！');
+
+                }).finally(() => {
+                    this.selectLoading = false;
+                })
+
+
+            }
+        },
+        GroupSelectFocus() {
+            if (this.options.length == 0) {
+                this.remoteMethod("")
+            }
         }
     },
     updated() {