Merge branch 'master_bug' into develop

src/views/finance/change_apply.vue

@@ -69,7 +69,7 @@
                   class="dateStyle"
                   @change="changeCustomerNumber($event,0)"
                   filterable
-                  v-model="scope.row.customerNumber"
+                  v-model.trim="scope.row.customerNumber"
                   placeholder="请选择"
                 >
                   <el-option v-for="item in customerData" :key="item.id" :label="item.number" :value="item.number"> </el-option>
@@ -282,6 +282,11 @@ export default {
         v.bz = ''
         v.name = ''
       })
+      this.searchForm.customerName = ''
+      this.dataList[0].customerId = ''
+      this.dataList[0].customerNumber = ''
+      this.dataList[0].customerName = ''
+      this.dataList[0].allowanceAmount = ''
       this.dataList[1].customerId = ''
       this.dataList[1].customerNumber = ''
       this.dataList[1].allowanceAmount = ''

src/views/finance/change_list.vue

@@ -246,7 +246,7 @@
               <template slot-scope="scope">
                 <el-button
                   @click="submitFn(scope.row.id)"
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && isCustomer && scope.row.examineStatus == 'SAVE'"
+                  v-if="$checkBtnRole('apply', $route.meta.roles)  && scope.row.examineStatus == 'SAVE'"
                   type="text"
                   class="textColor"
                   slot="reference"