WIN-B904R0U0NNS\Administrator пре 2 година
родитељ
комит
3019ef2852
17 измењених фајлова са 3210 додато и 89 уклоњено
  1. 4 5
      src/views/settings/components/modules/printComponents/breakFastCouponPrint.vue
  2. 272 0
      src/views/settings/components/modules/printComponents/changeRoomPrint.vue
  3. 4 2
      src/views/settings/components/modules/printComponents/extractPrint.vue
  4. 552 0
      src/views/settings/components/modules/printComponents/handoverDetailPrint.vue
  5. 724 0
      src/views/settings/components/modules/printComponents/handoverPrint.vue
  6. 48 4
      src/views/settings/components/modules/printComponents/hotelEntryPrint.vue
  7. 47 3
      src/views/settings/components/modules/printComponents/hotelOutPrint.vue
  8. 32 10
      src/views/settings/components/modules/printComponents/paymentPrint.vue
  9. 25 1
      src/views/settings/components/modules/printComponents/posCheckOutPrint.vue
  10. 26 1
      src/views/settings/components/modules/printComponents/refundPrint.vue
  11. 542 0
      src/views/settings/components/modules/printComponents/registrationPrint.vue
  12. 30 20
      src/views/settings/components/modules/printComponents/renewalOrderPrint.vue
  13. 695 0
      src/views/settings/components/modules/printComponents/shiftHandoverPrint.vue
  14. 46 4
      src/views/settings/components/modules/printComponents/teamCheckIn.vue
  15. 40 6
      src/views/settings/components/modules/printComponents/teamCheckOut.vue
  16. 117 27
      src/views/settings/components/modules/printTemplateForm.vue
  17. 6 6
      src/views/settings/components/printTemplate.vue

+ 4 - 5
src/views/settings/components/modules/printComponents/breakFastCouponPrint.vue

@@ -12,12 +12,11 @@
             <div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-title">房号:</div>
-                    <div class="print-fee-value"></div>
+                    <div class="print-fee-value">{{feeInfo.roomNo}}</div>
                 </div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-title">用餐时间:</div>
-                    <div class="print-fee-value">
-                    </div>
+                    <div class="print-fee-value">{{feeInfo.userTime}}</div>
                 </div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-value">
@@ -69,8 +68,8 @@
                 type: Object,
                 default() {
                     return {
-                        openTime: '2023-05-16 15:30',
-                        payTime:'2023-05-16 15:30',
+                        roomNo: '8207',
+                        userTime:'2023-05-16 08:30',
                     }
                 }
             },

Разлика између датотеке није приказан због своје велике величине
+ 272 - 0
src/views/settings/components/modules/printComponents/changeRoomPrint.vue


+ 4 - 2
src/views/settings/components/modules/printComponents/extractPrint.vue

@@ -10,7 +10,7 @@
             <div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-title">手牌:</div>
-                    <div class="print-fee-value"></div>
+                    <div class="print-fee-value">{{feeInfo.handCardNo}}</div>
                 </div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-title">开牌时间:</div>
@@ -26,7 +26,7 @@
                 </div>
                 <div class="print-fee-item-wrapper">
                     <div class="print-fee-title">备注:</div>
-                    <div class="print-fee-value"></div>
+                    <div class="print-fee-value">{{ feeInfo.remarks }}</div>
                 </div>
             </div>
         </div>
@@ -50,8 +50,10 @@
                 type: Object,
                 default() {
                     return {
+                        handCardNo:'H001',
                         openTime: '2023-05-16 15:30',
                         payTime:'2023-05-16 15:30',
+                        remarks:'999'
                     }
                 }
             },

+ 552 - 0
src/views/settings/components/modules/printComponents/handoverDetailPrint.vue

@@ -0,0 +1,552 @@
+<template>
+    <div class="a5">
+        <div class="content">
+            <div class="print-title">{{ storeInfo.name }}交班明细表</div>
+
+            <div class="print-fee-info">
+                <div class="print-fee-item-wrapper row">
+                    <div class="print-fee-value">当班:{{ feeInfo.startTime }} 至 {{ feeInfo.endTime }} </div>
+                    <div class="print-fee-value">交班模式:{{ feeInfo.mode}} </div>
+                    <div class="print-fee-value">班次:{{ feeInfo.classes }} </div>
+                </div>
+                <div class="print-fee-item-wrapper row">
+                    <div class="print-fee-value">操作员:{{ nickname() }} </div>
+                    <div class="print-fee-value">打印人:{{ nickname() }} </div>
+                </div>
+            </div>
+
+            <!--收款-->
+<!--            <div class="table">-->
+<!--                <div class="row border-top border-bottom border-left border-right font-weight font-size-18">-->
+<!--                    收款-->
+<!--                </div>-->
+<!--                <div class="wrapper-td" :key="index" v-for="(item, index) in data_payment">-->
+<!--                    <div class="row border-bottom border-left border-right font-weight">-->
+<!--                        {{ item.payName }}-->
+<!--                    </div>-->
+<!--                    <div class="row">-->
+<!--                        <div class="row border-bottom border-left border-right ">-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                项目名称-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                付款方式-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                单据号-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                姓名-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                房间号-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                金额-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                发生时间-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                营业日-->
+<!--                            </div>-->
+<!--                            <div class="flex-1">-->
+<!--                                备注-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="row" :key="index1" v-for="(itemChild, index1) in item.children">-->
+<!--                        <div class="row border-bottom border-left border-right ">-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.projectName }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.payName }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.receiptNo }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.customerName }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.roomNo }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.money }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.occurTime }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1 border-right">-->
+<!--                                {{ itemChild.businessDay }}-->
+<!--                            </div>-->
+<!--                            <div class="flex-1">-->
+<!--                                {{ itemChild.remarks }}-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="row border-bottom border-left border-right font-weight font-size-18">-->
+<!--                        收款合计:{{ item.amount }}-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div style="height: 5px"></div>-->
+            <!--收款-->
+            <div style="border: 3px solid #333333;width: 99.9%;" >
+                <div class="font-weight border-bottom font-size-18">
+                    收款
+                </div>
+                <div :key="index" v-for="(item, index) in data_payment">
+                    <table style="width: 100%;table-layout: fixed">
+                        <tr class="border-bottom font-weight item-row">
+                            {{ item.payName }}
+                        </tr>
+                        <tr class="border-bottom">
+                            <th class="border-right">项目名称</th>
+                            <th class="border-right">付款方式</th>
+                            <th class="border-right">单据号</th>
+                            <th class="border-right">姓名</th>
+                            <th class="border-right">房间号</th>
+                            <th class="border-right">金额</th>
+                            <th class="border-right">发生时间</th>
+                            <th class="border-right">营业日</th>
+                            <th class="">备注</th>
+                        </tr>
+                        <tr  class="border-bottom" v-for="(item1,index1) in item.children">
+                            <td class="border-right">{{item1.projectName}}</td>
+                            <td class="border-right">{{item1.payName}}</td>
+                            <td class="border-right">{{item1.receiptNo}}</td>
+                            <td class="border-right">{{item1.customerName}}</td>
+                            <td class="border-right">{{item1.roomName}}</td>
+                            <td class="border-right">{{item1.money}}</td>
+                            <td class="border-right">{{item1.occurTime}}</td>
+                            <td class="border-right">{{item1.businessDay}}</td>
+                            <td class="">{{item1.remarks}}</td>
+                        </tr>
+                        <tr v-if="data_payment.length -1 == index" class=" font-weight font-size-16 item-row">
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                        <tr v-else  class="border-bottom font-weight font-size-16 item-row" >
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                    </table>
+                </div>
+                <div class="font-weight border-top font-size-18">
+                    收款合计:{{data_payment_amount}}
+                </div>
+            </div>
+
+            <!--退款-->
+            <div style="height: 8px"></div>
+            <div style="border: 3px solid #333333;width: 99.9%;" >
+                <div class="font-weight border-bottom font-size-18">
+                    退款
+                </div>
+                <div :key="index" v-for="(item, index) in data_refund">
+                    <table style="width: 100%;table-layout: fixed">
+                        <tr class="border-bottom font-weight item-row">
+                            {{ item.payName }}
+                        </tr>
+                        <tr class="border-bottom">
+                            <th class="border-right">项目名称</th>
+                            <th class="border-right">付款方式</th>
+                            <th class="border-right">单据号</th>
+                            <th class="border-right">姓名</th>
+                            <th class="border-right">房间号</th>
+                            <th class="border-right">金额</th>
+                            <th class="border-right">发生时间</th>
+                            <th class="border-right">营业日</th>
+                            <th class="">备注</th>
+                        </tr>
+                        <tr  class="border-bottom" v-for="(item1,index1) in item.children">
+                            <td class="border-right">{{item1.projectName}}</td>
+                            <td class="border-right">{{item1.payName}}</td>
+                            <td class="border-right">{{item1.receiptNo}}</td>
+                            <td class="border-right">{{item1.customerName}}</td>
+                            <td class="border-right">{{item1.roomName}}</td>
+                            <td class="border-right">{{item1.money}}</td>
+                            <td class="border-right">{{item1.occurTime}}</td>
+                            <td class="border-right">{{item1.businessDay}}</td>
+                            <td class="">{{item1.remarks}}</td>
+                        </tr>
+                        <tr v-if="data_payment.length -1 == index" class=" font-weight font-size-16 item-row">
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                        <tr v-else  class="border-bottom font-weight font-size-16 item-row" >
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                    </table>
+                </div>
+                <div class="font-weight border-top font-size-18">
+                    退款合计:{{data_refund_amount}}
+                </div>
+            </div>
+
+            <!--收支明细-->
+            <div style="height: 8px"></div>
+            <div style="border-top: 3px solid #333333;border-left: 3px solid #333333;width: 99.9%;" >
+                <div class="font-weight border-right border-bottom font-size-18">
+                    收支明细
+                </div>
+                <table style="width: 100%;table-layout: fixed;border-collapse: collapse;" class="border-bottom">
+                    <tr>
+                        <th class="border-right" v-for="item in data_detail">{{item.name}}:{{item.money}}</th>
+                    </tr>
+                </table>
+<!--                <div class="row">-->
+<!--                    <div class="flex-1 border-left" :key="index" v-for="(item, index) in data_detail">-->
+<!--                        <span class="border-left">-->
+<!--                            {{item.name}}:{{item.money}}-->
+<!--                        </span>-->
+<!--                    </div>-->
+<!--                </div>-->
+            </div>
+
+            <!--营业额-->
+            <div style="height: 8px"></div>
+            <div style="border: 3px solid #333333;width: 99.9%;" >
+                <div class="font-weight border-bottom font-size-18">
+                    营业额
+                </div>
+                <div :key="index" v-for="(item, index) in data_turnover">
+                    <table style="width: 100%;table-layout: fixed">
+                        <tr class="border-bottom font-weight item-row">
+                            {{ item.payName }}
+                        </tr>
+                        <tr class="border-bottom">
+                            <th class="border-right">项目名称</th>
+                            <th class="border-right">付款方式</th>
+                            <th class="border-right">单据号</th>
+                            <th class="border-right">姓名</th>
+                            <th class="border-right">房间号</th>
+                            <th class="border-right">金额</th>
+                            <th class="border-right">发生时间</th>
+                            <th class="border-right">营业日</th>
+                            <th class="">备注</th>
+                        </tr>
+                        <tr  class="border-bottom" v-for="(item1,index1) in item.children">
+                            <td class="border-right">{{item1.projectName}}</td>
+                            <td class="border-right">{{item1.payName}}</td>
+                            <td class="border-right">{{item1.receiptNo}}</td>
+                            <td class="border-right">{{item1.customerName}}</td>
+                            <td class="border-right">{{item1.roomName}}</td>
+                            <td class="border-right">{{item1.money}}</td>
+                            <td class="border-right">{{item1.occurTime}}</td>
+                            <td class="border-right">{{item1.businessDay}}</td>
+                            <td class="">{{item1.remarks}}</td>
+                        </tr>
+                        <tr v-if="data_payment.length -1 == index" class=" font-weight font-size-16 item-row">
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                        <tr v-else  class="border-bottom font-weight font-size-16 item-row" >
+                            {{ item.payName }}合计:{{ item.amount }}
+                        </tr>
+                    </table>
+                </div>
+                <div class="font-weight border-top font-size-18">
+                    费用合计:{{data_turnover_amount}}
+                </div>
+            </div>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import { mapActions, mapGetters, mapState } from 'vuex'
+    import { httpAction, getAction } from '@/api/manage'
+
+    export default {
+        props: {
+            title: {
+                type: String,
+                default: '交班明细表'
+            },
+            feeInfo: {
+                type: Object,
+                default() {
+                    return {
+                        startTime: '2023-05-15 15:30',
+                        endTime: '2023-05-16 15:30',
+                        mode:'权责发生制',
+                        classes:'早班',
+                    }
+                }
+            },
+            //收款
+            data_payment:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            payName:'支付宝',
+                            amount:509,
+                            children:[
+                                // {
+                                //     projectName:'项目名称',
+                                //     payName:'付款方式',
+                                //     receiptNo:'单据号',
+                                //     customerName:'姓名',
+                                //     roomNo:'房间号',
+                                //     money:'金额',
+                                //     occurTime:'发生时间',
+                                //     businessDay:'营业日',
+                                //     remarks:'备注',
+                                // },
+                                {
+                                    projectName:'押金',
+                                    payName:'支付宝',
+                                    receiptNo:'S20230518195733',
+                                    customerName:'张先生',
+                                    roomNo:'8707',
+                                    money:188,
+                                    occurTime:'2023-05-18 11:25:36',
+                                    businessDay:'2023-05-18',
+                                    remarks:'押金',
+                                },
+                            ]
+                        },
+                    ];
+                }
+            },
+            data_payment_amount:{
+                type:Number ,
+                default() {
+                    return 1500
+                }
+            },
+            //退款
+            data_refund:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            payName:'支付宝',
+                            amount:509,
+                            children:[
+                                // {
+                                //     projectName:'项目名称',
+                                //     payName:'付款方式',
+                                //     receiptNo:'单据号',
+                                //     customerName:'姓名',
+                                //     roomNo:'房间号',
+                                //     money:'金额',
+                                //     occurTime:'发生时间',
+                                //     businessDay:'营业日',
+                                //     remarks:'备注',
+                                // },
+                                {
+                                    projectName:'押金',
+                                    payName:'支付宝',
+                                    receiptNo:'S20230518195733',
+                                    customerName:'张先生',
+                                    roomNo:'8707',
+                                    money:188,
+                                    occurTime:'2023-05-18 11:25:36',
+                                    businessDay:'2023-05-18',
+                                    remarks:'押金',
+                                },
+                            ]
+                        },
+                    ];
+                }
+            },
+            data_refund_amount:{
+                type:Number ,
+                default() {
+                    return 1500
+                }
+            },
+            //收支明细
+            data_detail:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            name:'支付宝',
+                            money:55
+                        },
+                        {
+                            name:'微信',
+                            money:33
+                        },
+                        {
+                            name:'现金',
+                            money:99
+                        },
+                    ];
+                }
+            },
+            //营业额
+            data_turnover:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            payName:'房费',
+                            amount:509,
+                            children:[
+                                // {
+                                //     projectName:'项目名称',
+                                //     payName:'付款方式',
+                                //     receiptNo:'单据号',
+                                //     customerName:'姓名',
+                                //     roomNo:'房间号',
+                                //     money:'金额',
+                                //     occurTime:'发生时间',
+                                //     businessDay:'营业日',
+                                //     remarks:'备注',
+                                // },
+                                {
+                                    projectName:'押金',
+                                    payName:'支付宝',
+                                    receiptNo:'S20230518195733',
+                                    customerName:'张先生',
+                                    roomNo:'8707',
+                                    money:188,
+                                    occurTime:'2023-05-18 11:25:36',
+                                    businessDay:'2023-05-18',
+                                    remarks:'押金',
+                                },
+                            ]
+                        },
+                    ];
+                }
+            },
+            data_turnover_amount:{
+                type:Number ,
+                default() {
+                    return 0
+                }
+            },
+        },
+        data() {
+            let storeInfo = JSON.parse(localStorage.getItem("storeInfo"))
+            return {
+                storeInfo,
+                printDate: new Date().format('yyyy/MM/dd hh:mm:ss'),
+                tableHeader:["序号","书名","价格","数量"],
+                dat:[
+                    {bookName:"围城",price:"75",quantity:"0"},
+                    {bookName:"骆驼祥子",price:"55",quantity:"0"},
+                    {bookName:"百年孤独",price:"69",quantity:"0"},
+                    {bookName:"梦里花落知多少",price:"39",quantity:"0"}
+
+                ],
+            }
+        },
+        created() {
+        },
+        methods: {
+            ...mapGetters(["nickname", "avatar", "userInfo"]),
+        }
+    }
+</script>
+
+<style lang="less">
+    .row{
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+    }
+    .item-row{
+        width: 100%;
+        white-space: nowrap;
+    }
+    .flex-1{
+        flex: 1;
+        width:0px;
+    }
+    .font-weight{
+        font-weight: 600;
+    }
+    .font-size-16{
+        font-size: 16px;
+    }
+    .font-size-18{
+        font-size: 18px;
+    }
+    .border-top{
+        border-top: 3px solid #333333;
+    }
+    .border-bottom{
+        border-bottom: 3px solid #333333;
+    }
+    .border-left{
+        border-left: 3px solid #333333;
+    }
+    .border-right{
+        border-right: 3px solid #333333;
+    }
+
+    .a5 {
+        width: 210mm;
+        border: 1px solid #00000055;
+        padding: 3mm;
+
+        .print-fee-info {
+            display: flex;
+            flex-wrap: wrap;
+
+
+            .print-fee-item-wrapper {
+                width: 50%;
+            }
+
+            .row{
+                width: 100%;
+            }
+
+            .print-fee-title {
+                width: 20%;
+                text-align: right;
+            }
+
+            .row .print-fee-title {
+                width: 10%;
+            }
+
+        }
+
+        .print-no{
+            text-align: center;
+        }
+        .print-title {
+            text-align: center;
+            font-size: 16px;
+            font-weight: 600;
+        }
+        .a5-partail{
+            display: flex;
+            flex-wrap: wrap;
+            .print-fee-item-wrapper {
+                margin: 3mm 0;
+                width: 45%;
+            }
+            .row{
+                width: 100%;
+            }
+        }
+    }
+    .print-fee-item-wrapper {
+        display: flex;
+        width: 100%;
+        padding: 4px 0;
+        font-size: small;
+
+        .print-fee-title {
+            width: 65px;
+            text-align: right;
+        }
+
+        .print-fee-value {
+            flex: 1;
+            padding-right: 5px;
+        }
+
+        .value-underline {
+            border-bottom: 1px solid #00000088;
+        }
+    }
+</style>

Разлика између датотеке није приказан због своје велике величине
+ 724 - 0
src/views/settings/components/modules/printComponents/handoverPrint.vue


+ 48 - 4
src/views/settings/components/modules/printComponents/hotelEntryPrint.vue

@@ -42,6 +42,19 @@
                 </div>
             </div>
 
+            <div class="info-split"></div>
+            <div class="info-split-dashed"></div>
+            <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+                <div class="fee-cell flex-2">{{item.goodType}}</div>
+                <div class="fee-cell">{{item.goodName}}</div>
+                <div class="fee-cell">{{item.number}}</div>
+                <div class="fee-cell">{{item.unit}}</div>
+                <div class="fee-cell">{{item.price}}</div>
+                <div class="fee-cell">{{item.stock}}</div>
+                <div class="fee-cell">{{item.size}}</div>
+            </div>
+            <div class="info-split"></div>
+
         </div>
         <div v-else>
             <div class="print-fee-info">
@@ -80,11 +93,17 @@
                 </div>
             </div>
 
-        </div>
+            <div class="info-split"></div>
+            <div class="info-split-dashed"></div>
+            <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+                <div class="fee-cell flex-2">{{item.goodName}}</div>
+                <div class="fee-cell">{{item.number}}</div>
+                <div class="fee-cell">{{item.unit}}</div>
+                <div class="fee-cell">{{item.price}}</div>
+            </div>
+            <div class="info-split"></div>
 
-        <div class="info-split"></div>
-        <div class="info-split-dashed"></div>
-        <div class="info-split"></div>
+        </div>
 
         <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
 
@@ -152,6 +171,31 @@
             defContent: {
                 type: String,
                 default: ""
+            },
+            dataSource:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            goodType:'8025',
+                            goodName:'商品',
+                            number:'20',
+                            unit:'元',
+                            price:'6.99',
+                            stock:'88',
+                            size:'3.55*1.2',
+                        },
+                        {
+                            goodType:'8025',
+                            goodName:'商品',
+                            number:'20',
+                            unit:'元',
+                            price:'6.99',
+                            stock:'88',
+                            size:'3.55*1.2',
+                        },
+                    ];
+                }
             }
         },
         data() {

+ 47 - 3
src/views/settings/components/modules/printComponents/hotelOutPrint.vue

@@ -36,6 +36,18 @@
                 </div>
             </div>
 
+            <div class="info-split"></div>
+            <div class="info-split-dashed"></div>
+            <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+                <div class="fee-cell flex-2">{{item.goodType}}</div>
+                <div class="fee-cell">{{item.goodName}}</div>
+                <div class="fee-cell">{{item.number}}</div>
+                <div class="fee-cell">{{item.unit}}</div>
+                <div class="fee-cell">{{item.stock}}</div>
+                <div class="fee-cell">{{item.size}}</div>
+            </div>
+            <div class="info-split"></div>
+
         </div>
         <div v-else>
             <div class="print-fee-info">
@@ -70,11 +82,18 @@
                 </div>
             </div>
 
+            <div class="info-split"></div>
+            <div class="info-split-dashed"></div>
+            <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+                <div class="fee-cell flex-2">{{item.goodName}}</div>
+                <div class="fee-cell">{{item.number}}</div>
+                <div class="fee-cell">{{item.unit}}</div>
+                <div class="fee-cell">{{item.stock}}</div>
+            </div>
+            <div class="info-split"></div>
+
         </div>
 
-        <div class="info-split"></div>
-        <div class="info-split-dashed"></div>
-        <div class="info-split"></div>
 
         <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
 
@@ -142,6 +161,31 @@
             defContent: {
                 type: String,
                 default: ""
+            },
+            dataSource:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            goodType:'8025',
+                            goodName:'商品',
+                            number:'20',
+                            unit:'元',
+                            price:'6.99',
+                            stock:'88',
+                            size:'3.55*1.2',
+                        },
+                        {
+                            goodType:'8025',
+                            goodName:'商品',
+                            number:'20',
+                            unit:'元',
+                            price:'6.99',
+                            stock:'88',
+                            size:'3.55*1.2',
+                        },
+                    ];
+                }
             }
         },
         data() {

+ 32 - 10
src/views/settings/components/modules/printComponents/paymentPrint.vue

@@ -7,16 +7,25 @@
                 <div class="print-fee-title">单号:</div>
                 <div class="print-fee-value value-underline">{{ feeInfo.no }}</div>
             </div>
-            <div class="print-fee-item-wrapper">
-                <div class="print-fee-title">支付方式:</div>
-                <div class="print-fee-value">{{ feeInfo.payType }}</div>
-            </div>
-            <div class="print-fee-item-wrapper">
-                <div class="print-fee-title">金额:</div>
-                <div class="print-fee-value">{{ feeInfo.money }}</div>
-            </div>
+<!--            <div class="print-fee-item-wrapper">-->
+<!--                <div class="print-fee-title">支付方式:</div>-->
+<!--                <div class="print-fee-value">{{ feeInfo.payType }}</div>-->
+<!--            </div>-->
+<!--            <div class="print-fee-item-wrapper">-->
+<!--                <div class="print-fee-title">金额:</div>-->
+<!--                <div class="print-fee-value">{{ feeInfo.money }}</div>-->
+<!--            </div>-->
+
+            <table style="width: 100%;table-layout: fixed">
+                <tr  class="" v-for="(item,index) in dataSource">
+                    <td class="">支付方式:{{item.payName}}</td>
+                    <td class="">金额:{{item.money}}</td>
+                </tr>
+            </table>
         </div>
 
+        <div style="height: 20px"></div>
+
         <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
 
         <div class="a5-partail">
@@ -67,14 +76,27 @@
                 default() {
                     return {
                         no: "NO202305172255",
-                        payType:'现金',
-                        money: 198,
                     }
                 }
             },
             defContent: {
                 type: String,
                 default: ""
+            },
+            dataSource:{
+                type:Array,
+                default() {
+                    return [
+                        {
+                            payName:'现金',
+                            money: 198,
+                        },
+                        {
+                            payName:'现金',
+                            money: 198,
+                        }
+                    ];
+                }
             }
         },
         data() {

+ 25 - 1
src/views/settings/components/modules/printComponents/posCheckOutPrint.vue

@@ -32,13 +32,20 @@
 
         <div class="info-split"></div>
         <div class="info-split-dashed"></div>
+        <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource.childs">
+            <div class="fee-cell flex-3">{{item.projectName}}</div>
+            <div class="fee-cell flex-2">{{item.price}}</div>
+            <div class="fee-cell flex-2">{{item.preferentialPrice}}</div>
+            <div class="fee-cell flex-2">{{item.number}}</div>
+            <div class="fee-cell">{{item.money}}</div>
+        </div>
         <div class="info-split"></div>
 
         <div class="print-fees">
             <div class="print-fees-header fee-row">
                 <div class="fee-cell flex-5">项目合计:</div>
                 <div class="fee-cell flex-8"></div>
-                <div class="fee-cell">0</div>
+                <div class="fee-cell">{{dataSource.amount}}</div>
             </div>
         </div>
 
@@ -115,6 +122,23 @@
             defContent: {
                 type: String,
                 default: ""
+            },
+            dataSource:{
+                type:Object,
+                default() {
+                    return {
+                        amount:'99',
+                        childs:[
+                            {
+                                projectName: '点菜',
+                                price: '88.8',
+                                preferentialPrice: '78',
+                                number: '1',
+                                money: '78',
+                            },
+                        ]
+                    };
+                }
             }
         },
         data() {

+ 26 - 1
src/views/settings/components/modules/printComponents/refundPrint.vue

@@ -181,6 +181,12 @@
 
             <div class="info-split"></div>
             <div class="info-split-dashed"></div>
+            <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+                <div class="fee-cell flex-2">{{item.roomNo}}</div>
+                <div class="fee-cell">{{item.layoutName}}</div>
+                <div class="fee-cell">{{item.price}}</div>
+                <div class="fee-cell">{{item.discount}}</div>
+            </div>
             <div class="info-split"></div>
 
             <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
@@ -256,7 +262,26 @@
             defContent: {
                 type: String,
                 default: ""
-            }
+            },
+            dataSource:{
+                type:Array,
+                default() {
+                    return [
+                        {
+                            roomNo:'8212',
+                            layoutName:'星空房',
+                            discount:'98',
+                            price:'88',
+                        },
+                        {
+                            roomNo:'8212',
+                            layoutName:'星空房',
+                            discount:'98',
+                            price:'88',
+                        }
+                    ];
+                }
+            },
         },
         data() {
             let storeInfo = JSON.parse(localStorage.getItem("storeInfo"))

Разлика између датотеке није приказан због своје велике величине
+ 542 - 0
src/views/settings/components/modules/printComponents/registrationPrint.vue


+ 30 - 20
src/views/settings/components/modules/printComponents/renewalOrderPrint.vue

@@ -1,29 +1,29 @@
 <template>
     <div :class="sizeTypeClass">
-        <div class="print-title">{{ storeInfo.name }}续住单</div>
+        <div class="content">
+            <div class="print-title">{{ storeInfo.name }}续住单</div>
 
-        <div class="print-fee-info">
-            <div class="print-fee-item-wrapper row">
-                <div class="print-fee-title">打印时间:</div>
-                <div class="print-fee-value value-underline">{{ printDate }}</div>
+            <div class="print-fee-info">
+                <div class="print-fee-item-wrapper row">
+                    <div class="print-fee-title">打印时间:</div>
+                    <div class="print-fee-value">{{ printDate }}</div>
+                </div>
             </div>
-        </div>
 
-        <div class="print-feesinfo">
-            <div>
-                <div class="print-fee-item-wrapper">
+            <div class="print-feesinfo">
+                <div class="print-fee-item-wrapper border-bottom">
                     <div class="print-fee-title">客人姓名</div>
                     <div class="print-fee-value"></div>
                 </div>
-                <div class="print-fee-item-wrapper">
+                <div class="print-fee-item-wrapper border-bottom">
                     <div class="print-fee-title">房号</div>
                     <div class="print-fee-value"></div>
                 </div>
-                <div class="print-fee-item-wrapper">
+                <div class="print-fee-item-wrapper border-bottom">
                     <div class="print-fee-title">原离店时间</div>
                     <div class="print-fee-value"></div>
                 </div>
-                <div class="print-fee-item-wrapper">
+                <div class="print-fee-item-wrapper border-bottom">
                     <div class="print-fee-title">新离店时间</div>
                     <div class="print-fee-value"></div>
                 </div>
@@ -32,17 +32,17 @@
                     <div class="print-fee-value"></div>
                 </div>
             </div>
-        </div>
 
-        <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
+            <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
 
 
-        <div class="print-fee-item-wrapper">
-            <div class="print-fee-value" style="text-align: right">操作员:{{ nickname() }}</div>
-        </div>
-        <div class="print-fee-item-wrapper" style="font-weight: 600;font-size: 18px;">
-            <div>住客签字:</div>
-            <div class="print-fee-value value-underline"></div>
+            <div class="print-fee-item-wrapper">
+                <div class="print-fee-value" style="text-align: right">操作员:{{ nickname() }}</div>
+            </div>
+            <div class="print-fee-item-wrapper" style="font-weight: 600;font-size: 16px;">
+                <div>住客签字:</div>
+                <div class="print-fee-value value-underline"></div>
+            </div>
         </div>
     </div>
 </template>
@@ -91,6 +91,16 @@
 </script>
 
 <style lang="less">
+    .content{
+        width: 94%;
+        margin: auto;
+    }
+    .print-feesinfo{
+        border: 1px solid #1d1a1a
+    }
+    .border-bottom{
+        border-bottom: 1px solid #1d1a1a
+    }
     .mm58 {
         width: 58mm;
         border: 1px solid #00000055;

Разлика између датотеке није приказан због своје велике величине
+ 695 - 0
src/views/settings/components/modules/printComponents/shiftHandoverPrint.vue


+ 46 - 4
src/views/settings/components/modules/printComponents/teamCheckIn.vue

@@ -47,7 +47,7 @@
                 <div class="print-fee-title">离时<span v-if="sizeTypeClass == 'a5'">/CheckOut</span>:</div>
                 <div class="print-fee-value">{{ feeInfo.dueOutTime }}</div>
             </div>
-            <div class="print-fee-item-wrapper row">
+            <div class="print-fee-item-wrapper row" v-if="defModel.isShowBreakfast == 0">
                 <div class="print-fee-title">早餐<span v-if="sizeTypeClass == 'a5'">/Breakfirst</span>:</div>
                 <div class="print-fee-value">{{ feeInfo.breakFirst }}</div>
             </div>
@@ -73,6 +73,13 @@
 
         <div class="info-split"></div>
         <div class="info-split-dashed"></div>
+        <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource">
+            <div class="fee-cell flex-2">{{item.roomNo}}</div>
+            <div class="fee-cell">{{item.customerName}}</div>
+            <div class="fee-cell">{{item.layoutName}}</div>
+            <div class="fee-cell">{{item.dayCount}}</div>
+            <div class="fee-cell flex-3">{{item.money}}</div>
+        </div>
         <div class="info-split"></div>
 
         <pre style="white-space: pre-wrap;" class="print-def-content">{{ defContent }}</pre>
@@ -137,6 +144,38 @@
             defContent: {
                 type: String,
                 default: ""
+            },
+            defModel:{
+                type:Object,
+                default(){
+                    return {
+                        isShowIdcard:0,
+                        isShowBreakfast:0,
+                        isShowAddress:0,
+                        isShowPhone:0
+                    }
+                }
+            },
+            dataSource:{
+                type:Array ,
+                default() {
+                    return [
+                        {
+                            roomNo:'8025',
+                            customerName:'张三',
+                            layoutName:'大床房',
+                            dayCount:'8',
+                            money:'969',
+                        },
+                        {
+                            roomNo:'8025',
+                            customerName:'张三',
+                            layoutName:'大床房',
+                            dayCount:'8',
+                            money:'969',
+                        },
+                    ];
+                }
             }
         },
         data() {
@@ -176,7 +215,7 @@
                 width: 60%;
             }
             .row {
-                width: 100%;
+                width: 100% !important;
             }
 
             .small-item {
@@ -188,10 +227,13 @@
             }
 
             .print-fee-title {
-                width: fit-content;
+                /*width: fit-content;*/
                 text-align: right;
             }
-
+            .row .print-fee-title {
+                width: 10% !important;
+                text-align: left !important;
+            }
         }
 
         .print-title {

+ 40 - 6
src/views/settings/components/modules/printComponents/teamCheckOut.vue

@@ -66,17 +66,24 @@
 
         <div class="info-split"></div>
         <div class="info-split-dashed"></div>
+        <div class="print-fees-header fee-row" style="padding-bottom: 5px" v-for="(item,index) in dataSource.childs">
+            <div class="fee-cell flex-2">{{item.roomNo}}</div>
+            <div class="fee-cell">{{item.projectName}}</div>
+            <div class="fee-cell" v-if="sizeTypeClass == 'a5'">{{item.occurTime}}</div>
+            <div class="fee-cell" >{{item.amount}}</div>
+            <div class="fee-cell">{{item.cost}}</div>
+            <div class="fee-cell flex-3">{{item.payName}}</div>
+        </div>
         <div class="info-split"></div>
 
         <div class="print-fees">
             <div class="print-fees-header fee-row">
-<!--                <div class="fee-cell flex-2"></div>-->
-                <div class="fee-cell">合计:</div>
-                <div class="fee-cell">/</div>
+                <div class="fee-cell flex-2">合计:</div>
                 <div class="fee-cell">/</div>
-                <div class="fee-cell">--</div>
-                <div class="fee-cell">--</div>
-                <div class="fee-cell flex-1"></div>
+                <div class="fee-cell" v-if="sizeTypeClass == 'a5'">/</div>
+                <div class="fee-cell">{{dataSource.amount}}</div>
+                <div class="fee-cell">{{dataSource.cost}}</div>
+                <div class="fee-cell flex-3"></div>
             </div>
         </div>
 
@@ -150,6 +157,33 @@
             defContent: {
                 type: String,
                 default: ""
+            },
+            dataSource:{
+                type:Object ,
+                default() {
+                    return {
+                        amount:'666',
+                        cost:'888',
+                        childs:[
+                            {
+                                roomNo:'8025',
+                                projectName:'张三',
+                                occurTime:'2023-05-15 15:30',
+                                amount:'8',
+                                cost:'969',
+                                payName:"微信",
+                            },
+                            {
+                                roomNo:'8025',
+                                projectName:'张三',
+                                occurTime:'2023-05-15 15:30',
+                                amount:'8',
+                                cost:'969',
+                                payName:"微信",
+                            },
+                        ]
+                    }
+                }
             }
         },
         data() {

+ 117 - 27
src/views/settings/components/modules/printTemplateForm.vue

@@ -5,12 +5,19 @@
         <j-form-container :disabled="formDisabled">
           <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" layout="vertical">
             <a-row >
-              <a-col :span="24">
-                <a-form-model-item label="模板名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-                  <a-input v-model="model.name" placeholder="请输入打印模板名称"  ></a-input>
+<!--              <a-col :span="24">-->
+<!--                <a-form-model-item label="模板名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">-->
+<!--                  <a-input v-model="model.name" placeholder="请输入打印模板名称" ></a-input>-->
+<!--                </a-form-model-item>-->
+<!--              </a-col>-->
+              <a-col :span="24" v-if="model.type == 10">
+                <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specs">
+                  <j-dict-select-tag type="radio" v-model="model.specs" placeholder="请选择规格" dictCode="print_template_specs"
+                                     disabled="disabled"
+                                     @change="e=>onSpecsChange(e)"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="24">
+              <a-col :span="24" v-else>
                 <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specs">
                   <j-dict-select-tag type="radio" v-model="model.specs" placeholder="请选择规格" dictCode="print_template_specs"
                                      @change="e=>onSpecsChange(e)"/>
@@ -32,27 +39,56 @@
                   <a-input v-model="model.defaultPrint" placeholder="请输入默认打印机"  ></a-input>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="24">
+              <a-col :span="24" v-if=" model.type == 1 || model.type == 9 || model.type == 14">
                 <a-form-model-item label="打印类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="printType">
                   <j-dict-select-tag type="radio" v-model="model.printType" placeholder="请选择打印类型" dictCode="print_template_type"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="24">
-                <a-form-model-item label="是否显示退菜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowRefund">
-                  <j-dict-select-tag type="radio" v-model="model.isShowRefund" placeholder="请选择是否显示退菜" dictCode="print_template_refund"/>
-                </a-form-model-item>
-              </a-col>
+                <a-col :span="24" v-if="model.type == 9">
+                    <a-form-model-item label="是否显示退菜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowRefund">
+                        <j-dict-select-tag type="radio" v-model="model.isShowRefund" placeholder="请选择是否显示退菜" dictCode="print_template_refund"/>
+                    </a-form-model-item>
+                </a-col>
+
+                <a-row>
+                    <a-col :span="11" v-if="model.type == 1 || model.type == 8 || model.type == 14 || model.type == 15">
+                        <a-form-model-item label="是否打印证件信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowIdcard">
+                            <j-dict-select-tag type="radio" v-model="model.isShowIdcard" placeholder="请选择是否打印证件信息" dictCode="print_template_refund"/>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col :span="1"></a-col>
+                    <a-col :span="11" v-if="model.type == 1 || model.type == 8 || model.type == 14 || model.type == 15">
+                        <a-form-model-item label="是否打印早餐信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowBreakfast">
+                            <j-dict-select-tag type="radio" v-model="model.isShowBreakfast" placeholder="请选择是否打印早餐信息" dictCode="print_template_refund"/>
+                        </a-form-model-item>
+                    </a-col>
+                </a-row>
+                <a-row>
+                    <a-col :span="11" v-if="model.type == 1 || model.type == 8 || model.type == 14 || model.type == 15">
+                        <a-form-model-item label="是否打印客人详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowAddress">
+                            <j-dict-select-tag type="radio" v-model="model.isShowAddress" placeholder="请选择是否打印客人详细地址" dictCode="print_template_refund"/>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col :span="1"></a-col>
+                    <a-col :span="11" v-if="model.type == 1 || model.type == 8 || model.type == 14 || model.type == 15">
+                        <a-form-model-item label="是否打印客人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isShowPhone">
+                            <j-dict-select-tag type="radio" v-model="model.isShowPhone" placeholder="请选择是否打印客人电话" dictCode="print_template_refund"/>
+                        </a-form-model-item>
+                    </a-col>
+                </a-row>
+
               <a-col :span="24">
                 <a-form-model-item label="打印份数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="printSum">
                   <a-input-number v-model="model.printSum" placeholder="请输入打印份数" style="width: 100%" />
                 </a-form-model-item>
               </a-col>
-              <a-col :span="24">
+              <a-col :span="10">
                 <a-form-model-item label="打印时内容宽度偏差" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="printContentOffset">
                   <a-input v-model="model.printContentOffset" placeholder="请输入打印时内容宽度偏差"  ></a-input>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="24">
+              <a-col :span="1"></a-col>
+              <a-col :span="10">
                 <a-form-model-item label="打印时纸张宽度偏差" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="printPaperOffset">
                   <a-input v-model="model.printPaperOffset" placeholder="请输入打印时纸张宽度偏差"  ></a-input>
                 </a-form-model-item>
@@ -62,19 +98,58 @@
         </j-form-container>
       </div>
       <div class="right">
-        <!-- <jzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></jzd> -->
-<!--        <skd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></skd>-->
-<!--        <tkd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></tkd>-->
-<!--        <qxd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></qxd>-->
-<!--        <zcq :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></zcq>-->
-<!--        <tdrzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></tdrzd>-->
-<!--        <tdjzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></tdjzd>-->
-<!--        <rkd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></rkd>-->
-<!--        <ckd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></ckd>-->
-<!--        <hykfd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></hykfd>-->
-<!--        <posjzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></posjzd>-->
-<!--        <zfd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></zfd>-->
-        <xzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></xzd>
+        <div v-if="model.type == 1">
+          <jzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks" :defModel="model"></jzd>
+        </div>
+        <div v-else-if="model.type == 2">
+          <skd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></skd>
+        </div>
+        <div v-else-if="model.type == 3">
+          <tkd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></tkd>
+        </div>
+        <div v-else-if="model.type == 4">
+          <jbb :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></jbb>
+        </div>
+        <div v-else-if="model.type == 5">
+          <hfd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></hfd>
+        </div>
+        <div v-else-if="model.type == 6">
+          <xzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></xzd>
+        </div>
+        <div v-else-if="model.type == 7">
+          <zfd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></zfd>
+        </div>
+        <div v-else-if="model.type == 8">
+          <djd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks" :defModel="model"></djd>
+        </div>
+        <div v-else-if="model.type == 9">
+          <posjzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></posjzd>
+        </div>
+        <div v-else-if="model.type == 10">
+          <jbmxb :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></jbmxb>
+        </div>
+        <div v-else-if="model.type == 11">
+          <hykfd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></hykfd>
+        </div>
+        <div v-else-if="model.type == 12">
+          <ckd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></ckd>
+        </div>
+        <div v-else-if="model.type == 13">
+          <rkd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></rkd>
+        </div>
+        <div v-else-if="model.type == 14">
+          <tdjzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks" :defModel="model"></tdjzd>
+        </div>
+        <div v-else-if="model.type == 15">
+          <tdrzd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks" :defModel="model"></tdrzd>
+        </div>
+        <div v-else-if="model.type == 16">
+          <zcq :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></zcq>
+        </div>
+        <div v-else-if="model.type == 17">
+          <qxd :sizeTypeClass="sizeTypeClass" :defContent="model.remarks"></qxd>
+        </div>
+        <div v-else></div>
       </div>
     </div>
 
@@ -98,6 +173,10 @@
   import posjzd from './printComponents/posCheckOutPrint.vue'
   import zfd from './printComponents/paymentPrint.vue'
   import xzd from './printComponents/renewalOrderPrint.vue'
+  import hfd from './printComponents/changeRoomPrint.vue'
+  import djd from './printComponents/registrationPrint.vue'
+  import jbb from './printComponents/handoverPrint.vue'
+  import jbmxb from './printComponents/handoverDetailPrint.vue'
 
   export default {
     name: 'printTemplateForm',
@@ -115,6 +194,10 @@
       posjzd,
       zfd,
       xzd,
+      hfd,
+      djd,
+      jbb,
+      jbmxb
     },
     props: {
       //表单禁用
@@ -126,7 +209,7 @@
     },
     data () {
       return {
-        sizeTypeClass: 'mm58',
+        sizeTypeClass: 'mm80',
         model:{
          },
         labelCol: {
@@ -179,8 +262,14 @@
         console.log(record)
         this.model = Object.assign({}, record);
         this.width = record.specs;
-        if (record.specs === 'A5'){
+        if (record.specs === 'a5'){
           // this.width = '210mm';
+          this.sizeTypeClass = "a5"
+        }else if(record.specs === '58mm'){
+          this.sizeTypeClass = "mm58"
+        }
+        else{
+          this.sizeTypeClass = "mm80"
         }
         this.visible = true;
       },
@@ -238,6 +327,7 @@
   }
   .right{
     flex: 3;
+    padding-left: 20px;
   }
   .template{
     margin-left: 10px;

+ 6 - 6
src/views/settings/components/printTemplate.vue

@@ -21,7 +21,7 @@
 
         <!-- 操作按钮区域 -->
         <div class="table-operator">
-            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
 <!--            <a-button type="primary" icon="download" @click="handleExportXls('打印模板')">导出</a-button>-->
 <!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--                <a-button type="primary" icon="import">导入</a-button>-->
@@ -38,11 +38,6 @@
 
         <!-- table区域-begin -->
         <div>
-            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-            </div>
-
             <a-table
                     ref="table"
                     size="middle"
@@ -204,6 +199,11 @@
                 fieldList.push({type:'int',value:'isShowRefund',text:'状态(0-关闭;1-开启)'})
                 this.superFieldList = fieldList
             },
+            handleEdit: function (record) {
+                this.$refs.modalForm.edit(record);
+                this.$refs.modalForm.title = record.name;
+                this.$refs.modalForm.disableSubmit = false;
+            },
         }
     }
 </script>