canrd-main / canrd-erp-front · Commits

Commit e800745dc7686ebecfd0a7d9167a0d94473547dd

Authored by zhongnanhuang
1 parent 3553409f
build: skipped

feat: update

Inline Side-by-side
Showing 3 changed files with 43 additions and 42 deletions
src/pages/Order/components/DeliverModal.tsx
  View file @e800745
... ... @@ -28,7 +28,6 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) => {
28 28 } else {
29 29 newData[index][key] = obj.target?.value;
30 30 }
31   -
32 31 setData(newData);
33 32 };
34 33 const columns: ProColumns<any>[] = [
... ... @@ -68,10 +67,10 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
68 67 title: '包裹数量',
69 68 width: 80,
70 69 dataIndex: 'packageNumber',
71   - render: (_, record) => (
  70 + render: (_, record, index) => (
72 71 <InputNumber
73 72 value={record.packageNumber}
74   - onChange={(value) => (record.packageNumber = value)}
  73 + onChange={(value) => handleChange('packageNumber', index, value)}
75 74 />
76 75 ),
77 76 },
... ...
src/pages/Order/components/OrderDrawer.tsx
  View file @e800745
... ... @@ -53,7 +53,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
53 53 setInvoicingStatus(data.invoicingStatus);
54 54 }
55 55 }, [data]);
56   - let mainInfoDisbled = optType('edit');
  56 + // let mainInfoDisbled = optType('edit');
57 57 if (optType('edit') || optType('copy')) {
58 58 //订单修改和新增的子订单列表命名是list
59 59 data.list = data.subOrderInformationLists;
... ... @@ -114,6 +114,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
114 114 * @param currentRowData list中当前行的数据
115 115 */
116 116 function autoFillProductInfo(option: any, currentRowData: any) {
  117 + console.log(option);
117 118 let copyList = form.getFieldValue('list');
118 119 let currentData = copyList[currentRowData.field.key];
119 120 currentData.productCode = option?.productCode;
... ... @@ -200,7 +201,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
200 201 placeholder="请输入销售代表"
201 202 options={SALES_CODE_OPTIONS}
202 203 rules={[{ required: true, message: '销售代表必填' }]}
203   - disabled={mainInfoDisbled}
  204 + // disabled={mainInfoDisbled}
204 205 />
205 206 <ProFormText
206 207 name="customerName"
... ... @@ -208,7 +209,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
208 209 label="收货人"
209 210 placeholder="请输入收货人"
210 211 rules={[{ required: true, message: '收货人必填' }]}
211   - disabled={mainInfoDisbled}
  212 + // disabled={mainInfoDisbled}
212 213 />
213 214 <ProFormText
214 215 width="lg"
... ... @@ -216,7 +217,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
216 217 label="联系方式"
217 218 placeholder="请输入联系方式"
218 219 rules={[{ required: true, message: '联系方式必填' }]}
219   - disabled={mainInfoDisbled}
  220 + // disabled={mainInfoDisbled}
220 221 />
221 222 <ProFormText
222 223 width="lg"
... ... @@ -224,7 +225,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
224 225 label="单位"
225 226 placeholder="请输入单位"
226 227 rules={[{ required: true, message: '单位必填' }]}
227   - disabled={mainInfoDisbled}
  228 + // disabled={mainInfoDisbled}
228 229 />
229 230 <ProFormText
230 231 width="lg"
... ... @@ -232,7 +233,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
232 233 label="单位联系人"
233 234 placeholder="请输入单位联系人"
234 235 rules={[{ required: true, message: '单位联系人必填' }]}
235   - disabled={mainInfoDisbled}
  236 + // disabled={mainInfoDisbled}
236 237 />
237 238 <ProFormTextArea
238 239 width="lg"
... ... @@ -240,14 +241,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
240 241 label="收货地址"
241 242 placeholder="请输入收货地址"
242 243 rules={[{ required: true, message: '收货地址必填' }]}
243   - disabled={mainInfoDisbled}
  244 + // disabled={mainInfoDisbled}
244 245 />
245 246 <ProFormDigit
246 247 name="totalPayment"
247 248 width="lg"
248 249 label="支付总额（￥）"
249 250 rules={[{ required: true, message: '支付总额必填' }]}
250   - disabled={mainInfoDisbled}
  251 + // disabled={mainInfoDisbled}
251 252 />
252 253 <ProFormSelect
253 254 placeholder="请输入支付渠道"
... ... @@ -256,7 +257,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
256 257 label="支付渠道"
257 258 options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
258 259 rules={[{ required: true, message: '支付渠道必填' }]}
259   - disabled={mainInfoDisbled}
  260 + // disabled={mainInfoDisbled}
260 261 />
261 262 <ProFormSelect
262 263 placeholder="请输入支付方式"
... ... @@ -265,7 +266,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
265 266 label="支付方式"
266 267 options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
267 268 rules={[{ required: true, message: '支付方式必填' }]}
268   - disabled={mainInfoDisbled}
  269 + // disabled={mainInfoDisbled}
269 270 />
270 271 <ProFormSelect
271 272 placeholder="请输入所属事业部"
... ... @@ -274,7 +275,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
274 275 label="所属事业部"
275 276 options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
276 277 rules={[{ required: true, message: '所属事业部必填' }]}
277   - disabled={mainInfoDisbled}
  278 + // disabled={mainInfoDisbled}
278 279 />
279 280 <ProFormSelect
280 281 placeholder="选择是否需要开票"
... ... @@ -282,9 +283,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
282 283 width="lg"
283 284 label="是否需要开票"
284 285 options={enumToSelect(INVOCING_STATUS_OPTIONS)}
285   - disabled={mainInfoDisbled}
  286 + // disabled={mainInfoDisbled}
286 287 onChange={(_, option) => {
287 288 setInvoicingStatus(option.value);
  289 + console.log(option.value);
288 290 if (option.value === 'UN_INVOICE') {
289 291 form.setFieldValue('invoiceIdentificationNumber', undefined);
290 292 form.setFieldValue('bank', undefined);
... ... @@ -293,32 +295,27 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
293 295 }}
294 296 rules={[{ required: true, message: '是否需要开票必填' }]}
295 297 />
296   - {optType('add') || optType('copy') ? (
297   - <ProFormText
298   - width="lg"
299   - name="invoiceIdentificationNumber"
300   - label="开票信息"
301   - disabled={mainInfoDisbled}
302   - hidden={invoicingStatus !== 'INVOICED'}
303   - placeholder="请输入开票信息"
304   - rules={[
305   - {
306   - required: invoicingStatus === 'INVOICED' ? true : false,
307   - message: '开票信息必填',
308   - },
309   - ]}
310   - />
311   - ) : (
312   - ''
313   - )}
  298 + <ProFormText
  299 + width="lg"
  300 + name="invoiceIdentificationNumber"
  301 + label="开票信息"
  302 + // disabled={mainInfoDisbled}
  303 + hidden={invoicingStatus !== 'INVOICED'}
  304 + placeholder="请输入开票信息"
  305 + rules={[
  306 + {
  307 + required: invoicingStatus === 'INVOICED' ? true : false,
  308 + message: '开票信息必填',
  309 + },
  310 + ]}
  311 + />
314 312  
315   - {getUserInfo().roleSmallVO?.code === 'admin' &&
316   - (optType('add') || optType('edit')) ? (
  313 + {getUserInfo().roleSmallVO?.code === 'admin' ? (
317 314 <ProFormDateTimePicker
318 315 width="lg"
319 316 name="invoicingTime"
320   - disabled={mainInfoDisbled}
321   - hidden={invoicingStatus === 'INVOICED'}
  317 + // disabled={mainInfoDisbled}
  318 + hidden={invoicingStatus !== 'INVOICED'}
322 319 label="开票时间"
323 320 placeholder="请输入开票时间"
324 321 />
... ... @@ -329,7 +326,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
329 326 width="lg"
330 327 name="bank"
331 328 label="开户银行"
332   - disabled={mainInfoDisbled}
  329 + // disabled={mainInfoDisbled}
333 330 hidden={invoicingStatus !== 'INVOICED'}
334 331 placeholder="请输入开户银行"
335 332 />
... ... @@ -338,14 +335,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
338 335 name="bankAccountNumber"
339 336 hidden={invoicingStatus !== 'INVOICED'}
340 337 label="银行账号"
341   - disabled={mainInfoDisbled}
  338 + // disabled={mainInfoDisbled}
342 339 placeholder="请输入银行账号"
343 340 />
344 341 <ProFormText
345 342 width="lg"
346 343 name="notes"
347 344 label="备注"
348   - disabled={mainInfoDisbled}
  345 + // disabled={mainInfoDisbled}
349 346 placeholder="请输入备注"
350 347 />
351 348  
... ... @@ -474,7 +471,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
474 471 productName: keywords,
475 472 type: 'add',
476 473 label: keywords,
477   - value: keywords,
  474 + value: 13 + '|' + keywords,
  475 + key: keywords,
478 476 });
479 477 }
480 478 return options;
... ...
src/pages/Order/index.tsx
  View file @e800745
... ... @@ -391,8 +391,12 @@ const OrderPage = () =&gt; {
391 391 onClick={() => {
392 392 let selectedSubOrders = selectedRowObj[record.id];
393 393 setSelectedRows(selectedSubOrders);
394   - if (selectedSubOrders === null) {
  394 + if (selectedSubOrders === undefined) {
395 395 setSelectedRows(record.subOrderInformationLists);
  396 + console.log(
  397 + 'subOrderInformationLists：' +
  398 + record.subOrderInformationLists,
  399 + );
396 400 }
397 401 for (let i = 0; i < selectedRows.length; i++) {
398 402 if (
... ...