shish пре 4 година
родитељ
комит
c8597fe322

+ 5 - 1
hdApp/src/admin/home/components/order-item.vue

@@ -8,7 +8,11 @@
 				<view class="list-msg">
 				<view class="list-msg">
 					<view style="margin-top:3upx;"><text>时间:</text><text>{{info.addTime.substr(5,11)}}</text></view>
 					<view style="margin-top:3upx;"><text>时间:</text><text>{{info.addTime.substr(5,11)}}</text></view>
 					<view><text>收花:</text><text>{{info.receiveUserName||''}}</text></view>
 					<view><text>收花:</text><text>{{info.receiveUserName||''}}</text></view>
-					<view style="margin-top:3upx;"><text>数量:</text><text></text></view>
+					<view style="margin-top:3upx;">
+						<text>美团:</text>
+						<text v-if="info.fromType == 4 && !$util.isEmpty(info.thirdSn)">{{info.thirdSn}}</text>
+						<text v-else></text>
+					</view>
 					<view style="margin-top:3upx;"><text>备注:</text><text>{{info.remark||''}}</text></view>
 					<view style="margin-top:3upx;"><text>备注:</text><text>{{info.remark||''}}</text></view>
 				</view>
 				</view>
 			</view>
 			</view>

+ 1 - 1
hdApp/src/admin/order/detail.vue

@@ -26,7 +26,7 @@
 
 
       <view class="module-com order-msg">
       <view class="module-com order-msg">
         <view class="module-tit">
         <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>
           <button class="admin-button-com mini-btn" @click="edit" style="float:right;">编辑</button>
         </view>
         </view>
         <view class="module-det">
         <view class="module-det">

+ 8 - 2
hdApp/src/admin/order/workOrder.vue

@@ -37,6 +37,11 @@
             <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
             <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
           </tui-list-cell>
           </tui-list-cell>
 
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 4">
+            <view class="tui-title">美团编号</view>
+            <input v-model="form.thirdSn" placeholder-class="phcolor" class="tui-input" name="thirdSn" @focus="form.thirdSn=''" placeholder="请填写编号" type="number" />
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">付款方式</view>
             <view class="tui-title">付款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
             <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
@@ -50,7 +55,7 @@
             </picker>
             </picker>
           </tui-list-cell>
           </tui-list-cell>
 
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">订金</view>
             <view class="tui-title">订金</view>
             <input type="digit" @focus="dj=''" style="width:210upx;" v-model="dj" placeholder-class="tui-placeholder"/>
             <input type="digit" @focus="dj=''" style="width:210upx;" v-model="dj" placeholder-class="tui-placeholder"/>
             <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
             <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
@@ -110,7 +115,8 @@ export default {
         name:"花束",
         name:"花束",
         cover:[],
         cover:[],
         num:1,
         num:1,
-        flowerNum:''
+        flowerNum:'',
+        thirdSn:''
       },
       },
       goodsPrice:'',
       goodsPrice:'',
 			payWayindex:0,
 			payWayindex:0,