소스 검색

bug 修复

lilei 3 년 전
부모
커밋
e72c4df57b
2개의 변경된 파일19개의 추가작업 그리고 9개의 파일을 삭제
  1. 7 7
      src/views/salesManagement/salesQuery/chooseCustomModal.vue
  2. 12 2
      src/views/salesManagement/salesQuery/detail.vue

+ 7 - 7
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -94,11 +94,11 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
-              <a-form-model-item label="联系手机" prop="contactMobile">
+              <a-form-model-item label="联系手机" prop="consigneeMobile">
                 <a-input
-                  id="chooseCustom-contactMobile"
+                  id="chooseCustom-consigneeMobile"
                   :maxLength="11"
-                  v-model.trim="form.contactMobile"
+                  v-model.trim="form.consigneeMobile"
                   placeholder="请输入联系电话(最多11个字符)"
                   allowClear />
               </a-form-model-item>
@@ -223,7 +223,7 @@ export default {
         buyerName: '', // 客户名称
         buyerSn: undefined, // 客户sn
         consigneeTel: '', //  联系电话
-        contactMobile: '',
+        consigneeMobile: '',
         consigneeName: '', //  联系人
         shippingAddressProvinceSn: undefined, //  省
         shippingAddressProvinceName: '',
@@ -247,7 +247,7 @@ export default {
         buyerSn: [
           { required: true, message: '请选择客户', trigger: ['change', 'blur'] }
         ],
-        contactMobile: [{ required: false, pattern: /^\d{11}$/, message: '请输入正确的手机号', trigger: 'blur' }],
+        consigneeMobile: [{ required: false, pattern: /^\d{11}$/, message: '请输入正确的手机号', trigger: 'blur' }],
         shippingAddressProvinceSn: [
           { required: true, message: '请选择省', trigger: 'change' }
         ],
@@ -363,7 +363,7 @@ export default {
             buyerName: data.customerName, // 客户名称
             buyerSn: data.customerSn, // 客户sn
             consigneeTel: data.contactTel, //  联系电话
-            contactMobile: data.contactMobile,
+            consigneeMobile: data.contactMobile,
             consigneeName: data.contactName, //  联系人
             shippingAddressProvinceSn: data.provinceSn, //  省
             shippingAddressProvinceName: data.provinceName,
@@ -393,7 +393,7 @@ export default {
         customerName: this.form.buyerName,
         customerSn: this.form.buyerSn,
         contactTel: this.form.consigneeTel, //  联系电话
-        contactMobile: this.form.contactMobile,
+        contactMobile: this.form.consigneeMobile,
         contactName: this.form.consigneeName, //  联系人
         provinceSn: this.form.shippingAddressProvinceSn, //  省
         provinceName: this.form.shippingAddressProvinceName,

+ 12 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -81,6 +81,8 @@
         </s-table>
       </a-card>
     </a-spin>
+    <!-- 针式打印预览 -->
+    <pdfViewModal ref="pdfView" :openModal="pdfViewShow" @cancel="pdfViewShow=false" @ok="handlePrint('print','NEEDLE')"></pdfViewModal>
   </div>
 </template>
 
@@ -90,11 +92,12 @@ import { getOperationalPrecision } from '@/libs/tools.js'
 import { STable, VSelect } from '@/components'
 import { salesDetailBySn, salesDetailPrint, salesDetailExport } from '@/api/sales'
 import { salesDetailList } from '@/api/salesDetail'
+import pdfViewModal from '@/views/common/pdfViewModal.vue'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
   name: 'SalesDetail',
-  components: { STable, VSelect, Print },
+  components: { STable, VSelect, Print, pdfViewModal },
   mixins: [commonMixin],
   props: {
     outBizSn: { //  有值则为弹框,无值则为页面
@@ -104,6 +107,7 @@ export default {
   },
   data () {
     return {
+      pdfViewShow: false,
       showPage: false,
       spinning: false,
       disabled: false,
@@ -169,9 +173,15 @@ export default {
       if (type == 'export') { //  导出
         url = salesDetailExport
       }
+
       // 打印或导出
-      hdPrint(printerType, type, url, params, '销售单', function () {
+      hdPrint(printerType, type, url, params, '销售单', function (data) {
         _this.spinning = false
+        console.log(data)
+        if (data && data.data.length) {
+          _this.pdfViewShow = true
+          _this.$refs.pdfView.setData(data.data)
+        }
       })
     },
     //  返回