manage-client 3.2.91-1 → 3.2.91-aodeToV4

package/src/components/sale/report/aode/widget/DayReportListPrint.vue

@@ -28,13 +28,13 @@
       }
     },
     methods: {
-      stamp() {
+      async stamp() {
          this.model = this.countmodel.model,
           this.sumsmodel = this.countmodel.sumsmodel,
           this.orgname = this.countmodel.orgname,
           this.depname = this.countmodel.depname
         // 验证，必须选择用气性质
-        if (this.model.model.f_gasproperties.length == 0) {
+        if (this.model.model.f_gasproperties.length == 0 || this.model.model.f_gasproperties[0]=='') {
           this.$showAlert('请选择用气性质条件，点击查询之后再进行打印！！', 'warning', 3000)
           return
         };
@@ -43,6 +43,10 @@
         this.modelval = [
           "f_userinfo_code",
           "f_user_name",
+          "f_state",
+          "f_type",
+          "f_pregas",
+          "f_preamount",
           "f_stair1amount",
           "f_stair1price",
           "f_stair2amount",
@@ -50,14 +54,14 @@
           "f_stair3amount",
           "f_stair3price",
           "f_collection",
+          "f_payment",
           "f_operator",
-          "f_type",
-          "f_comments",
-          "f_operate_date"
+          "f_comments"
         ];
         this.fields = {
           "f_userinfo_code": "客户编号",
           "f_user_name": "客户姓名",
+          "f_state":"操作状态",
           "f_operate_date": "充值时间",
           "f_stair1amount": "1气量",
           "f_stair1price": "1单价",
@@ -77,7 +81,14 @@
           "f_comments": "备注"
         };
         this.put();
-        this.print();
+        await this.print();
+        this.clear();
+      },
+      clear(){
+        this.model={};
+        this.sumsmodel={};
+        this.orgname= '';
+        this.depname= 0;
       },
       put() {
         this.thead = `
@@ -88,7 +99,7 @@
           </th>
         </tr>
         <tr>
-          <th class="biaoti" colspan=${this.modelval.length}>统计日期：${this.model.model.f_startDate} 00:00:00 ~ ${this.model.model.f_endDate} 23:59:59</th></tr>
+          <th class="biaoti" colspan=${this.modelval.length}>统计日期：${this.model.model.f_startDate} ~ ${this.model.model.f_endDate}</th></tr>
         <tr>
         <tr>
           <th class="biaoti" colspan=${this.modelval.length}>制单人：${this.$login.f.name} 打印时间: ${this.$login.toStandardTimeString()}</th></tr>
@@ -122,16 +133,53 @@
             <span>补卡金额: ${this.sumsmodel.f_collection_bk}</span>
             <span>换表金额: ${this.sumsmodel.f_collection_hb}</span>
             <span>冲正金额: ${this.sumsmodel.f_collection_cz}</span>
-            <span>业务金额: ${this.sumsmodel.f_shouru_fee}</span>
+            <span>实收金额: ${this.sumsmodel.f_shouru_fee}</span>
           </th>
-        </tr>`
-
+        </tr>
+        <tr style="text-align: left;font-family: 微软雅黑">
+          <th colspan=${this.modelval.length}>
+            <span>应收金额: ${this.sumsmodel.f_yingshou_fee}</span>
+            <span>本期新增结余: ${this.sumsmodel.f_benqi_fee}</span>
+            <span>本期使用结余: ${this.sumsmodel.f_usebenqi_fee}</span>
+            <span>柜台微信: ${this.sumsmodel.f_sumgtwx}</span>
+            <span>财务收款: ${this.sumsmodel.f_sumcwsf}</span>
+            <span>现金缴费: ${this.sumsmodel.f_sumxjjf}</span>
+            <span>柜台支付宝: ${this.sumsmodel.f_sumzfb}</span>
+          </th>
+        </tr>
+          <tr style="text-align: left;font-family: 微软雅黑">
+            <th colspan=${this.modelval.length}>
+            <span>pos: ${this.sumsmodel.f_sumpos}</span>
+            <span>销售气票: ${this.sumsmodel.f_sumqp}</span>
+            <span>银行码收款: ${this.sumsmodel.f_sumyysk}</span>
+            <span>降价补气:${this.sumsmodel.f_sumjjbq}</span>
+            <span>煤改气补贴款:${this.sumsmodel.f_sumbtk}</span>
+             <span>涨价补费人次: ${this.sumsmodel.f_count_zjbf}</span>
+            <span>涨价补费金额: ${this.sumsmodel.f_collection_zjbf}</span>
+          </th>
+          </tr>
+           <tr style="text-align: left;font-family: 微软雅黑">
+            <th colspan=${this.modelval.length}>
+            <span>物联网补费人次:${this.sumsmodel.f_count_iotbf}</span>
+            <span>物联网补费金额:${this.sumsmodel.f_collection_iotbf}</span>
+            <span>物联网扣费人次:${this.sumsmodel.f_count_iotkf}</span>
+            <span>物联网扣费金额:${this.sumsmodel.f_collection_iotkf}</span>
+            <span>预收款人次: ${this.sumsmodel.f_count_ysk}</span>
+            <span>预收款费金额: ${this.sumsmodel.f_collection_ysk}</span>
+            <span></span>
+          </th>
+          </tr>
+        `
         this.thead += '<tr>';
         for (let key of this.modelval) {
           if (this.fields[key] == '客户姓名') {
             this.thead += '<th class="khxm">' + this.fields[key] + '</th>'
           } else if (this.fields[key] == '备注') {
             this.thead += '<th class="bz">' + this.fields[key] + '</th>'
+          } else if(this.fields[key] == '气量'){
+            this.thead += '<th class="bz2">' + this.fields[key] + '</th>'
+          } else if(this.fields[key] == '应收金额'){
+            this.thead += '<th class="bz2">' + this.fields[key] + '</th>'
           } else {
             this.thead += '<th class="other">' + this.fields[key] + '</th>'
           }
@@ -139,106 +187,118 @@
         this.thead += '</tr>'
       },
       async print() {
-        // 开始打印
-        let lodop = getLodop()
-        lodop.PRINT_INIT('打印')
+    // 开始打印
+    let lodop = getLodop()
+    lodop.PRINT_INIT('打印')
 
-        // 是否横向打印
-        console.log('是否横向打印？？', this.model.model.f_gasproperties[0])
-        let isHeng = this.model.model.f_gasproperties[0] === '居民用气' ? 1 : 2
-        lodop.SET_PRINT_PAGESIZE(isHeng, 0, 0, "A4");
+    // 是否横向打印
+    console.log('是否横向打印？？', this.model.model.f_gasproperties[0])
+    let isHeng = this.model.model.f_gasproperties[0] === '民用用气' ? 1 : 2
+    console.log("isHeng----"+isHeng)
+    lodop.SET_PRINT_PAGESIZE(isHeng, 0, 0, "A4");
 
-        // 定义样式
-        let style;
-        if (isHeng == 2) {//横向打印
-          style = '' +
-            '<style>table {border-collapse: collapse;font-size:2.8mm} ' +
-            'table th {border-collapse: collapse;width: 264mm;border: 0.2mm solid black} ' +
-            'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
-            '.biaoti {border-color: transparent} ' +
-            'table span {width: 36mm;text-align: left;display:inline-block}' +
-            '.comments {text-overflow: ellipsis;overflow: hidden} ' +
-            '.khxm {border-top: 0;width: 44.88mm} ' +
-            '.bz {border-top: 0;width: 34.32mm} ' +
-            '.other {border-top: 0;width: 18.48mm}</style>'
-        } else {
-          // 定义样式
-          style = '<style>table {border-collapse: collapse;font-size:2.8mm}' +
-            'table th {border-collapse: collapse;width: 180mm;border: 0.2mm solid black;}' +
-            'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
-            '.biaoti {border-color: transparent} ' +
-            'table span {width: 25mm;text-align:left;display:inline-block;}' +
-            '.comments {text-overflow: ellipsis;overflow: hidden} ' +
-            '.khxm {border-top: 0;width: 14.4mm} ' +
-            '.bz {border-top: 0;width: 21.6mm} ' +
-            '.other {border-top: 0;width: 14.4mm}</style>'
-        }
+    // 定义样式
+    let style;
+    if (isHeng == 2) {//横向打印
+      style = '' +
+        '<style>table {border-collapse: collapse;font-size:2.8mm} ' +
+        'table th {border-collapse: collapse;width: 264mm;border: 0.2mm solid black} ' +
+        'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
+        '.biaoti {border-color: transparent} ' +
+        'table span {width: 36mm;text-align: left;display:inline-block}' +
+        '.comments {text-overflow: ellipsis;overflow: hidden;height:5.25mm;white-space: nowrap;width:34.32mm;} ' +
+        '.khxm {border-top: 0;width: 44.88mm} ' +
+        '.bz {border-top: 0;width: 34.32mm;} ' +
+        '.bz2 {border-top: 0;width: 13.20mm} ' +
+        '.other {border-top: 0;width: 13.20mm}</style>'
+    } else {//竖向打印
+      // 定义样式
+      style = '<style>table {border-collapse: collapse;font-size:2.8mm}' +
+        'table th {border-collapse: collapse;width: 180mm;border: 0.2mm solid black;}' +
+        'table td {border-collapse: collapse;text-align: center;border: 0.2mm solid black} ' +
+        '.biaoti {border-color: transparent} ' +
+        'table span {width: 25mm;text-align:left;display:inline-block;}' +
+        '.comments {width:16.6mm;text-overflow: ellipsis;overflow: hidden;height:5.25mm;white-space: nowrap;} ' +
+        '.khxm {border-top: 0;width: 14.4mm} ' +
+        '.bz {border-top: 0;width: 16.6mm;} ' +
+        '.bz2 {border-top: 0;width: 11.0mm} ' +
+        '.other {border-top: 0;width: 10.2mm}</style>'
+    }
 
 
-        let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
-        for (var i = 1; i <= this.model.totalPage; i++) {
-          await this.model.loadPage(i)
-          for (let j = 0; j < this.model.rows.length; j++) {
-            tHtml += '<tr>'
-            for (let field of this.modelval) {
-              if (field && this.model.rows[j]) {
-                if (field === 'f_comments' && this.model.rows[j][field]) {
-                  tHtml += '<td class="comments">' +
-                    this.model.rows[j][field].substring(0, 10)
-                    + '</td>'
-                } else {
-                  tHtml += '<td>' + this.model.rows[j][field] + '</td>'
-                }
-              }
+    let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
+    for (var i = 1; i <= this.model.totalPage; i++) {
+      await this.model.loadPage(i)
+      for (let j = 0; j < this.model.rows.length; j++) {
+        tHtml += '<tr>'
+        for (let field of this.modelval) {
+          if (field && this.model.rows[j]) {
+            if (field === 'f_comments' && this.model.rows[j][field]) {
+              tHtml += '<td ><div class="comments">' +
+                this.model.rows[j][field].substring(0, 10)
+                + '</div></td>'
+            } else {
+              tHtml += '<td>' + this.model.rows[j][field] + '</td>'
             }
-            tHtml += '</tr>'
           }
         }
-        this.tfoot = `
+        tHtml += '</tr>'
+      }
+    }
+    this.tfoot = `
          <tr>
           <td class="defaulttd" colspan='2' >
             合计
           </td>
           <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="3">###方</font>
+            <font color="#0000FF" tindex="5">###</font>
           </td>
           <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="5">###方</font>
+            <font color="#0000FF" tindex="6">###</font>
           </td>
           <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="right">
             <font color="#0000FF" tindex="7">###方</font>
           </td>
-          <td class="defaulttd" colspan='4'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF"  tindex="9">###元</font>
+          <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="left">
+            <font color="#0000FF" tindex="9">###方</font>
+          </td>
+          <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="right">
+            <font color="#0000FF" tindex="11">###方</font>
+          </td>
+          <td class="defaulttd" colspan='3'  tdata="allSum" format="#,##0.00" align="left">
+            <font color="#0000FF"  tindex="13">###元</font>
+          </td>
+          <td class="defaulttd" colspan='1' >
           </td>
+
         </tr>`
 
-        // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
-        tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`
-        console.log('打印的html', tHtml)
-        //ADD_PRINT_TABLE(intTop,intLeft,intWidth,intHeight,strHtml)增加表格项
-        if (isHeng == 2) {//横向打印
-          lodop.ADD_PRINT_TABLE(0, 0, "264mm", 'BottomMargin:' + 30, tHtml);//增加表格项
-        } else {
-          lodop.ADD_PRINT_TABLE(0, 0, "200mm", 'BottomMargin:' + 30, tHtml);//增加表格项
-        }
-        lodop.SET_PRINT_STYLEA(0, "Horient", 2);//打印项在纸张中水平居中
-        // lodop.SET_PRINT_STYLEA(0,"Vorient",2);//打印项在纸张中垂直居中
-        // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
+    // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
+    tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`
+    console.log('打印的html', tHtml)
+    //ADD_PRINT_TABLE(intTop,intLeft,intWidth,intHeight,strHtml)增加表格项
+    if (isHeng == 2) {//横向打印
+      lodop.ADD_PRINT_TABLE(0, 0, "264mm", 'BottomMargin:' + 30, tHtml);//增加表格项
+    } else {
+      lodop.ADD_PRINT_TABLE(0, 0, "200mm", 'BottomMargin:' + 30, tHtml);//增加表格项
+    }
+    lodop.SET_PRINT_STYLEA(0, "Horient", 2);//打印项在纸张中水平居中
+    // lodop.SET_PRINT_STYLEA(0,"Vorient",2);//打印项在纸张中垂直居中
+    // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
 
-        // 设置页脚
-        lodop.ADD_PRINT_HTM("96%", "45%", 100, 50, `<font color='#0000ff' format='##'><span tdata='pageNO'>第##页</span>/<span tdata='pageCount'>共##页</span></font>`);//增加超文本项
-        lodop.SET_PRINT_STYLEA(0, "ItemType", 1);
-        lodop.SET_PRINT_STYLEA(0, "Horient", 2);
+    // 设置页脚
+    lodop.ADD_PRINT_HTM("96%", "45%", 100, 50, `<font style="margin-top:2px;" color='#0000ff' format='##'><span tdata='pageNO'>第##页</span>/<span tdata='pageCount'>共##页</span></font>`);//增加超文本项
+    lodop.SET_PRINT_STYLEA(0, "ItemType", 1);
+    lodop.SET_PRINT_STYLEA(0, "Horient", 2);
 
-        // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
-        // 设置打印方式 （横向|纵向）
-        lodop.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
-        // 打印维护
-        // lodop.PRINT_SETUP()
-        // 使用打印预览是为了方便调整打印格式。例如：横向打印
-        lodop.PREVIEW()
-      },
+    // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-width')
+    // 设置打印方式 （横向|纵向）
+    lodop.SET_SHOW_MODE("LANDSCAPE_DEFROTATED", 1);
+    // 打印维护
+    // lodop.PRINT_SETUP()
+    // 使用打印预览是为了方便调整打印格式。例如：横向打印
+    lodop.PREVIEW()
+  },
     }
 
 

package/src/components/sale/report/aode/widget/LifeDayReportListPrint.vue

@@ -49,6 +49,7 @@
           "f_stair3amount",
           "f_payment",
           "f_pay_id",
+          "f_serial_id",
           "f_terminal_num"
         ];
         this.fields = {
@@ -65,6 +66,7 @@
           "f_stair3price": "3单价",
           "f_payment": "付款方式",
           "f_pay_id":"交易号",
+          "f_serial_id":"订单号",
           "f_terminal_num":"服务机"
         };
         this.put();
@@ -151,7 +153,49 @@
             tHtml += '</tr>'
           }
         }
-        this.tfoot = ``
+        this.tfoot = `
+             <tr>
+              <td class="defaulttd" colspan='1' >
+                合计
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="2">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF" tindex="3">###</font>
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="4">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF"  tindex="5">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="6">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF"  tindex="7">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="8">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF"  tindex="9">###</font>
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+              <td class="defaulttd" colspan='1' >
+              </td>
+            </tr>`
+
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`

package/src/components/sale/report/aode/widget/LifeMonthPrint.vue

@@ -12,6 +12,9 @@
       countmodel:{
         type:Object,
         default:{}
+      },
+      printshow:{
+        default:''
       }
     },
     data() {
@@ -29,7 +32,7 @@
       stamp() {
         this.model = this.countmodel.model,
           this.sumsmodel = this.countmodel.sumsmodel,
-          this.orgname = this.countmodel.orgname,
+          this.orgname = this.printshow,
         //默认选择要打印的列
         this.modelval = [
           "f_operate_date",
@@ -96,9 +99,9 @@
           'table span {width: 25mm;text-align:left;display:inline-block;}' +
           '.comments {text-overflow: ellipsis;overflow: hidden} ' +
           '.khxm {border-top: 0;width: 14.4mm;text-align: center;} ' +
-          '.bz {border-top: 0;width: 21.6mm;text-align: center;} ' +
+          '.bz {border-top: 0;width: 31.6mm;text-align: center;} ' +
           '.name {border-top: 0;width: 14.4 mm} ' +
-          '.other {border-top: 0;width: 10mm}</style>'
+          '.other {border-top: 0;width: 77.4mm}</style>'
 
 
         let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
@@ -123,7 +126,21 @@
             tHtml += '</tr>'
           }
         }
-        this.tfoot = ``
+        this.tfoot = `
+             <tr>
+              <td class="defaulttd" colspan='1' >
+                合计
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="right">
+                <font color="#0000FF" tindex="2">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF" tindex="3">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="4">###</font>
+              </td>
+              `
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`

package/src/components/sale/report/aode/widget/LifeYearPrint.vue

@@ -12,6 +12,9 @@
       countmodel:{
         type:Object,
         default:{}
+      },
+      printshow:{
+        default:''
       }
     },
     data() {
@@ -29,7 +32,7 @@
       stamp() {
         this.model = this.countmodel.model,
           this.sumsmodel = this.countmodel.sumsmodel,
-          this.orgname = this.countmodel.orgname
+          this.orgname = this.printshow
         //默认选择要打印的列
         this.modelval = [
           "f_operate_date",
@@ -86,9 +89,9 @@
           'table span {width: 25mm;text-align:left;display:inline-block;}' +
           '.comments {text-overflow: ellipsis;overflow: hidden} ' +
           '.khxm {border-top: 0;width: 14.4mm;text-align: center;} ' +
-          '.bz {border-top: 0;width: 21.6mm;text-align: center;} ' +
+          '.bz {border-top: 0;width: 31.6mm;text-align: center;} ' +
           '.name {border-top: 0;width: 14.4 mm} ' +
-          '.other {border-top: 0;width: 10mm}</style>'
+          '.other {border-top: 0;width: 77.4mm}</style>'
 
 
         let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
@@ -113,7 +116,21 @@
             tHtml += '</tr>'
           }
         }
-        this.tfoot = ``
+        this.tfoot = `
+             <tr>
+              <td class="defaulttd" colspan='1' >
+                合计
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="right">
+                <font color="#0000FF" tindex="2">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
+                <font color="#0000FF" tindex="3">###</font>
+              </td>
+              <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
+                <font color="#0000FF" tindex="4">###</font>
+              </td>
+              `
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`

package/src/components/sale/report/aode/widget/MonthByChargePrint.vue

@@ -83,7 +83,13 @@
             this.thead += '<th class="khxm">' + this.fields[key] + '</th>'
           } else if (this.fields[key] == '备注') {
             this.thead += '<th class="bz">' + this.fields[key] + '</th>'
-          } else {
+          }else if(this.fields[key] == '总气量' || this.fields[key] == '总气量' ||this.fields[key] == '开户金额'|| this.fields[key] == '开户气量' ){
+            this.thead += '<th class="maxs">' + this.fields[key] + '</th>'
+          } else if( this.fields[key].includes("人次")){
+            this.thead += '<th class="newmins">' + this.fields[key] + '</th>'
+          } else if(this.fields[key] == '总次数'){
+            this.thead += '<th class="newmins">' + this.fields[key] + '</th>'
+          } else{
             this.thead += '<th class="other">' + this.fields[key] + '</th>'
           }
         }
@@ -111,7 +117,10 @@
             '.comments {text-overflow: ellipsis;overflow: hidden} ' +
             '.khxm {border-top: 0;width: 44.88mm} ' +
             '.bz {border-top: 0;width: 34.32mm} ' +
-            '.other {border-top: 0;width: 18.48mm}</style>'
+            '.other {border-top: 0;width: 18.48mm}' +
+            '.mins {border-top: 0;width: 14.48mm}'+
+            '.newmins {border-top: 0;width: 12.48mm}'+
+            '.maxs {border-top: 0;width: 20.48mm} </style>'
         } else {
           // 定义样式
           style = '<style>table {border-collapse: collapse;font-size:2.2mm}' +
@@ -122,7 +131,8 @@
             '.comments {text-overflow: ellipsis;overflow: hidden} ' +
             '.khxm {border-top: 0;width: 14.4mm} ' +
             '.bz {border-top: 0;width: 21.6mm} ' +
-            '.other {border-top: 0;width: 14.4mm}</style>'
+            '.other {border-top: 0;width: 14.4mm}</style>' +
+            '.mins {border-top: 0;width: 15.48mm}</style>'
         }
 
 
@@ -150,53 +160,53 @@
           <td class="defaulttd" colspan='1' >
             合计
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF"  tindex="2">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="left">
+            <font color="#0000FF"  tindex="2">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="3">###方</font>
+            <font color="#0000FF" tindex="3">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="4">###元</font>
+            <font color="#0000FF" tindex="4">###</font>
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="5">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="right">
+            <font color="#0000FF" tindex="5">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF"  tindex="6">###方</font>
+            <font color="#0000FF"  tindex="6">###</font>
           </td>
            <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="7">###元</font>
+            <font color="#0000FF" tindex="7">###</font>
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="8">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="left">
+            <font color="#0000FF" tindex="8">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="9">###元</font>
+            <font color="#0000FF" tindex="9">###</font>
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF"  tindex="10">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="left">
+            <font color="#0000FF"  tindex="10">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="11">###方</font>
+            <font color="#0000FF" tindex="11">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="12">###元</font>
+            <font color="#0000FF" tindex="12">###</font>
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="13">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="right">
+            <font color="#0000FF" tindex="13">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF"  tindex="14">###元</font>
+            <font color="#0000FF"  tindex="14">###</font>
           </td>
-          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="right">
-            <font color="#0000FF" tindex="15">###人</font>
+          <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0" align="right">
+            <font color="#0000FF" tindex="15">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="16">###方</font>
+            <font color="#0000FF" tindex="16">###</font>
           </td>
           <td class="defaulttd" colspan='1'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="17">###元</font>
+            <font color="#0000FF" tindex="17">###</font>
           </td>
         </tr>`