Эх сурвалжийг харах

reactor:修复某些查询条件重置不了的问题;

zhangchong 8 сар өмнө
parent
commit
5907a6701d

+ 5 - 5
src/App.vue

@@ -37,11 +37,6 @@ const { themeConfig } = storeToRefs(storesThemeConfig);
 const storesKeepALiveNames = useKeepALiveNames();
 const storesTagsViewRoutes = useTagsViewRoutes();
 const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
-// 动态修改icon
-const icon = useFavicon();
-const { favicon } = getCurrentCityConfig();
-console.log(favicon)
-icon.value = getImageUrl(favicon); // 更改当前左上角角标
 
 // 设置锁屏时组件显示隐藏
 const setLockScreen = computed(() => {
@@ -118,6 +113,11 @@ onMounted(() => {
 			/*mittBus.on('*', (index, data) => {
         console.log(index, data);
       });*/
+
+			// 动态修改icon
+			const icon = useFavicon();
+			const { favicon } = getCurrentCityConfig();
+			icon.value = getImageUrl(favicon); // 更改当前左上角角标
 		} catch (error) {
 			console.log(error);
 		}

+ 0 - 1
src/views/dataShare/editExpire.vue

@@ -10,7 +10,6 @@
 				:total="state.total"
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
-				:key="Math.random()"
 			>
         <template #table-search>
           <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>

+ 0 - 1
src/views/dataShare/userInfo.vue

@@ -10,7 +10,6 @@
 				:total="state.total"
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
-				:key="Math.random()"
 			>
         <template #table-search>
           <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>

+ 0 - 1
src/views/statistics/center/detailEventFrequently.vue

@@ -10,7 +10,6 @@
 				:total="state.total"
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
-				:key="Math.random()"
 			>
         <template #table-search>
           <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px">

+ 13 - 13
src/views/statistics/order/detailVisitDiscontent.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="business-visit-table-container layout-padding">
     <div class="layout-padding-auto layout-padding-view pd20">
+			<div class="table-search-content">
+				<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+					<el-form-item label="关键字" prop="Keyword">
+						<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+						<el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
+							<SvgIcon name="ele-Refresh" class="mr5" />重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -12,19 +25,6 @@
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
 			>
-        <template #table-search>
-          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-            <el-form-item label="关键字" prop="Keyword">
-              <el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-              <el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
-                <SvgIcon name="ele-Refresh" class="mr5" />重置
-              </el-button>
-            </el-form-item>
-          </el-form>
-        </template>
 				<template #title="{ row }">
 					<order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
 				</template>

+ 27 - 27
src/views/statistics/order/visitDiscontent.vue

@@ -1,6 +1,33 @@
 <template>
 	<div class="statistics-order-visit-discontent-container layout-padding">
     <div class="layout-padding-auto layout-padding-view pd20">
+			<div class="table-search-content">
+				<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+					<el-form-item label="部门名称" prop="OrgName">
+						<el-input v-model="state.queryParams.OrgName" placeholder="部门名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+					</el-form-item>
+					<el-form-item label="时间段" prop="crTime">
+						<el-date-picker
+							v-model="state.queryParams.crTime"
+							type="daterange"
+							unlink-panels
+							range-separator="至"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
+							:shortcuts="shortcuts"
+							@change="handleQuery"
+							value-format="YYYY-MM-DD"
+							:clearable="false"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+						<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+							<SvgIcon name="ele-Refresh" class="mr5" />重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -12,33 +39,6 @@
 				:key="Math.random()"
 				show-summary
 			>
-        <template #table-search>
-          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-            <el-form-item label="部门名称" prop="OrgName">
-              <el-input v-model="state.queryParams.OrgName" placeholder="部门名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
-            </el-form-item>
-            <el-form-item label="时间段" prop="crTime">
-              <el-date-picker
-                  v-model="state.queryParams.crTime"
-                  type="daterange"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  :shortcuts="shortcuts"
-                  @change="handleQuery"
-                  value-format="YYYY-MM-DD"
-                  :clearable="false"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-              <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-                <SvgIcon name="ele-Refresh" class="mr5" />重置
-              </el-button>
-            </el-form-item>
-          </el-form>
-        </template>
 			</ProTable>
 		</div>
 	</div>

+ 20 - 21
src/views/tels/callLog/component/Connect-business.vue

@@ -8,6 +8,26 @@
 					<el-radio :value="false">回访</el-radio>
 				</el-radio-group>
 			</div>
+			<div class="table-search-content">
+				<el-form :model="state.queryParams" @submit.native.prevent inline>
+					<el-form-item label="" prop="Keyword">
+						<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
+					</el-form-item>
+					<el-form-item label="" label-width="0">
+						<el-button type="primary" @click="queryList" :loading="loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+						<el-button
+							@click="
+									state.queryParams.Keyword = null;
+									queryList();
+								"
+							class="default-button"
+							:loading="loading"
+						>
+							<SvgIcon name="ele-Refresh" class="mr5" />重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -22,27 +42,6 @@
 				@current-change="handleSelectionChange"
 				max-height="400"
 			>
-				<!-- 表格 header 按钮 -->
-				<template #tableHeader="scope">
-					<el-form :model="state.queryParams" @submit.native.prevent inline>
-						<el-form-item label="" prop="Keyword">
-							<el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="queryList" class="keyword-input" />
-						</el-form-item>
-						<el-form-item label="" label-width="0">
-							<el-button type="primary" @click="queryList" :loading="loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-							<el-button
-								@click="
-									state.queryParams.Keyword = null;
-									queryList();
-								"
-								class="default-button"
-								:loading="loading"
-							>
-								<SvgIcon name="ele-Refresh" class="mr5" />重置
-							</el-button>
-						</el-form-item>
-					</el-form>
-				</template>
 				<template #title="{ row }">
 					<order-detail v-if="isOrder" :order="row">{{ row.title }}</order-detail>
 					<order-detail v-else :order="row.order">{{ row.order?.title }}</order-detail>

+ 0 - 1
src/views/todo/center/index.vue

@@ -10,7 +10,6 @@
 				:total="state.total"
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
-				:key="Math.random()"
 			>
 				<template #table-search>
 					<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px" class="mb10">