|
|
@@ -235,7 +235,7 @@
|
|
|
<div style="margin: 60px 0px 20px 0px">
|
|
|
<span class="font-small">费用信息</span>
|
|
|
</div>
|
|
|
- <el-descriptions :column="4" border >
|
|
|
+ <el-descriptions v-if="zdyInfo !== 'gzzdy'" :column="4" border >
|
|
|
<el-descriptions-item label="商品合计" >
|
|
|
<span v-if="order!=null">
|
|
|
¥{{order.totalPrice.toFixed(2)}}
|
|
|
@@ -273,6 +273,43 @@
|
|
|
</el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
|
|
|
+ <el-descriptions v-if="zdyInfo === 'gzzdy'" :column="4" border >
|
|
|
+ <el-descriptions-item label="商品合计" >
|
|
|
+ <span v-if="order!=null">
|
|
|
+ ¥{{order.totalPrice.toFixed(2)}}
|
|
|
+ </span>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="应付金额" >
|
|
|
+ <span v-if="order!=null">
|
|
|
+ ¥{{order.payPrice.toFixed(2)}}
|
|
|
+ </span>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="实付金额" >
|
|
|
+ <span v-if="order!=null">
|
|
|
+ ¥{{order.payMoney.toFixed(2)}}
|
|
|
+ </span>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="代收金额" >
|
|
|
+ <span v-if="order!=null">
|
|
|
+ ¥{{order.payDelivery.toFixed(2)}}
|
|
|
+ </span>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ class="edit-quantity-btn"
|
|
|
+ @click="editPayDeliveryHandle()"
|
|
|
+ v-hasPermi="['store:storeOrder:editPayDelivery']">
|
|
|
+ 修改
|
|
|
+ </el-button>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="优惠券" >
|
|
|
+ <span v-if="order!=null">
|
|
|
+ ¥{{order.couponPrice.toFixed(2)}}
|
|
|
+ </span>
|
|
|
+ </el-descriptions-item>
|
|
|
+ </el-descriptions>
|
|
|
+
|
|
|
<div style="margin-top: 20px">
|
|
|
<svg-icon icon-class="marker" style="color: #606266"></svg-icon>
|
|
|
<span class="font-small">支付信息</span>
|
|
|
@@ -689,6 +726,29 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!-- 修改代收金额 -->
|
|
|
+ <el-dialog :title="editPayDelivery.title" :visible.sync="editPayDelivery.open" width="500px" append-to-body>
|
|
|
+ <el-form ref="payDeliveryForm" :model="payDeliveryForm" :rules="payDeliveryRules" label-width="150px">
|
|
|
+ <el-form-item label="代收金额(元)" prop="payDelivery">
|
|
|
+ <el-input-number
|
|
|
+ v-model="payDeliveryForm.payDelivery"
|
|
|
+ :min="0.01"
|
|
|
+ :precision="2"
|
|
|
+ :step="0.01"
|
|
|
+ size="small"
|
|
|
+ style="width: 150px"
|
|
|
+ >
|
|
|
+ </el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="editPayDelivery.open = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitPayDeliveryForm">确 定</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -701,7 +761,8 @@ import {
|
|
|
updateStoreOrderItemJson,
|
|
|
bindCustomer,
|
|
|
uploadCredentials,
|
|
|
- getUserPhone
|
|
|
+ getUserPhone,
|
|
|
+ editPayDelivery
|
|
|
} from "@/api/hisStore/storeOrder";
|
|
|
import {listStoreProduct} from "@/api/hisStore/storeProduct";
|
|
|
import {updateUser,getUser } from "@/api/users/user";
|
|
|
@@ -725,6 +786,7 @@ export default {
|
|
|
components: {customerDetails,ImageUpload,Material ,addSms,Treeselect,Editor,singleImg},
|
|
|
data() {
|
|
|
return {
|
|
|
+ zdyInfo: process.env.VUE_APP_FS_USER_INFO,
|
|
|
// 遮罩层
|
|
|
productOrderLoading: true,
|
|
|
isStores: true,
|
|
|
@@ -908,7 +970,21 @@ export default {
|
|
|
express:[],
|
|
|
traces:[],
|
|
|
payments:[],
|
|
|
- auditLogs: []
|
|
|
+ auditLogs: [],
|
|
|
+ // 修改代收金额相关参数
|
|
|
+ editPayDelivery: {
|
|
|
+ title: "修改代收金额",
|
|
|
+ open: false,
|
|
|
+ },
|
|
|
+ payDeliveryForm: {
|
|
|
+ id: null,
|
|
|
+ payDelivery: 0.00
|
|
|
+ },
|
|
|
+ payDeliveryRules: {
|
|
|
+ payDelivery: [
|
|
|
+ { required: true, message: "代收金额不能为空", trigger: "blur" },
|
|
|
+ ]
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -1503,7 +1579,31 @@ export default {
|
|
|
this.customerInfo=response.customer;
|
|
|
this.auditLogs = response.auditLogs;
|
|
|
});
|
|
|
- }
|
|
|
+ },
|
|
|
+ editPayDeliveryHandle() {
|
|
|
+ this.payDeliveryForm.id = this.orderId;
|
|
|
+ this.payDeliveryForm.payDelivery = this.order.payDelivery || 0.00;
|
|
|
+ this.editPayDelivery.open = true;
|
|
|
+ },
|
|
|
+ // 提交修改代收金额
|
|
|
+ submitPayDeliveryForm() {
|
|
|
+ this.$refs["payDeliveryForm"].validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ editPayDelivery(this.payDeliveryForm).then(response => {
|
|
|
+ if (response.code === 200) {
|
|
|
+ this.msgSuccess("修改成功");
|
|
|
+ this.editPayDelivery.open = false;
|
|
|
+ this.getOrder(this.order.id);
|
|
|
+ }else{
|
|
|
+ this.msgError(response.message);
|
|
|
+ }
|
|
|
+ }).catch(error => {
|
|
|
+ this.$message.error('请求失败: ' + error.message)
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
</script>
|