canrd-outside / order-erp-front · Commits

Commit f82f92858113bc262ccbc77fdb7d124fe1b01550

Authored by boyang
1 parent 455e7b29
build: skipped

fix: bug修复042701

Inline Side-by-side
Showing 12 changed files with 58 additions and 20 deletions
src/views/project/approve/ProduceFieldPanel.vue
  View file @f82f928
... ... @@ -130,7 +130,7 @@
130 130 const [registerTable, { reload }] = useTable({
131 131 scroll: false,
132 132 api: props.isApproved ? getApprovedListApi : getWaitListApi,
133   - searchInfo: { typeIn: [60, 70] },
  133 + searchInfo: { typeIn: [80, 90] },
134 134 columns,
135 135 useSearchForm: false,
136 136 formConfig: getFormConfig('true'),
... ...
src/views/project/approve/ProfitFieldPanel.vue
  View file @f82f928
... ... @@ -85,7 +85,11 @@
85 85 dataIndex: 'auditRoleCodes',
86 86 width: 150,
87 87 customRender: (column) => {
88   - return '业务研发净利字段';
  88 + if (column.record.type === 'FIELD_EDIT_APPLY') {
  89 + return '业务利润字段编辑申请';
  90 + } else if (column.record.type === 'INNER_PROFIT_FIELD_EDIT_APPLY') {
  91 + return '内部利润字段编辑申请';
  92 + }
89 93 },
90 94 },
91 95 {
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerData/ApproveReason.vue
  View file @f82f928
... ... @@ -32,8 +32,9 @@
32 32 orderId: baseFieldValues.value.orderId,
33 33 productionActualPrice: baseFieldValues.value.productionActualPrice,
34 34 productionDepartmentPredictPrice: baseFieldValues.value.productionDepartmentPredictPrice,
  35 + productionDepartmentPredictUnitPrice: baseFieldValues.value.productionDepartmentPredictUnitPrice,
35 36 applyRemark: baseFieldValues.value.applyRemark,
36   - type: 70,
  37 + type: 90,
37 38 });
38 39 emit('success');
39 40 setTimeout(() => {
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerData/FinanceEdit.vue
  View file @f82f928
... ... @@ -142,18 +142,18 @@
142 142 const orderCount = ref();
143 143 const id = ref();
144 144 const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
  145 + console.log(data,'5656fdsfa');
145 146 // 方式1
146 147 if (data.data?.lockFields) {
147 148 status1.value = data.data?.lockFields?.productionDepartmentPredictPrice;
148 149 status2.value = data.data?.lockFields?.productionActualPrice;
149   - status3.value = data.data?.lockFields?.productionDepartmentPredictUnitprice;
  150 + status3.value = data.data?.lockFields?.productionDepartmentPredictUnitPrice;
150 151 }
151   -
152 152 id.value = data.data.orderId;
153   - input1.value = data.data?.productionDepartmentPredictPrice.toFixed(2);
154   - input2.value = data.data?.productionActualPrice.toFixed(2);
  153 + input1.value = data.data?.productionDepartmentPredictPrice?.toFixed(2);
  154 + input2.value = data.data?.productionActualPrice?.toFixed(2);
155 155 orderCount.value = data.data?.orderCount;
156   - input3.value = data.data?.productionDepartmentPredictUnitprice.toFixed(2);
  156 + input3.value = data.data?.productionDepartmentPredictUnitPrice?.toFixed(2);
157 157 resetFields();
158 158 setDrawerProps({ confirmLoading: false });
159 159 // setFieldsValue({
... ... @@ -177,7 +177,7 @@
177 177 productionDepartmentPredictPrice: input1.value,
178 178 productionActualPrice: input2.value,
179 179 orderCount: orderCount.value,
180   - productionDepartmentPredictUnitprice: input3.value,
  180 + productionDepartmentPredictUnitPrice: input3.value,
181 181 });
182 182 emit('success');
183 183 closeDrawer();
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
  View file @f82f928
... ... @@ -139,9 +139,9 @@ export const COLUMNS = [
139 139 {
140 140 title: '生产科预算单价￥',
141 141 width: 150,
142   - dataIndex: 'productionDepartmentPredictUnitprice',
  142 + dataIndex: 'productionDepartmentPredictUnitPrice',
143 143 customRender: (column) => {
144   - return column.record?.productionDepartmentPredictUnitprice?.toFixed(2);
  144 + return column.record?.productionDepartmentPredictUnitPrice?.toFixed(2);
145 145 },
146 146 },
147 147 {
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
  View file @f82f928
... ... @@ -170,7 +170,7 @@
170 170 popConfirm: {
171 171 title: '确认审批？',
172 172 confirm: () => {
173   - if (record.status === 0 && role.value === ROLE.ADMIN) {
  173 + if (record.innerProduceStatus === 0 && role.value === ROLE.ADMIN) {
174 174 handleStatus(record, true);
175 175 }
176 176 return;
... ... @@ -344,6 +344,7 @@
344 344 .catch((error) => {
345 345 console.error(error);
346 346 });
  347 + handleClearChoose();
347 348 reload();
348 349 }
349 350  
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerData/tableData.tsx
  View file @f82f928
... ... @@ -34,6 +34,13 @@ export const FIELDS_BASE_INFO = [
34 34 label: '实际发生费用',
35 35 rules: [{ required: true }],
36 36 },
  37 + {
  38 + field: 'productionDepartmentPredictUnitPrice',
  39 + component: 'Select',
  40 + labelWidth: 150,
  41 + label: '生产科预算单价',
  42 + rules: [{ required: true }],
  43 + },
37 44 ];
38 45  
39 46 export const EDIT_INFO = [
... ... @@ -58,5 +65,12 @@ export const EDIT_INFO = [
58 65 label: '实际发生费用',
59 66 rules: [{ required: true }],
60 67 },
  68 + {
  69 + field: 'productionDepartmentPredictUnitPrice',
  70 + component: 'Select',
  71 + labelWidth: 150,
  72 + label: '生产科预算单价',
  73 + rules: [{ required: true }],
  74 + },
61 75 ];
62 76  
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/HistoryDetail.vue
  View file @f82f928
... ... @@ -134,12 +134,22 @@
134 134 const getOrderOptLogFunc = async (data, index, page) => {
135 135 console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
136 136 if (index === 1) {
137   - const res = await getProjectOptLog({ orderId: data, type: 30, page: page, pageSize: 20 });
  137 + const res = await getProjectOptLog({
  138 + projectNoPrefix: data,
  139 + type: 30,
  140 + page: page,
  141 + pageSize: 20
  142 + });
138 143 list1.value = res.items;
139 144 total1.value = res.total;
140 145 page1.value = page;
141 146 } else {
142   - const res = await getProjectOptLog({ orderId: data, type: 1, page: page, pageSize: 20 });
  147 + const res = await getProjectOptLog({
  148 + projectNoPrefix: data,
  149 + type: 1,
  150 + page: page,
  151 + pageSize: 20
  152 + });
143 153 list2.value = res.items;
144 154 total2.value = res.total;
145 155 page2.value = page;
... ...
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
  View file @f82f928
... ... @@ -171,7 +171,7 @@
171 171 popConfirm: {
172 172 title: '确认审核？',
173 173 confirm: () => {
174   - if (record.status === 0 && role.value === ROLE.ADMIN) {
  174 + if (record.innerProductionStatus === 0 && role.value === ROLE.ADMIN) {
175 175 handleStatus(record, true);
176 176 }
177 177 return;
... ... @@ -254,7 +254,7 @@
254 254 async function handleStatus(record, status) {
255 255 try {
256 256 await setInnerProfitSetStatus({
257   - projectNo: record.projectNo,
  257 + projectNo: record.projectNoPrefix,
258 258 customerCode: record.customerCode
259 259 });
260 260 reload();
... ... @@ -405,6 +405,7 @@
405 405 .catch((error) => {
406 406 console.error(error);
407 407 });
  408 + handleClearChoose();
408 409 reload();
409 410 }
410 411 </script>
... ...
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/ApproveReason.vue
  View file @f82f928
... ... @@ -32,7 +32,7 @@
32 32 orderId: baseFieldValues.value.orderId,
33 33 packetActualRmbTotalPrice: baseFieldValues.value.packetActualRmbTotalPrice,
34 34 applyRemark: baseFieldValues.value.applyRemark,
35   - type: 60,
  35 + type: 80,
36 36 });
37 37 emit('success');
38 38 setTimeout(() => {
... ...
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
  View file @f82f928
... ... @@ -176,7 +176,7 @@
176 176 popConfirm: {
177 177 title: '确认审核？',
178 178 confirm: () => {
179   - if (record.status === 0 && role.value === ROLE.ADMIN) {
  179 + if (record.packStatus === 0 && role.value === ROLE.ADMIN) {
180 180 handleStatus(record, true);
181 181 }
182 182 return;
... ... @@ -347,6 +347,7 @@
347 347 .catch((error) => {
348 348 console.error(error);
349 349 });
  350 + handleClearChoose();
350 351 reload();
351 352 }
352 353 async function onSelect(record, selected: boolean) {
... ...
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/index.vue
  View file @f82f928
... ... @@ -79,6 +79,11 @@
79 79 bordered: true,
80 80 columns: COLUMNS,
81 81 clickToRowSelect: false,
  82 + formConfig: {
  83 + labelWidth: 120,
  84 + schemas: searchFormSchema,
  85 + autoSubmitOnEnter: true,
  86 + },
82 87 rowKey: (record) => record.detailProjectNo || record.id || record.serialNumber,
83 88 rowSelection: {
84 89 type: 'checkbox',
... ... @@ -115,7 +120,7 @@
115 120 popConfirm: {
116 121 title: '确认审核？',
117 122 confirm: () => {
118   - if (record.status === 0 && role.value === ROLE.ADMIN) {
  123 + if (record.developmentStatus === 0 && role.value === ROLE.ADMIN) {
119 124 handleStatus(record, true);
120 125 }
121 126 return;
... ... @@ -187,7 +192,7 @@
187 192 try {
188 193 await setBusinessProfitSetStatus({
189 194 customerCode: record.customerCode,
190   - projectNo: record.projectNo
  195 + projectNo: record.projectNoPrefix,
191 196 });
192 197 reload();
193 198 } catch (error) {
... ... @@ -247,6 +252,7 @@
247 252 .catch((error) => {
248 253 console.error(error);
249 254 });
  255 + handleClearChoose();
250 256 reload();
251 257 }
252 258  
... ...