Commit 2b1f2ebe authored by youjie's avatar youjie

应收总额详情

parent c0293224
......@@ -431,7 +431,10 @@
<td style="color: #ff9c00">{{ item.tC_Price }}</td>
<td style="color: #ff9c00">¥{{ item.unit_Price }}</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>
......@@ -739,10 +742,12 @@
import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default {
components: {
Treeselect,
updateSalesMan,
PriceDetail,
},
data() {
return {
......
......@@ -1793,7 +1793,10 @@
<td style="color: #ff9c00">{{ item.unit_Price }}</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>
<el-popover style="padding: 0" width="370" trigger="click">
......@@ -2476,6 +2479,7 @@
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default {
data() {
return {
......@@ -2799,6 +2803,7 @@
updateSalesMan: updateSalesMan,
commissionDialog,
orderRemark: orderRemark,
PriceDetail,
},
filters: {
priceFormat(value) {
......
......@@ -1939,13 +1939,14 @@
</td>
<td>
<p style="color: #ff9c00">
<span v-if="
<PriceDetail :OrderId="item.OrderId" :PreferPrice="item.preferPrice"></PriceDetail>
<!-- <span v-if="
item.isOwn == 1 ||
IsSupperOrderEdit ||
IsLookOrder ||
isUpdateOrder
">{{ item.preferPrice }}</span>
<span v-else>*****</span>
<span v-else>*****</span> -->
</p>
</td>
<td>
......@@ -3229,6 +3230,7 @@
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import EditTip from "./Common/EditTip.vue";
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import PriceDetail from '../orderCommon/PriceDetail.vue';
export default {
data() {
return {
......@@ -3622,6 +3624,7 @@
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
orderRemark: orderRemark,
PriceDetail,
},
watch: {
fullHeight(val) {
......
......@@ -2394,8 +2394,8 @@
</td>
<td>{{ childItem.Unit_Price }}</td>
<td class="nowrap">
<p style="text-decoration: underline;cursor: pointer;" @click="SellPrice(childItem)">
<PriceDetail :OrderId="childItem.OrderId" :obj="childItem"></PriceDetail>
<p style="text-decoration: underline;cursor: pointer;">
<PriceDetail :OrderId="childItem.OrderId" :PreferPrice="childItem.PreferPrice"></PriceDetail>
<!-- <el-popover width="630" trigger="click"> -->
<!-- {{ childItem.PreferPrice }} -->
......@@ -6062,9 +6062,6 @@
},
(err) => {}
);
},
SellPrice(obj) {
},
getList() {
this.showID = -1;
......
......@@ -186,7 +186,7 @@
<td>{{ OrderPrice.TipAmount ? OrderPrice.TipAmount : "0.00" }}</td>
</tr>
</table>
<span slot="reference" class="price" @click="CalculationDetails">{{ obj.PreferPrice }}</span>
<span slot="reference" class="price" @click="CalculationDetails">{{ PreferPrice }}</span>
</el-popover>
</div>
......@@ -195,14 +195,14 @@
export default {
//订单信息
props: [
"OrderId","obj"
"OrderId","PreferPrice"
],
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
console.log("value",value);
// console.log("value",value);
let nStr = value.toFixed(2);
let x = nStr.split(".");
let x1 = x[0];
......@@ -372,9 +372,9 @@
},
watch: {
obj: {
PreferPrice: {
handler(newVal) {
console.log(this.obj.PreferPrice,'======')
console.log(this.PreferPrice,'======')
},
deep: 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