Commit a940a1184500b79bf9d9b778d0ae6698f5d735a0

Authored by boyang
1 parent 327b80fa

修改销售额配置

src/views/project/config/CreateModal.vue
... ... @@ -58,7 +58,7 @@
58 58 {
59 59 field: 'relationValue',
60 60 component: 'InputNumber',
61   - label: props.column === 1 ? '利润率' : '包装费用',
  61 + label: props.column === 1 ? '利润率' : props.column === 2 ? '包装费用' : '销售额',
62 62 rules: [{ required: true }],
63 63 colProps: {
64 64 span: 24,
... ... @@ -96,7 +96,12 @@
96 96 settingName: '客户编码',
97 97 settingValue: values.settingValue,
98 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 105 relationName: '包装费用',
101 106 relationValue: values.relationValue,
102 107 };
... ...
src/views/project/finance/pay/pay.data.tsx
... ... @@ -67,6 +67,7 @@ export const columns: BasicColumn[] = [
67 67 dataIndex: 'deductUrl',
68 68 width: 120,
69 69 customRender: (column) => {
  70 + console.log(column, '5656column');
70 71 const deductUrl = column.record.deductUrl;
71 72 if (deductUrl == undefined) {
72 73 return;
... ...
src/views/project/order/tableData.tsx
... ... @@ -967,6 +967,25 @@ export const FIELDS_BASE_INFO = [
967 967 label: '业务员',
968 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 //项目完成报告信息
... ...