no message

src/views/order/cloth/collectCloth.vue

@@ -39,9 +39,12 @@
                                 {{ (appUserInfo.welfareBalance * 100) / 100 }}
                             </el-descriptions-item>
                             <el-descriptions-item label="地址" :span="2">{{ appUserInfo.defaultAddress ? appUserInfo.defaultAddress.address + ' ' + appUserInfo.defaultAddress.addressDetail : '' }}</el-descriptions-item>
-                        </el-descriptions>
-                        <!--  -->
-                        <el-button type="text" @click="showAdvanceOrder = true">选择预约订单</el-button>
+                            <el-descriptions-item label="预约订单">
+                                <a style="color: #409eff;" @click="showAdvanceOrder = true" v-if="orderForm.orderNo">{{ orderForm.orderNo }}</a>
+                                <a style="color: #409eff;"  @click="showAdvanceOrder = true" v-if="!orderForm.orderNo">选择预约订单</a>
+                                <a style="color: #409eff; margin-left: 10px;" @click="clearAppointment" v-if="orderForm.orderNo">删除</a>
+                            </el-descriptions-item>
+                        </el-descriptions>                        
                     </el-card>
                 </el-col>
                 <el-col :span="18" :xs="24">
@@ -493,8 +496,8 @@
         <pay-status-popup ref="payStatusPopup" @paySuccess="handelPaySuccess"></pay-status-popup>
         <el-dialog title="预约订单" :visible.sync="showAdvanceOrder" width="55%">
             <el-table :data="advanceOrderList">
-                <el-table-column prop="date" label="预约单号" width="180"> </el-table-column>
-                <el-table-column prop="date" label="预约时间" width="180"> </el-table-column>
+                <el-table-column prop="orderNo" label="预约单号" width="180"> </el-table-column>
+                <el-table-column prop="createTime" label="预约时间" width="180"> </el-table-column>
                 <el-table-column prop="date" label="是否大件" width="180"> </el-table-column>
                 <el-table-column prop="date" label="是否拆装" width="180"> </el-table-column>
                 <el-table-column prop="date" label="件数" width="180"> </el-table-column>
@@ -1082,7 +1085,7 @@ export default {
                 if (valid) {
                     findUserByPhoneNumber(this.queryParams).then((res) => {
                         this.appUserInfo = res.data
-                        // this.getAdvanceOrder(res.data.id)
+                        this.getAdvanceOrder(res.data.id)
                     })
                 }
             })
@@ -1096,7 +1099,8 @@ export default {
                 params: {
                     pageNum: 1,
                     pageSize: 100,
-                    user: id
+                    userId: id,
+                    isAppointment: 'Y'
                 }
             }).then((data) => {
                 if (data && data.code === 200) {
@@ -1107,6 +1111,7 @@ export default {
                     // } else {
                     //     this.data = data.rows
                     // }
+                    this.advanceOrderList = data.rows
                 } else {
                     this.$message.error(data.msg)
                 }
@@ -1116,7 +1121,12 @@ export default {
         changeAdanceOrder(e) {
             // orderForm.isAppointment orderForm.orderNo
             this.orderForm.isAppointment = 'Y'
-            this.orderForm.orderForm.orderNo = e.orderNo
+            this.orderForm.orderNo = e.orderNo
+        },
+
+        clearAppointment() {
+            this.orderForm.isAppointment = 'N'
+            this.orderForm.orderNo = ''
         },
 
         handleAddClothFlaw(index) {
@@ -1450,6 +1460,7 @@ export default {
             this.orderForm.isSpecial = 'N'
             this.orderForm.authCode = ''
             this.orderForm.payType = ''
+            this.orderForm.sendClothWay = '0'
             getDiscountByStoreId({ appUserId: this.appUserInfo.id }).then((res) => {
                 this.discountCouponVOS = res.data
                 params.discountWay = '0'

src/views/order/cloth/component/cashCloth.vue

@@ -18,7 +18,7 @@
                 </el-descriptions>
             </el-card>
 
-            <el-card style="margin-top: 10px">
+            <el-card style="margin-top: 10px" v-if="orderForm.isAppointment === 'N'">
                 <div slot="header" class="clearfix">
                     <span>优惠信息</span>
                 </div>
@@ -206,8 +206,8 @@
                 </el-tabs>
             </el-card>
 
-            <el-card style="margin-top: 10px">
-                <div slot="header" class="clearfix">
+            <el-card style="margin-top: 10px" v-if="orderForm.isAppointment === 'N'">
+                <div slot="header" class="clearfix" v-if="orderForm.isAppointment === 'N'">
                     <span>收款方式</span>
                     <template v-if="calculateTotalDiscountAmountByCoupon()">
                         <span style="margin-left: 10px">优惠券优惠</span>
@@ -231,7 +231,7 @@
                     <span style="color: #ff4949">{{ (parseInt(calculateTotalPrice() * 100) + parseInt(calculateDeliveryPrice() * 100) - parseInt(calculateTotalDiscountAmount() * 100)) / 100 }}</span>
                     <span>元</span>
                 </div>
-                <el-form-item label="支付方式" prop="payType">
+                <el-form-item label="支付方式" prop="payType" v-if="orderForm.isAppointment === 'N'">
                     <el-radio-group v-model="orderForm.payType" @change="changePayType">
                         <el-radio-button label="3" name="3">余额</el-radio-button>
                         <el-radio-button label="2" name="2">现金</el-radio-button>
@@ -251,10 +251,13 @@
                     <el-descriptions-item label="支付后余额（元）" v-if="appUserInfo">{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance - calculateTotalPrice() }}</el-descriptions-item>
                 </el-descriptions>
 
-                <div style="margin-top: 20px">
+                <div style="margin-top: 20px"  v-if="orderForm.isAppointment === 'N'">
                     <el-button type="primary" @click="submitForm(0)" style="margin-right: 10px">立即支付</el-button>
                     <el-button type="primary" @click="submitForm(1)" style="margin-right: 5%">取衣支付</el-button>
                 </div>
+                <div style="margin-top: 20px"  v-if="orderForm.isAppointment === 'Y'">
+                    <el-button type="primary" @click="submitForm(3)" style="margin-right: 10px" >确认定价</el-button>
+                </div>
             </el-card>
         </el-form>