Commit 2b1f2ebe authored by youjie's avatar youjie

应收总额详情

parent c0293224
...@@ -431,7 +431,10 @@ ...@@ -431,7 +431,10 @@
<td style="color: #ff9c00">{{ item.tC_Price }}</td> <td style="color: #ff9c00">{{ item.tC_Price }}</td>
<td style="color: #ff9c00">¥{{ item.unit_Price }}</td> <td style="color: #ff9c00">¥{{ item.unit_Price }}</td>
<td> <td>
<p style="color: #ff9c00">¥{{ item.preferPrice }}</p> <p style="color: #ff9c00">
<!-- ¥{{ item.preferPrice }} -->
<PriceDetail :OrderId="item.orderId" :PreferPrice="item.preferPrice"></PriceDetail>
</p>
</td> </td>
<td> <td>
...@@ -739,10 +742,12 @@ ...@@ -739,10 +742,12 @@
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../commonPage/updateSalesMan.vue"; import updateSalesMan from "../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default { export default {
components: { components: {
Treeselect, Treeselect,
updateSalesMan, updateSalesMan,
PriceDetail,
}, },
data() { data() {
return { return {
......
...@@ -1793,7 +1793,10 @@ ...@@ -1793,7 +1793,10 @@
<td style="color: #ff9c00">{{ item.unit_Price }}</td> <td style="color: #ff9c00">{{ item.unit_Price }}</td>
<td> <td>
<p style="color: #ff9c00">{{ item.preferPrice }}</p> <p style="color: #ff9c00">
<!-- {{ item.preferPrice }} -->
<PriceDetail :OrderId="item.orderId" :PreferPrice="item.preferPrice"></PriceDetail>
</p>
</td> </td>
<td> <td>
<el-popover style="padding: 0" width="370" trigger="click"> <el-popover style="padding: 0" width="370" trigger="click">
...@@ -2162,7 +2165,7 @@ ...@@ -2162,7 +2165,7 @@
}}<span v-if="item.oneSex > 0" }}<span v-if="item.oneSex > 0"
style="color: #e95252">({{ item.oneSex == 1 ? "单男" : "单女" }})</span><span v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">({{ item.oneSex == 1 ? "单男" : "单女" }})</span><span v-if="item.chirdNoNeedBedNum > 0"
style="color: #e95252">(儿童不占床{{ item.chirdNoNeedBedNum }}人 )</span>:{{ item.orderGuestHouseStr }}</span> style="color: #e95252">(儿童不占床{{ item.chirdNoNeedBedNum }}人 )</span>:{{ item.orderGuestHouseStr }}</span>
<div> <div>
<span v-if="item.opTipMoney == '' && item.tipMoney != ''" <span v-if="item.opTipMoney == '' && item.tipMoney != ''"
...@@ -2177,9 +2180,9 @@ ...@@ -2177,9 +2180,9 @@
" v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span> " v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span>
</span> </span>
</div> </div>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" > <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}} <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span> </span>
</div> </div>
<div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)"> <div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
...@@ -2476,6 +2479,7 @@ ...@@ -2476,6 +2479,7 @@
import updateSalesMan from "../commonPage/updateSalesMan.vue"; import updateSalesMan from "../commonPage/updateSalesMan.vue";
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注 import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default { export default {
data() { data() {
return { return {
...@@ -2799,6 +2803,7 @@ ...@@ -2799,6 +2803,7 @@
updateSalesMan: updateSalesMan, updateSalesMan: updateSalesMan,
commissionDialog, commissionDialog,
orderRemark: orderRemark, orderRemark: orderRemark,
PriceDetail,
}, },
filters: { filters: {
priceFormat(value) { priceFormat(value) {
......
...@@ -1939,13 +1939,14 @@ ...@@ -1939,13 +1939,14 @@
</td> </td>
<td> <td>
<p style="color: #ff9c00"> <p style="color: #ff9c00">
<span v-if=" <PriceDetail :OrderId="item.OrderId" :PreferPrice="item.preferPrice"></PriceDetail>
<!-- <span v-if="
item.isOwn == 1 || item.isOwn == 1 ||
IsSupperOrderEdit || IsSupperOrderEdit ||
IsLookOrder || IsLookOrder ||
isUpdateOrder isUpdateOrder
">{{ item.preferPrice }}</span> ">{{ item.preferPrice }}</span>
<span v-else>*****</span> <span v-else>*****</span> -->
</p> </p>
</td> </td>
<td> <td>
...@@ -2379,7 +2380,7 @@ ...@@ -2379,7 +2380,7 @@
</el-popover> </el-popover>
</span> </span>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" > <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}} <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span> </span>
</div> </div>
<div> <div>
...@@ -3229,6 +3230,7 @@ ...@@ -3229,6 +3230,7 @@
import updateSalesMan from "../commonPage/updateSalesMan.vue"; import updateSalesMan from "../commonPage/updateSalesMan.vue";
import EditTip from "./Common/EditTip.vue"; import EditTip from "./Common/EditTip.vue";
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注 import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default { export default {
data() { data() {
return { return {
...@@ -3622,6 +3624,7 @@ ...@@ -3622,6 +3624,7 @@
tripDownLoadCommon: tripDownLoadCommon, tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan, updateSalesMan: updateSalesMan,
orderRemark: orderRemark, orderRemark: orderRemark,
PriceDetail,
}, },
watch: { watch: {
fullHeight(val) { fullHeight(val) {
......
...@@ -2394,8 +2394,8 @@ ...@@ -2394,8 +2394,8 @@
</td> </td>
<td>{{ childItem.Unit_Price }}</td> <td>{{ childItem.Unit_Price }}</td>
<td class="nowrap"> <td class="nowrap">
<p style="text-decoration: underline;cursor: pointer;" @click="SellPrice(childItem)"> <p style="text-decoration: underline;cursor: pointer;">
<PriceDetail :OrderId="childItem.OrderId" :obj="childItem"></PriceDetail> <PriceDetail :OrderId="childItem.OrderId" :PreferPrice="childItem.PreferPrice"></PriceDetail>
<!-- <el-popover width="630" trigger="click"> --> <!-- <el-popover width="630" trigger="click"> -->
<!-- {{ childItem.PreferPrice }} --> <!-- {{ childItem.PreferPrice }} -->
...@@ -6062,9 +6062,6 @@ ...@@ -6062,9 +6062,6 @@
}, },
(err) => {} (err) => {}
); );
},
SellPrice(obj) {
}, },
getList() { getList() {
this.showID = -1; this.showID = -1;
......
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<td>{{ OrderPrice.TipAmount ? OrderPrice.TipAmount : "0.00" }}</td> <td>{{ OrderPrice.TipAmount ? OrderPrice.TipAmount : "0.00" }}</td>
</tr> </tr>
</table> </table>
<span slot="reference" class="price" @click="CalculationDetails">{{ obj.PreferPrice }}</span> <span slot="reference" class="price" @click="CalculationDetails">{{ PreferPrice }}</span>
</el-popover> </el-popover>
</div> </div>
...@@ -195,14 +195,14 @@ ...@@ -195,14 +195,14 @@
export default { export default {
//订单信息 //订单信息
props: [ props: [
"OrderId","obj" "OrderId","PreferPrice"
], ],
filters: { filters: {
priceFormat(value) { priceFormat(value) {
if (value == null) { if (value == null) {
return 0.0; return 0.0;
} }
console.log("value",value); // console.log("value",value);
let nStr = value.toFixed(2); let nStr = value.toFixed(2);
let x = nStr.split("."); let x = nStr.split(".");
let x1 = x[0]; let x1 = x[0];
...@@ -372,9 +372,9 @@ ...@@ -372,9 +372,9 @@
}, },
watch: { watch: {
obj: { PreferPrice: {
handler(newVal) { handler(newVal) {
console.log(this.obj.PreferPrice,'======') console.log(this.PreferPrice,'======')
}, },
deep: true, deep: true,
immediate: true, immediate: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment