diff --git a/src/components/SalesModule/productQuery.vue b/src/components/SalesModule/productQuery.vue index 58df1bc8070413b9b9375f442c8ced3d46c8ef2c..e690723037f13a9dd0d9ded9bb5df7851be7e252 100644 --- a/src/components/SalesModule/productQuery.vue +++ b/src/components/SalesModule/productQuery.vue @@ -144,6 +144,17 @@ .PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;} .PQ_detail tr{background: #fff;text-align: center; height: 40px;} .PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;} + .TC_HotelPop >div{ + overflow: auto; + max-height:350px; + } + .TC_HotelPop table td{ + padding:5px 0; + text-align: center; + } + .TC_HotelPop table th{ + text-align: center; + } </style> <template> <div class="flexOne"> @@ -159,7 +170,7 @@ <el-row :gutter="20"> <el-col :span="4"> <el-form-item label="客户类型" prop="CustomerType"> - <el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice();getDdlyList();getKhmdList();getTotalPrice()'> + <el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice(),resetSelect();getDdlyList();getKhmdList();getTotalPrice()'> <el-option v-for="item in khlxList" :label='item.Name' :value='item.Id' :key='item.Id'> </el-option> </el-select> @@ -771,6 +782,51 @@ <span slot="reference" class="price">æŸ¥çœ‹ä»·æ ¼æ˜Žç»†</span> </el-popover> </p> + + + <!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> + <el-popover width="600" trigger="click" popper-class="TC_HotelPop"> + <div> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> + <tr> + <th width="100">日期</th> + <th style="border-right:1px solid #E5E5E5">酒店情况</th> + <th width="100" style="border-right:1px solid #E5E5E5">å æˆ¿æ—¶é—´</th> + </tr> + <tr v-for="subItem in item.HotelOrderListReports"> + <td width="100"> + {{subItem.UseDay}} + </td> + <td style="text-align:left;padding:3px 10px;"> + <template v-if="subItem.SubList"> + <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "> + {{subItem.SubList[0].HotelName}} + <a style="color:green">{{subItem.SubList[0].Status==1?"ã€OK】":"ã€æš‚定】"}}</a> + ã€<a + style="color:green"> 本团使用库å˜ï¼š{{subItem.SubList[0].UseCount}} + {{subItem.SubList[0].CostPrice!=0?"ä»·æ ¼:"+subItem.SubList[0].CostPrice:""}}</a>】</div> + <template v-else v-for="childItem in subItem.SubList"> + <div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"ã€æš‚定】":""}}</div> + </template> + </template> + </td> + <td> + <template v-if="subItem.SubList"> + <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "> + {{subItem.SubList[0].CreateDateStr}} + </div> + <template v-else v-for="childItem in subItem.SubList"> + <div></div> + </template> + </template> + </td> + </tr> + </table> + </div> + <span slot="reference" class="price">酒店信æ¯</span> + </el-popover> + </p> --> + </div> <div class="d5"> <p><i class="iconfont icon-tuanwei"></i>团ä½ä¿¡æ¯</p> @@ -1497,21 +1553,24 @@ } }, err => {}) }, + resetSelect(){ + if (this.addMsg.CustomerType == 1) { + this.addMsg.CustomerId = '' + } + if (this.addMsg.CustomerType == 2) { + this.addMsg.CustomerId = '' + } + }, getTypePrice() { this.addMsg.ContactName = '' this.addMsg.ContactMobile = '' - console.log('this.addMsg.CustomerType', this.addMsg.CustomerType) if (this.addMsg.CustomerType == 1) { this.addMsg.TC_Price = this.addObj.B2BMemberPrice this.addMsg.Unit_Price = this.addObj.B2BMemberPrice; - this.addMsg.CustomerId = '' - } if (this.addMsg.CustomerType == 2) { this.addMsg.TC_Price = this.addObj.B2BPrice this.addMsg.Unit_Price = this.addObj.B2BPrice; - this.addMsg.CustomerId = '' - } if (this.addMsg.CustomerType == 3) { this.addMsg.TC_Price = this.addObj.B2CMemberPrice @@ -1990,9 +2049,9 @@ for (let i = 0; i < res.data.data.pageData.length; i++) { res.data.data.pageData[i]['wxImage'] = '' } - this.list = res.data.data.pageData + this.list = res.data.data.pageData; } else { - this.$message.error(res.data.message) + this.Error(res.data.message) } }, err => {}) }, @@ -2010,7 +2069,7 @@ if (res.data.resultCode == 1) { this.tripDetails = res.data.data.FlightList } else { - this.$message.error(res.data.message) + this.Error(res.data.message) } }, err => {})