优化

hdApp/src/admin/home/order.vue

@@ -28,7 +28,8 @@
               <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
             </view>
             <view class="list-button">
-                <view class="admin-button-com middle" @click.stop="sendOrderFn(item)">发货</view>
+                <view class="admin-button-com middle" v-if="item.payStatus == 2" @click.stop="sendOrderFn(item)">发货</view>
+                <view class="admin-button-com default" v-else>发货</view>
                 <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
                 <view class="admin-button-com default" v-else>打印</view>
             </view>

hdPad/src/pages/home/components/orderInfo.vue

@@ -5,22 +5,8 @@
   </view>  
   <view class="work-info" v-else>
     <view class="work-detail">
-      <view class="order-img">
-        <image :src="orderInfo.cover" @click.stop="previewImage(orderInfo.bigCover)"></image>
-      </view>
       <view class="order-item">
 
-        <view>
-          <text class="left">配送</text>
-          <text class="right" v-if="orderInfo.sendType == 1" style="color:red;font-weight:bold;">到店自取</text>
-          <text class="right" v-else style="color:red;font-weight:bold;">
-            <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
-            <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
-            <text v-else>{{orderInfo.reachDate.substr(5,9)}}</text>
-            <text style="margin-left:5upx;">{{orderInfo.reachPeriod}} 前</text>
-          </text>
-        </view>
-
         <view v-if="!$util.isEmpty(orderInfo.remark)" style="min-height:35upx;height:auto;">
           <text class="right" style="color:red;">[备注] {{orderInfo.remark}}</text>
         </view>
@@ -36,28 +22,6 @@
           </text>
         </view>
 
-        <view><text class="left">数量</text>
-        <text class="right" style="color:red;font-weight:bold;">{{orderInfo.num}}</text>
-        </view>
-
-        <view v-if="orderInfo.anonymity == 1">
-          <text class="left">要求</text>
-          <text class="right" style="color:red;font-weight:bold;text-align:right;">匿名派送！！</text>
-        </view>
-
-        <view v-if="Number(orderInfo.orderDebtPrice)>0">
-          <text class="left">尾款</text>
-          <text class="right" style="color:red;font-weight:bold;">¥{{orderInfo.orderDebtPrice?parseFloat(orderInfo.orderDebtPrice):0}}</text>
-        </view>
-
-        <view v-if="orderInfo.fromType == 4">
-          <text class="left">美团编号</text>
-          <text class="right" style="color:black;font-weight:bold;">{{orderInfo.thirdSn}}</text>
-        </view>
-
-        <view><text class="left">分类</text><text class="right">{{orderInfo.catName}}</text></view>
-        <view><text class="left">名称</text><text class="right" style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:125upx;text-align:right;">{{orderInfo.name}}</text></view>
-        <view><text class="left">商品编号</text><text class="right">{{orderInfo.goodsSn}}</text></view>
         <view><text class="left">订单号</text><text class="right">{{orderInfo.orderSn}}</text></view>
         <view><text class="left">状态</text><text class="right">{{getStatus(orderInfo.status)}}</text></view>
         <view><text class="left">创建</text><text class="right">{{orderInfo.addTime ? orderInfo.addTime.substr(5,11):''}}</text></view>
@@ -65,61 +29,48 @@
     </view>
     <view class="work-item-detail">
 
-      <view class="flex-space right-detail-title" v-if="getMyShopInfo.stockModel && getMyShopInfo.stockModel == 1">每份用材
-        <text v-if="orderInfo.stockLock && orderInfo.stockLock == 1 && orderInfo.status == 0" style="color:red;">（不可修改）</text></view>
-      <view class="flex-space right-detail-title" v-else>使用花材
-        <text v-if="orderInfo.stockLock && orderInfo.stockLock == 1 && orderInfo.status == 0" style="color:red;">（不可修改）</text></view>
-      
+      <view class="flex-space right-detail-title">商品列表</view>
+
       <view class="unit-use-item">
         <view class="commodity-list">
-          <view v-for="(s, idx) in selectList" :key="idx" class="commodity-item" >
-            <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
+          <view v-for="(s, idx) in orderInfo.itemInfoList" :key="idx" class="commodity-item" >
+            <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
             <view class="item-info">
               <view class="info-line">
                 <text class="item-name">{{ s.name }}</text>
                 <text class="item-price">
-                  <text class="unit">{{s.currentNum}}{{s.unitName}}</text>
+                  <text class="unit">{{s.num}}{{s.unitName}}</text>
                 </text>
               </view>
               <view class="info-line">
-                <text class="item-type">{{s.ratio}}{{s.smallUnit}}/{{s.bigUnit}}</text>
+                <text class="item-type"></text>
               </view>
             </view>
           </view>
-        </view>
-      </view>
 
-      <view style="height:2vh;background-color:#EEEEEE;" v-if="getMyShopInfo.stockModel && getMyShopInfo.stockModel == 1"></view>
-
-      <view class="flex-space right-detail-title" v-if="getMyShopInfo.stockModel && getMyShopInfo.stockModel == 1"> 总共用材 </view>
-      
-      <view class="total-use-item" v-if="getMyShopInfo.stockModel && getMyShopInfo.stockModel == 1">
-        <view class="commodity-list">
-          <view v-for="(s, idx) in selectList" :key="idx" class="commodity-item" >
-            <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
+          <view v-for="(s, idx) in orderInfo.goodsInfoList" :key="idx" class="commodity-item" >
+            <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
             <view class="item-info">
               <view class="info-line">
                 <text class="item-name">{{ s.name }}</text>
                 <text class="item-price">
-                  <text class="unit">{{(s.currentNum*orderInfo.num).toFixed()}}{{s.unitName}}</text>
+                  <text class="unit">{{s.num}}份</text>
                 </text>
               </view>
               <view class="info-line">
-                <text class="item-type">{{s.ratio}}{{s.smallUnit}}/{{s.bigUnit}}</text>
-                <text style="font-size:9upx;position:relative;right:80upx;top:10upx;" v-if="Number(s.wastNum)>0">{{s.wastNum}}{{s.wastUnitName}}</text>
-                <button class="wastage" @click="wastageFn(s)">报损</button>
+                <text class="item-type"></text>
               </view>
             </view>
           </view>
+
         </view>
       </view>
 
-
     </view>
 
     <view class="button-area">
-      <view :class="[orderInfo.status==1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
-      <view :class="[orderInfo.status==0 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>
+      <view :class="[orderInfo.status!=1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
+      <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>
     </view>
 
     <!-- 选数量金额 -->
@@ -208,25 +159,37 @@ export default {
     getStatus(status) {
       status = Number(status)
       switch (status) {
-          case 0:
-          return "待完成";
-          break;
           case 1:
-          return "已完成";
+          return "待付款";
           break;
           case 2:
+          return "待配送";
+          break;
+          case 3:
+          return "配送中";
+          break;
+          case 4:
+          return "已完成";
+          break;
+          case 5:
           return "已取消";
           break;
           default:
-          return "待完成";
+          return "待付款";
       }
     },
     getOrderDetail(id){
       getDetail({id}).then(res=>{
         if(res.code == 1){
-          this.orderInfo = res.data.info
+          this.orderInfo = res.data
         }
       })
+    },
+    printFn(){
+
+    },
+    cancelFn(){
+
     }
   }
 }
@@ -312,7 +275,7 @@ export default {
       font-size:10upx;
       font-weight:bold;
       margin-left:5upx;
-      margin-top:5upx;
+      margin-top:10upx;
     }
     & .unit-use-item {
       flex: 40;

hdPad/src/pages/home/components/orderList.vue

@@ -2,9 +2,9 @@
     <view class="itemList-box">
         <view class="title">列表</view>
         <view class="order-status">
+            <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">全部</view>
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">待完成</view>
             <view @tap="changeStatus(4)" :class="[{'checked':status===4}]">已完成</view>
-            <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">全部</view>
         </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
         :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
@@ -59,7 +59,7 @@ export default {
             currentJobType:'bill',
             currentJobId:0,
             groupList:[],
-            status:1,
+            status:0,
             selectOrderId:0,
             triggered:false,
             _freshing: false,
@@ -82,19 +82,11 @@ export default {
         if(this.mt == 'yes'){
             this.snTitle = '美团编号'
         }
-        this.listenOrder()
     },
     destroyed(){
         clearInterval(this.t)
     },
     methods:{
-        listenOrder(){
-            //有新制作单时自动刷新
-            let that = this
-            this.t = setInterval(function () {
-                that.getOrderInfoList(1)
-            },5000)
-        },
         refreshList(){
             this.resetList()
             this.getOrderInfoList()

hdPad/src/pages/home/components/selectNumPrice.vue

@@ -32,7 +32,7 @@
             </view>
 
             <view style="text-align:center;" v-if="customData.property==0">
-            <button class="admin-button-com mini-btn blue" @click="clear()">结算</button>
+            <button class="admin-button-com mini-btn blue" @click="clear()">扫码付</button>
             </view>
 
         </view>

hdPad/src/pages/home/components/selectPrice.vue

@@ -9,7 +9,7 @@
                     </div>
                 </view>
             </view>
-            <input class="goods-name" v-model="name" placeholder="商品名称（选填）" placeholder-class="grey-color" />
+            <input class="goods-name" v-model="name" placeholder="商品名称" placeholder-class="grey-color" />
             <view class="flower-open_box">
                 <view @tap="checkCurrent(2)" style="position:relative;">
                     <view class="desc">