Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
7976b2aa 1 parent ffcaf147

feat: 新增时间到时分秒

Inline Side-by-side
Showing 2 changed files with 17 additions and 17 deletions
...@@ -8,16 +8,6 @@ ...@@ -8,16 +8,6 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 - <!-- 角色名称 -->
12 - <el-col :span="5">
13 - <Formitem label="物流运单编号" prop="logisticsNo">
14 - <FormTextareaInput
15 - :formData="sreachFormData"
16 - dataKey="logisticsNo"
17 - @formChange="formChange"
18 - />
19 - </Formitem>
20 - </el-col>
21 <el-col :span="5"> 11 <el-col :span="5">
22 <Formitem label="提运单号" prop="billNo"> 12 <Formitem label="提运单号" prop="billNo">
23 <el-input 13 <el-input
...@@ -32,6 +22,16 @@ ...@@ -32,6 +22,16 @@
32 </Formitem> 22 </Formitem>
33 </el-col> 23 </el-col>
34 <el-col :span="5"> 24 <el-col :span="5">
25 + <Formitem label="物流运单编号" prop="logisticsNo">
26 + <FormTextareaInput
27 + :formData="sreachFormData"
28 + dataKey="logisticsNo"
29 + @formChange="formChange"
30 + />
31 + </Formitem>
32 + </el-col>
33 +
34 + <el-col :span="5">
35 <Formitem label="回执状态" prop="returnStatus"> 35 <Formitem label="回执状态" prop="returnStatus">
36 <el-select 36 <el-select
37 type="text" 37 type="text"
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
119 @popoverClose="popoverClose" 119 @popoverClose="popoverClose"
120 > 120 >
121 <div slot="title"> 121 <div slot="title">
122 - <span style="font-weight: 700; color: #515a6e">运单编号：</span 122 + <span style="font-weight: 700; color: #515a6e">提运单号：</span
123 - >{{ scope.row.logisticsNo }} 123 + >{{ scope.row.billNo }}
124 </div> 124 </div>
125 <div slot="buttonLabel"> 125 <div slot="buttonLabel">
126 {{ scope.row.returnStatus }} 126 {{ scope.row.returnStatus }}
......
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
78 class="inputInner--time" 78 class="inputInner--time"
79 id="inputInner--time" 79 id="inputInner--time"
80 v-model="formData.time" 80 v-model="formData.time"
81 - type="daterange" 81 + type="datetimerange"
82 - format="yyyy-MM-dd" 82 + format="yyyy-MM-dd HH:mm:ss"
83 prefix-icon="none" 83 prefix-icon="none"
84 - value-format="yyyy-MM-dd" 84 + value-format="yyyy-MM-dd HH:mm:ss"
85 range-separator="至" 85 range-separator="至"
86 @change="dateChange" 86 @change="dateChange"
87 style="background-color: #f2f2f2" 87 style="background-color: #f2f2f2"
...@@ -322,8 +322,8 @@ export default { ...@@ -322,8 +322,8 @@ export default {
322 }, 322 },
323 dateChange(val) { 323 dateChange(val) {
324 if (val) { 324 if (val) {
325 - this.formData.startTime = val[0] + " 00:00:00"; 325 + this.formData.startTime = val[0];
326 - this.formData.endTime = val[1] + " 23:59:59"; 326 + this.formData.endTime = val[1];
327 } else { 327 } else {
328 this.formData.startTime = ""; 328 this.formData.startTime = "";
329 this.formData.endTime = ""; 329 this.formData.endTime = "";
......