dev01 1 month ago
parent
commit
fde5488cc5

+ 1 - 1
js/component/common/flowchart/index.jsx

@@ -72,7 +72,7 @@ class FlowChart extends Component {
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
               { status: 3, title: "财务/复审/技术总监审核", name: info.cwzy, time: "" },
-              { status: 4, title: "运营保障审核 ", name: !info.yybz ? "-" : info.yybz, time: "" },
+              { status: 4, title: "运营保障审核 ", name: info.approval === 0 ? "-" : info.approvalStatus === 0 ? "-" : info.yybz, time: "" },
               { status: 5, title: "特批审核", name: tpname, time: "" },
               { status: 6, title: "技术总监派单", name: info.zxsgly, time: "" },
               { status: 7, title: "技术接单", name: "", time: "" },

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

@@ -431,7 +431,7 @@ const ContactPerson = React.createClass({
         </div>
 
         <div style={{
-          fontSize: 16,
+          fontSize: 14,
           marginTop: 20,
         }}>
           <div style={{ fontWeight: "bold", marginBottom: 5, color: "#58A3FF" }}>企业情况及前期准备工作</div>
@@ -461,7 +461,7 @@ const ContactPerson = React.createClass({
               </Button>
             }
           </div>
-          <div>
+          <div style={{ fontSize: 12, }}>
             专利总数&nbsp;{detail.patentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             发明专利&nbsp;{detail.inventionPatentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             实用新型&nbsp;{detail.utilityModelCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -491,7 +491,7 @@ const ContactPerson = React.createClass({
               </Button>
             }
           </div>
-          <div>{detail.financialData || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.financialData || "无"}</div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             3.前期沟通<span style={{ color: "red" }}>(客户的难处、需求)</span>&nbsp;&nbsp;
             {
@@ -514,7 +514,7 @@ const ContactPerson = React.createClass({
               </Button>
             }
           </div>
-          <div>{detail.earlyCommunication || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.earlyCommunication || "无"}</div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             4.面谈思路及目的&nbsp;&nbsp;
             {
@@ -537,7 +537,7 @@ const ContactPerson = React.createClass({
               </Button>
             }
           </div>
-          <div>{detail.interviewIdeas || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.interviewIdeas || "无"}</div>
         </div>
 
         {/* 新增联系人 */}

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

@@ -430,7 +430,7 @@ const ContactPerson = React.createClass({
         </div>
 
         <div style={{
-          fontSize: 16,
+          fontSize: 14,
           marginTop: 20,
         }}>
           <div style={{ fontWeight: "bold", marginBottom: 5, color: "#58A3FF" }}>企业情况及前期准备工作</div>
@@ -457,7 +457,7 @@ const ContactPerson = React.createClass({
               修改
             </Button>
           </div>
-          <div>
+          <div style={{ fontSize: 12, }}>
             专利总数&nbsp;{detail.patentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             发明专利&nbsp;{detail.inventionPatentCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
             实用新型&nbsp;{detail.utilityModelCount || 0}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -484,7 +484,7 @@ const ContactPerson = React.createClass({
               修改
             </Button>
           </div>
-          <div>{detail.financialData || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.financialData || "无"}</div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             3.前期沟通<span style={{ color: "red" }}>(客户的难处、需求)</span>&nbsp;&nbsp;
             <Button
@@ -504,7 +504,7 @@ const ContactPerson = React.createClass({
               修改
             </Button>
           </div>
-          <div>{detail.earlyCommunication || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.earlyCommunication || "无"}</div>
           <div style={{ fontWeight: "bold", marginTop: 10 }}>
             4.面谈思路及目的&nbsp;&nbsp;
             <Button
@@ -524,7 +524,7 @@ const ContactPerson = React.createClass({
               修改
             </Button>
           </div>
-          <div>{detail.interviewIdeas || "无"}</div>
+          <div style={{ fontSize: 12, }}>{detail.interviewIdeas || "无"}</div>
         </div>
 
         <AddContact

+ 1 - 1
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -103,7 +103,7 @@ const Newuser = Form.create()(React.createClass({
       message.warning('请输入正确的上级主管');
       return false;
     };
-    if (!getNewArray(this.state.Business, "value").toString()) {
+    if (!getNewArray(this.state.Business, "reviewerId").toString()) {
       message.warning('请输入正确的公出审核人');
       return false;
     }

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.3.22",
+  "version": "1.3.23",
   "description": "",
   "main": "index.js",
   "scripts": {