Merge branch 'master' into develop

src/views/finance/receipt_list.vue

@@ -42,6 +42,7 @@
                   v-model="searchForm.wlCompanyType"
                   placeholder="请选择"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(v, i) in customerList"
@@ -61,6 +62,7 @@
                   v-model="searchForm.customerName"
                   placeholder="请选择"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(v, i) in customerList"
@@ -112,13 +114,14 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="customerName">
+              <el-form-item label="区域" prop="websitNumber">
                 <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
                 <el-select
                   class="selectStyle"
                   v-model="searchForm.websitNumber"
                   placeholder="请选择"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(v, i) in orage"

src/views/supply/engin/components/home_detail.vue

@@ -167,7 +167,7 @@
             </el-col>
             <el-col :span="24" class="item" v-if="!isDealer">
           <div class="label" >引用记录</div>
-          <div class="value">{{detailData.items[0].useRefCount}}</div>
+          <div class="value">{{detailData.items[0]&&detailData.items[0].useRefCount}}</div>
         </el-col>
           </el-row>
         </div>