diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index c7eed38..8a62412 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -335,7 +335,7 @@
- 提交 + 提交 返回
@@ -436,8 +436,9 @@ 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, listHistoryData } from '@/api/order'; +import { getWorkOrder, listHistoryData, submitWorkOrder } from '@/api/order'; import { onMounted, ref } from 'vue'; +import useUserStore from '@/store/modules/user'; const { proxy } = getCurrentInstance(); // 工单类型: work_order_type @@ -449,7 +450,7 @@ 'work_order_source' ); -const emit = defineEmits(['closeDialog']); +const emit = defineEmits(['closeDialog', 'getList']); const props = defineProps({ status: { type: String, @@ -499,28 +500,28 @@ }, confirmForm: { customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), - message: '', + id: '', + submitUserId: useUserStore().userInfo.userId, type: '1', - threeValue: '', - presonThreeValue: '', - location: '', - fileList: [ - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, + approveResult: '', + approveComment: '', + fileSaveRequestList: [ + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, ], }, presonThreeData: [ @@ -696,7 +697,23 @@ handleProcess.value.historyData = res.data; }); }; -const handleSubmit = () => {}; + +const handleSubmit = async formRef => { + if (!formRef) return; + formRef.validate(valid => { + if (valid) { + confirmForm.value.approveResult = confirmForm.value.type == '1' ? 'true' : 'false'; + confirmForm.value.id = props.orderId; + console.log('🚀 ~ handleSubmit ~ valid:', valid, confirmForm.value); + submitWorkOrder(confirmForm.value).then(response => { + proxy.$modal.msgSuccess('提交成功'); + // getList(); + emit('getList'); + emit('closeDialog'); + }); + } + }); +}; const close = () => { emit('closeDialog'); diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index c7eed38..8a62412 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -335,7 +335,7 @@
- 提交 + 提交 返回
@@ -436,8 +436,9 @@ 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, listHistoryData } from '@/api/order'; +import { getWorkOrder, listHistoryData, submitWorkOrder } from '@/api/order'; import { onMounted, ref } from 'vue'; +import useUserStore from '@/store/modules/user'; const { proxy } = getCurrentInstance(); // 工单类型: work_order_type @@ -449,7 +450,7 @@ 'work_order_source' ); -const emit = defineEmits(['closeDialog']); +const emit = defineEmits(['closeDialog', 'getList']); const props = defineProps({ status: { type: String, @@ -499,28 +500,28 @@ }, confirmForm: { customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), - message: '', + id: '', + submitUserId: useUserStore().userInfo.userId, type: '1', - threeValue: '', - presonThreeValue: '', - location: '', - fileList: [ - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, + approveResult: '', + approveComment: '', + fileSaveRequestList: [ + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, ], }, presonThreeData: [ @@ -696,7 +697,23 @@ handleProcess.value.historyData = res.data; }); }; -const handleSubmit = () => {}; + +const handleSubmit = async formRef => { + if (!formRef) return; + formRef.validate(valid => { + if (valid) { + confirmForm.value.approveResult = confirmForm.value.type == '1' ? 'true' : 'false'; + confirmForm.value.id = props.orderId; + console.log('🚀 ~ handleSubmit ~ valid:', valid, confirmForm.value); + submitWorkOrder(confirmForm.value).then(response => { + proxy.$modal.msgSuccess('提交成功'); + // getList(); + emit('getList'); + emit('closeDialog'); + }); + } + }); +}; const close = () => { emit('closeDialog'); diff --git a/src/views/order/workOrderConfig/index.vue b/src/views/order/workOrderConfig/index.vue new file mode 100644 index 0000000..c4e1844 --- /dev/null +++ b/src/views/order/workOrderConfig/index.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index c7eed38..8a62412 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -335,7 +335,7 @@
- 提交 + 提交 返回
@@ -436,8 +436,9 @@ 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, listHistoryData } from '@/api/order'; +import { getWorkOrder, listHistoryData, submitWorkOrder } from '@/api/order'; import { onMounted, ref } from 'vue'; +import useUserStore from '@/store/modules/user'; const { proxy } = getCurrentInstance(); // 工单类型: work_order_type @@ -449,7 +450,7 @@ 'work_order_source' ); -const emit = defineEmits(['closeDialog']); +const emit = defineEmits(['closeDialog', 'getList']); const props = defineProps({ status: { type: String, @@ -499,28 +500,28 @@ }, confirmForm: { customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), - message: '', + id: '', + submitUserId: useUserStore().userInfo.userId, type: '1', - threeValue: '', - presonThreeValue: '', - location: '', - fileList: [ - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, + approveResult: '', + approveComment: '', + fileSaveRequestList: [ + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, ], }, presonThreeData: [ @@ -696,7 +697,23 @@ handleProcess.value.historyData = res.data; }); }; -const handleSubmit = () => {}; + +const handleSubmit = async formRef => { + if (!formRef) return; + formRef.validate(valid => { + if (valid) { + confirmForm.value.approveResult = confirmForm.value.type == '1' ? 'true' : 'false'; + confirmForm.value.id = props.orderId; + console.log('🚀 ~ handleSubmit ~ valid:', valid, confirmForm.value); + submitWorkOrder(confirmForm.value).then(response => { + proxy.$modal.msgSuccess('提交成功'); + // getList(); + emit('getList'); + emit('closeDialog'); + }); + } + }); +}; const close = () => { emit('closeDialog'); diff --git a/src/views/order/workOrderConfig/index.vue b/src/views/order/workOrderConfig/index.vue new file mode 100644 index 0000000..c4e1844 --- /dev/null +++ b/src/views/order/workOrderConfig/index.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue index 57129ab..812b881 100644 --- a/src/views/order/workOrderProcessing/components/checkOrder.vue +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -75,7 +75,7 @@ :append-to-body="true" :destroy-on-close="true" > - + diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index c7eed38..8a62412 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -335,7 +335,7 @@
- 提交 + 提交 返回
@@ -436,8 +436,9 @@ 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, listHistoryData } from '@/api/order'; +import { getWorkOrder, listHistoryData, submitWorkOrder } from '@/api/order'; import { onMounted, ref } from 'vue'; +import useUserStore from '@/store/modules/user'; const { proxy } = getCurrentInstance(); // 工单类型: work_order_type @@ -449,7 +450,7 @@ 'work_order_source' ); -const emit = defineEmits(['closeDialog']); +const emit = defineEmits(['closeDialog', 'getList']); const props = defineProps({ status: { type: String, @@ -499,28 +500,28 @@ }, confirmForm: { customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), - message: '', + id: '', + submitUserId: useUserStore().userInfo.userId, type: '1', - threeValue: '', - presonThreeValue: '', - location: '', - fileList: [ - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, + approveResult: '', + approveComment: '', + fileSaveRequestList: [ + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, ], }, presonThreeData: [ @@ -696,7 +697,23 @@ handleProcess.value.historyData = res.data; }); }; -const handleSubmit = () => {}; + +const handleSubmit = async formRef => { + if (!formRef) return; + formRef.validate(valid => { + if (valid) { + confirmForm.value.approveResult = confirmForm.value.type == '1' ? 'true' : 'false'; + confirmForm.value.id = props.orderId; + console.log('🚀 ~ handleSubmit ~ valid:', valid, confirmForm.value); + submitWorkOrder(confirmForm.value).then(response => { + proxy.$modal.msgSuccess('提交成功'); + // getList(); + emit('getList'); + emit('closeDialog'); + }); + } + }); +}; const close = () => { emit('closeDialog'); diff --git a/src/views/order/workOrderConfig/index.vue b/src/views/order/workOrderConfig/index.vue new file mode 100644 index 0000000..c4e1844 --- /dev/null +++ b/src/views/order/workOrderConfig/index.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue index 57129ab..812b881 100644 --- a/src/views/order/workOrderProcessing/components/checkOrder.vue +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -75,7 +75,7 @@ :append-to-body="true" :destroy-on-close="true" > - + diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue index 5bd7300..6fc9cd6 100644 --- a/src/views/order/workOrderProcessing/index.vue +++ b/src/views/order/workOrderProcessing/index.vue @@ -12,7 +12,7 @@
{{ item.title }}
-
{{ '( ' + item.num + ' )' }}
+
{{ '( ' + (item.num || 0) + ' )' }}
@@ -40,60 +40,60 @@ const showOrderCode = ref('accept'); const orderTitleList = ref([ { - code: '001', + code: 'register', title: '登记工单', icon: gddj_icon, value: 'launch', - num: '1', + num: null, }, { - code: '002', + code: 'accept', title: '工单受理', icon: sl_icon, value: 'accept', - num: '0', + num: null, }, { - code: '003', + code: 'submit', title: '工单提交', icon: tj_icon, value: 'submit', - num: '0', + num: null, }, { - code: '004', + code: 'assign', title: '工单分派', icon: fp_icon, value: 'assign', - num: '0', + num: null, }, { - code: '005', + code: 'response', title: '工单响应', icon: xy_icon, value: 'response', - num: '0', + num: null, }, { - code: '006', + code: 'report', title: '工单上报', icon: sb_icon, value: 'report', - num: '0', + num: null, }, { - code: '007', + code: 'check', title: '工单核实', icon: hs_icon, value: 'check', - num: '0', + num: null, }, { - code: '008', + code: 'complete', title: '工单结案', icon: ja_icon, value: 'complete', - num: '0', + num: null, }, ]); diff --git a/src/api/order.js b/src/api/order.js index f551299..eb8b5cf 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -3,7 +3,7 @@ // /business/workOrder/list export function workOrderPage(query) { return request({ - url: '/business/workOrder/page', + url: '/business/workOrder/page_my', method: 'get', params: query, }); @@ -19,6 +19,7 @@ } // /business/workOrder/{id} +// business/workOrder/page_my export function getWorkOrder(id) { return request({ url: '/business/workOrder/' + id, @@ -34,3 +35,49 @@ params: query, }); } + +// business/workOrderSourceConfig/list +export function listWorkOrderSourceConfig(query) { + return request({ + url: '/business/workOrderSourceConfig/list', + method: 'get', + params: query, + }); +} + +// /business/workOrder/submit +export function submitWorkOrder(data) { + return request({ + url: '/business/workOrder/submit', + method: 'put', + data: data, + }); +} + +// /business/workOrderSourceConfig/edit +export function editWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/edit', + method: 'put', + data: data, + }); +} + +// business/workOrderSourceConfig/listUnConfigDictData +export function listUnConfigDictData(query) { + return request({ + url: '/business/workOrderSourceConfig/listUnConfigDictData', + method: 'get', + params: query, + }); +} + +// /business/workOrderSourceConfig/add +export function addWorkOrderSourceConfig(data) { + return request({ + url: '/business/workOrderSourceConfig/add', + method: 'post', + data: data, + }); +} + diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue index c7eed38..8a62412 100644 --- a/src/views/order/components/orderDia.vue +++ b/src/views/order/components/orderDia.vue @@ -335,7 +335,7 @@
- 提交 + 提交 返回
@@ -436,8 +436,9 @@ 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, listHistoryData } from '@/api/order'; +import { getWorkOrder, listHistoryData, submitWorkOrder } from '@/api/order'; import { onMounted, ref } from 'vue'; +import useUserStore from '@/store/modules/user'; const { proxy } = getCurrentInstance(); // 工单类型: work_order_type @@ -449,7 +450,7 @@ 'work_order_source' ); -const emit = defineEmits(['closeDialog']); +const emit = defineEmits(['closeDialog', 'getList']); const props = defineProps({ status: { type: String, @@ -499,28 +500,28 @@ }, confirmForm: { customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'), - message: '', + id: '', + submitUserId: useUserStore().userInfo.userId, type: '1', - threeValue: '', - presonThreeValue: '', - location: '', - fileList: [ - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, - { - name: 'food.jpeg', - url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', - }, + approveResult: '', + approveComment: '', + fileSaveRequestList: [ + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, + // { + // name: 'food.jpeg', + // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', + // }, ], }, presonThreeData: [ @@ -696,7 +697,23 @@ handleProcess.value.historyData = res.data; }); }; -const handleSubmit = () => {}; + +const handleSubmit = async formRef => { + if (!formRef) return; + formRef.validate(valid => { + if (valid) { + confirmForm.value.approveResult = confirmForm.value.type == '1' ? 'true' : 'false'; + confirmForm.value.id = props.orderId; + console.log('🚀 ~ handleSubmit ~ valid:', valid, confirmForm.value); + submitWorkOrder(confirmForm.value).then(response => { + proxy.$modal.msgSuccess('提交成功'); + // getList(); + emit('getList'); + emit('closeDialog'); + }); + } + }); +}; const close = () => { emit('closeDialog'); diff --git a/src/views/order/workOrderConfig/index.vue b/src/views/order/workOrderConfig/index.vue new file mode 100644 index 0000000..c4e1844 --- /dev/null +++ b/src/views/order/workOrderConfig/index.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue index 57129ab..812b881 100644 --- a/src/views/order/workOrderProcessing/components/checkOrder.vue +++ b/src/views/order/workOrderProcessing/components/checkOrder.vue @@ -75,7 +75,7 @@ :append-to-body="true" :destroy-on-close="true" > - + diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue index 5bd7300..6fc9cd6 100644 --- a/src/views/order/workOrderProcessing/index.vue +++ b/src/views/order/workOrderProcessing/index.vue @@ -12,7 +12,7 @@
{{ item.title }}
-
{{ '( ' + item.num + ' )' }}
+
{{ '( ' + (item.num || 0) + ' )' }}
@@ -40,60 +40,60 @@ const showOrderCode = ref('accept'); const orderTitleList = ref([ { - code: '001', + code: 'register', title: '登记工单', icon: gddj_icon, value: 'launch', - num: '1', + num: null, }, { - code: '002', + code: 'accept', title: '工单受理', icon: sl_icon, value: 'accept', - num: '0', + num: null, }, { - code: '003', + code: 'submit', title: '工单提交', icon: tj_icon, value: 'submit', - num: '0', + num: null, }, { - code: '004', + code: 'assign', title: '工单分派', icon: fp_icon, value: 'assign', - num: '0', + num: null, }, { - code: '005', + code: 'response', title: '工单响应', icon: xy_icon, value: 'response', - num: '0', + num: null, }, { - code: '006', + code: 'report', title: '工单上报', icon: sb_icon, value: 'report', - num: '0', + num: null, }, { - code: '007', + code: 'check', title: '工单核实', icon: hs_icon, value: 'check', - num: '0', + num: null, }, { - code: '008', + code: 'complete', title: '工单结案', icon: ja_icon, value: 'complete', - num: '0', + num: null, }, ]); 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 }) => {