Commit a940a1184500b79bf9d9b778d0ae6698f5d735a0
1 parent
327b80fa
修改销售额配置
Showing
3 changed files
with
27 additions
and
2 deletions
src/views/project/config/CreateModal.vue
@@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
58 | { | 58 | { |
59 | field: 'relationValue', | 59 | field: 'relationValue', |
60 | component: 'InputNumber', | 60 | component: 'InputNumber', |
61 | - label: props.column === 1 ? '利润率' : '包装费用', | 61 | + label: props.column === 1 ? '利润率' : props.column === 2 ? '包装费用' : '销售额', |
62 | rules: [{ required: true }], | 62 | rules: [{ required: true }], |
63 | colProps: { | 63 | colProps: { |
64 | span: 24, | 64 | span: 24, |
@@ -96,7 +96,12 @@ | @@ -96,7 +96,12 @@ | ||
96 | settingName: '客户编码', | 96 | settingName: '客户编码', |
97 | settingValue: values.settingValue, | 97 | settingValue: values.settingValue, |
98 | settingType: 1, | 98 | settingType: 1, |
99 | - relationCode: props.column === 1 ? 'profitRate' : 'packetPrice', | 99 | + relationCode: |
100 | + props.column === 1 | ||
101 | + ? 'profitRate' | ||
102 | + : props.column === 2 | ||
103 | + ? 'packetPrice' | ||
104 | + : 'salesAmount', | ||
100 | relationName: '包装费用', | 105 | relationName: '包装费用', |
101 | relationValue: values.relationValue, | 106 | relationValue: values.relationValue, |
102 | }; | 107 | }; |
src/views/project/finance/pay/pay.data.tsx
@@ -67,6 +67,7 @@ export const columns: BasicColumn[] = [ | @@ -67,6 +67,7 @@ export const columns: BasicColumn[] = [ | ||
67 | dataIndex: 'deductUrl', | 67 | dataIndex: 'deductUrl', |
68 | width: 120, | 68 | width: 120, |
69 | customRender: (column) => { | 69 | customRender: (column) => { |
70 | + console.log(column, '5656column'); | ||
70 | const deductUrl = column.record.deductUrl; | 71 | const deductUrl = column.record.deductUrl; |
71 | if (deductUrl == undefined) { | 72 | if (deductUrl == undefined) { |
72 | return; | 73 | return; |
src/views/project/order/tableData.tsx
@@ -967,6 +967,25 @@ export const FIELDS_BASE_INFO = [ | @@ -967,6 +967,25 @@ export const FIELDS_BASE_INFO = [ | ||
967 | label: '业务员', | 967 | label: '业务员', |
968 | rules: [{ required: true }], | 968 | rules: [{ required: true }], |
969 | }, | 969 | }, |
970 | + { | ||
971 | + field: 'returnOrder', | ||
972 | + component: 'Select', | ||
973 | + labelWidth: 150, | ||
974 | + label: '是否返单', | ||
975 | + rules: [{ required: true }], | ||
976 | + componentProps: { | ||
977 | + options: [ | ||
978 | + { | ||
979 | + label: '是', | ||
980 | + value: '1', | ||
981 | + }, | ||
982 | + { | ||
983 | + label: '否', | ||
984 | + value: '0', | ||
985 | + }, | ||
986 | + ], | ||
987 | + }, | ||
988 | + }, | ||
970 | ]; | 989 | ]; |
971 | 990 | ||
972 | //项目完成报告信息 | 991 | //项目完成报告信息 |