feat:订单默认时间

.env.development

@@ -10,18 +10,16 @@ ENV = 'development'
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
-# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 # VITE_ADMIN_PROXY_PATH = http://192.168.101.196:9999 # 邓-本地
-# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
+VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
-# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
+# VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = http://192.168.101.196:9999 # 邓-本地
-# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
+VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003

src/views/hard/hard-order/index.vue

@@ -274,6 +274,7 @@ import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import { ElLoading, TableColumnCtx } from "element-plus"
 import { VNode } from "vue"
+import dayjs from "dayjs"
 
 const { push } = useRouter()
 
@@ -309,8 +310,15 @@ const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 
+const defaultCreateTimeList = [
+	dayjs().subtract(3, "month").startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+	dayjs().hour(23).minute(23).second(23).format("YYYY-MM-DD HH:mm:ss"),
+]
+
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		createTimeList: defaultCreateTimeList,
+	},
 	pageList: hardOrder.pageJoin,
 })
 
@@ -415,7 +423,7 @@ const getSummaries = (param: SummaryMethodProps) => {
 					{ column: "totalPrice", columnName: "商品总价", color: "#67C260" },
 					{ column: "extraPrice", columnName: "额外支付", color: "#F56E9B" },
 					{ column: "payPrice", columnName: "实际支付", color: "#355CF6" },
-				].forEach(({ column, columnName, color }: any, index: number) => {
+				].forEach(({ column, columnName, color }: any) => {
 					const values = data.map((item) => Number(item[column]))
 					if (!values.every((value) => Number.isNaN(value))) {
 						priceVNode.push(

src/views/wallet/wallet-recharge-invoice/print-dialog.vue

@@ -1,12 +1,14 @@
 <template>
 	<el-dialog v-model="visible" title="预览" width="800px" :close-on-click-modal="false" draggable destroy-on-close>
-		<div v-loading="loading" id="receiptRef" ref="receiptRef" class="w-[17.5cm] h-[9.5cm] border border-gray-400 p-6 bg-[#EBE1C622]">
+		<div v-loading="loading" id="receiptRef" ref="receiptRef"
+			class="w-[17.5cm] h-[9.5cm] border border-gray-400 p-6 bg-[#EBE1C622]">
 			<div class="text-center mx-auto w-[10cm] text-3xl font-bold">浦江县行政事业单位食堂统一收款收据</div>
 
 			<div class="flex justify-between items-end mb-1">
 				<div></div>
 				<div>
-					{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;") }}
+					{{ formatDate(new Date(receiptData.time), "YYYY年 mm月 dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;")
+					}}
 				</div>
 				<span>
 					<span>No. </span>
@@ -19,13 +21,9 @@
 					<tr>
 						<td class="border border-gray-600 px-2 w-3/12 h-[0.75cm]">交款单位（或个人）</td>
 						<td class="border border-gray-600 px-2 w-9/12 h-[0.75cm] text-sm text-blue-800" colspan="4">
-							<input
+							<input type="text" v-model="receiptData.deptOrUser"
-								type="text"
+								class="caret-red-600 w-full h-full bg-transparent text-center" ref="deptOrUserInput"
-								v-model="receiptData.deptOrUser"
+								maxlength="30" />
-								class="caret-red-600 w-full h-full bg-transparent text-center"
-								ref="deptOrUserInput"
-								maxlength="30"
-							/>
 						</td>
 					</tr>
 					<tr>
@@ -62,14 +60,10 @@
 						<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">收款单位<br />（盖章）</td>
 						<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
 							<!-- <input type="text" v-model="receiptData.payeeDept" class="w-full h-full bg-transparent" /> -->
-							<img
+							<img v-if="receiptData.stampPicUrl && visibleStampPic"
-								v-if="receiptData.stampPicUrl && visibleStampPic"
+								class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]" draggable="false"
-								class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
-								draggable="false"
 								style="-webkit-user-drag: none; user-select: none; pointer-events: none"
-								oncontextmenu="return false"
+								oncontextmenu="return false" src="/@/assets/receiptStamp.png" />
-								src="/@/assets/receiptStamp.png"
-							/>
 						</td>
 						<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">开票人<br />（签名）</td>
 						<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
@@ -79,11 +73,8 @@
 						<td class="border border-gray-600 px-2 text-left align-text-top w-1/3 h-[0.75cm]">
 							<div class="flex">
 								<span class="whitespace-nowrap">备注：</span>
-								<textarea
+								<textarea v-model="receiptData.remark" maxlength="12"
-									v-model="receiptData.remark"
+									class="flex-1 text-sm text-blue-800 w-full h-full bg-transparent resize-none overflow-y-hidden" />
-									maxlength="12"
-									class="flex-1 text-sm text-blue-800 w-full h-full bg-transparent resize-none overflow-y-hidden"
-								/>
 							</div>
 						</td>
 					</tr>
@@ -99,48 +90,20 @@
 		<template #footer>
 			<el-button @click="handleClose" :disabled="loading">关闭</el-button>
 			<!-- ['2', '3'].includes(receiptData.processStatus!) && !['6'].includes(receiptData.status!) -->
-			<el-button
+			<el-button v-if="['2', '3'].includes(receiptData.processStatus!)" v-auth="'wallet_walletRechargeApply_back'"
-				v-if="['2', '3'].includes(receiptData.processStatus!)"
+				type="primary" plain @click="backInvoice" :disabled="loading">
-				v-auth="'wallet_walletRechargeApply_back'"
-				type="primary"
-				plain
-				@click="backInvoice"
-				:disabled="loading"
-			>
 				作废
 			</el-button>
-			<el-button
+			<el-button v-if="!receiptData.processStatus && !['6'].includes(receiptData.status!)" type="primary"
-				v-if="!receiptData.processStatus && !['6'].includes(receiptData.status!)"
+				:disabled="loading" @click="applyStamp">申请审批</el-button>
-				type="primary"
+			<el-button v-if="receiptData.processStatus == undefined && !['6'].includes(receiptData.status!)"
-				:disabled="loading"
+				v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt"
-				@click="applyStamp"
+				:disabled="loading">保存</el-button>
-				>申请审批</el-button
+			<el-button v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="warning"
-			>
+				@click="handlePrint" :disabled="loading">打印</el-button>
-			<el-button
+			<el-button v-auth="'wallet_invoice_refresh'"
-				v-if="receiptData.processStatus == undefined && !['6'].includes(receiptData.status!)"
+				v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="primary" plain
-				v-auth="'wallet_walletRechargeApply_receiptSave'"
+				icon="RefreshRight" @click="refreshInvoice" :disabled="refreshLoading">重新生成发票</el-button>
-				type="primary"
-				@click="saveReceipt"
-				:disabled="loading"
-				>保存</el-button
-			>
-			<el-button
-				v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)"
-				type="warning"
-				@click="handlePrint"
-				:disabled="loading"
-				>打印</el-button
-			>
-			<el-button
-				v-auth="'wallet_invoice_refresh'"
-				v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)"
-				type="primary"
-				plain
-				icon="RefreshRight"
-				@click="refreshInvoice"
-				:disabled="refreshLoading"
-				>重新生成发票</el-button
-			>
 		</template>
 	</el-dialog>
 </template>