变更划分

src/global/components/hc-date-picker/index.vue

@@ -45,12 +45,15 @@ watch(() => [
 //事件
 const emit = defineEmits(['change'])
 const betweenDateUpdate = (arr) => {
-    let res = arr ?? []
+    let res = arr ?? [], query = '';
     let obj = {start: null, end: null}
     if (res.length > 0) {
         obj = {start: res[0], end: res[1]}
     }
-    emit('change', {val: obj, arr: res})
+    if (obj['start'] && obj['end']) {
+        query = `${obj['start']}~${obj['end']}`
+    }
+    emit('change', {val: obj, arr: res, query})
 }
 </script>
 

src/views/data-fill/query.vue

@@ -309,9 +309,9 @@ const searchForm = ref({
 
 //日期时间被选择
 const betweenTime = ref(null)
-const betweenTimeUpdate = ({val,arr}) => {
+const betweenTimeUpdate = ({arr,query}) => {
     betweenTime.value = arr
-    searchForm.value.betweenTime = `${val['start']}~${val['end']}`
+    searchForm.value.betweenTime = query
 }
 
 //回车搜索

src/views/data-fill/wbs.vue

@@ -1103,16 +1103,16 @@ const tableFormSaveClick = async () => {
         FormData = ListItemRef.value.getFormData()
     }
     console.log(FormData)
-    /*tableFormSaveLoading.value = true
+    tableFormSaveLoading.value = true
     const {error, code} = await wbsApi.saveExcelBussData({
         dataInfo: {orderList: FormData}
     })
-    tableFormSaveLoading.value = false*/
-    /*if (!error && code === 200) {
+    tableFormSaveLoading.value = false
+    if (!error && code === 200) {
         window?.$message?.success('保存成功')
         bussPdfsClick()
         getTableDataAll()
-    }*/
+    }
 }
 
 //多表预览

src/views/ledger/components/table-list.vue

@@ -129,9 +129,9 @@ const searchForm = ref({queryTime: '', createUser: null, current: 1, size: 20, t
 
 //日期时间被选择
 const betweenTime = ref(null)
-const betweenTimeUpdate = ({val,arr}) => {
+const betweenTimeUpdate = ({arr, query}) => {
     betweenTime.value = arr
-    searchForm.value.queryTime = `${val['start']}~${val['end']}`
+    searchForm.value.queryTime = query
 }
 
 //搜索