dfdf

components/page-component/goods/u-attr.vue

@@ -199,7 +199,12 @@
 					this.screenDescription=this.service_screen.screenList[index]['description']||''
 					this.service_label = this.service_screen.screenList[index]
 					this.card_id = this.service_screen.screenList['card_id']
+					
 				} 
+				this.checked.service_label=this.service_label;
+				this.checked.card_id=this.card_id;
+				this.checked.hasScreen=this.hasCurrentServiceData();
+				this.$emit('check', this.checked,this.number);
 			// 	if(this.serviceId || this.serviceId===0){
 			// 		this.service_screen.screenList.forEach((item,index)=>{
 			
@@ -296,6 +301,9 @@
                     if (f.stock === 0 && sign <= 1) Array.prototype.push.apply(attrNum_0, arr);
 					console.log("eeeeeeeeeeeeeeeee")
 					console.log(f)
+					f.service_label=this.service_label;
+					f.card_id=this.card_id;
+					f.hasScreen=this.hasCurrentServiceData();
                     if (sign === 0) {
                         this.$emit('check', f, 1);
                     }
@@ -634,6 +642,9 @@
             },
             number: {
                 handler(newVal) {
+					this.checked.service_label=this.service_label;
+					this.checked.card_id=this.card_id;
+					this.checked.hasScreen=this.hasCurrentServiceData();
                     this.$emit('check', this.checked, newVal);
                 }
             },

plugins/clerk/order/order.vue

@@ -81,10 +81,24 @@
                     <view class="refund-text" v-if="item.refund">{{item.refund}}</view>
                     <view v-else class="clerk-btn dir-right-nowrap" >
                         <button @click="toClerk(item.id)">核销</button>
-						 <button v-if="item.sign=='booking'" @click="toTell(item.id)" style="width: 180upx;">完成维修</button>
+						<button v-if="item.sign=='booking'&&item.tellnum==0" @click="toTell(item.id)"  style="width: 180upx;">
+								{{"完成维修"}}
+						</button>
+						<button v-if="item.sign=='booking'&&item.tellnum>0" @click="toTell(item.id)"  style="width: 224upx;">
+								{{'已发送短信'+item.tellnum+'次'}}
+						</button>
                     </view>
-				
                 </view>
+				<view class='dir-right-nowrap' v-else-if="item.sign=='booking'">
+					<view  class="clerk-btn dir-right-nowrap" >
+						<button v-if="item.tellnum==0" @click="toTell(item.id)"  style="width: 180upx;">
+								{{"完成维修"}}
+						</button>
+						<button v-else-if="item.tellnum>0" @click="toTell(item.id)"  style="width: 224upx;">
+								{{'已发送短信'+item.tellnum+'次'}}
+						</button>
+					</view>
+				</view>
             </view>
         </template>
 
@@ -158,7 +172,8 @@
                 searchResult: false,
                 first: false,
                 keyword: '',
-                list: []
+                list: [],
+				send:false
             };
         },
         computed: {
@@ -551,6 +566,12 @@
             },
 			toTell(id){
 				let that=this;
+				if(that.send)
+					return;
+				that.send=true;
+				setTimeout(()=>{
+					that.send=false;
+				},2000);
 				that.$request({
 				        url: that.$api.order.order_tell,
 				        data:{

plugins/pt/goods/goods.vue

@@ -603,6 +603,7 @@
                     });
                     let newData = {
                         pintuan_order_id: 0,
+						hasScreen:this.selectAttr.hasScreen||1,
                         pintuan_group_id: this.selectGroupAttrId,
                         mch_id: this.detail.mch_id ? this.detail.mch_id : 0,
                         goods_list: [
@@ -611,7 +612,9 @@
                                 attrs,
                                 num: this.number,
                                 cat_id: 0,
-                                goods_attr_id: this.selectAttr.id
+                                goods_attr_id: this.selectAttr.id,
+								card_id:this.selectAttr.card_id,
+								service_label:this.selectAttr.service_label
                             }
                         ]
                     }
@@ -672,12 +675,15 @@
                         mch_id: goods.mch_id ? goods.mch_id : 0,
                         pintuan_order_id: 0,
                         pintuan_group_id: 0,
+						hasScreen:this.selectAttr.hasScreen||1,
                         goods_list: [{
                             id: goods.id,
                             attr: attr,
                             num: number,
                             cat_id: 0,
-                            goods_attr_id: select_attr.id
+                            goods_attr_id: select_attr.id,
+							card_id:this.selectAttr.card_id,
+							service_label:this.selectAttr.service_label
                         }]
                     }];
                     uni.navigateTo({

plugins/step/goods/goods.vue

@@ -98,7 +98,7 @@
                 :rightFunc="true"
                 @rightFunc="rightFunc"
             >
-                <view slot="priceBefore">
+                <view slot="priceBefore" v-if="selectAttr">
                     {{selectAttr.extra.value}}{{selectAttr.extra.name}} +
                 </view>
             </u-attr>