Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/stage.js

@@ -767,9 +767,9 @@ $(document).ready(() => {
                         if (!list || list.length === 0) return '';
                         const html = [];
                         for (const l of list) {
-                            html.push('<div class="row mr-1">');
-                            html.push(`<div class="col-auto pr-1 ${l.tagClass}">`, '<i class="fa fa-tag"></i>', '</div>');
-                            html.push('<div class="col p-0">', '<p>', l.comment, '</p>', '</div>');
+                            html.push('<div class="mr-1">');
+                            html.push(`<div class="float-left ${l.tagClass}">`, '<i class="fa fa-tag"></i>', '</div>');
+                            html.push('<div class="ml-4">', '<p style="word-wrap: break-word">', l.comment, '</p>', '</div>');
                             html.push('</div>');
                         }
                         return html.join('');

app/service/change_settle_list.js

@@ -22,7 +22,7 @@ module.exports = app => {
 
         async isSettle(cid) {
             const result = await this.getDataByCondition({ cid });
-            return result.length > 0;
+            return result && result.length > 0;
         }
 
         async updateChangeList(cid, settleBills, settlePos, list) {