Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker1.vue

@@ -0,0 +1,127 @@
+<template>
+  <el-select
+     :loading="loading"
+     filterable
+     clearable
+     v-model="svalue"
+     :placeholder="placeholder"
+     :filter-method="dataFilter"
+     style="width: 100%;"
+     :disabled="disabled"
+     @change="onChange">
+       <el-option v-for="item in optionItems" :key="item.customerCode" :label="item.custName" :value="item.customerCode" ></el-option>
+   </el-select>
+   <!-- item.custNo+'-'+ -->
+</template>
+<script>
+  import { listSimpleEmisMonthpayAccount } from "@/api/emis/emisMonthpayAccount";
+
+ export default {
+   name: "EmisMonthpayAccountPicker",
+   props: {
+    value: {
+        type: [String, Number],
+        required: false
+      },
+      sideCode: {
+        type: String,
+        required: false
+      },
+      payee: {
+        type: String,
+        required: false
+      },
+      salesmen: {
+        type: String,
+        required: false
+      },
+      postCode:{
+        type: String,
+        required: false
+      },
+     isInitiated:{
+       type: [Boolean,String],
+       required: false,
+       default:false
+     },
+     placeholder:{
+        type: String,
+        required: false
+      },
+     disabled:{
+       type: [Boolean,String],
+       required: false
+     },
+   },
+   data() {
+     return {
+       loading:false,
+       bakOptionItems:[],
+       optionItems: [],
+       svalue: this.value,
+       optionDefault:null,
+       dataMap:new Map(),
+     };
+   },
+   watch: {
+     value(newVal) {
+       this.svalue = newVal;
+     },
+     svalue(newVal, oldVal) {
+       // this.$emit("input", this.svalue);
+     },
+     postCode(newVal){
+
+     }
+   },
+   created() {
+      this.initData();
+   },
+   methods: {
+     onChange() {
+       this.$emit("input", this.svalue);
+       let itemData =null;
+       this.optionItems.forEach(item=>{
+         if(item.custNo === this.svalue){
+           itemData = item;
+         }
+       });
+       this.$emit("onChange",itemData);
+       this.optionItems = this.bakOptionItems;
+     },
+
+     initData() {
+       this.loading = true;
+       let queryParams = {
+        pageNumber:1,
+        pageSize:1300,
+        payee:this.payee,
+        salesmen:this.salesmen
+      };
+       this.bakOptionItems=[];
+       this.optionItems=[];
+       listSimpleEmisMonthpayAccount(queryParams).then(response => {
+        console.log('response',response.rows);
+         this.loading = false;
+         this.bakOptionItems =  response.rows;
+         this.optionItems =this.bakOptionItems;
+
+       });
+     },
+     dataFilter(val) {
+       this.optionDefault = val
+
+       if (val) {
+         let searchVal = val.toLowerCase();
+         this.optionItems = this.bakOptionItems.filter(item => {
+           if (item.custNo.indexOf(searchVal) != -1 || item.custName.toLowerCase().indexOf(searchVal) != -1 ) {
+             return true
+           }
+         })
+       } else {
+         this.optionItems = this.bakOptionItems;
+       }
+     },
+   }
+ };
+</script>

src/views/emis/emisCreditCustomer/index.vue

@@ -3,7 +3,7 @@
     <SearchForm slot="pageHeader"   :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="月结客户" prop="customerCode">
-        <EmisMonthpayAccountPicker v-model="queryParams.customerCode" ></EmisMonthpayAccountPicker>
+        <EmisMonthpayAccountPicker1 v-model="queryParams.customerCode" ></EmisMonthpayAccountPicker1>
       </el-form-item>
       <el-form-item label="运输方式" prop="transType">
         <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable>
@@ -170,6 +170,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisCreditCustomerForm from '@/views/emis/emisCreditCustomer/emisCreditCustomerForm';
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import EmisMonthpayAccountPicker1 from "../EmisBaseTools/EmisMonthpayAccountPicker1.vue";
 import NumberRangePicker from '@/components/NumberRange/NumberRangePicker';
 import { formatSearchStr,deepClone } from '@/utils/index'
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@@ -181,6 +182,7 @@ export default {
     elDateSimplePicker,
     emisCreditCustomerForm,
     EmisMonthpayAccountPicker,
+    EmisMonthpayAccountPicker1,
     NumberRangePicker,
     EmpNamePicker1,
     EmpNamePicker2

src/views/emis/emisTempCreditCustomer/index.vue

@@ -8,7 +8,7 @@
 
 
       <el-form-item label="月结客户" prop="customerCode">
-        <EmisMonthpayAccountPicker v-model="queryParams.customerCode" @onChange="onMonthpayAccountChange"></EmisMonthpayAccountPicker>
+        <EmisMonthpayAccountPicker1 v-model="queryParams.customerCode" @onChange="onMonthpayAccountChange"></EmisMonthpayAccountPicker1>
       </el-form-item>
 
 
@@ -113,6 +113,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisTempCreditCustomerForm from '@/views/emis/emisTempCreditCustomer/emisTempCreditCustomerForm';
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import EmisMonthpayAccountPicker1 from "../EmisBaseTools/EmisMonthpayAccountPicker1.vue";
 import NumberRangePicker from '@/components/NumberRange/NumberRangePicker';
 import { formatSearchStr,deepClone } from '@/utils/index'
 
@@ -122,6 +123,7 @@ export default {
     elDateSimplePicker,
     emisTempCreditCustomerForm,
     EmisMonthpayAccountPicker,
+    EmisMonthpayAccountPicker1,
     NumberRangePicker,
   },
   dicts: ['emis_biz_shipping_method'