Commit b1027295cabf357822b15678ced95c84c9c7fb2c
1 parent
1d0dc7fd
修改销售额bug
Showing
4 changed files
with
32 additions
and
15 deletions
src/views/project/config/CreateModal.vue
@@ -58,7 +58,14 @@ | @@ -58,7 +58,14 @@ | ||
58 | { | 58 | { |
59 | field: 'relationValue', | 59 | field: 'relationValue', |
60 | component: 'InputNumber', | 60 | component: 'InputNumber', |
61 | - label: props.column === 1 ? '利润率' : props.column === 5 ? '回款时间' : '包装费用', | 61 | + label: |
62 | + props.column === 1 | ||
63 | + ? '利润率' | ||
64 | + : props.column === 5 | ||
65 | + ? '回款时间' | ||
66 | + : props.column === 7 | ||
67 | + ? '销售额' | ||
68 | + : '包装费用', | ||
62 | rules: [{ required: true }], | 69 | rules: [{ required: true }], |
63 | colProps: { | 70 | colProps: { |
64 | span: 24, | 71 | span: 24, |
@@ -102,6 +109,8 @@ | @@ -102,6 +109,8 @@ | ||
102 | ? 'profitRate' | 109 | ? 'profitRate' |
103 | : props.column === 5 | 110 | : props.column === 5 |
104 | ? 'orderHodTime' | 111 | ? 'orderHodTime' |
112 | + : props.column === 7 | ||
113 | + ? 'salesAmount' | ||
105 | : 'packetPrice', | 114 | : 'packetPrice', |
106 | 115 | ||
107 | relationName: '包装费用', | 116 | relationName: '包装费用', |
src/views/project/config/TablePanel.vue
@@ -84,6 +84,7 @@ | @@ -84,6 +84,7 @@ | ||
84 | } | 84 | } |
85 | 85 | ||
86 | async function handleSave(record) { | 86 | async function handleSave(record) { |
87 | + console.log(record, '5656s'); | ||
87 | if (props.column === 3) { | 88 | if (props.column === 3) { |
88 | await saveConfig({ id: record.id, settingValue: record.settingValue }); | 89 | await saveConfig({ id: record.id, settingValue: record.settingValue }); |
89 | } else { | 90 | } else { |
@@ -94,6 +95,7 @@ | @@ -94,6 +95,7 @@ | ||
94 | } | 95 | } |
95 | 96 | ||
96 | function handleEdit(record: any) { | 97 | function handleEdit(record: any) { |
98 | + console.log(record, '5656e'); | ||
97 | record.onEdit?.(true); | 99 | record.onEdit?.(true); |
98 | } | 100 | } |
99 | 101 | ||
@@ -102,6 +104,7 @@ | @@ -102,6 +104,7 @@ | ||
102 | } | 104 | } |
103 | 105 | ||
104 | function handleModalSuccess() { | 106 | function handleModalSuccess() { |
107 | + console.log('5656ss'); | ||
105 | reload(); | 108 | reload(); |
106 | } | 109 | } |
107 | 110 |
src/views/project/order/ProductText.vue
@@ -79,28 +79,29 @@ | @@ -79,28 +79,29 @@ | ||
79 | // error('请选择订单'); | 79 | // error('请选择订单'); |
80 | // closeModal(); | 80 | // closeModal(); |
81 | // } | 81 | // } |
82 | + console.log(data, '5656data'); | ||
82 | }); | 83 | }); |
83 | const options = computed(() => { | 84 | const options = computed(() => { |
84 | // 运营总监-基本信息,跟单,质检 | 85 | // 运营总监-基本信息,跟单,质检 |
85 | return [ | 86 | return [ |
86 | - { label: '青岛翱特逸格饰品有限公司', value: '1' }, | ||
87 | - { label: ' 青岛吉庆天成饰品有限公司', value: '2' }, | 87 | + { label: '青岛翱特逸格饰品有限公司', value: '青岛翱特逸格饰品有限公司' }, |
88 | + { label: ' 青岛吉庆天成饰品有限公司', value: '青岛吉庆天成饰品有限公司' }, | ||
88 | ]; | 89 | ]; |
89 | }); | 90 | }); |
90 | const { createMessage } = useMessage(); | 91 | const { createMessage } = useMessage(); |
91 | const { error } = createMessage; | 92 | const { error } = createMessage; |
92 | const customerCodeToCompanyMap: Record<string, string> = { | 93 | const customerCodeToCompanyMap: Record<string, string> = { |
93 | - A01: '1', | ||
94 | - A04: '2', | ||
95 | - A05: '2', | ||
96 | - A06: '1', | ||
97 | - A07: '2', | ||
98 | - A08: '1', | ||
99 | - A09: '1', | ||
100 | - A10: '1', | ||
101 | - A11: '1', | ||
102 | - M03: '2', | ||
103 | - M05: '2', | 94 | + A01: '青岛翱特逸格饰品有限公司', |
95 | + A04: '青岛吉庆天成饰品有限公司', | ||
96 | + A05: '青岛吉庆天成饰品有限公司', | ||
97 | + A06: '青岛翱特逸格饰品有限公司', | ||
98 | + A07: '青岛吉庆天成饰品有限公司', | ||
99 | + A08: '青岛翱特逸格饰品有限公司', | ||
100 | + A09: '青岛翱特逸格饰品有限公司', | ||
101 | + A10: '青岛翱特逸格饰品有限公司', | ||
102 | + A11: '青岛翱特逸格饰品有限公司', | ||
103 | + M03: '青岛吉庆天成饰品有限公司', | ||
104 | + M05: '青岛吉庆天成饰品有限公司', | ||
104 | }; | 105 | }; |
105 | function handleCancel() { | 106 | function handleCancel() { |
106 | loading.value = true; | 107 | loading.value = true; |
@@ -146,7 +147,10 @@ | @@ -146,7 +147,10 @@ | ||
146 | if (!areValid) { | 147 | if (!areValid) { |
147 | error('勾选订单与选择的公司不匹配'); | 148 | error('勾选订单与选择的公司不匹配'); |
148 | } else { | 149 | } else { |
149 | - if (choose.value == '1' || choose.value == '2') { | 150 | + if ( |
151 | + choose.value == '青岛翱特逸格饰品有限公司' || | ||
152 | + choose.value == '青岛吉庆天成饰品有限公司' | ||
153 | + ) { | ||
150 | //此处设置接口,传递选择的公司值 | 154 | //此处设置接口,传递选择的公司值 |
151 | isShow1.value = false; | 155 | isShow1.value = false; |
152 | isShow2.value = true; | 156 | isShow2.value = true; |
src/views/project/order/index.vue
@@ -630,6 +630,7 @@ | @@ -630,6 +630,7 @@ | ||
630 | return; | 630 | return; |
631 | } | 631 | } |
632 | openProductModal(true, { | 632 | openProductModal(true, { |
633 | + checkedKeys: checkedKeys.value, | ||
633 | customers: selectedCustomCodes.value, | 634 | customers: selectedCustomCodes.value, |
634 | data: values, | 635 | data: values, |
635 | }); | 636 | }); |