Merge branch 'crm_fix' into 'master'

Crm fix See merge request !197

Merge branch 'crm_fix' into 'master'
Crm fix See merge request !197
张志伟
2 parents 4c9a3ac4 3b164e70
Showing 3 changed files with 70 additions and 4 deletions
src/pages/order3/AddValueTaskConfig/api.ts
src/pages/order3/AddValueTaskConfig/components/EditModal.tsx
src/pages/order3/AddValueTaskConfig/components/List.tsx
@@ -24,6 +24,8 @@ export interface ListResult {
   endTime?: number // 结束时间
   enable?: boolean // 启用/禁用
   addedValueType?: number // 附加值类型
+  vciOutputValueTask?: number // 商业险产值目标
+  decoOutputValueTask?: number // 装潢产值目标
 }
  
 /** 查询附加值任务配置服务列表 */
 import React, { useState, useEffect } from 'react';
-import { Modal, Button, message, Form, InputNumber, DatePicker, Radio } from 'antd';
+import { Modal, Button, message, Form, InputNumber, DatePicker, Radio, Row, Col } from 'antd';
 import {useStore} from '../index';
 import {ListResult, saveConfigApi} from '../api';
 import { debounce, isNil } from 'lodash';
@@ -57,7 +57,9 @@ export default function DetailModal() {
       decoOutputValueRatio: currentData.data?.decoOutputValueRatio,
       shopList: currentData.data?.shopList?.map((v: any) => ({value: v.shopId, label: v.shopName})) || [],
       rangeDate: [moment(currentData.data.beginTime), moment(currentData.data.endTime)],
-      addedValueType: currentData?.data.addedValueType
+      addedValueType: currentData?.data?.addedValueType,
+      vciOutputValueTask: currentData?.data?.vciOutputValueTask,
+      decoOutputValueTask: currentData?.data?.decoOutputValueTask
     });
     setType(currentData.data?.addedValueType || 2);
   };
@@ -75,7 +77,9 @@ export default function DetailModal() {
       shopList: params.shopList.map((v: any) => ({shopId: v.value, shopName: v.label})),
       beginTime: moment(params.rangeDate[0]).valueOf(),
       endTime: moment(params.rangeDate[1]).valueOf(),
-      addedValueType: params.addedValueType
+      addedValueType: params.addedValueType,
+      vciOutputValueTask: params.vciOutputValueTask,
+      decoOutputValueTask: params.decoOutputValueTask
     };
     saveConfigApi(_params)
     .then(res => {
@@ -129,6 +133,54 @@ export default function DetailModal() {
             parser={(value: string) => value?.replace('元/台', '')}
           />
         </Form.Item>
+        <Row style={{marginLeft: 30}}>
+
+          <Form.Item
+            label={<span>其中：<span>商业险产值目标</span></span>}
+            name="vciOutputValueTask"
+            style={{width: '100%'}}
+            rules={[({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (isNil(value)) {
+                    return Promise.reject(new Error('请输入'));
+                  }
+                  return Promise.resolve();
+                },
+              })]}
+          >
+            <InputNumber
+              style={{width: '100%'}}
+              controls={false}
+              min={0}
+              formatter={(value: any) => `${value}元/台`}
+              precision={2}
+              parser={(value: string) => value?.replace('元/台', '')}
+            />
+          </Form.Item>
+          <Form.Item
+            label={<span style={{textIndent: '42px'}}>装潢产值目标</span>}
+            name="decoOutputValueTask"
+            style={{width: '100%'}}
+            rules={[({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (isNil(value)) {
+                    return Promise.reject(new Error('请输入'));
+                  }
+                  return Promise.resolve();
+                },
+              })]}
+          >
+            <InputNumber
+              style={{width: '100%'}}
+              controls={false}
+              min={0}
+              formatter={(value: any) => `${value}元/台`}
+              precision={2}
+              parser={(value: string) => value?.replace('元/台', '')}
+            />
+          </Form.Item>
+        </Row>
+
         <div className="addValue_wrapper"><span className="addvalue_text">&#65290;</span><span>产值构成：</span></div>
         <Form.Item
           label={type === 2 ? "1.计算保险毛利" : "1.计算保险产值："}
@@ -43,13 +43,19 @@ export default function LargeList({addedValueType} : Props) {
       rowKey="id"
       pagination={paginationConfig}
     >
-      <Column 
+      <Column
         title="单车附加值目标" 
         dataIndex="addedValueTask" 
         align="left"
         render={(_text) => (isNil(_text) ? '-' : <span style={{color: "#FF921C", fontSize: '14px'}}>{_text}元<span style={{color: "#333"}}>/台</span></span>)}
       />
       <Column 
+        title="商业险产值目标" 
+        dataIndex="vciOutputValueTask" 
+        align="left"
+        render={(_text) => (isNil(_text) ? '-' : <div style={{display: 'flex', flexDirection: 'column'}}><span style={{color: "#FF921C", fontSize: '14px'}}>{_text}元<span style={{color: "#333"}}>/台</span></span><span>(含驾意险)</span></div>)}
+      />
+      <Column 
         title={addedValueType === 2 ? "计算保险毛利" : "计算保险产值"}
         dataIndex="addedValueTask" 
         align="left"
@@ -61,6 +67,12 @@ export default function LargeList({addedValueType} : Props) {
           </div>
         )}
       />
+      <Column 
+        title="装潢产值目标" 
+        dataIndex="decoOutputValueTask" 
+        align="left"
+        render={(_text) => (isNil(_text) ? '-' : <span style={{color: "#FF921C", fontSize: '14px'}}>{_text}元<span style={{color: "#333"}}>/台</span></span>)}
+      />
       <Column
         title={addedValueType === 2 ? "计算装潢毛利" : "计算装潢产值"}
         dataIndex="decoOutputValueRatio"