|
@@ -34,11 +34,11 @@
|
|
|
</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>
|
|
|
|
|
|
- <el-date-picker v-model="time" type="daterange" align="center" @change='timeChange' :editable="false"
|
|
|
+ <!-- <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) {
|
|
@@ -54,7 +54,7 @@
|
|
|
},
|
|
|
shortcuts: MixinPickerShortcuts,
|
|
|
}">
|
|
|
- </el-date-picker>
|
|
|
+ </el-date-picker> -->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
@@ -189,18 +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'">
|
|
|
+ </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 }}
|
|
@@ -1314,20 +1314,20 @@ 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 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) => {
|
|
|
total += item.product_vo.day_price * item.num * monthDiff;
|
|
|
- });
|
|
|
+ });*/
|
|
|
return total;
|
|
|
} else {
|
|
|
this.OrderForm.product_list.map((item) => {
|
|
@@ -1337,13 +1337,13 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.OrderForm.type == "TO_C") {
|
|
|
- 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) => {
|
|
|
- total += item.product_vo.day_price * item.num * monthDiff;
|
|
|
- });
|
|
|
+ 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;
|
|
|
+ });
|
|
|
return total;
|
|
|
} else {
|
|
|
this.OrderForm.product_list.map((item) => {
|