canrd-outside / order-erp-front · Commits

Commit f2c17542925f2e119bb70abd6f36c1a956bb9a4b

Authored by sanmu
1 parent 6953c5ab

fix: bug

Inline Side-by-side
Showing 4 changed files with 39 additions and 29 deletions
src/views/project/approve/ProfitPanel.vue
  View file @f2c1754
... ... @@ -24,7 +24,7 @@
24 24 @ok="handleTrue"
25 25 >
26 26 <BaseInfo :baseInfos="baseInfos" />
27   - <h2>项目报告书信息</h2>
  27 + <h2>利润分析信息</h2>
28 28 <div v-for="field in fieldInfos" :key="field">
29 29 <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
30 30 ><span>{{ field.value }}</span>
... ... @@ -140,18 +140,24 @@
140 140 async function handleDetail(data) {
141 141 openDrawer(true, { data });
142 142 id.value = data.id;
143   - fieldInfos.value = FIELDS_PROFIT_INFO.map((field) => {
144   - if (field.field === 'profitType') {
  143 + fieldInfos.value = (FIELDS_PROFIT_INFO as any)
  144 + .concat({
  145 + label: '利润率',
  146 + field: 'profitRate',
  147 + })
  148 + .map((field) => {
  149 + if (field.field === 'profitType') {
  150 + return {
  151 + label: field.label,
  152 + value: data.fieldInfos.profitAnalysisFields[field.field] == 0 ? '方式1' : '方式2',
  153 + };
  154 + }
145 155 return {
146 156 label: field.label,
147   - value: data.fieldInfos.profitAnalysisFields[field.field] == 0 ? '方式1' : '方式2',
  157 + value: data.fieldInfos.profitAnalysisFields[field.field],
148 158 };
149   - }
150   - return {
151   - label: field.label,
152   - value: data.fieldInfos.profitAnalysisFields[field.field],
153   - };
154   - }).filter((item) => !!item.value);
  159 + })
  160 + .filter((item) => !!item.value);
155 161 baseInfos.value = FIELDS_BASE_INFO.map((field) => {
156 162 return {
157 163 label: field.label,
... ...
src/views/project/config/TablePanel.vue
  View file @f2c1754
... ... @@ -84,7 +84,11 @@
84 84 }
85 85  
86 86 async function handleSave(record) {
87   - await saveConfig({ id: record.id, settingValue: record.settingValue });
  87 + if (props.column === 3) {
  88 + await saveConfig({ id: record.id, settingValue: record.settingValue });
  89 + } else {
  90 + await saveConfig({ id: record.id, relationValue: record.relationValue });
  91 + }
88 92 handleCancel(record);
89 93 reload();
90 94 }
... ...
src/views/project/order/ProfitAnalysis.vue
  View file @f2c1754
... ... @@ -18,7 +18,7 @@
18 18 ]"
19 19 v-model:value="profitType"
20 20 placeholder="请选择"
21   - default-value="0"
  21 + defaultValue="0"
22 22 />
23 23 </div>
24 24 <Space>
... ... @@ -65,7 +65,7 @@
65 65 const loading = ref(true);
66 66 const lines = ref(10);
67 67 const activeRate = ref();
68   - const profitType = ref('1');
  68 + const profitType = ref('0');
69 69 const info = ref({});
70 70 const [register, { setModalProps, redoModalHeight }] = useModalInner(async (data) => {
71 71 orderIds.value = toRaw(data.data);
... ...
src/views/project/order/tableData.tsx
  View file @f2c1754
... ... @@ -66,7 +66,7 @@ export const ORDER_LIST_BASE_FIELDS = [
66 66 },
67 67  
68 68 {
69   - title: 'Modelo(REFERENCE)',
  69 + title: 'Model(REFERENCE)',
70 70 width: 150,
71 71 dataIndex: 'modeleLo',
72 72 },
... ... @@ -114,7 +114,7 @@ export const ORDER_LIST_BASE_FIELDS = [
114 114 dataIndex: 'productStyle',
115 115 },
116 116 {
117   - title: '生成科拖货时间',
  117 + title: '生产科拖货时间',
118 118 width: 150,
119 119 dataIndex: 'productionDepartmentConsignTime',
120 120 customRender: (column) => {
... ... @@ -141,11 +141,11 @@ export const ORDER_LIST_BASE_FIELDS = [
141 141 width: 150,
142 142 dataIndex: 'packetType',
143 143 },
144   - {
145   - title: '业务员',
146   - width: 150,
147   - dataIndex: 'businessPerson',
148   - },
  144 + // {
  145 + // title: '业务员',
  146 + // width: 150,
  147 + // dataIndex: 'businessPerson',
  148 + // },
149 149 ];
150 150  
151 151 export const ORDER_LIST_REPORT_FIELDS = [
... ... @@ -447,9 +447,8 @@ export const ORDER_LIST_INSPECT_FIELDS = [
447 447 dataIndex: 'inspectionStageInfo',
448 448 children: [
449 449 {
450   - title: 'midCheckApplyTime',
  450 + title: '中期验货申请时间',
451 451 width: 150,
452   - label: '中期验货申请时间',
453 452 dataIndex: 'midCheckApplyTime',
454 453 customRender: (column) => {
455 454 const { record } = column || {};
... ... @@ -637,13 +636,7 @@ export const FIELDS_BASE_INFO = [
637 636 label: '生产科',
638 637 rules: [{ required: true }],
639 638 },
640   - {
641   - field: 'modeleLo',
642   - component: 'Input',
643   - labelWidth: 150,
644   - label: 'Modelo(REFERENCE)',
645   - rules: [{ required: true }],
646   - },
  639 +
647 640 {
648 641 field: 'innerNo',
649 642 component: 'Select',
... ... @@ -666,6 +659,13 @@ export const FIELDS_BASE_INFO = [
666 659 rules: [{ required: true }],
667 660 },
668 661 {
  662 + field: 'modeleLo',
  663 + component: 'Input',
  664 + labelWidth: 150,
  665 + label: 'Model(REFERENCE)',
  666 + rules: [{ required: true }],
  667 + },
  668 + {
669 669 field: 'collection',
670 670 component: 'Input',
671 671 labelWidth: 250,
... ...