许成详 6 anos atrás
pai
commit
c57ad13aab

+ 1
- 1
dist/index.html Ver arquivo

@@ -1 +1 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.ddd3e8ee05b5a16ce2dc1b46b188c78d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.340c2242190d5ca52316.js></script><script type=text/javascript src=./static/js/app.b7544dd4ce21aa7a1107.js></script></body></html>
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.19fc0d1bf5775a517653ed116fdb9349.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.d57b52b0d502adaf2a8c.js></script></body></html>

+ 2
- 2
src/pages/system/dataStatistics/goodsOrderList/index.vue Ver arquivo

@@ -76,7 +76,7 @@
76 76
           </div>
77 77
         </td>
78 78
         <td v-if="index%2 !== 0" colspan="4" class="noborder">
79
-          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}{{subItem.SpecName}}</span>
79
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}{{subItem.SpecName !== '' ? '(' + subItem.SpecName + ')' : ''}}</span>
80 80
         </td>
81 81
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
82 82
           <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>
@@ -236,7 +236,7 @@ export default {
236 236
       this.getGoodsOrderList(this.postData).then((res) => {
237 237
         // console.log(JSON.stringify(res))
238 238
         this.postData.page = res.page
239
-        this.total = res.total
239
+        this.total = res.pagenum
240 240
       })
241 241
     },
242 242
     printPdf (cl) {