魏熙美 6 years ago
parent
commit
b58b48024e

+ 1
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java View File

@@ -46,7 +46,7 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
46 46
         page.setSize(pageSize);
47 47
         page.setCurrent(pageNum);
48 48
         QueryWrapper<TaUserLicenseOrder> queryWrapper = new QueryWrapper<>();
49
-        queryWrapper.eq(id != null ,"id", id);
49
+        queryWrapper.like(id != null ,"id", id);
50 50
         queryWrapper.like(StringUtils.isNotBlank(licensePlate), "license_plate", licensePlate);
51 51
         queryWrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
52 52
         queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);

+ 15
- 1
VUECODE/smart-property-manage/src/views/bill/license/index.vue View File

@@ -83,7 +83,7 @@
83 83
         prop="updateDate"
84 84
         align="center"
85 85
         label="缴费完成时间">
86
-        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
86
+        <template slot-scope="scope">{{ formatDateTime(scope.row.updateDate) }}</template>
87 87
       </el-table-column>
88 88
     </el-table>
89 89
     <div class="block-page">
@@ -147,6 +147,20 @@ export default {
147 147
       // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
148 148
       return year + '-' + month + '-' + day
149 149
     },
150
+    formatDateTime(val) {
151
+      if (val === null || val === '') {
152
+        return ''
153
+      }
154
+      var value = new Date(val)
155
+      var year = value.getFullYear()
156
+      var month = value.getMonth() + 1
157
+      var day = value.getDate()
158
+      var hour = value.getHours()
159
+      var minutes = value.getMinutes()
160
+      var seconds = value.getSeconds()
161
+      // return year + '-' + month + '-' + day
162
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
163
+    },
150 164
     showPayType(obj) {
151 165
       let str = ''
152 166
       switch (obj) {