diff --git a/src/api/order.js b/src/api/order.js index 625e45c..f551299 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -26,3 +26,11 @@ }); } +// business/workOrder/listHistoryData +export function listHistoryData(query) { + return request({ + url: '/business/workOrder/listHistoryData', + method: 'get', + params: query, + }); +} diff --git a/src/api/order.js b/src/api/order.js index 625e45c..f551299 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -26,3 +26,11 @@ }); } +// business/workOrder/listHistoryData +export function listHistoryData(query) { + return request({ + url: '/business/workOrder/listHistoryData', + method: 'get', + params: query, + }); +} diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index 0d40e59..b75505d 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -418,7 +418,11 @@
处理明细
-
+
+
+ {{ item.operationTime + ' ' + item.operation }} +
+
@@ -432,7 +436,7 @@ import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传 import phone_icon from '@/assets/images/order/phone_icon.png'; import shortMessage_icon from '@/assets/images/order/shortMessage_icon.png'; -import { getWorkOrder } from '@/api/order'; +import { getWorkOrder, listHistoryData } from '@/api/order'; import { onMounted, ref } from 'vue'; const { proxy } = getCurrentInstance(); @@ -491,6 +495,7 @@ timeStep: [], operation: '', operationTime: '', + historyData: [], }, confirmForm: { time: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), @@ -658,9 +663,14 @@ ], }, ], + historyParams: { + workflowKey: 'WorkOrder', + fileRefFieldPattern: 'picture', + businessKey: '', + }, }); -const { rules, orderForm, handleProcess, confirmForm, threeData, presonThreeData } = toRefs(orderData); +const { rules, orderForm, handleProcess, confirmForm, threeData, presonThreeData, historyParams } = toRefs(orderData); // 详情 const getDetail = () => { @@ -673,9 +683,19 @@ // previousOperation handleProcess.value.operation = res.data.previousOperation?.operation || ''; handleProcess.value.operationTime = res.data.previousOperation?.operationTime || ''; + infoLoading.value = false; }); }; + +// 历史记录 +const getHistoryData = () => { + historyParams.value.businessKey = props.orderId; + listHistoryData(historyParams.value).then(res => { + // console.log('historyData', res); + handleProcess.value.historyData = res.data; + }); +}; const handleSubmit = () => {}; const close = () => { @@ -683,6 +703,7 @@ }; onMounted(() => { + getHistoryData(); getDetail(); }); diff --git a/src/api/order.js b/src/api/order.js index 625e45c..f551299 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -26,3 +26,11 @@ }); } +// business/workOrder/listHistoryData +export function listHistoryData(query) { + return request({ + url: '/business/workOrder/listHistoryData', + method: 'get', + params: query, + }); +} diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index 0d40e59..b75505d 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -418,7 +418,11 @@
处理明细
-
+
+
+ {{ item.operationTime + ' ' + item.operation }} +
+
@@ -432,7 +436,7 @@ import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传 import phone_icon from '@/assets/images/order/phone_icon.png'; import shortMessage_icon from '@/assets/images/order/shortMessage_icon.png'; -import { getWorkOrder } from '@/api/order'; +import { getWorkOrder, listHistoryData } from '@/api/order'; import { onMounted, ref } from 'vue'; const { proxy } = getCurrentInstance(); @@ -491,6 +495,7 @@ timeStep: [], operation: '', operationTime: '', + historyData: [], }, confirmForm: { time: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), @@ -658,9 +663,14 @@ ], }, ], + historyParams: { + workflowKey: 'WorkOrder', + fileRefFieldPattern: 'picture', + businessKey: '', + }, }); -const { rules, orderForm, handleProcess, confirmForm, threeData, presonThreeData } = toRefs(orderData); +const { rules, orderForm, handleProcess, confirmForm, threeData, presonThreeData, historyParams } = toRefs(orderData); // 详情 const getDetail = () => { @@ -673,9 +683,19 @@ // previousOperation handleProcess.value.operation = res.data.previousOperation?.operation || ''; handleProcess.value.operationTime = res.data.previousOperation?.operationTime || ''; + infoLoading.value = false; }); }; + +// 历史记录 +const getHistoryData = () => { + historyParams.value.businessKey = props.orderId; + listHistoryData(historyParams.value).then(res => { + // console.log('historyData', res); + handleProcess.value.historyData = res.data; + }); +}; const handleSubmit = () => {}; const close = () => { @@ -683,6 +703,7 @@ }; onMounted(() => { + getHistoryData(); getDetail(); }); diff --git a/vite.config.js b/vite.config.js index bc4479e..ca3cd5c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -9,8 +9,8 @@ // const targetUrl = 'http://192.168.48.145:13000'; //张鸿志 const zhz = 'http://192.168.20.5:13002'; //张鸿志 const zyh = 'http://192.168.16.105:13002'; //张亚辉 -const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 -// const targetUrl = 'http://192.168.16.135:13000'; //徐云欣 +// const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 +const targetUrl = 'http://192.168.16.135:13000'; //徐云欣 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {