测试的

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240424103726"
+  "value": "20240507170340"
 }

src/views/tentative/material/modules/testSample/dispose.vue

@@ -7,8 +7,8 @@
                     <el-option label="测试2" value="2" />
                 </el-select>
             </div>
-            <div class="ml-2 w-150px">
-                <el-date-picker v-model="searchForm.date" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable placeholder="废除时间" />
+            <div class="ml-2 w-250px">
+                <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
             </div>
             <div class="ml-2 w-250px">
                 <hc-search-input v-model="searchForm.queryValue" @search="searchClick" />
@@ -57,6 +57,19 @@ watch(() => props.tree, (obj) => {
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })
 
+//日期时间被选择
+const betweenTime = ref(null)
+const betweenTimeUpdate = ({ arr }) => {
+    betweenTime.value = arr
+    if (arr.length > 0) {
+        searchForm.value.startTime = arr[0]
+        searchForm.value.endTime = arr[1]
+    } else {
+        searchForm.value.startTime = ''
+        searchForm.value.endTime = ''
+    }
+}
+
 //搜索
 const searchClick = () => {
     searchForm.value.current = 1

src/views/tentative/material/modules/testSample/flow.vue

@@ -7,8 +7,8 @@
                     <el-option label="测试2" value="2" />
                 </el-select>
             </div>
-            <div class="ml-2 w-150px">
-                <el-date-picker v-model="searchForm.date" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable placeholder="委托上报时间" />
+            <div class="ml-2 w-250px">
+                <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
             </div>
             <div class="ml-2 w-250px">
                 <hc-search-input v-model="searchForm.queryValue" @search="searchClick" />
@@ -59,6 +59,19 @@ watch(() => props.tree, (obj) => {
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })
 
+//日期时间被选择
+const betweenTime = ref(null)
+const betweenTimeUpdate = ({ arr }) => {
+    betweenTime.value = arr
+    if (arr.length > 0) {
+        searchForm.value.startTime = arr[0]
+        searchForm.value.endTime = arr[1]
+    } else {
+        searchForm.value.startTime = ''
+        searchForm.value.endTime = ''
+    }
+}
+
 //搜索
 const searchClick = () => {
     searchForm.value.current = 1

src/views/tentative/material/modules/testSample/inventory.vue

@@ -7,8 +7,8 @@
                     <el-option label="测试2" value="2" />
                 </el-select>
             </div>
-            <div class="ml-2 w-150px">
-                <el-date-picker v-model="searchForm.date" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable placeholder="入库时间" />
+            <div class="ml-2 w-250px">
+                <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
             </div>
             <div class="ml-2 w-250px">
                 <hc-search-input v-model="searchForm.queryValue" @search="searchClick" />
@@ -115,6 +115,19 @@ watch(() => props.tree, (obj) => {
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })
 
+//日期时间被选择
+const betweenTime = ref(null)
+const betweenTimeUpdate = ({ arr }) => {
+    betweenTime.value = arr
+    if (arr.length > 0) {
+        searchForm.value.startTime = arr[0]
+        searchForm.value.endTime = arr[1]
+    } else {
+        searchForm.value.startTime = ''
+        searchForm.value.endTime = ''
+    }
+}
+
 //搜索
 const searchClick = () => {
     searchForm.value.current = 1

src/views/tentative/material/modules/testSample/testUnder.vue

@@ -7,8 +7,8 @@
                     <el-option label="测试2" value="2" />
                 </el-select>
             </div>
-            <div class="ml-2 w-150px">
-                <el-date-picker v-model="searchForm.date" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" clearable placeholder="试验时间" />
+            <div class="ml-2 w-250px">
+                <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
             </div>
             <div class="ml-2 w-250px">
                 <hc-search-input v-model="searchForm.queryValue" @search="searchClick" />
@@ -49,7 +49,7 @@
                     <el-input v-model="formModel.key2" type="textarea" :rows="5" resize="none" />
                 </el-form-item>
                 <el-form-item v-if="formModel.key1 === 2" label="留样时间：" prop="startTime">
-                    <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
+                    <hc-date-picker :dates="formTime" clearable @change="formTimeUpdate" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -92,6 +92,19 @@ watch(() => props.tree, (obj) => {
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })
 
+//日期时间被选择
+const betweenTime = ref(null)
+const betweenTimeUpdate = ({ arr }) => {
+    betweenTime.value = arr
+    if (arr.length > 0) {
+        searchForm.value.startTime = arr[0]
+        searchForm.value.endTime = arr[1]
+    } else {
+        searchForm.value.startTime = ''
+        searchForm.value.endTime = ''
+    }
+}
+
 //搜索
 const searchClick = () => {
     searchForm.value.current = 1
@@ -166,9 +179,9 @@ const rowDispose = (row) => {
 }
 
 //日期时间被选择
-const betweenTime = ref(null)
-const betweenTimeUpdate = ({ arr }) => {
-    betweenTime.value = arr
+const formTime = ref(null)
+const formTimeUpdate = ({ arr }) => {
+    formTime.value = arr
     if (arr.length > 0) {
         formModel.value.startTime = arr[0]
         formModel.value.endTime = arr[1]