yuantianjiao 6 年前
父节点
当前提交
c703bb47e5

+ 1
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue 查看文件

253
       }
253
       }
254
     },
254
     },
255
     returnStr (val) {
255
     returnStr (val) {
256
-      return (this.paytype.filter(x => x.id === val)[0] || {}).value || '';
256
+      return (this.paytype.filter(x => x.id === val)[0] || {}).value || ''
257
     },
257
     },
258
     returnListItem (target, index) {
258
     returnListItem (target, index) {
259
       return target[Math.ceil((index + 1) / 2) - 1]
259
       return target[Math.ceil((index + 1) / 2) - 1]

+ 5
- 1
src/pages/system/newOrder/newOrderList/index.vue 查看文件

44
             </div>
44
             </div>
45
           </div>
45
           </div>
46
           <div style="padding:10px 20px;border-bottom:1px solid #cccccc;white-space: normal;">备注:{{item.Remark}}</div>
46
           <div style="padding:10px 20px;border-bottom:1px solid #cccccc;white-space: normal;">备注:{{item.Remark}}</div>
47
-          <div style="padding:10px 20px;" @click="printPdf(`item${index}`)">下单人:{{item.UserName}}</div>
47
+          <div style="padding:10px 20px;">下单人:{{item.UserName}}</div>
48
         </div>
48
         </div>
49
         <div class="print-area" :class="'item_' + item.OrdersId" style="width:180px;">
49
         <div class="print-area" :class="'item_' + item.OrdersId" style="width:180px;">
50
           <div style="padding:0px 10px 5px;border-bottom:2px solid #cccccc;">
50
           <div style="padding:0px 10px 5px;border-bottom:2px solid #cccccc;">
297
       // let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
297
       // let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
298
       this.updateList({ list: this.list.concat(newList) }).then(() => {
298
       this.updateList({ list: this.list.concat(newList) }).then(() => {
299
         newList.forEach((it) => {
299
         newList.forEach((it) => {
300
+          console.log(it)
301
+          if (it.IsIntimidate === 0) {
302
+            console.log("print")
303
+          }
300
           // console.log('it:', it)
304
           // console.log('it:', it)
301
           this.printPdf(`item_${it.OrdersId}`)
305
           this.printPdf(`item_${it.OrdersId}`)
302
           this.putPrintGoodsOrder({
306
           this.putPrintGoodsOrder({