shish 4 лет назад
Родитель
Сommit
c8c8431d6c

+ 33 - 14
hdPad/src/admin/work/components/order-info.vue

@@ -1,19 +1,20 @@
 <template>
+
     <view class="work-info">
         <view class="work-detail">
           <view class="order-img">
-            <image :src="orderDetail.info.cover"></image>
+            <image :src="orderInfo.cover"></image>
           </view>
           <view class="order-item">
-            <view><text class="left">分类</text><text class="right">{{orderDetail.info.catName}}</text></view>
-            <view><text class="left">名称</text><text class="right">{{orderDetail.info.name}}</text></view>
-            <view><text class="left">数量</text><text class="right">{{orderDetail.info.num}}</text></view>
-            <view><text class="left">商品编号</text><text class="right">{{orderDetail.info.goodsId}}</text></view>
-            <view><text class="left">售价</text><text class="right">{{orderDetail.info.price||''}}</text></view>
-            <view><text class="left">工单号</text><text class="right">{{orderDetail.info.workSn}}</text></view>
-            <view><text class="left">订单号</text><text class="right">{{orderDetail.info.orderSn}}</text></view>
-            <view><text class="left">状态</text><text class="right">待制作</text></view>
-            <view><text class="left">备注</text><text class="right">{{orderDetail.info.remark}}</text></view>
+            <view><text class="left">分类</text><text class="right">{{orderInfo.catName}}</text></view>
+            <view><text class="left">名称</text><text class="right">{{orderInfo.name}}</text></view>
+            <view><text class="left">数量</text><text class="right">{{orderInfo.num}}</text></view>
+            <view><text class="left">商品编号</text><text class="right">{{orderInfo.goodsId}}</text></view>
+            <view><text class="left">售价</text><text class="right">{{orderInfo.price||''}}</text></view>
+            <view><text class="left">工单号</text><text class="right">{{orderInfo.workSn}}</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.remark}}</text></view>
           </view>
         </view>
         <view class="work-item-detail">
@@ -22,7 +23,7 @@
           
           <view class="unit-use-item">
             <view class="commodity-list">
-              <view v-for="(s, idx) in orderDetail.item" :key="idx" class="commodity-item" >
+              <view v-for="(s, idx) in orderItem" :key="idx" class="commodity-item" >
                 <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
                 <view class="item-info">
                   <view class="info-line">
@@ -49,7 +50,7 @@
           
           <view class="total-use-item">
             <view class="commodity-list">
-              <view v-for="(s, idx) in orderDetail.item" :key="idx" class="commodity-item" >
+              <view v-for="(s, idx) in orderItem" :key="idx" class="commodity-item" >
                 <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
                 <view class="item-info">
                   <view class="info-line">
@@ -79,13 +80,15 @@
         </view>
 
     </view>
+
 </template>
 <script>
 import { getFullInfo } from '@/api/work'
 export default {
   data() {
     return {
-      orderDetail:[]
+      orderInfo:[],
+      orderItem:[]
     }
   },
   props: {
@@ -105,10 +108,26 @@ export default {
       }
   },
   methods:{
+    getStatus(status) {
+        switch (status) {
+            case "0":
+            return "待完成";
+            break;
+            case "1":
+            return "已完成";
+            break;
+            case "2":
+            return "已取消";
+            break;
+            default:
+            return "待完成";
+        }
+    },
     getOrderDetail(id){
       getFullInfo({id}).then(res=>{
         if(res.code == 1){
-          this.orderDetail = res.data
+          this.orderInfo = res.data.info
+          this.orderItem = res.data.item
         }
       })
     }

+ 2 - 5
hdPad/src/admin/work/components/order-list.vue

@@ -7,8 +7,8 @@
             <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
         </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
-            <view v-for="item in list.data" :key="item.id" class="show-item_box" :class="[{'selected':selectOrderId==item.id}]" @click="getOrder(item)">
-                <view class="item-body_box not-active">
+            <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrder(item)">
+                <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
                         <view class="current-item-title"><text class="name">{{item.name}}</text></view>
                         <image class="flower-image" :src="item.cover"></image>
@@ -117,9 +117,6 @@ export default {
         overflow-y: auto;
         flex: 1;
         border: 1px solid #eee;
-        & .selected{
-            border:1upx solid rgb(133, 209, 133);
-        }
         & .show-item_box {
             padding: 2upx;
             & .item-body_box {

+ 0 - 1
hdPad/src/admin/work/index.vue

@@ -34,7 +34,6 @@ export default {
 		...mapGetters(["getLoginInfo"])
 	},
 	onLoad() {
-		//this.initDataFromStorage()
 	},
 	methods: {
 		getOrder(item){