reactor:附件对接;

src/api/auxiliary/message.ts

@@ -8,7 +8,7 @@ import request from '/@/utils/request';
  */
 export const messageBase = () => {
     return request({
-        url: `/api/v1/PushMessage/list-data`,
+        url: `/list-data`,
         method: 'get'
     });
 };
@@ -18,7 +18,7 @@ export const messageBase = () => {
  */
 export const messageList = (params: object) => {
     return request({
-        url: `/api/v1/PushMessage/getlist`,
+        url: `/getlist`,
         method: 'get',
         params,
     });
@@ -29,7 +29,7 @@ export const messageList = (params: object) => {
  */
 export const pushMessage = (id: string) => {
     return request({
-        url: `/api/v1/PushMessage/${id}`,
+        url: `/${id}`,
         method: 'get'
     });
 };

src/components/AnnexList/index.vue

@@ -98,7 +98,7 @@ const fileList = ref<EmptyArrayType>([]);
 const uploadListRef = ref<RefType>(); // 上传组件ref
 // 更新数据
 const updateData = () => {
-	emit('update:modelValue', [fileList.value]);
+	emit('update:modelValue', [...fileList.value]);
 	const data = formatData(fileList.value);
 	emit('update:format', [...data]);
 };
@@ -172,13 +172,14 @@ const handleDownload = (uploadFile: any) => {
 };
 // 预览
 const onPreview = (file: any) => {
-	if (!file.path) {
+	if (!file.response?.result?.path) {
 		ElMessage.error('附件不存在');
 		return;
 	}
+  const type = file.response?.result?.fileName?.split('.').pop();
 	// 图片预览
-	if (['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp', 'BMP', 'mpg', 'MPG', 'mpeg', 'MPEG', 'svg', 'tis'].includes(file.type)) {
-		const url = import.meta.env.VITE_FILE_PREFIX + file.path;
+	if (['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp', 'BMP', 'mpg', 'MPG', 'mpeg', 'MPEG', 'svg', 'tis'].includes(type)) {
+		const url = import.meta.env.VITE_FILE_PREFIX + file.response?.result?.path;
 		/*		viewerApi({ images: [] });*/
 		window.open(url);
 		return;

src/components/OrderDetail/index.vue

@@ -730,6 +730,7 @@ const onRevoke = () => {
 // 撤销提交成功
 const onRevokeSuccess = () => {
 	handleClick(state.activeName);
+  emit('updateList');
 };
 // 督办
 const orderSuperviseRef = ref<RefType>(); // 工单督办
@@ -744,6 +745,7 @@ const onUrge = () => {
 // 督办提交成功
 const onSuperviseSuccess = () => {
 	handleClick(state.activeName);
+  emit('updateList');
 };
 // 查看回访详情
 const currentVisitObj = ref<any>();
@@ -758,6 +760,7 @@ const onSpecialHandle = () => {
 // 特提提交成功
 const onSpecialHandleSuccess = () => {
 	handleClick(state.activeName);
+  emit('updateList');
 };
 // 暴露变量
 defineExpose({

src/layout/navBars/breadcrumb/telControl.vue

@@ -631,7 +631,7 @@ const getTelsLists = async () => {
 		state.telsList = state.telsList.map((item: any) => ({
 			value: item.telNo,
 			label: item.telNo,
-			queue: item.description === '默认' ? '10010' : item.description,
+			queue: item.queueId,
 			...item,
 		}));
 		state.loading = false;
@@ -724,7 +724,7 @@ const onDutyFn = async () => {
 					.then((res: any) => {
 						currentTel.value.password = res.result.telPwd;
 						currentTel.value.telNo = res.result.telNo;
-						currentTel.value.queue = res.result.description === '默认' ? '10010' : res.result.description;
+						currentTel.value.queue = res.result.queueId;
 						// 不需要选择分机号和密码 直接签入 传入默认分机号
 						websocket_connect(); //开启消息监听
 						state.loading = false;
@@ -755,7 +755,7 @@ const clickOnDuty = (formEl: FormInstance | undefined) => {
 				.then((res: any) => {
 					currentTel.value.password = state.dutyForm.password;
 					currentTel.value.telNo = state.dutyForm.telNo;
-					currentTel.value.queue = res.result.description === '默认' ? '10010' : res.result.description;
+					currentTel.value.queue = res.result.queueId;
 					websocket_connect(); //开启消息监听
 					state.loading = false;
 					state.dutyDialogVisible = false;
@@ -779,7 +779,7 @@ const clickOnDuty = (formEl: FormInstance | undefined) => {
 				.then((res: any) => {
 					currentTel.value.password = res.result.telPwd;
 					currentTel.value.telNo = res.result.telNo;
-					currentTel.value.queue = res.result.description === '默认' ? '10010' : res.result.description;
+					currentTel.value.queue = res.result.queueId;
 					websocket_connect(); //开启消息监听
 					state.loading = false;
 					state.dutyDialogVisible = false;
@@ -800,7 +800,7 @@ const clickOnDuty = (formEl: FormInstance | undefined) => {
 				.then((res: any) => {
 					currentTel.value.password = state.dutyForm.password;
 					currentTel.value.telNo = res.result.telNo;
-					currentTel.value.queue = res.result.description === '默认' ? '10010' : res.result.description;
+					currentTel.value.queue = res.result.queueId;
 					websocket_connect(); //开启消息监听
 					state.loading = false;
 					state.dutyDialogVisible = false;
@@ -1423,7 +1423,7 @@ onMounted(async () => {
 			.then((res: any) => {
 				currentTel.value.password = res.result.telPwd;
 				currentTel.value.telNo = res.result.telNo;
-				currentTel.value.queue = res.result.description === '默认' ? '10010' : res.result.description;
+				currentTel.value.queue = res.result.queueId;
 				websocket_connect(); //开启消息监听
 				state.loading = false;
 			})

src/views/business/supervise/components/Order-supervise-detail.vue

@@ -35,6 +35,11 @@
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <el-form-item label="被督办部门">{{ state.superviseDetail.orgName }}</el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
+              <annex-list name="督办申请附件" readonly classify="督办申请" v-model="state.superviseDetail.files"/>
+            </el-form-item>
+          </el-col>
           <template v-if="state.superviseDetail.replyTime">
             <el-divider content-position="left"> <el-text tag="b" size="large">回复内容</el-text> </el-divider>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -45,7 +50,7 @@
             </el-col>
             <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
               <el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
-                <annex-list name="督办附件" readonly :businessId="state.superviseDetail.id" classify="督办附件" v-model="state.superviseDetail.files"/>
+                <annex-list name="督办回复附件" readonly classify="督办回复" v-model="state.superviseDetail.replyFiles"/>
               </el-form-item>
             </el-col>
           </template>

src/views/business/supervise/components/Order-supervise-reply.vue

@@ -38,6 +38,11 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="督办回复时间"> {{ formatDate(Date(), 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 					</el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
+              <annex-list name="督办申请附件" readonly classify="督办申请" v-model="state.superviseDetail.files"/>
+            </el-form-item>
+          </el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="督办回复内容" prop="replyContent" :rules="[{ required: true, message: '请填写督办回复内容', trigger: 'blur' }]">
 							<common-advice
@@ -51,7 +56,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
-              <annex-list name="督办附件" v-model="state.ruleForm.files" v-model:format="filesFormat" :businessId="state.orderDetail.id" classify="督办附件" />
+              <annex-list name="督办回复附件" v-model="state.ruleForm.files" v-model:format="filesFormat" :businessId="state.superviseDetail.id" classify="督办回复" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -86,6 +91,7 @@ const state = reactive<any>({
 	ruleForm: {
 		acceptSms: false, // 发送督办短信
 		replyContent: '', // 督办回复内容
+    files:[]
 	},
 	superviseDetail: {}, // 督办详情
 	orderDetail: {}, // 工单详情

src/views/business/supervise/components/Order-supervise.vue

@@ -56,7 +56,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="发送督办短信" prop="acceptSms" :rules="[{ required: false, message: '请选择发送督办短信', trigger: 'change' }]">
+						<el-form-item label="" prop="acceptSms" :rules="[{ required: false, message: '请选择发送督办短信', trigger: 'change' }]">
 							<el-checkbox v-model="state.ruleForm.acceptSms" label="发送督办短信" />
 						</el-form-item>
 					</el-col>
@@ -73,7 +73,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="附件" prop="handleResult" :rules="[{ required: false, message: '请选择附件', trigger: 'change' }]">
-              <annex-list name="督办附件" v-model="state.ruleForm.files" v-model:format="filesFormat" :businessId="state.orderDetail.id" classify="督办附件" />
+              <annex-list name="督办申请附件" v-model="state.ruleForm.files" v-model:format="filesFormat" businessId="" classify="督办申请" />
 						</el-form-item>
 					</el-col>
 				</el-row>