打印修改

src/api/pages/fin/other-payable-item.js

@@ -0,0 +1,21 @@
+/**
+ * @desc   : 其它支出服务
+ * @author : 付斌
+ * @date   : 2024-01-31 14:37
+ */
+export default {
+  otherPayableItemService: {
+    prefix: '/mdm-server/mac/otherPayableItem/',
+  }
+}
+
+/**
+ * @desc   : 其它支出路由
+ * @author : 付斌
+ * @date   : 2024-02-01 16:03
+ */
+export const routeUrl = {
+  otherPayableItem: {
+
+  }
+}

src/api/pages/fin/other-receivable-item.js

@@ -0,0 +1,21 @@
+/**
+ * @desc   : 其它收入服务
+ * @author : 付斌
+ * @date   : 2024-01-31 14:37
+ */
+export default {
+  otherReceivableItemService: {
+    prefix: '/mdm-server/mac/otherReceivableItem/',
+  }
+}
+
+/**
+ * @desc   : 其它收入路由
+ * @author : 付斌
+ * @date   : 2024-02-01 16:03
+ */
+export const routeUrl = {
+  otherReceivableItem: {
+
+  }
+}

src/components/business/print/modal.vue

@@ -36,6 +36,12 @@ import { hiprint } from 'vue-plugin-hiprint'
       service: {
         type: Object
       },
+      detailService:{
+        type: Object
+      },
+      postName:{
+        type:String,
+      },
       id: {
         type: String
       },
@@ -64,15 +70,19 @@ import { hiprint } from 'vue-plugin-hiprint'
         let template = this.templateList.find(it => it.layoutId == this.currentTemplate)?.layoutData
 
         console.log('this.service',this.service)
+        console.log('this.detailService',this.detailService)
+        let params = {}
+        params[this.postName] = this.id
         let header=this.excuteNoParam(this.service, this.service.selectById,[this.id])
-        let detail=this.excuteNoParam(this.$service.orderService, this.$service.orderService.selectOrderInfoById, [this.id])
+        let detail=this.excute(this.detailService, this.detailService.selectByCond, params)
+        // let detail=this.excuteNoParam(this.$service.orderService, this.$service.orderService.selectOrderInfoById, [this.id])
         Promise.all([header, detail])
           .then((results) => {
             // 在这里执行接下来的操作
             if(results?.[0]?.code === this.$config.SUCCESS_CODE && results?.[1]?.code === this.$config.SUCCESS_CODE){
               let header =results?.[0]?.data
               let detail =results?.[1]?.data
-              this.$set(header, 'table', detail['orderItem'])
+              this.$set(header, 'table', detail['list'])
               let printData = {...header}
               this.$printUtil.print(template,printData)
             }else {

src/config/index.js

@@ -601,8 +601,6 @@ export default {
     warehouse: '仓库',
     bom: 'BOM配置',
     capitalAccount: '资金账户',
-    order: '销售订单',
-    purOrder:'采购订单',
     'order_out': '销售出库',
     'order_return': '销售退货',
     'cus_receipt': '客户收款',
@@ -614,6 +612,12 @@ export default {
     'pur_order': '采购订单',
     'pur_return': '采购退货',
     'money_transfer': '资金转账',
+    order: '销售订单',
+    purOrder:'采购订单',
+    transfer: '调整单',
+    moneyTransfer:'资金转账',
+    ivtFreeze:'冻结单',
+    ivtCheck:'盘点单',
     receipt: '收款单',
     payment: '付款单',
     income: '其他收入单',

src/view/fin/other-payable/index.vue

@@ -7,6 +7,8 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
         <BaseIndexButton ref="invalid" name="invalid"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
       </template>
       <template #right>
         <BaseIndexButton ref="add" name="add"></BaseIndexButton>
@@ -78,16 +80,23 @@
         </div>
       </DkSplit>
     </div>
+    <PrintModal ref="printModal" :doc-name="$config.docCode.outlay"
+                :service="$service.otherPayableService"
+                :detailService="$service.otherPayableItemService"
+                :postName="'payableId'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.payableId||null"/>
   </div>
 </template>
 
 <script>
 
 import {indexMixin} from '@/mixins'
+import PrintModal from '_c/business/print/modal'
 
 export default {
   name: 'payable',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -152,6 +161,16 @@ export default {
   },
 
   methods: {
+
+    /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
     /**
      * @desc   : 加载数据
      * @author : 付斌

src/view/fin/other-receivable/index.vue

@@ -7,6 +7,8 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
         <BaseIndexButton ref="invalid" name="invalid"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
       </template>
       <template #right>
         <BaseIndexButton ref="add" name="add"></BaseIndexButton>
@@ -81,16 +83,22 @@
       </DkSplit>
     </div>
 
+    <PrintModal ref="printModal" :doc-name="$config.docCode.income"
+                :service="$service.otherReceivableService"
+                :detailService="$service.otherReceivableItemService"
+                :postName="'receivableId'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.receivableId||null"/>
   </div>
 </template>
 
 <script>
 
 import {indexMixin} from '@/mixins'
-
+import PrintModal from '_c/business/print/modal'
 export default {
   name: 'receivable',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -162,6 +170,15 @@ export default {
 
   methods: {
     /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
+    /**
      * @desc   : 加载数据
      * @author : 付斌
      * @date   : 2024-02-20 15:53

src/view/ivt/ivt-check/index.vue

@@ -11,6 +11,8 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--    编辑    -->
         <BaseIndexButton v-show="flgEdit" ref="edit" name="edit"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
         <!--关闭-->
         <BaseIndexButton ref="close" name="close"></BaseIndexButton>
         <!--导入-->
@@ -116,15 +118,24 @@
         </div>
       </DkSplit>
     </div>
+
+
+    <PrintModal ref="printModal" :doc-name="$config.docCode.ivtCheck"
+                :service="$service.checkService"
+                :detailService="$service.checkItemService"
+                :postName="'checkId'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.checkId||null"/>
   </div>
 </template>
 
 <script>
 import {indexMixin} from "@/mixins";
+import PrintModal from '_c/business/print/modal'
 import Config from "@/config";
 export default {
   name: 'ivt-check',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -188,6 +199,15 @@ export default {
   methods: {
 
     /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
+    /**
      * @desc   : 加载数据
      * @author : 宋扬
      * @date   : 2024/3/25 11:16

src/view/ivt/ivt-freeze/index.vue

@@ -11,6 +11,8 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--    解冻    -->
         <BaseIndexButton v-show="flgUnFreese" ref="unFreeze" name="unFreeze"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
       </template>
       <template #right>
         <!--   新建     -->
@@ -99,16 +101,22 @@
         </div>
       </DkSplit>
     </div>
-
+    <PrintModal ref="printModal" :doc-name="$config.docCode.ivtFreeze"
+                :service="$service.freezeService"
+                :detailService="$service.freezeItemService"
+                :postName="'freezeId'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.freezeId||null"/>
   </div>
 </template>
 
 <script>
 import {indexMixin} from "@/mixins";
+import PrintModal from '_c/business/print/modal'
 import Config from "@/config";
 export default {
   name: 'ivt-freeze',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -184,6 +192,16 @@ export default {
     }
   },
   methods: {
+
+    /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
     /**
      * @desc   : 加载数据
      * @author : 宋扬

src/view/ivt/ivt-transfer/index.vue

@@ -11,6 +11,8 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <!--    作废    -->
         <BaseIndexButton ref="invalid" name="invalid"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
         <!--关闭-->
         <BaseIndexButton ref="close" name="close"></BaseIndexButton>
       </template>
@@ -109,16 +111,24 @@
       </DkSplit>
     </div>
 
+    <PrintModal ref="printModal" :doc-name="$config.docCode.transfer"
+                :service="$service.transferService"
+                :detailService="$service.transferItemService"
+                :postName="'transferId'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.transferId||null"/>
+
   </div>
 </template>
 
 
 <script>
 import {indexMixin} from "@/mixins";
+import PrintModal from '_c/business/print/modal'
 import Config from "@/config";
 export default {
   name: 'ivt-transfer',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -181,6 +191,15 @@ export default {
   methods: {
 
     /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
+    /**
      * @desc   : 加载数据
      * @author : 宋扬
      * @date   : 2024/3/30 15:44

src/view/pur/pur-order/index.vue

@@ -142,6 +142,8 @@
 
           <PrintModal ref="printModal" :doc-name="$config.docCode.purOrder"
                       :service="$service.purOrderService"
+                      :detailService="$service.purchaseItemService"
+                      :postName="'purId'"
                       :id="$refs?.['table-select']?.batchRows?.[0]?.purId||null"/>
 
         </div>

src/view/sale/order/index.vue

@@ -122,6 +122,8 @@
 
         <PrintModal ref="printModal" :doc-name="$config.docCode.order"
                     :service="$service.orderService"
+                    :detailService="$service.orderItemService"
+                    :postName="'orderId'"
                     :id="$refs?.['table-select']?.batchRows?.[0]?.orderId||null"/>
       </div>
     </DkSplit>