浏览代码

问题修改

dev01 4 天之前
父节点
当前提交
179496ba48

+ 20 - 0
js/component/common/ApproveTypeTooltip/index.js

@@ -0,0 +1,20 @@
+import React from "react";
+import { Checkbox } from "antd";
+
+export default function ApproveTypeTooltip() {
+  return (
+    <div>
+      <div className="mandatory" style={{ lineHeight: '22px', fontSize: '12px', paddingTop: '4px' }}>
+        1、本特批订单自审批生效之日起合同或应收账款若在半年内还未能收回或无前期款项目通过后客户不支付尾款则由我本人及上级、部门总经理共同承担该项目总成本的20%(本人承担对应职级提成点位的比例、上级及部门总经理承担管理奖金的对应比例),从工资或奖金中扣除。项目完结后,与业务提成奖励一并核算成本返还。
+        2.若本合同订单发生因违约金或赔偿等风险公司需要承担损失的情况,则由我本人及上级、部门总经理共同承担该项目违约金的20%(本人承担对应职级提成点位的比例、上级及部门总经理承担管理奖金的对应比例),从工资或奖金中扣除,不够的部分自行补齐。
+        3、本合同订单中存在未经公司审批同意就签订了有无限责任风险违约条款的情况,则本人愿意接受本合同业绩及项目奖金折半核算。本合同在执行过程中发生违约风险需要承担的全部损失均由我个人自行承担。
+        4、我本人承诺每周主动跟进该特批订单客户至少1次。并及时、如实将回款情况,项目正常服务情况,反馈至技术中心助理。如有不实,每次当月绩效扣10分,并更正反馈内容。
+      </div>
+      <div className="mandatory">
+        <Checkbox checked disabled>
+          <span style={{ color: 'red' }}>本人已知蒸以上内容,并承诺自愿按照以上约定执行。</span>
+        </Checkbox>
+      </div>
+    </div>
+  )
+}

+ 2 - 2
js/component/common/projectOperation/newAddProject.jsx

@@ -1743,7 +1743,7 @@ class NewAddProject extends Component {
                   </FormItem>
                 </div>
               } */}
-              {/* {
+              {
                 this.state.splitList.length < this.state.yearSum &&
                 <div
                   className="clearfix"
@@ -1941,7 +1941,7 @@ class NewAddProject extends Component {
                     </div>
                   }
                 </div>
-              } */}
+              }
             </div>
           </Spin>
         </Form>

+ 9 - 6
js/component/dataDic.js

@@ -4340,12 +4340,15 @@ module.exports = {
 
   approvalOptions: [
     { label: '无前期款', value: 1 },
-    { label: '暂无合同款', value: 2 },
-    { label: '含高风险条款', value: 3 },
-    { label: '新产品首单', value: 4 },
-    { label: '通过率低于80%', value: 5 },
-    { label: '3万以下会员', value: 6 },
-    { label: '认证首期5K以下', value: 7 },
+    { label: '前期款已收到,合同未收到,且在派单前仍不能收到的,预估合同收回时间', value: 2 },
+    { label: '合同条款存在明显风险的,如涉及到违约金、赔偿或退款的', value: 3 },
+    { label: '所有新项目的首单合同', value: 4 },
+    { label: '所有通过率低于80%的科技项目合同', value: 5 },
+    { label: '合同签订金额每年低于3万的会员合同', value: 6 },
+    { label: '认证类项目的前期款低于5000元', value: 7 },
+    { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
+    { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
+    { label: '非常规合同', value: 10 },
     { label: '其他', value: 0 },
   ],
 

+ 1 - 1
js/component/manageCenter/customer/NEW/crm/receiveLog.jsx

@@ -90,7 +90,7 @@ class ReceiveLog extends Component {
 
 
   expandedRowRender(record) {
-    let imgList = record.materialUrl.split(',');
+    let imgList = !!record.materialUrl ? record.materialUrl.split(',') : [];
     return imgList.map(url => {
       return (<div
         style={{ width: "60px", height: "60px", padding: "6px", border: "1px solid #eee", cursor: "pointer", marginRight: "6px" }}

+ 5 - 5
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx

@@ -467,12 +467,12 @@ const ContactPerson = React.createClass({
           </div>
           <div style={{ fontSize: 12, }}>
             专利总数&nbsp;{detail.patentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
-            发明专利&nbsp;{detail.inventionPatentCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            实用新型&nbsp;{detail.utilityModelCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            外观专利&nbsp;{detail.appearancePatentCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            软著&nbsp;{detail.softwareWorksCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
+            发明专利&nbsp;{detail.inventionPatentCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            实用新型&nbsp;{detail.utilityModelCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            外观专利&nbsp;{detail.appearancePatentCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            软著&nbsp;{detail.softwareWorksCount}&nbsp;&nbsp;&nbsp;&nbsp;
             标准&nbsp;{String(detail.standard) === '1' ? '有' : String(detail.standard) === '0' ? '无' : ''}&nbsp;&nbsp;&nbsp;&nbsp;
-            其他&nbsp;{detail.otherCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
+            其他&nbsp;{detail.otherCount}&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             2.财务数据<span style={{ color: "red" }}>(包括营收、税收、资产、研发费用等)</span>&nbsp;&nbsp;

+ 5 - 1
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import {
   Button, Cascader, Input, Select, Tag,
   Spin, Table, message, Form, Col, Tabs, Modal, Icon, AutoComplete, Upload
@@ -1055,6 +1055,10 @@ const QueryCustomer = React.createClass({
                         </div>
                       </FormItem>
                     ) }
+
+                    { !this.state.verificationMyUser && <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>
+                      注:请上传客户信息截图、电话记录等录入凭证图片
+                    </Col> }
                     
                   </div>
                   <FormItem wrapperCol={{ span: 12, offset: 6 }}>

+ 5 - 0
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -1211,6 +1211,7 @@ const QueryCustomer = React.createClass({
                       <FormItem
                         {...formItemLayout}
                         required
+                        help="帮助文档"
                         label="佐证资料" >
                         <div className="clearfix">
                         <ImgList
@@ -1229,6 +1230,10 @@ const QueryCustomer = React.createClass({
                       </FormItem>
                     ) }
 
+                     { !this.state.verificationMyUser && <Col style={{ color: 'red', marginBottom: '10px' }} span={12} offset={6}>
+                      注:请上传客户信息截图、电话记录等录入凭证图片
+                    </Col> }
+
                   </div>
                   <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                     <Button type="primary" htmlType="submit" style={{}}>领取客户</Button>

+ 5 - 5
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx

@@ -463,12 +463,12 @@ const ContactPerson = React.createClass({
           </div>
           <div style={{ fontSize: 12, }}>
             专利总数&nbsp;{detail.patentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
-            发明专利&nbsp;{detail.inventionPatentCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            实用新型&nbsp;{detail.utilityModelCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            外观专利&nbsp;{detail.appearancePatentCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
-            软著&nbsp;{detail.softwareWorksCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
+            发明专利&nbsp;{detail.inventionPatentCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            实用新型&nbsp;{detail.utilityModelCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            外观专利&nbsp;{detail.appearancePatentCount}&nbsp;&nbsp;&nbsp;&nbsp;
+            软著&nbsp;{detail.softwareWorksCount}&nbsp;&nbsp;&nbsp;&nbsp;
             标准&nbsp;{String(detail.standard) === '1' ? '有' : String(detail.standard) === '0' ? '无' : ''}&nbsp;&nbsp;&nbsp;&nbsp;
-            其他&nbsp;{detail.otherCount || ""}&nbsp;&nbsp;&nbsp;&nbsp;
+            其他&nbsp;{detail.otherCount}&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             2.财务数据<span style={{ color: "red" }}>(包括营收、税收、资产、研发费用等)</span>&nbsp;&nbsp;

+ 15 - 0
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -37,6 +37,7 @@ import NewEditProject from "../../../common/projectOperation/newEditProject";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip/index.js";
 
 const OrderDetail = Form.create()(
   React.createClass({
@@ -1021,6 +1022,20 @@ const OrderDetail = Form.create()(
                     {getApprovedType(this.state.type ? this.state.type.split(",").map(Number) : [], this.state.typeExplain, 1)}
                   </span>
                 </FormItem>
+                { this.state.approval == 1 && <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 5 }}
+                    wrapperCol={{ span: 16 }}
+                    label={
+                      <span className="mandatory" style={{fontSize: '12px'}}>
+                        提示
+                      </span>
+                    }
+                  >
+                    <ApproveTypeTooltip />
+                  </FormItem>
+                  </div>
+                }
                 <FormItem
                   className="half-item"
                   {...formItemLayout}

+ 41 - 6
js/component/manageCenter/order/orderNew/addService.jsx

@@ -78,6 +78,8 @@ import SelectList from '../../../common/mysuspend/selectList'; //
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip/index.js";
+
 
 const Option = AutoComplete.Option;
 const CheckboxGroup = Checkbox.Group;
@@ -6354,12 +6356,15 @@ const NewService = Form.create()(
       ));
       let approvalOptions = [
         { label: '无前期款', value: 1 },
-        { label: '暂无合同款', value: 2 },
-        { label: '含高风险条款', value: 3 },
-        { label: '新产品首单', value: 4 },
-        { label: '通过率低于80%', value: 5 },
-        { label: '3万以下会员', value: 6 },
-        { label: '认证首期5K以下', value: 7 },
+        { label: '前期款已收到,合同未收到,且在派单前仍不能收到的,预估合同收回时间', value: 2 },
+        { label: '合同条款存在明显风险的,如涉及到违约金、赔偿或退款的', value: 3 },
+        { label: '所有新项目的首单合同', value: 4 },
+        { label: '所有通过率低于80%的科技项目合同', value: 5 },
+        { label: '合同签订金额每年低于3万的会员合同', value: 6 },
+        { label: '认证类项目的前期款低于5000元', value: 7 },
+        { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
+        { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
+        { label: '非常规合同', value: 10 },
         {
           label: <span>
             <span>其他&nbsp;&nbsp;</span>
@@ -6688,6 +6693,22 @@ const NewService = Form.create()(
                                       </div>
                                     }
                                   </FormItem>
+
+                                  { this.state.approval == 1 && <div className="clearfix">
+                                      <FormItem
+                                        labelCol={{ span: 5 }}
+                                        wrapperCol={{ span: 16 }}
+                                        label={
+                                          <span className="mandatory" style={{fontSize: '12px'}}>
+                                            提示
+                                          </span>
+                                        }
+                                      >
+                                        <ApproveTypeTooltip />
+                                      </FormItem>
+                                    </div>
+                                  }
+  
                                   <FormItem
                                     className="half-item"
                                     {...formItemLayout}
@@ -6757,6 +6778,20 @@ const NewService = Form.create()(
                                       {getApprovedType(this.state.approvaType, this.state.typeExplain, 1)}
                                     </span>
                                   </FormItem>
+                                  { this.state.approval == 1 && <div className="clearfix">
+                                      <FormItem
+                                        labelCol={{ span: 5 }}
+                                        wrapperCol={{ span: 16 }}
+                                        label={
+                                          <span className="mandatory" style={{fontSize: '12px'}}>
+                                            提示
+                                          </span>
+                                        }
+                                      >
+                                        <ApproveTypeTooltip />
+                                      </FormItem>
+                                    </div>
+                                  }
                                   <FormItem
                                     className="half-item"
                                     {...formItemLayout}

+ 27 - 6
js/component/manageCenter/order/orderNew/reject.jsx

@@ -51,6 +51,7 @@ import PicturesWall from "./changeComponent/picturesWall.js";
 import FlowChart from '../../../common/flowchart'; // 流程图
 import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
 import Property from '../../../common/orderDetail/property' // 知识产权情况
+import ApproveTypeTooltip from "../../../common/ApproveTypeTooltip/index.js";
 
 const CheckboxGroup = Checkbox.Group;
 
@@ -2207,12 +2208,15 @@ const IntentionCustomer = Form.create()(
 
       let approvalOptions = [
         { label: '无前期款', value: 1 },
-        { label: '暂无合同款', value: 2 },
-        { label: '含高风险条款', value: 3 },
-        { label: '新产品首单', value: 4 },
-        { label: '通过率低于80%', value: 5 },
-        { label: '3万以下会员', value: 6 },
-        { label: '认证首期5K以下', value: 7 },
+        { label: '前期款已收到,合同未收到,且在派单前仍不能收到的,预估合同收回时间', value: 2 },
+        { label: '合同条款存在明显风险的,如涉及到违约金、赔偿或退款的', value: 3 },
+        { label: '所有新项目的首单合同', value: 4 },
+        { label: '所有通过率低于80%的科技项目合同', value: 5 },
+        { label: '合同签订金额每年低于3万的会员合同', value: 6 },
+        { label: '认证类项目的前期款低于5000元', value: 7 },
+        { label: '合同已收到,前期款延期支付,预估前期款收款时间', value: 8 },
+        { label: '合同与前期款均未收到,且在派单前仍不能收到的,预估收回时间', value: 9 },
+        { label: '非常规合同', value: 10 },
         {
           label: <span>
             <span>其他&nbsp;&nbsp;</span>
@@ -2593,6 +2597,23 @@ const IntentionCustomer = Form.create()(
                         }
                       </FormItem>
                     </div>
+
+                    { this.state.approval == 1 && <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 5 }}
+                        wrapperCol={{ span: 16 }}
+                        label={
+                          <span className="mandatory" style={{fontSize: '12px'}}>
+                            提示
+                          </span>
+                        }
+                      >
+                        <ApproveTypeTooltip />
+                      </FormItem>
+                    </div>
+                  }
+                      
+
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 2 - 2
js/component/tools.js

@@ -2474,9 +2474,9 @@ const obj = {
         let item = Number(e[i])
         for (var j = 0; j < approvalOptions.length; j++) {
           if (item == approvalOptions[j].value && item != 0) {
-            theType = theType + (theType ? "" : "") + approvalOptions[j].label
+            theType = theType + (theType ? "" : "") + approvalOptions[j].label
           } else if (item == approvalOptions[j].value && item == 0) {
-            theType = theType + (theType ? "" : "") + `其他(${other})`
+            theType = theType + (theType ? "" : "") + `其他(${other})`
           }
         }
       }