Merge branch 'mergeBranch' into allTestUrgent

src/HDrpManagement/serveWorkBill/index.vue

@@ -197,7 +197,7 @@ export default {
   methods: {
     list(data) {
       // if (!data[0].servicebillno) this.$refs.list.list = [];
-      if (!data[0].servicebillno) {
+      if (!data[0].billno) {
         this.$refs.list.list = []
         this.$refs.list.total = 0
       }