Browse Source

reactor:工单详情操作按钮状态判断;
fix:发布待办新增结办部门;

zhangchong 1 năm trước cách đây
mục cha
commit
6939d67bf7

+ 0 - 1
src/layout/navBars/breadcrumb/telControl.vue

@@ -1026,7 +1026,6 @@ const onMessage = (event: any) => {
       // 设置分机号和坐席组
       useTelStatusStore.setCallInfo({ telsNo: data.agent_extn});
 
-
 			// 结束计时
 			removeTimer();
 			console.log('已挂机',onCallArr.value,data);

+ 2 - 1
src/views/auxiliary/message/index.vue

@@ -46,6 +46,7 @@
 				</el-table-column>
 				<el-table-column prop="sendOrganize" label="发送部门" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="sendUser" label="发送人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="resendCount" label="重发次数" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="orderNo" label="关联工单编号" show-overflow-tooltip width="150"></el-table-column>
 				<el-table-column prop="remark" label="备注说明" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column prop="reason" label="失败原因" show-overflow-tooltip width="200"></el-table-column>
@@ -125,7 +126,7 @@ const queryList = () => {
 	else {
     const request = other.deepClone(state.queryParams);
     Reflect.deleteProperty(request, 'crTime'); // 删除无用的参数
-		messageList(state.queryParams)
+		messageList(request)
 			.then((res) => {
 				state.loading = false;
 				state.tableData = res.result.items ?? [];

+ 50 - 10
src/views/business/order/components/Order-detail.vue

@@ -157,7 +157,7 @@
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 								<el-form-item label="工单标题">
-									{{ state.ruleForm.title }} <el-tag class="ml10">{{ state.ruleForm.statusText }}</el-tag>
+									{{ state.ruleForm.title }} <el-tag class="ml10" v-if="state.ruleForm?.workflowId">{{ state.ruleForm.statusText }}</el-tag>
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -408,17 +408,57 @@
 
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button type="primary" @click="onRecord" :loading="state.loading" v-auth="'system:workflow:record'">流程明细</el-button>
-				<el-button type="primary" @click="onSpecialHandle" :loading="state.loading">撤 回(特提)</el-button>
-				<el-button type="primary" @click="onSupervise" :loading="state.loading" v-auth="'business:order:urge:apply'">督 办</el-button>
-				<el-button type="primary" @click="onUrge" :loading="state.loading" v-auth="'business:order:supervise:apply'"> 催 办</el-button>
-				<el-button type="primary" @click="onSubmit('延期申请', '延期附件')" v-auth="'business:order:delay'" :loading="state.loading">延 期</el-button>
-				<!-- 工单未归档和可以办理展示办理按钮 -->
+        <!-- 有流程信息就可以查询明细 -->
+				<el-button
+					type="primary"
+					@click="onRecord"
+					:loading="state.loading"
+					v-auth="'system:workflow:record'"
+					v-if="state.ruleForm?.workflowId"
+					>流程明细</el-button
+				>
+        <!-- 有流程信息就可以撤回 -->
+				<el-button
+					type="primary"
+					@click="onSpecialHandle"
+					:loading="state.loading"
+          v-if="state.ruleForm?.workflowId"
+					>撤 回(特提)</el-button
+				>
+        <!-- 办理中和会签中,可以督办 -->
+				<el-button
+					type="primary"
+					@click="onSupervise"
+					:loading="state.loading"
+					v-auth="'business:order:urge:apply'"
+					v-if="[100,200].includes(state.ruleForm?.status)"
+					>督 办</el-button
+				>
+        <!-- 办理中和会签中,可以催办 -->
+				<el-button
+					type="primary"
+					@click="onUrge"
+					:loading="state.loading"
+					v-auth="'business:order:supervise:apply'"
+					v-if="[100,200].includes(state.ruleForm?.status)"
+				>
+					催 办</el-button
+				>
+        <!-- 办理中和会签中,可以延期申请 -->
+				<el-button
+					type="primary"
+					@click="onSubmit('延期申请', '延期附件')"
+					v-auth="'business:order:delay'"
+					:loading="state.loading"
+          v-if="[100,200].includes(state.ruleForm?.status)"
+					>延 期</el-button
+				>
+				<!-- 办理中和会签中并且应该自己办理 -->
 				<el-button
 					type="primary"
 					@click="onSubmit('工单办理')"
 					:loading="state.loading"
-					v-if="![60].includes(state.ruleForm.workflow?.status) && state.workflow.canHandle"
+					v-if="[100,200].includes(state.ruleForm?.status) && state.workflow.canHandle"
 					v-auth="'business:order:handle'"
 					>办 理</el-button
 				>
@@ -436,12 +476,12 @@
 					v-auth="'business:order:recall'"
 					>撤 回(特提)</el-button
 				>-->
-				<!-- 工单未归档和可以办理展示退回按钮 -->
+				<!-- 办理中和会签中并且应该自己办理 -->
 				<el-button
 					type="primary"
 					@click="onSubmit('工单退回')"
 					:loading="state.loading"
-					v-if="![60].includes(state.ruleForm.workflow?.status) && state.workflow.canHandle"
+					v-if="[100,200].includes(state.ruleForm?.status) && state.workflow.canHandle"
 					v-auth="'business:order:return'"
 					>退 回</el-button
 				>

+ 1 - 5
src/views/knowledge/index/index.vue

@@ -81,15 +81,12 @@
 							<el-form-item label="关键字" prop="Keyword">
 								<el-input
 									v-model="state.queryParams.Keyword"
-									placeholder="标题/创建人/创建部门/申请部门"
+									placeholder="标题/创建人/创建部门/来源部门"
 									clearable
 									@keyup.enter="handleQuery"
 									style="width: 250px"
 								/>
 							</el-form-item>
-							<el-form-item label="标题" prop="Title">
-								<el-input v-model="state.queryParams.Title" placeholder="标题" clearable @keyup.enter="handleQuery" />
-							</el-form-item>
 							<el-form-item label="是否公开" prop="IsPublic">
 								<el-select v-model="state.queryParams.IsPublic" placeholder="请选择是否公开" class="w100">
 									<el-option label="公开" :value="true" />
@@ -221,7 +218,6 @@
 										@click="onPreview(row)"
 										title="查看"
 										v-if="[1, 2, 3, 4, 5, 6].includes(row.newStatus)"
-										v-auth="'knowledge:index:preview'"
 									>
 										查看
 									</el-button>

+ 13 - 12
src/views/todo/publish/index.vue

@@ -45,6 +45,7 @@
 				<el-table-column prop="sourceChannel" label="来源方式" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="acceptType" label="受理类型" show-overflow-tooltip width="150"></el-table-column>
 				<el-table-column prop="counterSignTypeText" label="中心会签" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="actualHandleOrgName" label="接办部门" show-overflow-tooltip width="150"></el-table-column>
 				<el-table-column prop="expiredTime" label="受理人" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span
@@ -69,7 +70,7 @@
 				</el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center">
 					<template #default="{ row }">
-            <el-button link type="primary" @click="onDetail(row)" title="查看工单详情"> 工单详情 </el-button>
+						<el-button link type="primary" @click="onDetail(row)" title="查看工单详情"> 工单详情 </el-button>
 						<el-button link type="primary" @click="publish(row)" title="发布工单" v-auth="'todo:publish:publish'"> 发布 </el-button>
 					</template>
 				</el-table-column>
@@ -87,17 +88,17 @@
 		</el-card>
 		<!-- 工单发布详情 -->
 		<order-publish ref="orderPublishRef" @updateList="queryList" />
-    <!-- 工单详情 -->
-    <order-detail ref="orderDetailRef" @updateList="queryList" />
+		<!-- 工单详情 -->
+		<order-detail ref="orderDetailRef" @updateList="queryList" />
 	</div>
 </template>
 <script setup lang="ts" name="todoPublish">
-import {defineAsyncComponent, onMounted, reactive, ref} from 'vue';
-import {ElButton, ElMessage, FormInstance} from 'element-plus';
-import {auth} from '/@/utils/authFunction';
-import {throttle} from '/@/utils/tools';
-import {formatDate} from '/@/utils/formatTime';
-import {publishList} from '/@/api/todo/publish';
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { ElButton, ElMessage, FormInstance } from 'element-plus';
+import { auth } from '/@/utils/authFunction';
+import { throttle } from '/@/utils/tools';
+import { formatDate } from '/@/utils/formatTime';
+import { publishList } from '/@/api/todo/publish';
 // 引入组件
 const OrderPublish = defineAsyncComponent(() => import('/@/views/business/publish/component/Order-publish.vue'));
 const OrderDetail = defineAsyncComponent(() => import('/@/views/business/order/components/Order-detail.vue')); // 工单详情
@@ -152,9 +153,9 @@ const publishMultiple = () => {
 };
 // 工单详情
 const orderDetailRef = ref<RefType>();
-const onDetail = (row:any)=>{
-  orderDetailRef.value.openDialog(row);
-}
+const onDetail = (row: any) => {
+	orderDetailRef.value.openDialog(row);
+};
 // 发布
 const orderPublishRef = ref<RefType>(); // 工单发布详情ref
 const publish = (row: any) => {