查询日期范围调整为日期时间范围

src/App.vue

@@ -101,6 +101,9 @@ onMounted(() => {
 			event.preventDefault();
 			event.stopPropagation();
 		};
+		// mittBus.on('*', (index, data) => {
+		// 	console.log(index, data);
+		// });
 	});
 });
 // 清除缓存 name

src/views/business/order/accept/orderAdd.vue

@@ -198,9 +198,18 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-								<el-form-item label="" prop="acceptSms" :rules="[{ required: false, message: '请选择', trigger: 'blur' }]">
-									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" />
-									<el-checkbox v-model="state.ruleForm.needContact" label="无需联系" @change="(val:boolean)=> ruleFormRef.resetFields('contact')" />
+								<el-form-item label="" prop="acceptSms" :rules="[{ required: false, message: '请选择', trigger: 'change' }]">
+									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" :disabled="state.ruleForm.needContact" />
+									<el-checkbox
+										v-model="state.ruleForm.needContact"
+										label="无需联系"
+										@change="
+											() => {
+												ruleFormRef.resetFields('contact');
+												ruleFormRef.resetFields('acceptSms');
+											}
+										"
+									/>
 								</el-form-item>
 							</el-col>
 							<!-- 当“来电/信人身份”为“企业”时必填 -->
@@ -284,7 +293,7 @@
 								<el-form-item label="事发时间" prop="incidentTime" :rules="[{ required: false, message: '请选择事发时间', trigger: 'change' }]">
 									<el-date-picker
 										v-model="state.ruleForm.incidentTime"
-										type="date"
+										type="datetime"
 										placeholder="请选择事发时间"
 										value-format="YYYY-MM-DD[T]HH:mm:ss"
 										class="w100"
@@ -576,6 +585,8 @@ const state = reactive<any>({
 		duplicateId: '',
 		content: '',
 		licenceTypeCode: '',
+		acceptSms: false,
+		needContact: false,
 	},
 	formLoading: false, // 表单加载状态
 	historyOrderLoading: false, // 历史工单加载状态

src/views/business/order/accept/orderEdit.vue

@@ -204,8 +204,17 @@
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 								<el-form-item label="" prop="acceptSms" :rules="[{ required: false, message: '请选择', trigger: 'blur' }]">
-									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" />
-									<el-checkbox v-model="state.ruleForm.needContact" label="无需联系" @change="(val:boolean)=> ruleFormRef.resetFields('contact')" />
+									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" :disabled="state.ruleForm.needContact"/>
+									<el-checkbox
+										v-model="state.ruleForm.needContact"
+										label="无需联系"
+										@change="
+											() => {
+												ruleFormRef.resetFields('contact');
+												ruleFormRef.resetFields('acceptSms');
+											}
+										"
+									/>
 								</el-form-item>
 							</el-col>
 							<!-- 当“来电/信人身份”为“企业”时必填 -->
@@ -290,7 +299,7 @@
 								<el-form-item label="事发时间" prop="incidentTime" :rules="[{ required: false, message: '请选择事发时间', trigger: 'change' }]">
 									<el-date-picker
 										v-model="state.ruleForm.incidentTime"
-										type="date"
+										type="datetime"
 										placeholder="请选择事发时间"
 										value-format="YYYY-MM-DD[T]HH:mm:ss"
 										class="w100"
@@ -579,6 +588,8 @@ const state = reactive<any>({
 		duplicateTitle: '',
 		duplicateId: '',
 		content: '',
+		acceptSms:false,
+		needContact:false
 	},
 	formLoading: false, // 表单加载状态
 	historyOrderLoading: false, // 历史工单加载状态

src/views/business/order/index.vue

@@ -89,11 +89,11 @@
 							<el-form-item label="受理时间" prop="crTime">
 								<el-date-picker
 									v-model="state.queryParams.crTime"
-									type="daterange"
+									type="datetimerange"
 									unlink-panels
 									range-separator="至"
-									start-placeholder="开始日期"
-									end-placeholder="结束日期"
+									start-placeholder="开始时间"
+									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
 									@change="timeStartChangeCr"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"
@@ -122,11 +122,11 @@
 							<el-form-item label="办理期限" prop="exTime">
 								<el-date-picker
 									v-model="state.queryParams.exTime"
-									type="daterange"
+									type="datetimerange"
 									unlink-panels
 									range-separator="至"
-									start-placeholder="开始日期"
-									end-placeholder="结束日期"
+									start-placeholder="开始时间"
+									end-placeholder="结束时间"
 									:shortcuts="shortcuts"
 									@change="timeStartChangeEx"
 									value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/apply/index.vue

@@ -19,8 +19,8 @@
 							type="datetimerange"
 							unlink-panels
 							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
 							:shortcuts="shortcuts"
 							@change="tiemChange"
 							value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/apply/my/component/MyApplyAdd.vue

@@ -75,7 +75,7 @@
 							</template>
 							<el-date-picker
 								v-model="state.ruleForm.expiredTime"
-								type="date"
+								type="datetime"
 								placeholder="请选择截止日期"
 								class="w100"
 								value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/apply/my/component/MyApplyEdit.vue

@@ -75,7 +75,7 @@
 							</template>
 							<el-date-picker
 								v-model="state.ruleForm.expiredTime"
-								type="date"
+								type="datetime"
 								placeholder="请选择截止日期"
 								class="w100"
 								value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/apply/my/index.vue

@@ -22,8 +22,8 @@
 							type="datetimerange"
 							unlink-panels
 							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
 							:shortcuts="shortcuts"
 							@change="tiemChange"
 							value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/knowledge/component/editKnowledge.vue

@@ -112,7 +112,7 @@
 							</template>
 							<el-date-picker
 								v-model="state.ruleForm.expiredTime"
-								type="date"
+								type="datetime"
 								placeholder="请选择失效时间"
 								class="w100"
 								value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/knowledge/delApply/index.vue

@@ -21,8 +21,8 @@
 							type="datetimerange"
 							unlink-panels
 							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
 							:shortcuts="shortcuts"
 							@change="tiemChange"
 							value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/knowledge/draft/index.vue

@@ -27,8 +27,8 @@
 						type="datetimerange"
 						unlink-panels
 						range-separator="至"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"
+						start-placeholder="开始时间"
+						end-placeholder="结束时间"
 						:shortcuts="shortcuts"
 						@change="tiemChange"
 						value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/knowledge/knowledge/index.vue

@@ -101,8 +101,8 @@
 										type="datetimerange"
 										unlink-panels
 										range-separator="至"
-										start-placeholder="开始日期"
-										end-placeholder="结束日期"
+										start-placeholder="开始时间"
+										end-placeholder="结束时间"
 										:shortcuts="shortcuts"
 										@change="timeStartChangeCr"
 										value-format="YYYY-MM-DD[T]HH:mm:ss"
@@ -114,8 +114,8 @@
 										type="datetimerange"
 										unlink-panels
 										range-separator="至"
-										start-placeholder="开始日期"
-										end-placeholder="结束日期"
+										start-placeholder="开始时间"
+										end-placeholder="结束时间"
 										:shortcuts="shortcuts"
 										@change="timeStartChangeSj"
 										value-format="YYYY-MM-DD[T]HH:mm:ss"
@@ -127,8 +127,8 @@
 										type="datetimerange"
 										unlink-panels
 										range-separator="至"
-										start-placeholder="开始日期"
-										end-placeholder="结束日期"
+										start-placeholder="开始时间"
+										end-placeholder="结束时间"
 										:shortcuts="shortcuts"
 										@change="timeStartChangeXj"
 										value-format="YYYY-MM-DD[T]HH:mm:ss"

src/views/system/organize/component/addOrg.vue

@@ -62,6 +62,7 @@
 import { reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
 import { addOrg } from '/@/api/system/organize';
+import mittBus from '/@/utils/mitt';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 
@@ -126,6 +127,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
 					emit('updateList');
 					closeDialog(); // 关闭弹窗
 					ElMessage.success('新增成功');
+					mittBus.emit('clearCache','systemUser')
 					state.loading = false;
 				})
 				.catch(() => {

src/views/system/organize/component/editOrg.vue

@@ -61,6 +61,7 @@
 <script setup lang="ts" name="systemEditOrg">
 import { reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
+import mittBus from '/@/utils/mitt';
 import { auth } from '/@/utils/authFunction';
 import { excludeSelfById } from '/@/utils/tools';
 import { updateOrg, getOrgById } from '/@/api/system/organize';
@@ -128,6 +129,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
 					emit('updateList');
 					closeDialog(); // 关闭弹窗
 					ElMessage.success('修改成功');
+					mittBus.emit('clearCache','systemUser')
 					state.loading = false;
 				})
 				.catch(() => {

src/views/system/organize/index.vue

@@ -266,7 +266,12 @@ const getOrgListApi = () => {
 		.then((res: any) => {
 			state.orgTableData = res?.result ?? [];
 			state.staticArr = res?.result ?? [];
-			getAllIds(state.orgTableData);
+			state.expandedRowKeys = state.orgTableData.map((v: any) => {
+				return v.children.map((i: any) => {
+					return i.id;
+				});
+			});
+			state.expandedRowKeys.push(state.orgTableData[0].id); //默认展开一级部门
 			state.loading = false;
 		})
 		.catch(() => {

src/views/tels/blacklist/index.vue

@@ -19,7 +19,7 @@
 				<el-form-item label="时间" prop="time">
 					<el-date-picker
 						v-model="state.queryParams.time"
-						type="daterange"
+						type="datetimerange"
 						range-separator="至"
 						start-placeholder="开始时间"
 						end-placeholder="结束时间"

src/views/tels/telsLog/index.vue

@@ -6,7 +6,7 @@
 				<el-form-item label="时间" prop="time">
 					<el-date-picker
 						v-model="state.queryParams.time"
-						type="daterange"
+						type="datetimerange"
 						range-separator="至"
 						start-placeholder="开始时间"
 						end-placeholder="结束时间"