|
@@ -83,7 +83,9 @@
|
|
|
<el-descriptions-item label="收货人电话" > <span v-if="item!=null">{{item.userPhone}}</span>
|
|
<el-descriptions-item label="收货人电话" > <span v-if="item!=null">{{item.userPhone}}</span>
|
|
|
<el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['live:liveOrder:queryPhone']"></el-button>
|
|
<el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['live:liveOrder:queryPhone']"></el-button>
|
|
|
</el-descriptions-item>
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="详细地址" > <span>{{item.userAddress}}</span> </el-descriptions-item>
|
|
|
|
|
|
|
+ <el-descriptions-item label="详细地址" > <span v-if="item!=null">{{item.userAddress}}</span>
|
|
|
|
|
+ <el-button icon="el-icon-search" size="mini" @click="handleAddress()" style="margin-left: 20px;" circle v-hasPermi="['live:liveOrder:queryAddress']"></el-button>
|
|
|
|
|
+ </el-descriptions-item>
|
|
|
<el-descriptions-item label="所属公司"><span v-if="item!=null">{{item.companyName}}</span></el-descriptions-item>
|
|
<el-descriptions-item label="所属公司"><span v-if="item!=null">{{item.companyName}}</span></el-descriptions-item>
|
|
|
<el-descriptions-item label="员工"><span v-if="item!=null">{{item.companyUserName}}</span></el-descriptions-item>
|
|
<el-descriptions-item label="员工"><span v-if="item!=null">{{item.companyUserName}}</span></el-descriptions-item>
|
|
|
<el-descriptions-item label="推广佣金" ><span v-if="item.tuiMoney!=null">{{item.tuiMoney.toFixed(2)}}</span></el-descriptions-item>
|
|
<el-descriptions-item label="推广佣金" ><span v-if="item.tuiMoney!=null">{{item.tuiMoney.toFixed(2)}}</span></el-descriptions-item>
|
|
@@ -143,11 +145,11 @@
|
|
|
{{scope.row.otPrice}}
|
|
{{scope.row.otPrice}}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
-<!-- <el-table-column label="数量" width="180" align="center">-->
|
|
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
|
|
-<!-- {{scope.row.num}}-->
|
|
|
|
|
-<!-- </template>-->
|
|
|
|
|
-<!-- </el-table-column>-->
|
|
|
|
|
|
|
+ <el-table-column label="产品数量" width="240" align="center">
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ {{scope.row.totalNum}}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<!-- <el-table-column label="小计" align="center">-->
|
|
<!-- <el-table-column label="小计" align="center">-->
|
|
|
<!-- <template slot-scope="scope" >-->
|
|
<!-- <template slot-scope="scope" >-->
|
|
|
<!-- ¥{{(scope.row.num*scope.row.price).toFixed(2)}}-->
|
|
<!-- ¥{{(scope.row.num*scope.row.price).toFixed(2)}}-->
|
|
@@ -262,7 +264,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
-import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder} from "@/api/live/liveOrder";
|
|
|
|
|
|
|
+import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder, getUserPhone, getLiveOrderAddress} from "@/api/live/liveOrder";
|
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -439,10 +441,16 @@ export default {
|
|
|
},
|
|
},
|
|
|
handlePhone(){
|
|
handlePhone(){
|
|
|
const orderId = this.item.orderId;
|
|
const orderId = this.item.orderId;
|
|
|
- getOrderUserPhone(orderId).then(response =>{
|
|
|
|
|
|
|
+ getUserPhone(orderId).then(response =>{
|
|
|
this.item.userPhone = response.userPhone;
|
|
this.item.userPhone = response.userPhone;
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ handleAddress(){
|
|
|
|
|
+ const orderId = this.item.orderId;
|
|
|
|
|
+ getLiveOrderAddress(orderId).then(response =>{
|
|
|
|
|
+ this.item.userAddress = response.address;
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
editDelivery(){
|
|
editDelivery(){
|
|
|
this.editDy.open = true;
|
|
this.editDy.open = true;
|
|
|
this.editDyForm.orderId = this.item.orderId;
|
|
this.editDyForm.orderId = this.item.orderId;
|