Browse Source

Merge branch 'master' into dev

zhangchong 10 months ago
parent
commit
b1a64397d3

+ 15 - 4
src/views/business/overdue/index.vue

@@ -3,9 +3,18 @@
 		<!-- 搜索  -->
 		<el-card shadow="never">
 			<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 label="工单标题" prop="Title">
+          <el-input v-model="state.queryParams.Title" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
+        </el-form-item>
+        <el-form-item label="工单编码" prop="No">
+          <el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
+        </el-form-item>
+        <el-form-item label="是否省工单" prop="IsProvince">
+          <el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery" class="w100">
+            <el-option label="是" value="true" />
+            <el-option label="否" value="false" />
+          </el-select>
+        </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">
@@ -95,7 +104,9 @@ const state = reactive({
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 10,
-		Keyword: null, // 关键字
+    Title: null, // 关键字
+    No: null, // 工单编码
+    IsProvince:null // 是否省工单
 	},
 	tableData: [{}], //表单
 	loading: false, // 加载

+ 18 - 8
src/views/business/overdue/soon.vue

@@ -3,9 +3,18 @@
 		<!-- 搜索  -->
 		<el-card shadow="never">
 			<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 label="工单标题" prop="Title">
+					<el-input v-model="state.queryParams.Title" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
 				</el-form-item>
+				<el-form-item label="工单编码" prop="No">
+					<el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery" class="keyword-input" />
+				</el-form-item>
+        <el-form-item label="是否省工单" prop="IsProvince">
+          <el-select v-model="state.queryParams.IsProvince" placeholder="请选择是否省工单" @change="handleQuery" class="w100">
+            <el-option label="是" value="true" />
+            <el-option label="否" value="false" />
+          </el-select>
+        </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">
@@ -39,7 +48,6 @@
 <script setup lang="tsx" name="businessOverdueSoon">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { throttle } from '@/utils/tools';
 import { formatDate } from '@/utils/formatTime';
 import { useRouter } from 'vue-router';
 import { overdueSoonList } from '@/api/query/overdue';
@@ -87,7 +95,9 @@ const state = reactive({
 		// 查询条件
 		PageIndex: 1,
 		PageSize: 10,
-		Keyword: null, // 关键字
+		Title: null, // 关键字
+		No: null, // 工单编码
+    IsProvince:null // 是否省工单
 	},
 	tableData: [{}], //表单
 	loading: false, // 加载
@@ -95,8 +105,8 @@ const state = reactive({
 });
 // 手动查询,将页码设置为1
 const handleQuery = () => {
-  state.queryParams.PageIndex = 1;
-  queryList();
+	state.queryParams.PageIndex = 1;
+	queryList();
 };
 /** 获取列表 */
 const queryList = () => {
@@ -113,14 +123,14 @@ const queryList = () => {
 		.finally(() => {
 			state.loading = false;
 		});
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
 	queryList();
-}
+};
 onMounted(async () => {
 	queryList();
 });

+ 1 - 1
src/views/tels/callLog/index.vue

@@ -6,7 +6,7 @@
 				<el-tab-pane name="1" label="呼入已接"></el-tab-pane>
 				<el-tab-pane name="2" label="呼出已接"></el-tab-pane>
 				<el-tab-pane name="3" label="未接"></el-tab-pane>
-<!--				<el-tab-pane name="4" label="智能应答"></el-tab-pane>-->
+				<el-tab-pane name="4" label="智能应答"></el-tab-pane>
 			</el-tabs>
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="20px">
 				<el-row :gutter="10">