Browse Source

副总裁逻辑判断

dev01 1 year ago
parent
commit
7dc506244f

+ 3 - 4
js/component/common/flowchart/index.jsx

@@ -140,7 +140,7 @@ class FlowChart extends Component {
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
               { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
-              { status: 9, title: "董事长审核", name: info.changeAmount > 0.2 ? info.dsz : "-", time: "" },
+              { status: 9, title: "董事长审核", name: info.isHN == 1 ? (info.changeAmount > 0.2 ? info.dsz : "-") : "-", time: "" },
             ]
             // 1 项目&金额
             let theArr1 = [
@@ -262,9 +262,9 @@ class FlowChart extends Component {
             // 显示当前流程处理
             if (info.status == 0 || info.status == 1 || info.status == 3) {
               list.forEach((item, index) => {
-                if (item.status == info.processState) {
+                if (info.processState == 10 && item.status == 8) { // 副总裁审核processState == 10 
                   pstatus = index
-                } else if (info.processState == 10 && item.status == 8) {  // 副总裁审核processState == 10 
+                } else if ((item.status == info.processState) && info.processState != 10) {  
                   pstatus = index
                 }
               })
@@ -276,7 +276,6 @@ class FlowChart extends Component {
               list = [{ status: -1, title: "变更已取消", name: "", time: "" }]
               pstatus = 0
             }
-
             this.setState({
               details: info,
               list: list,

+ 1 - 1
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -226,7 +226,7 @@ const ProjectVip = React.createClass({
           render: (text, record) => {
             return (
               <div>
-                {text != 1 && <div>{["", "财务审核", "特批审核", "通过", "驳回"][text]}</div>}
+                {text != 1 && <div>{["", "财务审核", `${["", "总裁", "副总裁"][record.approvalType]}特批审核`, "通过", "驳回"][text]}</div>}
                 {text == 1 &&
                   <div>
                     {record.examineType == 1

+ 11 - 2
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -220,10 +220,19 @@ const ApprovedVipProject = React.createClass({
           title: "状态",
           dataIndex: "status",
           key: "status",
-          render: (text) => {
+          render: (text, record) => {
             return (
               <div>
-                {["", "财务审核", "特批审核", "通过", "驳回"][text]}
+                {text != 1 && <div>{["", "财务审核", `${["", "总裁", "副总裁"][record.approvalType]}特批审核`, "通过", "驳回"][text]}</div>}
+                {text == 1 &&
+                  <div>
+                    {record.examineType == 1
+                      ? "财务审核" : record.examineType == 2
+                        ? "财务复审" : record.examineType == 3 && "财务审核"
+                    }
+                    {record.examineType == 3 && <div>财务复审</div>}
+                  </div>
+                }
               </div>
             );
           }

+ 11 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -288,7 +288,8 @@ class ChangeDetail extends Component {
                 style={{
                   display:
                     (this.props.data.processState == 8 ||
-                      this.props.data.processState == 9) &&
+                      this.props.data.processState == 9 ||
+                      this.props.data.processState == 10) &&
                       this.props.data.status == 4
                       ? "none"
                       : "block"
@@ -1099,7 +1100,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} id={this.props.id}/>;
+            return <Itemlist key={index} pageData={item} id={this.props.id} />;
           })}
           <Form.Item
             label="变更凭证"
@@ -1432,7 +1433,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -1457,7 +1459,8 @@ class ChangeDetail extends Component {
               color: "red",
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 4 || this.props.data.status == 2 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "inline-block"
                   : "none",
@@ -1529,7 +1532,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"
@@ -1555,7 +1559,8 @@ class ChangeDetail extends Component {
                 right: 30,
                 display:
                   (this.props.data.processState == 8 ||
-                    this.props.data.processState == 9) &&
+                    this.props.data.processState == 9 ||
+                    this.props.data.processState == 10) &&
                     this.props.data.status == 4
                     ? "block"
                     : "block",

+ 6 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -839,7 +839,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -879,7 +880,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -968,7 +970,8 @@ class ChangeDetail extends Component {
           style={{
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 4 &&
                 this.props.data.refundStatus
                 ? "block"

+ 17 - 9
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -288,7 +288,8 @@ class ChangeDetail extends Component {
                 style={{
                   display:
                     (this.props.data.processState == 8 ||
-                      this.props.data.processState == 9) &&
+                      this.props.data.processState == 9 ||
+                      this.props.data.processState == 10) &&
                       this.props.data.status == 4 || this.props.data.status == 6
                       ? "none"
                       : "block"
@@ -1482,7 +1483,7 @@ class ChangeDetail extends Component {
           <div
             style={{
               display:
-                (this.props.data.processState == 9 ||
+                (this.props.data.processState == 10 || this.props.data.processState == 9 ||
                   this.props.data.processState == 8) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
@@ -1504,7 +1505,8 @@ class ChangeDetail extends Component {
                 zIndex: "999",
                 display:
                   (this.props.data.processState == 8 ||
-                    this.props.data.processState == 9) &&
+                    this.props.data.processState == 9 ||
+                    this.props.data.processState == 10) &&
                     this.props.data.status == 4 || this.props.data.status == 6
                     ? "none"
                     : "block",
@@ -1531,7 +1533,8 @@ class ChangeDetail extends Component {
               color: "red",
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 4 || this.props.data.status == 2)
                   ? "inline-block"
                   : "none",
@@ -1555,7 +1558,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -1658,7 +1662,8 @@ class ChangeDetail extends Component {
               position: "relative",
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   !this.props.data.refundStatus
                   ? "block"
@@ -1730,7 +1735,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"
@@ -1848,7 +1854,8 @@ class ChangeDetail extends Component {
               transform: "translateX(-50%)",
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 2
                   ? "block"
                   : "none",
@@ -1871,7 +1878,8 @@ class ChangeDetail extends Component {
                 right: 30,
                 display:
                   (this.props.data.processState == 8 ||
-                    this.props.data.processState == 9) &&
+                    this.props.data.processState == 9 ||
+                    this.props.data.processState == 10) &&
                     this.props.data.status == 4
                     ? "block"
                     : "block",

+ 5 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -550,7 +550,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -572,7 +573,7 @@ class ChangeDetail extends Component {
           <div style={{
             position: "relative",
             display:
-              ((this.props.data.processState == 8 || this.props.data.processState == 9) &&
+              ((this.props.data.processState == 8 || this.props.data.processState == 9 || this.props.data.processState == 10) &&
                 (this.props.data.status == 2 || this.props.data.status == 3 || this.props.data.status == 4 || this.props.data.status == 6))
                 ? "block"
                 : "none",
@@ -697,7 +698,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"

+ 4 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -558,7 +558,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -658,7 +659,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"

+ 6 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -551,7 +551,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -574,7 +575,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -698,7 +700,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"

+ 6 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -570,7 +570,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -593,7 +594,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -734,7 +736,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"

+ 6 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxjl.js

@@ -576,7 +576,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -599,7 +600,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -647,7 +649,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"

+ 12 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -654,7 +654,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 9 ||
-                  this.props.data.processState == 8) &&
+                  this.props.data.processState == 8 ||
+                  this.props.data.processState == 10) &&
                   (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
@@ -678,7 +679,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3
                 ? "block"
                 : "none",
@@ -784,7 +786,8 @@ class ChangeDetail extends Component {
             position: "relative",
             display:
               (this.props.data.processState == 8 ||
-                this.props.data.processState == 9) &&
+                this.props.data.processState == 9 ||
+                this.props.data.processState == 10) &&
                 this.props.data.status == 6
                 ? "block"
                 : "none",
@@ -842,7 +845,8 @@ class ChangeDetail extends Component {
                 style={{
                   display:
                     (this.props.data.processState == 8 ||
-                      this.props.data.processState == 9) &&
+                      this.props.data.processState == 9 ||
+                      this.props.data.processState == 10) &&
                       this.props.data.status == 6
                       ? "block"
                       : "none",
@@ -891,7 +895,8 @@ class ChangeDetail extends Component {
             style={{
               display:
                 (this.props.data.processState == 8 ||
-                  this.props.data.processState == 9) &&
+                  this.props.data.processState == 9 ||
+                  this.props.data.processState == 10) &&
                   this.props.data.status == 4 &&
                   this.props.data.refundStatus
                   ? "block"
@@ -934,7 +939,8 @@ class ChangeDetail extends Component {
                 right: 30,
                 display:
                   (this.props.data.processState == 8 ||
-                    this.props.data.processState == 9) &&
+                    this.props.data.processState == 9 ||
+                    this.props.data.processState == 10) &&
                     this.props.data.status == 4
                     ? "block"
                     : "block",

+ 8 - 5
js/component/manageCenter/order/orderNew/examinejl.jsx

@@ -1046,7 +1046,8 @@ const IntentionCustomer = Form.create()(
               flag: false,
               agreeVisible: false,
             });
-            this.reset();
+            this.loadData(this.state.pageNo)
+            // this.reset();
           }
         }.bind(this),
       }).always(
@@ -1075,7 +1076,7 @@ const IntentionCustomer = Form.create()(
           outsource: 1,
         },
         success: function (data) {
-          if (data.error.length || data.data.list == "") {
+          if (data.error.length == 0 || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
               this.setState({
@@ -1088,7 +1089,8 @@ const IntentionCustomer = Form.create()(
               visible: false,
               flag: false,
             });
-            this.reset();
+            // this.reset();
+            this.loadData(this.state.pageNo)
           }
         }.bind(this),
       }).always(
@@ -1143,7 +1145,8 @@ const IntentionCustomer = Form.create()(
               reason: "",
               loading: false,
             });
-            this.reset();
+            // this.reset();
+            this.loadData(this.state.pageNo)
           }
         }.bind(this),
       }).always(
@@ -1859,7 +1862,7 @@ const IntentionCustomer = Form.create()(
                               {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                             </span>
                             <FlowChart
-                              orderNo={this.state.orderNo}
+                              orderNo={this.state.orderNos}
                             />
                           </FormItem>
                           <FormItem

+ 1 - 1
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -224,7 +224,7 @@ const MyProjectVip = React.createClass({
           render: (text, record) => {
             return (
               <div>
-                {text != 1 && <div style={{ color: text == 4 && "red" }}>{["", "财务审核", "特批审核", "通过", "驳回"][text]}</div>}
+                {text != 1 && <div style={{ color: text == 4 && "red" }}>{["", "财务审核", `${["", "总裁", "副总裁"][record.approvalType]}特批审核`, "通过", "驳回"][text]}</div>}
                 {text == 1 &&
                   <div>
                     {record.examineType == 1