shish 5 лет назад
Родитель
Сommit
5974b613c7

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-42590054.f829d13a.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-5e009b24.66e235c4.css


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

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				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.28567ed6.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.28567ed6.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.773477e0.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.773477e0.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.773477e0.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-42590054.58f98404.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-59dda069.b2177ec6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-5e009b24.7c7392bc.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-fa34bcba.79d89b69.js


+ 11 - 11
ghs/src/views/order/list.vue

@@ -87,9 +87,9 @@
 
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
         <tr>
-          <td style="padding: 10px;width: 260px;">客户:{{orderMsg.customName}}</td>
-          <td style="padding: 10px;width: 260px;">单号:{{orderMsg.orderSn}}</td>
-          <td style="padding: 10px;width: 260px;">日期:{{orderMsg.deadline}}</td>
+          <td style="padding: 10px;width: 260px;">客户:{{orderInfo.customName}}</td>
+          <td style="padding: 10px;width: 260px;">单号:{{orderInfo.orderSn}}</td>
+          <td style="padding: 10px;width: 260px;">日期:{{orderInfo.deadline}}</td>
         </tr>
       </table>
       <table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
@@ -102,7 +102,7 @@
           <td style="padding: 10px;width: 100px;text-align: center;">金额</td>
           <td style="padding: 10px;width: 100px;text-align: center;">备注</td>
         </tr>
-        <tr v-for="(res,i) in orderMsg.product">
+        <tr v-for="(res,i) in orderInfo.product">
           <td style="padding: 10px;width: 100px;text-align: center;">{{ i+1 }}</td>
           <td style="padding: 10px;width: 100px;text-align: center;">{{ res.name }}</td>
           <td style="padding: 10px;width: 100px;text-align: center;">扎/支</td>
@@ -113,19 +113,19 @@
           <td style="padding: 10px;width: 100px;text-align: center;"></td>
         </tr>
         <tr>
-          <td style="padding: 10px;width: 100px;" colspan="2">合计:{{orderMsg.actPrice}}</td>
-          <td style="padding: 10px;width: 100px;" colspan="2">实收:{{orderMsg.debt==0?orderMsg.actPrice:'0.00'}}</td>
-          <td style="padding: 10px;width: 100px;" colspan="2">欠款:{{orderMsg.debt==1?orderMsg.actPrice:'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">合计:{{orderInfo.actPrice}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">实收:{{orderInfo.debt==0?orderInfo.actPrice:'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">欠款:{{orderInfo.debt==1?orderInfo.actPrice:'0.00'}}</td>
           <td style="padding: 10px;width: 100px;"></td>
         </tr>
         <tr>
           <td style="padding: 10px;width: 100px;">其他说明:</td>
-          <td style="padding: 10px;width: 100px;" colspan="6">{{orderMsg.remark}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="6">{{orderInfo.remark}}</td>
         </tr>
       </table>
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
         <tr >
-          <td style="padding: 10px;width: 260px;">开单:{{orderMsg.shopAdminName}}</td>
+          <td style="padding: 10px;width: 260px;">开单:{{orderInfo.shopAdminName}}</td>
           <td style="padding: 10px;width: 260px;">配送:</td>
           <td style="padding: 10px;width: 260px;">打印时间:{{todays(1)}}</td>
         </tr>
@@ -176,7 +176,7 @@ export default {
 				}
 			],
 			optionData: {},
-      orderMsg:'',
+      orderInfo:'',
 		};
 	},
 	created() {
@@ -206,7 +206,7 @@ export default {
 		},
     printOrder(e){
       this.$service.order.info({ id: e.id }).then(res => {
-        this.orderMsg = res;
+        this.orderInfo = res;
         this.$nextTick(() => {
           let LODOP = getLodop();
 

Некоторые файлы не были показаны из-за большого количества измененных файлов