制作单

hdApp/src/admin/home/order.vue

@@ -29,7 +29,7 @@
               <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" v-if="item.payStatus == 2" @click.stop="sendOrderFn(item)">发货</view>
+                <view class="admin-button-com middle" v-if="item.status == 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>

hdApp/src/admin/order/components/detail-work.vue

@@ -0,0 +1,76 @@
+<template>
+	<view class="list-module" @click="goTo(info)">
+		<block v-if="!$util.isEmpty(info)">
+			<view class="list-left">
+				<view class="image">
+					<image :src="info.smallCover" mode="aspectFit" style="width:95upx;height:95upx;"></image>
+				</view>
+				<view class="list-msg">
+					<view class="title">{{info.workSn}} {{info.goodsSn}} {{ info.name}}</view>
+				</view>
+			</view>
+			<view class="list-right">
+				<view class="price">X&nbsp;{{ info.num||0 }}</view>
+				<view class="num">{{info.status==0?'待完成':info.status==1?'已完成':info.status==2?'已取消':''}}</view>
+			</view>
+		</block>
+	</view>
+</template>
+<script>
+export default {
+	name: 'detailWork',
+	props: {
+		info: {
+			type: Object,
+			default: () => {}
+		}
+	},
+	data() {
+		return {}
+	},
+	methods: {
+		goTo(item){
+			this.$util.pageTo({url:'/admin/work/detail?id='+item.id})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.list-module {
+	@include disFlex(center, space-between);
+	padding: 10upx 0;
+	border-bottom: 1px solid $borderColor;
+	.list-left {
+		@include disFlex(flex-start, space-between);
+		.image {
+			width:95upx;
+		}
+		.list-msg {
+			margin-left: 20upx;
+			.title {
+				font-size: 28upx;
+				color: $fontColor2;
+				margin-bottom: 10upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 420upx;
+			}
+			.desc {
+				color: $fontColor3;
+			}
+		}
+	}
+	.list-right {
+		text-align: right;
+		color: $fontColor2;
+		.price {
+			margin-bottom:30upx;
+			color: #333;
+		}
+		.num{
+			color:rgb(43, 100, 43);
+		}
+	}
+}
+</style>

hdApp/src/admin/order/detail.vue

@@ -1,6 +1,7 @@
 <template>
   <view class="app-content">
     <view class="page-det">
+
       <view class="module-com">
         <view class="module-tit">商品信息</view>
         <view class="module-det">
@@ -13,31 +14,23 @@
         </view>
       </view>
 
-      <view class="module-com order-msg" v-if="!$util.isEmpty(orderInfo.remark)">
-        <view class="module-det">
-          <view class="order-msg-blo">
-            <view class="msg-list">
-              <view class="label">备注：</view>
-              <view class="value" style="color:red;font-weight:bold;">{{orderInfo.remark}}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-
       <view class="module-com order-msg">
         <view class="module-tit">
           收花人信息<text v-if="orderInfo.fromType == 4 && !$util.isEmpty(orderInfo.thirdSn)">（美团编号：{{orderInfo.thirdSn}}）</text>
           <button class="admin-button-com mini-btn" @click="edit" style="float:right;">编辑</button>
         </view>
         <view class="module-det">
+
           <view class="order-msg-blo">
-            <view class="msg-list">
-              <view class="label">名称：</view>
-              <view class="value">{{ orderInfo.receiveUserName }}</view>
+
+            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.remark)">
+              <view class="label">备注：</view>
+              <view class="value" style="color:red;font-weight:bold;width:580upx;min-height:28upx;height:auto;word-break:break-all;">{{orderInfo.remark}}</view>
             </view>
+
             <view class="msg-list">
-              <view class="label">电话：</view>
-              <view class="value" @click="callUp(orderInfo.receiveMobile)">{{ orderInfo.receiveMobile }}</view>
+              <view class="label">收花：</view>
+              <view class="value">{{ orderInfo.receiveUserName }} <text style="margin-left:18upx;" v-if="!$util.isEmpty(orderInfo.receiveMobile)" @click="callUp(orderInfo.receiveMobile)">{{orderInfo.receiveMobile}}</text></view>
             </view>
             <view class="msg-list">
               <view class="label">地址：</view>
@@ -57,7 +50,7 @@
               </view>
             </view>
             <view class="msg-list">
-              <view class="label">贺卡内容：</view>
+              <view class="label">寄语：</view>
               <view class="value">{{ orderInfo.cardInfo || '' }}</view>
             </view>
             <view class="msg-list" v-if="orderInfo.sendType == 1">
@@ -65,17 +58,23 @@
               <view class="value" style="font-weight:bold;color:red;">到店自取</view>
             </view>
             <view class="msg-list" v-if="!$util.isEmpty(orderInfo.bookName)">
-              <view class="label">订花人：</view>
-              <view class="value">{{orderInfo.bookName}}</view>
-            </view>
-            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.bookMobile)">
-              <view class="label">订花人电话：</view>
-              <view class="value" @click="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</view>
+              <view class="label">订花：</view>
+              <view class="value">{{orderInfo.bookName}} <text style="margin-left:18upx;" v-if="!$util.isEmpty(orderInfo.bookMobile)" @click="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</text></view>
             </view>
           </view>
         </view>
       </view>
 
+      <view class="module-com" v-if="!$util.isEmpty(orderInfo.workList)">
+        <view class="module-tit">制作单</view>
+        <view class="module-det">
+          <block v-if="!$util.isEmpty(orderInfo.workList)">
+            <detailWork v-for="(items, subIndex) in orderInfo.workList" :key="subIndex" :info="items"></detailWork>
+          </block>
+
+        </view>
+      </view>
+
       <view class="module-com order-msg">
         <view class="module-tit">
           <text>订单信息</text>
@@ -181,6 +180,7 @@
 </template>
 <script>
 import detailGoods from "./components/detail-goods.vue";
+import detailWork from "./components/detail-work.vue";
 import detailItem from "./components/detail-item.vue";
 import AppCoupon from "@/components/app-coupon-sel";
 import ModalModule from "@/components/plugin/modal";
@@ -191,7 +191,7 @@ const commonUtil = require("@/utils/common.js");
 import { confirmSettle } from "@/api/settle/index"
 export default {
   name: "detail",
-  components: { detailGoods, AppCoupon, ModalModule, RateModule,detailItem },
+  components: { detailGoods, AppCoupon, ModalModule, RateModule,detailItem,detailWork },
   data() {
     return {
       constant: this.$constant,