From 1e848b86fbb38e88591be01a39099701ba16b10f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 19 Feb 2025 19:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  8 ++++----
 src/views/hard/hard-dept-total/index.vue      |  1 +
 .../smErpCgDd/smErpCgDdOption.vue             | 12 ++----------
 .../smErpCgPlan/cgPlanOption.vue              | 19 ++++++-------------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/.env.development b/.env.development
index 06c6a70..6480b17 100644
--- a/.env.development
+++ b/.env.development
@@ -8,18 +8,18 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15: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://192.168.101.50:9999/ # 邓-本地
+# VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
 
 
 # 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15: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://192.168.101.50:9999 # 邓-本地
+# VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址
diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue
index 1e3c9cf..0be3693 100644
--- a/src/views/hard/hard-dept-total/index.vue
+++ b/src/views/hard/hard-dept-total/index.vue
@@ -44,6 +44,7 @@
 						v-loading="state.loading"
 						border
 						:cell-style="tableStyle.cellStyle"
+						height="70vh"
 						:header-cell-style="tableStyle.headerCellStyle"
 						:summary-method="getSummaries"
 						show-summary
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index 18d99ac..a533fea 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -4,18 +4,11 @@
 			<el-form ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" formDialogRef label-width="140px">
 				<div class="flex flex-wrap">
 					<el-form-item label="编号" prop="code">
-						<el-input v-model="baseDataForm.code" placeholder="请输入编号" style="width: 200px" />
+						<el-input v-model="baseDataForm.code" readonly style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="单据日期" prop="dDate">
-						<el-date-picker
-							style="width: 200px"
-							v-model.trim="baseDataForm.dDate"
-							type="date"
-							placeholder="请选择单据日期"
-							format="YYYY-MM-DD"
-							value-format="YYYY-MM-DD"
-						/>
+						<el-input v-model="baseDataForm.dDate" readonly style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -256,7 +249,6 @@
 <script setup lang="ts" name="smErpCgDd">
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
-import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgDd"
 import { getPlanCode, getCgPlanSpuPage, getErpSpuSimpleAll } from "/@/api/supermarketerp/smErpCgPlan"
diff --git a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
index 2a5431c..335fb7a 100644
--- a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
+++ b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
@@ -4,17 +4,10 @@
 			<el-form ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" formDialogRef label-width="140px">
 				<div class="flex flex-wrap">
 					<el-form-item label="编号" prop="planCode">
-						<el-input v-model.trim="baseDataForm.planCode" placeholder="请输入编号" disabled style="width: 200px" />
+						<el-input v-model="baseDataForm.planCode" readonly style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="planDate">
-						<el-date-picker
-							style="width: 200px"
-							v-model.trim="baseDataForm.planDate"
-							type="date"
-							placeholder="请选择采购计划单据日期"
-							format="YYYY-MM-DD"
-							value-format="YYYY-MM-DD"
-						/>
+						<el-input v-model="baseDataForm.planDate" readonly style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -117,7 +110,7 @@
 					</template>
 				</vxe-column>
 
-<!--				<vxe-column field="unitPrice" title="进价">
+				<!-- <vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
 						{{ row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
 					</template>
@@ -131,7 +124,7 @@
 								: ""
 						}}
 					</template>
-				</vxe-column>-->
+				</vxe-column> -->
 
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
@@ -239,12 +232,12 @@
 <script setup lang="ts" name="cgPlanOption">
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
-import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj, getPlanCode, getCgPlanSpuPage, getErpSpuSimpleAll } from "/@/api/supermarketerp/smErpCgPlan"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
 import { storePrice } from "/@/utils/formatMoney"
+import { formatDate } from "/@/utils/formatTime"
 
 // 基本表单数据类型
 interface FormVO {
@@ -283,7 +276,7 @@ const baseDataForm = reactive<FormVO>({
 	id: undefined,
 	planCode: "",
 	orderNumber: "",
-	planDate: "",
+	planDate: formatDate(new Date(), "YYYY-mm-dd"),
 	supplierId: "",
 	handlerUserId: "",
 	remark: "",