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 | 58 | { |
| 59 | 59 | field: 'relationValue', |
| 60 | 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 | 69 | rules: [{ required: true }], |
| 63 | 70 | colProps: { |
| 64 | 71 | span: 24, |
| ... | ... | @@ -102,6 +109,8 @@ |
| 102 | 109 | ? 'profitRate' |
| 103 | 110 | : props.column === 5 |
| 104 | 111 | ? 'orderHodTime' |
| 112 | + : props.column === 7 | |
| 113 | + ? 'salesAmount' | |
| 105 | 114 | : 'packetPrice', |
| 106 | 115 | |
| 107 | 116 | relationName: '包装费用', | ... | ... |
src/views/project/config/TablePanel.vue
| ... | ... | @@ -84,6 +84,7 @@ |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | async function handleSave(record) { |
| 87 | + console.log(record, '5656s'); | |
| 87 | 88 | if (props.column === 3) { |
| 88 | 89 | await saveConfig({ id: record.id, settingValue: record.settingValue }); |
| 89 | 90 | } else { |
| ... | ... | @@ -94,6 +95,7 @@ |
| 94 | 95 | } |
| 95 | 96 | |
| 96 | 97 | function handleEdit(record: any) { |
| 98 | + console.log(record, '5656e'); | |
| 97 | 99 | record.onEdit?.(true); |
| 98 | 100 | } |
| 99 | 101 | |
| ... | ... | @@ -102,6 +104,7 @@ |
| 102 | 104 | } |
| 103 | 105 | |
| 104 | 106 | function handleModalSuccess() { |
| 107 | + console.log('5656ss'); | |
| 105 | 108 | reload(); |
| 106 | 109 | } |
| 107 | 110 | ... | ... |
src/views/project/order/ProductText.vue
| ... | ... | @@ -79,28 +79,29 @@ |
| 79 | 79 | // error('请选择订单'); |
| 80 | 80 | // closeModal(); |
| 81 | 81 | // } |
| 82 | + console.log(data, '5656data'); | |
| 82 | 83 | }); |
| 83 | 84 | const options = computed(() => { |
| 84 | 85 | // 运营总监-基本信息，跟单，质检 |
| 85 | 86 | return [ |
| 86 | - { label: '青岛翱特逸格饰品有限公司', value: '1' }, | |
| 87 | - { label: ' 青岛吉庆天成饰品有限公司', value: '2' }, | |
| 87 | + { label: '青岛翱特逸格饰品有限公司', value: '青岛翱特逸格饰品有限公司' }, | |
| 88 | + { label: ' 青岛吉庆天成饰品有限公司', value: '青岛吉庆天成饰品有限公司' }, | |
| 88 | 89 | ]; |
| 89 | 90 | }); |
| 90 | 91 | const { createMessage } = useMessage(); |
| 91 | 92 | const { error } = createMessage; |
| 92 | 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 | 106 | function handleCancel() { |
| 106 | 107 | loading.value = true; |
| ... | ... | @@ -146,7 +147,10 @@ |
| 146 | 147 | if (!areValid) { |
| 147 | 148 | error('勾选订单与选择的公司不匹配'); |
| 148 | 149 | } else { |
| 149 | - if (choose.value == '1' || choose.value == '2') { | |
| 150 | + if ( | |
| 151 | + choose.value == '青岛翱特逸格饰品有限公司' || | |
| 152 | + choose.value == '青岛吉庆天成饰品有限公司' | |
| 153 | + ) { | |
| 150 | 154 | //此处设置接口,传递选择的公司值 |
| 151 | 155 | isShow1.value = false; |
| 152 | 156 | isShow2.value = true; | ... | ... |