canrd-outside / order-erp-front · Commits

Commit 9f55c4b2e7679e06cb956087bbf4928b37e5776d

Authored by boyang
1 parent 28d15080
build: skipped

内部生产表日期格式

Inline Side-by-side
Showing 2 changed files with 16 additions and 16 deletions
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/FinanceEdit.vue
  View file @9f55c4b
@@ -168,15 +168,15 @@ @@ -168,15 +168,15 @@
168 // // 返回格式化后的字符串：'YYYY-MM-DD HH:mm:ss' 168 // // 返回格式化后的字符串：'YYYY-MM-DD HH:mm:ss'
169 // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; 169 // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
170 // } 170 // }
171 - function formatDateToDateOnly(dateStr: string): string {  
172 - const date = new Date(dateStr);  
173 - const year = date.getFullYear();  
174 - const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，+1  
175 - const day = String(date.getDate()).padStart(2, '0'); 171 + // function formatDateToDateOnly(dateStr: string): string {
  172 + // const date = new Date(dateStr);
  173 + // const year = date.getFullYear();
  174 + // const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，+1
  175 + // const day = String(date.getDate()).padStart(2, '0');
176 176
177 - // 返回格式化后的日期字符串：'YYYY-MM-DD'  
178 - return `${year}-${month}-${day}`;  
179 - } 177 + // // 返回格式化后的日期字符串：'YYYY-MM-DD'
  178 + // return `${year}-${month}-${day}`;
  179 + // }
180 const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => { 180 const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
181 // 方式1 181 // 方式1
182 if (data.data.lockFields) { 182 if (data.data.lockFields) {
@@ -191,8 +191,8 @@ @@ -191,8 +191,8 @@
191 console.log(data.data, '5656datafff'); 191 console.log(data.data, '5656datafff');
192 input1.value = data?.data?.developmentCopyRmbTotalPrice?.toFixed(2); 192 input1.value = data?.data?.developmentCopyRmbTotalPrice?.toFixed(2);
193 input2.value = data?.data?.spainPaidRmbCommission?.toFixed(2); 193 input2.value = data?.data?.spainPaidRmbCommission?.toFixed(2);
194 - input3.value = dayjs(formatDateToDateOnly(data?.data?.produceStartTime));  
195 - input4.value = dayjs(formatDateToDateOnly(data?.data?.produceEndTime)); 194 + input3.value = data?.data?.produceStartTime ? dayjs(data?.data?.produceStartTime) : null;
  195 + input4.value = data?.data?.produceEndTime ? dayjs(data?.data?.produceEndTime) : null;
196 input5.value = data?.data?.paidRmbCommission?.toFixed(2); 196 input5.value = data?.data?.paidRmbCommission?.toFixed(2);
197 input6.value = data?.data?.actualExchangeRate?.toFixed(2); 197 input6.value = data?.data?.actualExchangeRate?.toFixed(2);
198 198
vite.config.ts
  View file @9f55c4b
@@ -30,8 +30,8 @@ export default defineApplicationConfig({ @@ -30,8 +30,8 @@ export default defineApplicationConfig({
30 }, 30 },
31 }, 31 },
32 '/basic-api/order': { 32 '/basic-api/order': {
33 - target: 'http://47.104.8.35:18000',  
34 - // target: 'http://localhost:18000', 33 + // target: 'http://47.104.8.35:18000',
  34 + target: 'http://localhost:18000',
35 // target: 'http://39.108.227.113:8000', 35 // target: 'http://39.108.227.113:8000',
36 // target: 'http://localhost:8000', 36 // target: 'http://localhost:8000',
37 // target: 'http://39.108.227.113:3000/mock/35', 37 // target: 'http://39.108.227.113:3000/mock/35',
@@ -41,8 +41,8 @@ export default defineApplicationConfig({ @@ -41,8 +41,8 @@ export default defineApplicationConfig({
41 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''), 41 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
42 }, 42 },
43 '/basic-api/project': { 43 '/basic-api/project': {
44 - target: 'http://47.104.8.35:18000',  
45 - // target: 'http://localhost:18000', 44 + // target: 'http://47.104.8.35:18000',
  45 + target: 'http://localhost:18000',
46 // target: 'http://39.108.227.113:8000', 46 // target: 'http://39.108.227.113:8000',
47 // target: 'http://localhost:8000', 47 // target: 'http://localhost:8000',
48 // target: 'http://39.108.227.113:3000/mock/35', 48 // target: 'http://39.108.227.113:3000/mock/35',
@@ -52,8 +52,8 @@ export default defineApplicationConfig({ @@ -52,8 +52,8 @@ export default defineApplicationConfig({
52 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''), 52 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
53 }, 53 },
54 '/api/localStorage/upload': { 54 '/api/localStorage/upload': {
55 - target: 'http://47.104.8.35:18000',  
56 - // target: 'http://localhost:18000', 55 + // target: 'http://47.104.8.35:18000',
  56 + target: 'http://localhost:18000',
57 // target: 'http://39.108.227.113:8000', 57 // target: 'http://39.108.227.113:8000',
58 // target: '192.168.31.250:18000', 58 // target: '192.168.31.250:18000',
59 // target: 'http://localhost:8000', 59 // target: 'http://localhost:8000',