订单列表

ghsApp/src/admin/home/components/OrderItem.vue

@@ -12,7 +12,7 @@
           <view class="other-refund" v-if="item.refund==2">有退款</view>
           <view class="other-status" v-if="item.debt == 1">欠款</view>
           <text class="other-book" v-if="item.book == 1" >预订单</text>
-          <view :class="['status',item.status == '3' ? 'buleColor' : item.status == '6' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
+          <view :class="['status',item.status == '4' ? 'buleColor' : item.status == '1' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
         </view>
         <view class="order-list_info">
         <view class="order-info_box">
@@ -44,11 +44,8 @@
         </view>
         <div class="list-bottom">
             <div class="list-button">
-                <view v-for="s in item.buttonList" :key="s.type">
-                <button @click.stop="orderEventBtn(s, item)" v-if="s.show == 1" :disabled="s.disable === 1" class="admin-button-com bule" :class="s.disable === 1 ? 'active' : ''">
-                                    {{ s.type === "print" ? s.name+`(${item.printNum})` : s.name}}
-                </button>
-                </view>
+                <view v-if="item.status == 1 || item.status == 5"><button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button> </view>
+                <view><button @click.stop="printOrder(item)" class="admin-button-com bule">打印</button> </view>
             </div>
         </div>
     </view>
@@ -73,8 +70,8 @@ export default {
 		};
 	},
 	methods: {
-		orderEventBtn(s,item) {
-			this.$emit('orderEventBtn', s,item)
+		printOrder(item) {
+			this.$emit('printOrder', item)
 		},
     statusFormat(status) {
         switch (status) {

ghsApp/src/admin/home/order.vue

@@ -20,15 +20,12 @@
       <block v-if="!$util.isEmpty(list.data)">
         <div class="list" v-for="(item, index) in list.data" :key="index">
 
-          <OrderItem :item="item" :isScanEnv="isScanEnv" @orderEventBtn="orderEventBtn"></OrderItem>
+          <OrderItem :item="item" :isScanEnv="isScanEnv" @printOrder="printOrder"></OrderItem>
 
         </div>
       </block>
       <block v-else>
-        <app-wrapper-empty
-          title="暂无数据"
-          :is-empty="$util.isEmpty(list.data)"
-        />
+        <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
       </block>
     </div>
 
@@ -46,9 +43,9 @@ import { mapGetters } from "vuex";
 import { getListB} from "@/api/order";
 import AppSearchModule from "@/components/module/app-search";
 import DropShopSelect from "@/components/module/shopSelect";
-import orderMixin from "@/mixins/order";
 import OrderItem from "./components/OrderItem";
 import DateSelect from "@/components/module/dateSelect";
+import { cloudPrintOrder } from "@/api/order"
 export default {
   name: "order-list",
   components: {
@@ -61,7 +58,7 @@ export default {
     DateSelect,
     NotLogin
   },
-  mixins: [list,orderMixin],
+  mixins: [list],
   computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
   data() {
     return {
@@ -150,6 +147,23 @@ export default {
 
   },
   methods: {
+    printOrder(item){
+      let that = this
+      uni.showLoading({title: '打印中...'});
+      cloudPrintOrder({id:item.id}).then((res) => {
+        uni.hideLoading()
+        if(res.code == 1){
+          if(res.data.hasNoPrint == 1){
+            that.$util.confirmModal({content:'请先设置打印机'},() => {
+              that.$util.pageTo({url: "/admin/shop/print"})
+            })
+            return false
+          }else{
+            item.printNum++
+          }
+        }
+      })
+    },
     setSearchType(){
       let that = this
       uni.showActionSheet({

ghsApp/src/mixins/order.js

@@ -1,4 +1,3 @@
-import { cloudPrintOrder } from "@/api/order";
 export default {
     data(){
         return {
@@ -72,54 +71,40 @@ export default {
                 },
               });
             }else if (s.type === "print") {
-              uni.showLoading({title: '打印中...'});
-              cloudPrintOrder({id:item.id}).then((res) => {
-                uni.hideLoading()
-                if(res.code == 1){
-                  if(res.data.hasNoPrint == 1){
-                    that.$util.confirmModal({content:'请先设置打印机'},() => {
-                      that.$util.pageTo({url: "/admin/shop/print"})
-                    })
-                    return false
-                  }else{
-                    item.printNum++
-                    console.log('aaaa',item)
-                  }
+
+            }else if(s.type == 'confirm'){
+                let self = this;
+                uni.showActionSheet({
+                    itemList: ['请选择结算方式：', '欠款', '已收款'],
+                    success: function (res) {
+                if(res.tapIndex == 0){
+                  return false
                 }
-              })
-                  }else if(s.type == 'confirm'){
-                      let self = this;
-                      uni.showActionSheet({
-                          itemList: ['请选择结算方式：', '欠款', '已收款'],
-                          success: function (res) {
-                  if(res.tapIndex == 0){
+                        let payWay = 0
+                        let title = res.tapIndex == 1 ? '确认客户欠款？' : '确认已收款？'
+                        //1欠款 2已收款
+                        let clearType = res.tapIndex == 1 ? 1 : 2;
+                        //选择的已收款，还需要选择收款方式
+                        if(clearType == 2){
+                            uni.showActionSheet({
+                                itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
+                                success: function (respond) {
+                                    let currentIndex = respond.tapIndex
+                                    let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
+                                    if(currentIndex == 0){
                     return false
                   }
-                              let payWay = 0
-                              let title = res.tapIndex == 1 ? '确认客户欠款？' : '确认已收款？'
-                              //1欠款 2已收款
-                              let clearType = res.tapIndex == 1 ? 1 : 2;
-                              //选择的已收款，还需要选择收款方式
-                              if(clearType == 2){
-                                  uni.showActionSheet({
-                                      itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
-                                      success: function (respond) {
-                                          let currentIndex = respond.tapIndex
-                                          let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-                                          if(currentIndex == 0){
-                          return false
+                                    payWay = inWay[currentIndex].id
+                                    let params = {id:item.id,clearType:clearType,payWay:payWay}
+                                    self.toConfrim(params,title)
+                                }
+                            })
+                        }else{
+                            let params = {id:item.id,clearType:clearType,payWay:payWay}
+                            self.toConfrim(params,title)
                         }
-                                          payWay = inWay[currentIndex].id
-                                          let params = {id:item.id,clearType:clearType,payWay:payWay}
-                                          self.toConfrim(params,title)
-                                      }
-                                  })
-                              }else{
-                                  let params = {id:item.id,clearType:clearType,payWay:payWay}
-                                  self.toConfrim(params,title)
-                              }
-                          }
-                      });
+                    }
+                });
             }else if(s.type == 'cancel'){
               let that = this;
               that.$util.confirmModal({content:'确认取消？'},() => {

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -77,7 +77,7 @@ export default {
 				that.flowersList = res.data.list;
 				that.productList = [];
 				that.flowersList.forEach(function(item){
-					that.productList.push({id:item.id,price:item.autoPrice,skPrice:item.skPrice,skMore:item.skMore})
+					that.productList.push({id:item.id,price:parseFloat(item.autoPrice),skPrice:parseFloat(item.autoSkPrice),skMore:item.skMore})
 				})
 			});
 		},