zhanbo.xu

feat: 新增时间到时分秒

......@@ -8,16 +8,6 @@
size="small"
>
<el-row class="row-border">
<!-- 角色名称 -->
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
@formChange="formChange"
/>
</Formitem>
</el-col>
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
......@@ -32,6 +22,16 @@
</Formitem>
</el-col>
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
@formChange="formChange"
/>
</Formitem>
</el-col>
<el-col :span="5">
<Formitem label="回执状态" prop="returnStatus">
<el-select
type="text"
......@@ -119,8 +119,8 @@
@popoverClose="popoverClose"
>
<div slot="title">
<span style="font-weight: 700; color: #515a6e">运单编号:</span
>{{ scope.row.logisticsNo }}
<span style="font-weight: 700; color: #515a6e">提运单号:</span
>{{ scope.row.billNo }}
</div>
<div slot="buttonLabel">
{{ scope.row.returnStatus }}
......
......@@ -78,10 +78,10 @@
class="inputInner--time"
id="inputInner--time"
v-model="formData.time"
type="daterange"
format="yyyy-MM-dd"
type="datetimerange"
format="yyyy-MM-dd HH:mm:ss"
prefix-icon="none"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
@change="dateChange"
style="background-color: #f2f2f2"
......@@ -322,8 +322,8 @@ export default {
},
dateChange(val) {
if (val) {
this.formData.startTime = val[0] + " 00:00:00";
this.formData.endTime = val[1] + " 23:59:59";
this.formData.startTime = val[0];
this.formData.endTime = val[1];
} else {
this.formData.startTime = "";
this.formData.endTime = "";
......