소스 검색

Merge branch 'bug' into develop

zhouhao 2 년 전
부모
커밋
2206e7de4c
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/views/finance/rebate_list.vue
  2. 1 1
      src/views/finance/standbook_list.vue

+ 1 - 1
src/views/finance/rebate_list.vue

@@ -68,7 +68,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="12" :lg="6" v-if="isCustomer">
+                <el-col :xs="24" :sm="12" :lg="6" >
                   <el-form-item label="备注1" prop="remark1">
                     <el-input v-model="searchForm.remark1" placeholder="请输入备注1"></el-input>
                   </el-form-item>

+ 1 - 1
src/views/finance/standbook_list.vue

@@ -49,7 +49,7 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="钱包类型" prop="customerWalletId">
+                <el-form-item :label="bill==='COMMONLY'?'钱包类型':'返利类型'" prop="customerWalletId">
                   <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
                     <el-option
                       v-for="(v, i) in walletList"