更新

pages.json

@@ -401,6 +401,22 @@
         "navigationBarTitleText": "员工信息",
         "navigationStyle": "custom"
       }
+    },
+    {
+      "path": "pages/manage/workReport/workReport",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": true,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/manage/workReport/workReportAdd",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": true,
+        "navigationStyle": "custom"
+      }
     }
   ],
   "globalStyle": {

pages/index/Neworder.vue

@@ -71,6 +71,16 @@
               <input type="text" v-model="carIdNo" placeholder="请输入车辆识别代号">
             </view>
           </view>
+          <view class="list-box">
+            <view class="l-left" @click="showRegisterDate = true">
+              <text style="color: red;font-weight: bold;text-align: center;">*</text>
+              车辆注册日期
+              <text class="xixi">点击选择</text>
+            </view>
+            <view class="l-right">
+              <input type="text" v-model="carRegisterDateStr" placeholder="请输入车辆注册日期">
+            </view>
+          </view>
           <view class="list-box">
             <view class="l-left" @click="show = true">
               <text style="color: red;font-weight: bold;text-align: center;">*</text>
@@ -191,6 +201,13 @@
         <u-picker :show="showLeadMan" :columns="leadManList" :defaultIndex="defaultIndex" @confirm="confirmLeadMan"
                   @cancel="cancelLeadMan"
                   keyName="nickname"></u-picker>
+        <u-datetime-picker
+            :show="showRegisterDate"
+            v-model="carRegisterDate"
+            mode="date"
+            @cancel="showRegisterDate = false"
+            @confirm="confirmRegisterDate"
+        ></u-datetime-picker>
 <!--        <u-datetime-picker-->
 <!--            :show="showRecord"-->
 <!--            v-model="recordTime"-->
@@ -213,6 +230,7 @@ import config from '@/config';
 import request from '../../utils/request';
 import upload from '@/utils/upload.js'
 import {getToken, getTenantId} from '@/utils/auth'
+import {formatDate} from "@/utils/utils";
 
 export default {
   data() {
@@ -232,6 +250,7 @@ export default {
       carModel: '',
       carNature: '',
       otherPhone: '',
+      showRegisterDate:false,
       show: false,
       shownature: false,
       showgoods: false,
@@ -263,6 +282,7 @@ export default {
       shopImages: [],
       shoplist: {},
       province: '',
+      carRegisterDateStr:'',
       unitName: '',
       kehui: '',
       naturetext: '',
@@ -274,6 +294,7 @@ export default {
       inspectionId: undefined,
       xinDefaultIndex: [0],
       recordTimeStr: '',
+      carRegisterDate : '',
     }
   },
   onLoad(options) {
@@ -371,7 +392,14 @@ export default {
       this.recordTimeStr = this.formatTimestamp(e)
       this.showRecord = false
     },
-    cancelzhi() {
+    confirmRegisterDate(e) {
+      //将时间戳转换
+      this.carRegisterDateStr = formatDate(e.value)
+      this.carRegisterDate = e.value
+      console.log(this.carRegisterDate)
+      this.showRegisterDate = false
+    },
+    cancelzhi()
       this.showzhi = false
     },
     formatTimestamp(e) {
@@ -467,7 +495,7 @@ export default {
       })
     },
     async getgoodes() {
-      if (this.carNum == '' || this.customerSource == "" || this.skuId == '' || this.leadManId == undefined) {
+      if (this.carNum == '' || this.customerSource == "" || this.skuId == '' || this.leadManId == undefined || this.carRegisterDate == '') {
         uni.showToast({
           title: '车牌号 客户来源 商品 引车员 必填！',
           icon: 'none'
@@ -502,6 +530,7 @@ export default {
         leadManId: this.leadManId,
         startTime: this.recordTime,
         otherPhone: this.otherPhone,
+        carRegisterDate: this.carRegisterDate,
       }
 
       let res = await request({
@@ -543,6 +572,7 @@ export default {
         carNature: this.carNature,
         inspectionWorkNodes: this.inspectionWorkNodes,
         leadManId: this.leadManId,
+        carRegisterDate: this.carRegisterDate,
         status: '2',
       }
 
@@ -764,6 +794,8 @@ export default {
       this.carModel = res.data.FrontInfo.Model
       this.carIdNo = res.data.FrontInfo.Vin
       this.carNature = res.data.FrontInfo.UseCharacter
+      this.carRegisterDate = res.data.FrontInfo.RegisterDate
+      this.carRegisterDateStr = formatDate(this.carRegisterDate)
       uni.hideLoading();
       uni.showToast({
         title: '识别成功',

pages/manage/deviceManage.vue

@@ -118,16 +118,16 @@ export default {
 
   },
   onReachBottom() {
-    if (this.pageNum >= this.totalPages) {
-      uni.showToast({
-        title: '没有下一页数据',
-        icon: 'none'
-      })
-
-    } else {
-      this.pageNum++
-      this.getlist()
-    }
+    // if (this.pageNum >= this.totalPages) {
+    //   uni.showToast({
+    //     title: '没有下一页数据',
+    //     icon: 'none'
+    //   })
+    //
+    // } else {
+    //   this.pageNum++
+    //   this.getlist()
+    // }
   },
   methods: {
     formatDate,

pages/manage/workReport/workReport.vue

@@ -43,21 +43,8 @@
         <view class="popup-header">
           <text>时间筛选</text>
         </view>
-        <view class="time-picker">
-          <view class="picker-item" @click="showStarTime = true">
-            <text class="label">开始时间</text>
-            <text :class="['time-text', !queryParams.reportTime[0] && 'placeholder']">
-              {{ reportTimeStr[0] || '选择时间' }}
-            </text>
-            <uni-icons type="calendar" size="16" color="#666"></uni-icons>
-          </view>
-          <view class="picker-item" @click="showEndTime = true">
-            <text class="label">结束时间</text>
-            <text :class="['time-text', !queryParams.reportTime[1] && 'placeholder']">
-              {{ reportTimeStr[1] || '选择时间' }}
-            </text>
-            <uni-icons type="calendar" size="16" color="#666"></uni-icons>
-          </view>
+        <view style="width: 95%; margin: 5px auto;">
+          <uni-datetime-picker v-model="queryParams.reportTime" type="daterange" />
         </view>
         <view class="popup-footer">
           <u-button type="primary" @click="applyFilter">应用筛选</u-button>
@@ -143,20 +130,6 @@ export default {
     },
     // 应用筛选
     applyFilter() {
-      if (!this.queryParams.reportTime[0] || !this.queryParams.reportTime[1]) {
-        uni.showToast({
-          title: '请选择时间',
-          icon: 'none'
-        });
-        return;
-      }
-      if (this.queryParams.reportTime[0] > this.queryParams.reportTime[1]) {
-        uni.showToast({
-          title: '开始时间不能大于结束时间',
-          icon: 'none'
-        });
-        return;
-      }
       this.closeFilterPopup();
       this.search();
     },
@@ -233,6 +206,8 @@ export default {
 /* 筛选弹窗样式 */
 .filter-popup {
   padding: 20rpx;
+  width: 450rpx; /* 或者设置更大的固定宽度，如 600px */
+  max-width: 90%; /* 最大宽度，防止屏幕过窄时弹窗过大 */
 }
 
 .popup-header {
@@ -241,6 +216,7 @@ export default {
   align-items: center;
   padding-bottom: 20rpx;
   border-bottom: 1rpx solid #eee;
+  margin-top: 70rpx;
 }
 
 .popup-footer {