lilei 10 месяцев назад
Родитель
Сommit
87421dadb5

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1722655371771
+  "version": 1722669717493
 }

+ 1 - 1
src/api/settle.js

@@ -75,7 +75,7 @@ export const settleUnitQuerySum = (params) => {
 //详情  打印
 export const settleUnitPrint = params => {
   const data = {
-    url: `/settle/unit/print/${params.type}`,
+    url: `/settle/unit/print/${params.type}/${params.remarksFlag}`,
     data: params,
     method: 'post',
     headers: {

+ 1 - 0
src/views/common/print.vue

@@ -4,6 +4,7 @@
       <a-radio value="NEEDLE">针式</a-radio>
       <a-radio value="INK">喷墨</a-radio>
     </a-radio-group>
+    <slot name="extendCons"></slot>
     <a-button key="3" id="print-preview-btn" :loading="$store.state.app.printLoading" :disabled="disabled" @click="handlePrint('preview')">打印预览</a-button>
     <a-button
       key="2"

+ 8 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -8,7 +8,11 @@
           <p style=" display: inline-block;margin: 0 0 0 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
-          <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint"></Print>
+          <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint">
+            <template slot="extendCons">
+              <a-checkbox v-model="remarksFlag">打印备注</a-checkbox>
+            </template>
+          </Print>
         </template>
       </a-page-header>
       <!-- 已选单据 -->
@@ -197,6 +201,7 @@ export default {
       disabled: false,
       spinning: false,
       loading: false, //  表格加载中
+      remarksFlag: false, // 打印备注
       chooseQueryParam: {
         productCode: '',
         productName: ''
@@ -282,6 +287,8 @@ export default {
       if (type == 'export') { //  导出
         url = settleUnitExport
       }
+      // 是否打印备注
+      params.remarksFlag = _this.remarksFlag ? 1 : 0
       // 打印或导出
       hdPrint(printerType, type, url, params, '单位应收应付', function () {
         _this.spinning = false

+ 13 - 10
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -10,10 +10,11 @@
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" @handlePrint="handlePrint">
-              <!-- <div style="padding:10px;" slot="extendCons">
-                <a-checkbox v-model="printTotalKs" :checked="printTotalKs" id="salesQuery-printTotalKs">打印总款数</a-checkbox>
-                <a-checkbox v-model="printTotalNums" :checked="printTotalNums" id="salesQuery-printTotalNums">打印总数量</a-checkbox>
-              </div> -->
+              <div style="padding:10px;" slot="extendCons">
+                <a-checkbox v-model="remarksFlag" id="salesQuery-remarksFlag">打印备注</a-checkbox>
+                <!-- <a-checkbox v-model="printTotalKs" :checked="printTotalKs" id="salesQuery-printTotalKs">打印总款数</a-checkbox> -->
+                <!-- <a-checkbox v-model="printTotalNums" :checked="printTotalNums" id="salesQuery-printTotalNums">打印总数量</a-checkbox> -->
+              </div>
             </PrintPanel>
             <a-divider type="vertical" />
             <a-button id="salesNewOrderEdit-del-btn" class="button-default" type="link" @click="handleOk([])"><a-icon type="close" />清空单据</a-button>
@@ -245,6 +246,7 @@ export default {
       enableFundAccount: false,
       printTotalKs: false, // 打印原创编码
       printTotalNums: false, // 打印全部名称
+      remarksFlag: false // 打印备注
     }
   },
   computed: {
@@ -284,16 +286,17 @@ export default {
     handlePrint (type, printerType) {
       const _this = this
       const params = _this.getParams()
-      
+
       _this.spinning = true
       let url = ''
       if (type == 'export') { //  导出
         url = settleUnitExport
-      }else{
+      } else {
         url = settleUnitPrint
         // 打印
         // params.printTotalKs = params.printTotalKs ? 1 : 0
         // params.printTotalNums = params.printTotalNums ? 1 : 0
+        params.remarksFlag = this.remarksFlag ? 1 : 0
       }
       // 打印或导出
       hdPrint(printerType, type, url, params, '单位应收应付', function () {
@@ -412,16 +415,16 @@ export default {
       })
     },
     handleOk (selectedRows) {
-      if(selectedRows.length){
+      if (selectedRows.length) {
         this.chooseLoadData = this.chooseLoadData.concat(selectedRows).sort((a, b) => {
           const at = new Date(a.auditTime).getTime()
           const bt = new Date(b.auditTime).getTime()
           return at - bt
         })
-      }else{
+      } else {
         this.chooseLoadData = selectedRows
       }
-      
+
       this.amountSettledChange()
     },
     // 返回列表
@@ -502,6 +505,6 @@ export default {
         color: #ed1c24;
       }
     }
-    
+
   }
 </style>

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.124/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.10/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,