shish 5 年 前
コミット
bdb67b8193

ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/css/chunk-0180ee22.10fb2cca.css


ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/css/chunk-ef0ed8ee.73ebb5bb.css


+ 2 - 2
ghs/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			body,
 			#app {
 			#app {
 				height: 100%;
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 			.once .sub-title {
 				color: #ababab;
 				color: #ababab;
 				font-size: 12px;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.19a0da74.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.19a0da74.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.9470a1b0.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.9470a1b0.js"></script></body></html>

ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/js/app.9470a1b0.js


ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/js/chunk-0180ee22.77100fd9.js


ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/js/chunk-6882e592.7ebea08c.js


ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/js/chunk-c465e424.da399862.js


ファイルの差分が大きいため隠しています
+ 0 - 0
ghs/dist/shop/js/chunk-ef0ed8ee.05ca6ab9.js


+ 16 - 12
ghs/src/views/order/list.vue

@@ -84,9 +84,12 @@
     <div class="print-html-box">
     <div class="print-html-box">
       <table border="0" width="730" style="border:solid 1px #fff;border-collapse:collapse">
       <table border="0" width="730" style="border:solid 1px #fff;border-collapse:collapse">
         <tr>
         <tr>
-          <td style="width: 260px;">客户:{{orderMsg.customName}}</td>
-          <td style="width: 260px;">单号:{{orderMsg.orderSn}}</td>
-          <td style="width: 260px;">日期:{{orderMsg.deadline}}</td>
+          <td style="width: 340px;">客户:{{orderData.customName}} {{orderData.customMobile}}</td>
+          <td style="width: 200px;">单号:{{orderData.orderSn}}</td>
+          <td style="width: 220px;">日期:{{orderData.deadline}}</td>
+        </tr>
+        <tr>
+          <td colspan="3">地址:{{orderData.fullAddress}}<span v-if="orderData.showAddress!=''">({{orderData.showAddress}})</span></td>
         </tr>
         </tr>
       </table>
       </table>
       <table border="1" width="730" style="border:solid 1px black;border-collapse:collapse">
       <table border="1" width="730" style="border:solid 1px black;border-collapse:collapse">
@@ -99,7 +102,7 @@
           <td style="width: 60px;text-align: center;">金额</td>
           <td style="width: 60px;text-align: center;">金额</td>
           <td style="width: 100px;text-align: center;">备注</td>
           <td style="width: 100px;text-align: center;">备注</td>
         </tr>
         </tr>
-        <tr v-for="(res,i) in orderMsg.product">
+        <tr v-for="(res,i) in orderData.product">
           <td style="width: 50px;text-align: center;">{{ i+1 }}</td>
           <td style="width: 50px;text-align: center;">{{ i+1 }}</td>
           <td style="width: 250px;text-align: center;">{{ res.name }}</td>
           <td style="width: 250px;text-align: center;">{{ res.name }}</td>
           <td style="width: 80px;text-align: center;">扎/支</td>
           <td style="width: 80px;text-align: center;">扎/支</td>
@@ -111,19 +114,20 @@
         </tr>
         </tr>
         <tr>
         <tr>
           <td style="width: 100px;"></td>
           <td style="width: 100px;"></td>
-          <td style="width: 100px;" colspan="2">运费:{{orderMsg.sendCost}} 合计:{{orderMsg.actPrice}}</td>
-          <td style="width: 100px;" colspan="2">实收:{{orderMsg.debt==0?orderMsg.realPrice:'0.00'}}</td>
-          <td style="width: 100px;" colspan="2">欠款:{{orderMsg.debt==1?orderMsg.realPrice:'0.00'}}</td>
+          <td style="width: 100px;font-weight:bold;" colspan="6">
+            <span>合计:{{orderData.actPrice}}<span v-if="orderData.sendCost > 0">(运费:{{orderData.sendCost}} )</span></span>
+            <span style="margin-left:30px;">实收:{{orderData.debt==0?orderData.realPrice:'0.00'}}</span>
+            <span v-if="orderData.debtAmount > 0" style="margin-left:30px;">累计欠款:{{orderData.debtAmount}}</span>
+          </td>
         </tr>
         </tr>
         <tr>
         <tr>
           <td style="width: 100px;">其他说明:</td>
           <td style="width: 100px;">其他说明:</td>
-          <td style="width: 100px;" colspan="6">{{orderMsg.remark}}</td>
+          <td style="width: 100px;" colspan="6">{{orderData.remark}}</td>
         </tr>
         </tr>
       </table>
       </table>
       <table border="0" width="730" style="border:solid 1px #fff;border-collapse:collapse">
       <table border="0" width="730" style="border:solid 1px #fff;border-collapse:collapse">
         <tr >
         <tr >
-          <td style="width: 260px;">开单:{{orderMsg.shopAdminName}}</td>
-          <td style="width: 260px;">配送:</td>
+          <td style="width: 260px;" colspan="2">开单:{{orderData.shopAdminName}}</td>
           <td style="width: 260px;">打印时间:{{todays(1)}}</td>
           <td style="width: 260px;">打印时间:{{todays(1)}}</td>
         </tr>
         </tr>
       </table>
       </table>
@@ -173,7 +177,7 @@ export default {
         }
         }
       ],
       ],
       optionData: {},
       optionData: {},
-      orderMsg:'',
+      orderData:'',
     };
     };
   },
   },
   created() {
   created() {
@@ -203,7 +207,7 @@ export default {
     },
     },
     printOrder(e){
     printOrder(e){
       this.$service.order.info({ id: e.id }).then(res => {
       this.$service.order.info({ id: e.id }).then(res => {
-        this.orderMsg = res;
+        this.orderData = res;
         this.$nextTick(() => {
         this.$nextTick(() => {
           let LODOP = getLodop();
           let LODOP = getLodop();
           LODOP.SET_PRINT_STYLE('FontSize', 13);
           LODOP.SET_PRINT_STYLE('FontSize', 13);

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません