manage-client 3.2.77-aode → 3.2.77-jb

package/src/components/sale/report/aode/life/LifeYearReport.vue

@@ -28,15 +28,11 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
 
 
-              <export-excel-hand :data="$parent.$parent.getCondition"
-                                 v-ref:exports
-                                 :defaultselect="$parent.$parent.selectfields"
-                                 :other-data="$parent.$parent.other"
-                                 :footer-data="$parent.$parent.footer"
+              <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
-                            sqlurl="rs/logic/reportExportfile" sql-name="aode_LifeYearByChargeType" template-name='悦生活年报表'  :choose-col="true"></export-excel-hand>
+                            sqlurl="rs/logic/exportfile" sql-name="aode_LifeYearByChargeType" template-name='悦生活年报表'  :choose-col="true"></export-excel>
 
-              <life-year-print  :printshow.sync="$parent.$parent.printshoworg"  :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-year-print>
+              <life-year-print :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-year-print>
 
             </div>
           </div>
@@ -96,21 +92,14 @@
           org:[this.$login.f.orgid]
         },
         orgname: '',
-        printshoworg:'',
         criteriaShow: true,
         orgCondtionStr:'',
         defaultfield:["f_operate_date","f_count","f_pregas","f_collection"],
         sumName:[
-        'f_count','f_pregas','f_collection'],
-        selectfields:[],
-        other:[],
-        footer:[],
+        'f_count','f_pregas','f_collection']
       }
     },
     ready(){
-      for(var item in exportConfig.lifeYearByChargeConfig){
-        this.selectfields.push(item)
-      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -118,25 +107,6 @@
       })
     },
     methods: {
-      getotherfooter(){
-        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-
-        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
-        otherInData.push(`导出人：${this.$login.f.name}`)
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       selfSearch (args) {
         let f_orgstr = this.orgCondtionStr
         if(!this.orgCondtionStr){
@@ -152,7 +122,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = ''
+          this.$refs.paged.$refs.cri.model[key] = []
         })
       },
       show(){
@@ -163,9 +133,6 @@
       },
       getorg (obj) {
         this.orgname = obj.res
-        if(obj.res != null &&obj.res.length>0){
-          this.printshoworg=obj.res[0]
-        }
         this.orgCondtionStr = `and f_orgid in ${this.$login.convertToIn(obj.resids)}`
       },
     },
@@ -181,12 +148,6 @@
       'modelval.length' () {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
     },
     computed:{
       getCondition(){
@@ -208,9 +169,7 @@
           rs.push(temp)
         }
         return [{label: '全部', value: ''}, ...rs]
-      },
-
-
+      }
     }
   }
 </script>

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

@@ -28,13 +28,13 @@
       }
     },
     methods: {
-      async stamp() {
+      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 || this.model.model.f_gasproperties[0]=='') {
+        if (this.model.model.f_gasproperties.length == 0) {
           this.$showAlert('请选择用气性质条件，点击查询之后再进行打印！！', 'warning', 3000)
           return
         };
@@ -43,10 +43,6 @@
         this.modelval = [
           "f_userinfo_code",
           "f_user_name",
-          "f_state",
-          "f_type",
-          "f_pregas",
-          "f_preamount",
           "f_stair1amount",
           "f_stair1price",
           "f_stair2amount",
@@ -54,14 +50,14 @@
           "f_stair3amount",
           "f_stair3price",
           "f_collection",
-          "f_payment",
           "f_operator",
-          "f_comments"
+          "f_type",
+          "f_comments",
+          "f_operate_date"
         ];
         this.fields = {
           "f_userinfo_code": "客户编号",
           "f_user_name": "客户姓名",
-          "f_state":"操作状态",
           "f_operate_date": "充值时间",
           "f_stair1amount": "1气量",
           "f_stair1price": "1单价",
@@ -81,14 +77,7 @@
           "f_comments": "备注"
         };
         this.put();
-        await this.print();
-        this.clear();
-      },
-      clear(){
-        this.model={};
-        this.sumsmodel={};
-        this.orgname= '';
-        this.depname= 0;
+        this.print();
       },
       put() {
         this.thead = `
@@ -99,7 +88,7 @@
           </th>
         </tr>
         <tr>
-          <th class="biaoti" colspan=${this.modelval.length}>统计日期：${this.model.model.f_startDate} ~ ${this.model.model.f_endDate}</th></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>
         <tr>
         <tr>
           <th class="biaoti" colspan=${this.modelval.length}>制单人：${this.$login.f.name} 打印时间: ${this.$login.toStandardTimeString()}</th></tr>
@@ -133,53 +122,16 @@
             <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>
-          </th>
-        </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>
+            <span>业务金额: ${this.sumsmodel.f_shouru_fee}</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>
-        `
+        </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>'
           }
@@ -187,118 +139,106 @@
         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
-    console.log("isHeng----"+isHeng)
-    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
+        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;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 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 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>'
+        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>'
+                }
+              }
             }
+            tHtml += '</tr>'
           }
         }
-        tHtml += '</tr>'
-      }
-    }
-    this.tfoot = `
+        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="5">###</font>
+            <font color="#0000FF" tindex="3">###方</font>
           </td>
           <td class="defaulttd" colspan='2'  tdata="allSum" format="#,##0.00" align="left">
-            <font color="#0000FF" tindex="6">###</font>
+            <font color="#0000FF" tindex="5">###方</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='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 class="defaulttd" colspan='4'  tdata="allSum" format="#,##0.00" align="left">
+            <font color="#0000FF"  tindex="9">###元</font>
           </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 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.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.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,7 +49,6 @@
           "f_stair3amount",
           "f_payment",
           "f_pay_id",
-          "f_serial_id",
           "f_terminal_num"
         ];
         this.fields = {
@@ -66,7 +65,6 @@
           "f_stair3price": "3单价",
           "f_payment": "付款方式",
           "f_pay_id":"交易号",
-          "f_serial_id":"订单号",
           "f_terminal_num":"服务机"
         };
         this.put();
@@ -153,49 +151,7 @@
             tHtml += '</tr>'
           }
         }
-        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>`
-
+        this.tfoot = ``
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`

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

@@ -12,9 +12,6 @@
       countmodel:{
         type:Object,
         default:{}
-      },
-      printshow:{
-        default:''
       }
     },
     data() {
@@ -32,7 +29,7 @@
       stamp() {
         this.model = this.countmodel.model,
           this.sumsmodel = this.countmodel.sumsmodel,
-          this.orgname = this.printshow,
+          this.orgname = this.countmodel.orgname,
         //默认选择要打印的列
         this.modelval = [
           "f_operate_date",
@@ -99,9 +96,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: 31.6mm;text-align: center;} ' +
+          '.bz {border-top: 0;width: 21.6mm;text-align: center;} ' +
           '.name {border-top: 0;width: 14.4 mm} ' +
-          '.other {border-top: 0;width: 77.4mm}</style>'
+          '.other {border-top: 0;width: 10mm}</style>'
 
 
         let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
@@ -126,21 +123,7 @@
             tHtml += '</tr>'
           }
         }
-        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>
-              `
+        this.tfoot = ``
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`

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

@@ -12,9 +12,6 @@
       countmodel:{
         type:Object,
         default:{}
-      },
-      printshow:{
-        default:''
       }
     },
     data() {
@@ -32,7 +29,7 @@
       stamp() {
         this.model = this.countmodel.model,
           this.sumsmodel = this.countmodel.sumsmodel,
-          this.orgname = this.printshow
+          this.orgname = this.countmodel.orgname
         //默认选择要打印的列
         this.modelval = [
           "f_operate_date",
@@ -89,9 +86,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: 31.6mm;text-align: center;} ' +
+          '.bz {border-top: 0;width: 21.6mm;text-align: center;} ' +
           '.name {border-top: 0;width: 14.4 mm} ' +
-          '.other {border-top: 0;width: 77.4mm}</style>'
+          '.other {border-top: 0;width: 10mm}</style>'
 
 
         let tHtml = style + '<table><thead>' + this.thead + '</thead><tbody>'
@@ -116,21 +113,7 @@
             tHtml += '</tr>'
           }
         }
-        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>
-              `
+        this.tfoot = ``
 
         // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
         tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`