canrd-outside / order-erp-front · Commits

Commit 119e51093acb3eb300f7534ee8ea8e7e766d34d7

Authored by boyang
1 parent 51bcf05d
build: skipped

fix:修改系统配置名称

Inline Side-by-side
Showing 4 changed files with 12 additions and 14 deletions
src/views/project/config/ProduCostCreate.vue
  View file @119e510
... ... @@ -22,7 +22,7 @@
22 22 <a-input v-model:value="fixCost"
23 23 /></div>
24 24 <div
25   - ><span style="margin-right: 8px; width: 80%">提成比例：</span>
  25 + ><span style="margin-right: 8px; width: 80%">提成单价：</span>
26 26 <a-input v-model:value="ratio" />
27 27 </div>
28 28 </a-space>
... ...
src/views/project/config/ProduCostEdit.vue
  View file @119e510
... ... @@ -16,7 +16,7 @@
16 16 >
17 17 <a-space direction="vertical" style="width: 100%">
18 18 <a-input v-model:value="fixCost" addonBefore="固定成本 " />
19   - <a-input v-model:value="ratio" addonBefore="提成比例 " />
  19 + <a-input v-model:value="ratio" addonBefore="提成单价 " />
20 20 </a-space>
21 21 </BasicDrawer>
22 22 </template>
... ...
src/views/project/config/data.tsx
  View file @119e510
1   -import { InputNumber, Tag } from 'ant-design-vue';
  1 +import { Tag } from 'ant-design-vue';
2 2 import { BasicColumn } from '@/components/Table';
3   -import { func } from 'vue-types';
4   -import { h, ref } from 'vue';
5   -
  3 +import { h } from 'vue';
6 4  
7 5 export const COLUMNS = {
8 6 1: [
... ... @@ -82,7 +80,7 @@ export const COLUMNS = {
82 80 width: 150,
83 81 customRender: (column) => {
84 82 const value = JSON.parse(column.record.relationValue);
85   - return value[1].relationValue;
  83 + return (value[1]?.relationValue * 100).toFixed(2) + '%';
86 84 },
87 85 },
88 86 {
... ... @@ -91,7 +89,7 @@ export const COLUMNS = {
91 89 width: 150,
92 90 customRender: (column) => {
93 91 const value = JSON.parse(column.record.relationValue);
94   - return value[2].relationValue;
  92 + return (value[2]?.relationValue * 100).toFixed(2) + '%';
95 93 },
96 94 },
97 95 // {
... ...
vite.config.ts
  View file @119e510
... ... @@ -30,8 +30,8 @@ export default defineApplicationConfig({
30 30 },
31 31 },
32 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 35 // target: 'http://39.108.227.113:8000',
36 36 // target: 'http://localhost:8000',
37 37 // target: 'http://39.108.227.113:3000/mock/35',
... ... @@ -41,8 +41,8 @@ export default defineApplicationConfig({
41 41 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
42 42 },
43 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 46 // target: 'http://39.108.227.113:8000',
47 47 // target: 'http://localhost:8000',
48 48 // target: 'http://39.108.227.113:3000/mock/35',
... ... @@ -52,8 +52,8 @@ export default defineApplicationConfig({
52 52 rewrite: (path) => path.replace(new RegExp(`^/basic-api`), ''),
53 53 },
54 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 57 // target: 'http://39.108.227.113:8000',
58 58 // target: '192.168.31.250:18000',
59 59 // target: 'http://localhost:8000',
... ...