|
@@ -34,8 +34,26 @@
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="起始时间:" prop="time" :rules="rules.start_time" v-if="OrderForm.type == 'TO_C'">
|
|
|
- <el-date-picker v-model="OrderForm.start_time" type="datetime" placeholder="选择日期时间"
|
|
|
+ <!-- <el-date-picker v-model="OrderForm.start_time" type="datetime" placeholder="选择日期时间"
|
|
|
:disabled="type == 'pone'" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss">
|
|
|
+ </el-date-picker> -->
|
|
|
+
|
|
|
+ <el-date-picker v-model="time" type="daterange" align="center" @change='timeChange' :editable="false"
|
|
|
+ unlink-panels :clearable="false" :default-time="['00:00:00', '23:59:59']" range-separator="-"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd hh:mm:ss" :picker-options="{
|
|
|
+ disabledDate(time) {
|
|
|
+ return (
|
|
|
+ time.getTime() <=
|
|
|
+ new Date(
|
|
|
+ new Date().getFullYear(),
|
|
|
+ new Date().getMonth(),
|
|
|
+ new Date().getDate()
|
|
|
+ ).getTime() -
|
|
|
+ 86400000
|
|
|
+ );
|
|
|
+ },
|
|
|
+ shortcuts: MixinPickerShortcuts,
|
|
|
+ }">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -46,25 +64,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
- <span>{{ "¥" + price }}</span>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="折扣:" prop="">
|
|
|
- <el-input placeholder="请输入" v-model="discount" @blur="handleBlur" :disabled="type == 'pone'"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="10">
|
|
|
- <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
- <!-- @input="validateNumber"
|
|
|
- <span>折扣:
|
|
|
- </span>
|
|
|
- <span>折后金额:</span>-->
|
|
|
- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
|
|
|
<el-select v-model="OrderForm.marketing_id" clearable :disabled="type == 'pone'">
|
|
@@ -95,8 +94,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
|
|
|
- <el-select v-model="OrderForm.return_warehouse_id" clearable
|
|
|
- :disabled="type == 'pone'">
|
|
|
+ <el-select v-model="OrderForm.return_warehouse_id" clearable :disabled="type == 'pone'">
|
|
|
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
@@ -139,8 +137,7 @@
|
|
|
<el-table-column type="selection" width="40" align="center" />
|
|
|
<el-table-column label="图标">
|
|
|
<template slot-scope="scope">
|
|
|
- <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px"
|
|
|
- >
|
|
|
+ <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="仓库名称">
|
|
@@ -158,10 +155,10 @@
|
|
|
{{ scope.row.goods_vo.name }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="条码">
|
|
|
+ <el-table-column label="sku">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="!id"> {{ scope.row.product_vo.bar_code }}</span>
|
|
|
- <span v-else> {{ scope.row.product_vo.bar_code }}</span>
|
|
|
+ <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
|
|
|
+ <span v-else> {{ scope.row.product_vo.sku }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="序列号">
|
|
@@ -192,13 +189,18 @@
|
|
|
{{ scope.row.usable_stock }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
|
|
|
+ <el-table-column label="天数" width="200" v-if="OrderForm.type == 'TO_C'">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.num" type="number" :min="0" :maxlength="20"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker style="width: 170px;" v-model="scope.row.end_time" type="datetime" placeholder="选择日期时间"
|
|
|
:picker-options="pickerOptionsEnd" value-format="yyyy-MM-dd HH:mm:ss">
|
|
|
</el-date-picker>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<!-- <el-table-column label="差异">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.usable_stock - scope.row.num || 0 }}
|
|
@@ -265,6 +267,27 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
+ <el-row style="margin-top: 15px;margin-bottom: 20px;">
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
|
|
|
+ <span>{{ "¥" + price }}</span>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="折扣:" prop="">
|
|
|
+ <el-input placeholder="请输入" v-model="discount" @blur="handleBlur" :disabled="type == 'pone'"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
|
|
|
+ <!-- @input="validateNumber"
|
|
|
+ <span>折扣:
|
|
|
+ </span>
|
|
|
+ <span>折后金额:</span>-->
|
|
|
+ <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
<!-- <div class="mx">
|
|
|
<h3>支付信息</h3>
|
|
|
<el-button v-if="!isDetail" class="button" size="mini" type="primary" icon="el-icon-circle-plus-outline"
|
|
@@ -447,7 +470,7 @@ export default {
|
|
|
province_city_area_address: "",
|
|
|
subtract_stock: false,
|
|
|
warehouse_id: [],
|
|
|
- return_warehouse_id:'',
|
|
|
+ return_warehouse_id: '',
|
|
|
start_time: null,
|
|
|
customer_name: "",
|
|
|
customer_phone: '',
|
|
@@ -661,6 +684,7 @@ export default {
|
|
|
size: 10
|
|
|
},//商品分页
|
|
|
orderType: '',//条形码查看类型
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
@@ -676,11 +700,18 @@ export default {
|
|
|
this.GET_CollectingAccountList();
|
|
|
// 获取客户列表
|
|
|
this.GET_CustomerList();
|
|
|
+ this.OrderForm.marketing_id=JSON.parse(JSON.parse(localStorage.getItem("admin_user")).data).uid
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 租赁时间
|
|
|
+ timeChange(val) {
|
|
|
+ let start = new Date(val[1]); // 将起始日期字符串转换为Date对象
|
|
|
+ let end = new Date(val[0]); // 将结束日期字符串转换为Date对象
|
|
|
+ let timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
+ let monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000));
|
|
|
+ },
|
|
|
selMember(val) {
|
|
|
API_BasicSetting.getCustomer(val).then(res => {
|
|
|
-
|
|
|
this.$set(this.OrderForm, 'customer_name', res.name);
|
|
|
this.$set(this.OrderForm, 'customer_phone', res.mobile);
|
|
|
/* this.$nextTick(() => { this.OrderForm.customer_name = res.name
|
|
@@ -929,8 +960,8 @@ export default {
|
|
|
//goodsApiParams: { order_type: this.OrderForm.type,warehouse_ids:arr },
|
|
|
|
|
|
});
|
|
|
- goodsData.map(el=>{
|
|
|
- el.end_time=''
|
|
|
+ goodsData.map(el => {
|
|
|
+ el.end_time = ''
|
|
|
console.log(el);
|
|
|
})
|
|
|
this.OrderForm.product_list = goodsData;
|
|
@@ -1283,11 +1314,18 @@ export default {
|
|
|
if (!this.OrderForm.product_list) return
|
|
|
if (!this.id) {
|
|
|
if (this.OrderForm.type == "TO_C") {
|
|
|
- var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
|
|
|
+ /* var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
|
|
|
+ this.OrderForm.product_list.map((item) => {
|
|
|
+ var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
|
|
|
+ var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
+ var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
|
+ total += item.product_vo.day_price * item.num * monthDiff;
|
|
|
+ }); */
|
|
|
+ var start = new Date(this.time[1]); // 将起始日期字符串转换为Date对象
|
|
|
+ var end = new Date(this.time[0]); // 将结束日期字符串转换为Date对象
|
|
|
+ var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
+ var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
|
this.OrderForm.product_list.map((item) => {
|
|
|
- var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
|
|
|
- var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
- var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
|
total += item.product_vo.day_price * item.num * monthDiff;
|
|
|
});
|
|
|
return total;
|
|
@@ -1299,14 +1337,13 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.OrderForm.type == "TO_C") {
|
|
|
- var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
|
|
|
+ var start = new Date(this.time[1]); // 将起始日期字符串转换为Date对象
|
|
|
+ var end = new Date(this.time[0]); // 将结束日期字符串转换为Date对象
|
|
|
+ var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
+ var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
|
this.OrderForm.product_list.map((item) => {
|
|
|
- var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
|
|
|
- var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
|
|
|
- var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
|
|
|
total += item.product_vo.day_price * item.num * monthDiff;
|
|
|
});
|
|
|
- console.log("total",total);
|
|
|
return total;
|
|
|
} else {
|
|
|
this.OrderForm.product_list.map((item) => {
|