景聚庭-优惠结账-流程调整为通知

src/views/dashboard/widgets/components/MyNoticePageList.vue

@@ -61,6 +61,7 @@
 	<ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
 	<CwInvoiceForm ref="cwInvoiceForm"></CwInvoiceForm>
 	<InvoiceForm ref="invoiceForm"></InvoiceForm>
+	<DishOrderInfoDialog ref="dishOrderInfoDialog"></DishOrderInfoDialog>
 
 </template>
 
@@ -68,6 +69,8 @@
 import WareHouseHistoryPopup from '@/views/materialManagement/wareHouseSummary/WareHouseHistoryPopup'
 import PsiWareHouseHistoryPopup from '@/views/psiManagement/loss/PurchasePageFormPopup.vue'
 import PurchasePageFormCurrent from '@/views/psiManagement/loss/PurchasePageFormCurrent.vue'
+// 优惠结账通知弹框
+import DishOrderInfoDialog from '@/views/psiManagement/dishManage/order/DishOrderInfoDialog'
 import RegisterPopup from '@/views/human/practice/register/RegisterPopup'
 import KeyCardPopup from '@/views/human/enrollment/registration/KeyCardPopup'
 import DepartPopup from '@/views/human/depart/handover/DepartPopup'
@@ -98,6 +101,7 @@ export default {
 		ProjectRecordsForm,
 		CwInvoiceForm,
 		InvoiceForm,
+		DishOrderInfoDialog
 	},
 	data() {
 		return {
@@ -168,6 +172,14 @@ export default {
 				}
 				noticeService.stockUpdate(this.inputForm)
 				this.resetSearch()
+			} else if (row.taskName === '景聚庭-优惠结账') {
+				// console.log('测试进来了')
+				this.$refs.dishOrderInfoDialog.init(row.defId)
+				this.inputForm = {
+					id: row.id
+				}
+				noticeService.stockUpdate(this.inputForm)
+				this.resetSearch()
 			} else if (row.taskName === '实习日志超时提醒') {
 				this.$refs.registerPopup.init(row.defId)
 				this.inputForm = {

src/views/flowable/task/NoticePageList.vue

@@ -69,6 +69,7 @@
 		<ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
 		<CwInvoiceForm ref="cwInvoiceForm"></CwInvoiceForm>
 		<InvoiceForm ref="invoiceForm"></InvoiceForm>
+		<DishOrderInfoDialog ref="dishOrderInfoDialog"></DishOrderInfoDialog>
 	</div>
 </template>
 
@@ -76,6 +77,8 @@
 import WareHouseHistoryPopup from '@/views/materialManagement/wareHouseSummary/WareHouseHistoryPopup'
 import PsiWareHouseHistoryPopup from '@/views/psiManagement/loss/PurchasePageFormPopup.vue'
 import PurchasePageFormCurrent from '@/views/psiManagement/loss/PurchasePageFormCurrent.vue'
+// 优惠结账通知弹框
+import DishOrderInfoDialog from '@/views/psiManagement/dishManage/order/DishOrderInfoDialog'
 import RegisterPopup from '@/views/human/practice/register/RegisterPopup'
 import taskService from '@/api/flowable/taskService'
 import noticeService from '@/api/flowable/noticeService'
@@ -128,6 +131,7 @@ export default {
 		ProjectRecordsForm,
 		CwInvoiceForm,
 		InvoiceForm,
+		DishOrderInfoDialog
 	},
 	methods: {
 		// 获取数据列表
@@ -155,7 +159,7 @@ export default {
 			this.refreshList()
 		},
 		todo(row) {
-			// console.log('row', row)
+			console.log('row', row)
 			if (row.taskName === '评估发票超期收款') {
 				// console.log('测试进来了')
 				console.log('id', row.defId)
@@ -198,6 +202,13 @@ export default {
 				}
 				noticeService.stockUpdate(this.inputForm)
 				this.resetSearch()
+			} else if (row.taskName === '景聚庭-优惠结账') {
+				this.$refs.dishOrderInfoDialog.init(row.defId)
+				this.inputForm = {
+					id: row.id
+				}
+				noticeService.stockUpdate(this.inputForm)
+				this.resetSearch()
 			} else if (row.taskName === '实习日志超时提醒') {
 				this.$refs.registerPopup.init(row.defId)
 				this.inputForm = {

src/views/home/components/MyNoticePageList2.vue

@@ -43,13 +43,15 @@
 	<KeyCardPopup ref="keyCardPopup"></KeyCardPopup>
 	<DepartPopup ref="departPopup"></DepartPopup>
 	<DepartProvePopup ref="departProvePopup"></DepartProvePopup>
+	<DishOrderInfoDialog ref="dishOrderInfoDialog"></DishOrderInfoDialog>
 </template>
 
 <script>
 import WareHouseHistoryPopup from '@/views/materialManagement/wareHouseSummary/WareHouseHistoryPopup'
 import PsiWareHouseHistoryPopup from '@/views/psiManagement/loss/PurchasePageFormPopup.vue'
 import PurchasePageFormCurrent from '@/views/psiManagement/loss/PurchasePageFormCurrent.vue'
-
+// 优惠结账通知弹框
+import DishOrderInfoDialog from '@/views/psiManagement/dishManage/order/DishOrderInfoDialog'
 import RegisterPopup from '@/views/human/practice/register/RegisterPopup'
 import KeyCardPopup from '@/views/human/enrollment/registration/KeyCardPopup'
 import DepartPopup from '@/views/human/depart/handover/DepartPopup'
@@ -74,6 +76,7 @@ export default {
 		KeyCardPopup,
 		DepartPopup,
 		DepartProvePopup,
+		DishOrderInfoDialog
 	},
 	data() {
 		return {
@@ -127,6 +130,14 @@ export default {
 				}
 				noticeService.stockUpdate(this.inputForm)
 				this.resetSearch()
+			} else if (row.taskName === '景聚庭-优惠结账') {
+				// console.log('测试进来了')
+				this.$refs.dishOrderInfoDialog.init(row.defId)
+				this.inputForm = {
+					id: row.id
+				}
+				noticeService.stockUpdate(this.inputForm)
+				this.resetSearch()
 			} else if (row.taskName === '物资库存提醒') {
 				// console.log('测试进来了')
 				this.$refs.purchasePageFormCurrent.init(row.defId)

src/views/psiManagement/dishManage/order/DishOrderDetail.vue

@@ -56,9 +56,10 @@
 			<div class="ordered-panel" v-loading="orderLoading">
 				<div class="ordered-title">
 					<span>已点菜</span>
-					<!-- <span class="ordered-count">{{ orderedList.length }} 项</span> -->
-					<el-button v-if="hasCurrentOrder" type="danger" plain :loading="submitting"
-						@click="confirmCancelOrder()">取消订单</el-button>
+					<div v-if="hasCurrentOrder" class="ordered-title-actions">
+						<el-button type="primary" plain @click="viewCurrentOrder()">订单详情</el-button>
+						<el-button type="danger" plain :loading="submitting" @click="confirmCancelOrder()">取消订单</el-button>
+					</div>
 				</div>
 
 				<div v-if="orderedList.length === 0" class="ordered-empty">
@@ -171,6 +172,7 @@
 				</span>
 			</template>
 		</el-dialog>
+		<DishOrderInfoDialog ref="dishOrderInfoDialog"></DishOrderInfoDialog>
 	</div>
 </template>
 
@@ -178,8 +180,12 @@
 import DishRoomService from '@/api/psi/DishRoomService'
 import DishOrderService from '@/api/psi/DishOrderService'
 import OSSSerivce from '@/api/sys/OSSService'
+import DishOrderInfoDialog from './DishOrderInfoDialog'
 import Sortable from 'sortablejs'
 export default {
+	components: {
+		DishOrderInfoDialog
+	},
 	data() {
 		return {
 			currentRoom: {},
@@ -432,6 +438,13 @@ export default {
 				})
 			})
 		},
+		viewCurrentOrder() {
+			if (!this.hasCurrentOrder) {
+				this.$message.warning('暂无订单详情')
+				return
+			}
+			this.$refs.dishOrderInfoDialog.init(this.currentOrder.id)
+		},
 		submitOrder(settleFlag, settleInfo = {}, requireChanged = false) {
 			const changedList = this.changedDetailList
 			const detailList = settleFlag === '1' && changedList.length === 0 ? [] : this.submitDetailList
@@ -749,6 +762,16 @@ export default {
 	border-bottom: 1px solid #ebeef5;
 }
 
+.ordered-title-actions {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.ordered-title-actions .el-button + .el-button {
+	margin-left: 0;
+}
+
 .ordered-count {
 	font-size: 12px;
 	font-weight: 400;

src/views/psiManagement/dishManage/order/DishOrderInfoDialog.vue

@@ -25,6 +25,7 @@
 								<template #default="scope">￥{{ formatMoney(scope.row.salePrice) }}</template>
 							</vxe-column>
 							<vxe-column width="80" title="数量" field="quantity"></vxe-column>
+							<vxe-column min-width="170" title="下单时间" field="createTime"></vxe-column>
 							<vxe-column width="100" title="金额" field="amount">
 								<template #default="scope">￥{{ formatMoney(scope.row.amount) }}</template>
 							</vxe-column>