Преглед на файлове

新增副总裁角色审核

dev01 преди 1 година
родител
ревизия
a011f2de6f

+ 11 - 8
js/component/common/flowchart/index.jsx

@@ -65,7 +65,8 @@ class FlowChart extends Component {
           } else {
             let pstatus = -1;
             let info = data.data;
-            let tpname = ["-", info.zc, info.zc, info.zc, info.dsz, info.dsz, info.dsz][info.approval];
+            // 0-非特批 ,1-总裁待审核,2-总裁通过,3-总裁驳回 4董事长待审核 5董事长通过 6董事长驳回 7副总裁待审核 8副总裁通过 9副总裁驳回
+            let tpname = ["-", info.zc, info.zc, info.zc, info.dsz, info.dsz, info.dsz, info.fzc, info.fzc, info.fzc][info.approval];
             theArr = [
               { status: 0, title: "营销员发起", name: info.yxy, time: "" },
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
@@ -138,7 +139,7 @@ class FlowChart extends Component {
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, 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: "" },
             ]
             // 1 项目&金额
@@ -151,7 +152,7 @@ class FlowChart extends Component {
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 2 仅项目
             let theArr2 = [
@@ -163,7 +164,7 @@ class FlowChart extends Component {
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 3 仅金额
             let theArr3 = [
@@ -173,7 +174,7 @@ class FlowChart extends Component {
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 4 重报
             let theArr4 = [
@@ -184,7 +185,7 @@ class FlowChart extends Component {
               { status: 4, title: "技术经理审核", name: info.zxsjl, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 5 赠送
             let theArr5 = [
@@ -192,7 +193,7 @@ class FlowChart extends Component {
               { status: 1, title: "经理审核", name: !info.yxjl ? "-" : info.yxjl, time: "" },
               { status: 2, title: "营销管理员审核", name: info.yxgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 6 退单不退款
             let theArr6 = [
@@ -204,7 +205,7 @@ class FlowChart extends Component {
               { status: 5, title: "技术总监审核", name: info.zxsgly, time: "" },
               { status: 6, title: "财务专员审核", name: info.cwzy, time: "" },
               { status: 7, title: "财务总监审核", name: info.cwgly, time: "" },
-              { status: 8, title: "总裁审核", name: info.zc, time: "" },
+              { status: 8, title: info.isHN == 1 ? "副总裁审核" : "总裁审核", name: info.isHN == 1 ? info.fzc : info.zc, time: "" },
             ]
             // 7 仅变更合同
             let theArr7 = [
@@ -263,6 +264,8 @@ class FlowChart extends Component {
               list.forEach((item, index) => {
                 if (item.status == info.processState) {
                   pstatus = index
+                } else if (info.processState == 10 && item.status == 8) {  // 副总裁审核processState == 10 
+                  pstatus = index
                 }
               })
             } else if (info.status == 2) {

+ 24 - 0
js/component/dataDic.js

@@ -2617,6 +2617,18 @@ module.exports = {
       value: "6",
       key: "特批董事长驳回",
     },
+    {
+      value: "7",
+      key: "特批副总裁待审核",
+    },
+    {
+      value: "8",
+      key: "特批副总裁通过",
+    },
+    {
+      value: "9",
+      key: "特批副总裁驳回",
+    },
   ],
   //交易外联
   transactionChannel: [
@@ -3347,6 +3359,18 @@ module.exports = {
       value: "6",
       key: "特批董事长驳回",
     },
+    {
+      value: "7",
+      key: "特批副总裁待审核",
+    },
+    {
+      value: "8",
+      key: "特批副总裁通过",
+    },
+    {
+      value: "9",
+      key: "特批副总裁驳回",
+    },
   ],
   //任务状态
   taskStatus: [

+ 2 - 8
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -10,7 +10,7 @@ import OrderItemStatus from "../../../common/orderItemStatus";
 import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
-import { splitUrl } from "@/tools";
+import { splitUrl, getApprovalTag } from "@/tools";
 import ImgList from "../../../common/imgList";
 import Cascaders from "../../../common/cascaders";
 
@@ -90,13 +90,7 @@ const ProjectVip = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 2 - 8
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -9,7 +9,7 @@ import OrderItemStatus from "../../../common/orderItemStatus";
 import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";
-import { splitUrl } from "@/tools";
+import { splitUrl, getApprovalTag } from "@/tools";
 import ImgList from "../../../common/imgList";
 import Cascaders from "../../../common/cascaders";
 const { TabPane } = Tabs;
@@ -89,13 +89,7 @@ const ProjectVipAll = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 4 - 8
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -35,10 +35,12 @@ import {
   getNewOrderStatus,
   getjiedian,
   splitUrl,
+  getApprovalTag,
+  getProjectName,
+  getClockState,
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import Project from "../../../../component/project";
-import { getProjectName, getClockState } from "@/tools";
 import LogPopup from "../../../common/logPopup";
 import { clockState, salesList } from "@/dataDic";
 import OrderItemStatus from "../../../common/orderItemStatus";
@@ -1060,13 +1062,7 @@ const ShouKuang = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 4 - 8
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -37,12 +37,14 @@ import {
   getProjectStatus,
   getjiedian,
   splitUrl,
+  getApprovalTag,
+  getProjectName,
+  getClockState,
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import Project from "../../../../component/project"
 import LogPopup from "../../../common/logPopup";
 import { throws } from "assert";
-import { getProjectName, getClockState } from "@/tools";
 import { clockState, salesList } from "@/dataDic";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
@@ -1081,13 +1083,7 @@ const ShouKuang = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 10 - 0
js/component/manageCenter/order/content.jsx

@@ -218,6 +218,16 @@ class Content extends Component {
         });
         break;
       //合同变更审核
+      case "contractChangeFzc":
+        require.ensure([], () => {
+          const ContractChangeZc = require("./orderNew/contractChangeFzc")
+            .default;
+          this.setState({
+            component: <ContractChangeZc />,
+          });
+        });
+        break;
+      //合同变更审核
       case "contractChangeZc":
         require.ensure([], () => {
           const ContractChangeZc = require("./orderNew/contractChangeZc")

+ 8 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2641,6 +2641,14 @@ const NewService = Form.create()(
           return;
         }
       }
+      if (
+        this.state.approval == 1 &&
+        record.dunType == 1 &&
+        !record.waitDay
+      ) {
+        message.warning("请填写收款时间");
+        return
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {

+ 8 - 0
js/component/manageCenter/order/orderNew/addorders.js

@@ -1279,6 +1279,14 @@ const Addorders = Form.create()(
           return;
         }
       }
+      if (
+        this.state.approval == 1 &&
+        record.dunType == 1 &&
+        !record.waitDay
+      ) {
+        message.warning("请填写收款时间");
+        return
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {

+ 5 - 5
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -269,7 +269,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -630,7 +630,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -761,7 +761,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -869,7 +869,7 @@ const IntentionCustomer = Form.create()(
             render: text => {
               return (
                 <Tooltip title={text}>
-                  <div 
+                  <div
                   // style={{
                   //   maxWidth: '150px',
                   //   overflow: 'hidden',
@@ -2707,7 +2707,7 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    {(this.state.approval === 1 || this.state.approval === 4) &&
+                    {(this.state.approval === 1 || this.state.approval === 4 || this.state.approval === 7) &&
                       <div className="addSave" style={{ display: "flex", justifyContent: "center" }}>
                         <Button
                           className="cancel"

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

@@ -9,7 +9,7 @@ import OrderItemStatus from "../../../common/orderItemStatus";
 import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
-import { splitUrl } from "@/tools";
+import { splitUrl, getApprovalTag } from "@/tools";
 import ImgList from "../../../common/imgList";
 import Cascaders from "../../../common/cascaders";
 const { TabPane } = Tabs;
@@ -88,13 +88,7 @@ const ApprovedVipProject = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 2 - 7
js/component/manageCenter/order/orderNew/billing.jsx

@@ -38,6 +38,7 @@ import {
   ShowModal,
   getProjectStatus,
   getProjectName,
+  getApprovalTag,
 } from "../../../tools.js";
 import { salesList, processStatus } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
@@ -503,13 +504,7 @@ const MyService = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      {getApprovalTag(record.approval)}
                     </div>
                   </div>
                 </Tooltip>

+ 17 - 0
js/component/manageCenter/order/orderNew/contractChangeFzc.jsx

@@ -0,0 +1,17 @@
+import React, { Component } from "react";
+import ContractChange from "./contractCwzj.js";
+
+class ContractChangeFzc extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      processState: 10
+    };
+  }
+
+  render() {
+    return <ContractChange processState={this.state.processState} />;
+  }
+}
+
+export default ContractChangeFzc;

+ 4 - 9
js/component/manageCenter/order/orderNew/examine.jsx

@@ -28,7 +28,9 @@ import {
   getCuikuan,
   getProjectStatus,
   moneyVerify,
-  ShowModal
+  ShowModal,
+  getProjectName,
+  getApprovalTag
 } from "@/tools.js";
 import "./customer.less";
 import ShowModalDiv from "@/showModal.jsx";
@@ -36,7 +38,6 @@ import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import { ChooseList } from "./chooseList";
-import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject"
 import OrderItemStatus from "../../../common/orderItemStatus";
@@ -275,13 +276,7 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      {getApprovalTag(record.approval)}
                     </div>
                   </div>
                 </Tooltip>

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

@@ -30,7 +30,8 @@ import {
   getProjectStatus,
   moneyVerify,
   ShowModal,
-  getProjectName
+  getProjectName,
+  getApprovalTag
 } from "@/tools.js";
 import "./customer.less";
 import ShowModalDiv from "@/showModal.jsx";
@@ -278,13 +279,7 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      {getApprovalTag(record.approval)}
                     </div>
                   </div>
                 </Tooltip>

+ 4 - 8
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -39,7 +39,9 @@ import {
   getProjectStatus,
   getboutique,
   getCuikuan,
-  getjiedian, getProjectName
+  getjiedian, 
+  getProjectName,
+  getApprovalTag,
 } from "../../../tools.js";
 import { salesList, processStatus } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
@@ -770,13 +772,7 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      {getApprovalTag(record.approval)}
                     </div>
                   </div>
                 </Tooltip>

+ 2 - 8
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -10,7 +10,7 @@ import { salesList } from "@/dataDic.js";
 import ProjectOperationVip from "../../../common/projectOperation/vip";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
-import { splitUrl } from "@/tools";
+import { splitUrl, getApprovalTag } from "@/tools";
 import ImgList from "../../../common/imgList";
 import Cascaders from "../../../common/cascaders";
 const { TabPane } = Tabs;
@@ -87,13 +87,7 @@ const MyProjectVip = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {
-                      record.approval == 1
-                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                              ? <Tag color="#ff0000">特批通过</Tag> : ""
-                    }
+                    {getApprovalTag(record.approval)}
                   </div>
                 </div>
               </Tooltip>

+ 9 - 14
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -20,10 +20,11 @@ import {
   getjiedian,
   getNewOrderStatus,
   getProjectStatus,
+  getProjectName,
+  getApprovalTag,
 } from "@/tools.js";
 import "./customer.less";
 import { ChooseList } from "./chooseList";
-import { getProjectName } from "../../../tools";
 import { salesList } from "@/dataDic.js"
 import DepartmentList from "../../../common/departmentList";
 import OrderItemStatus from "../../../common/orderItemStatus";
@@ -207,13 +208,7 @@ const IntentionCustomer = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      {getApprovalTag(record.approval)}
                     </div>
                   </div>
                 </Tooltip>
@@ -263,12 +258,12 @@ const IntentionCustomer = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    // style={{
-                    //   maxWidth: "150px",
-                    //   overflow: "hidden",
-                    //   textOverflow: "ellipsis",
-                    //   whiteSpace: "nowrap",
-                    // }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                   >
                     {text}
                   </div>

+ 8 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1293,6 +1293,14 @@ const IntentionCustomer = Form.create()(
           return;
         }
       }
+      if (
+        this.state.approval == 1 &&
+        record.dunType == 1 &&
+        !record.waitDay
+      ) {
+        message.warning("请填写收款时间");
+        return
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {

+ 30 - 12
js/component/tools.js

@@ -1735,6 +1735,21 @@ const obj = {
       return theType;
     }
   },
+  getApprovalTag: function (e) {
+    if (e == 1) {
+      return <Tag color="#faa755">特批待审</Tag>
+    } else if (e == 2) {
+      return <Tag color="#ff0000">特批通过</Tag>
+    } else if (e == 4) {
+      return <Tag color="#faa755">特批待审</Tag>
+    } else if (e == 5) {
+      return <Tag color="#ff0000">特批通过</Tag>
+    } else if (e == 7) {
+      return <Tag color="#faa755">特批待审</Tag>
+    } else if (e == 8) {
+      return <Tag color="#ff0000">特批通过</Tag>
+    }
+  },
   //特批状态
   getApproval: function (e, flag) {
     if (flag) {
@@ -1752,6 +1767,12 @@ const obj = {
         return "特批董事长通过";
       } else if (e == 6) {
         return "特批董事长驳回";
+      } else if (e == 7) {
+        return "特批副总裁待审核";
+      } else if (e == 8) {
+        return "特批副总裁通过";
+      } else if (e == 9) {
+        return "特批副总裁驳回";
       } else {
         return "未知";
       }
@@ -1855,6 +1876,8 @@ const obj = {
           theName = "(总裁)"
         } else if (state == "4" || state == "5" || state == "6") {
           theName = "(董事长)"
+        } else if (state == "7" || state == "8" || state == "9") {
+          theName = "(副总裁)"
         }
       }
       return theType + theName;
@@ -2026,18 +2049,9 @@ const obj = {
     }
   },
   getProcessStatusNew: function (name, pro, status) {
-    // if (e||e==0) {
-    //     let str=e.toString()
-    //  let theType = '';
-    //  processStatusNew.map(function (item) {
-    //         if (item.value == str) {
-    //             theType = item.key;
-    //         };
-    //     });
-    //     return theType;
-    // }
     let names = "(" + name + ")";
-    if (!name || pro == 0 || pro == 8 || pro == 9) {
+    // if (!name || pro == 0 || pro == 8 || pro == 9 || pro == 10) {
+    if (!name) {
       names = ""
     }
     let str = "";
@@ -2061,6 +2075,8 @@ const obj = {
       str = "总裁";
     } else if (pro == 9) {
       str = "董事长";
+    } else if (pro == 10) {
+      str = "副总裁";
     }
     let num = "";
     if (status == 0) {
@@ -2085,6 +2101,8 @@ const obj = {
       return `订单变更退票中 (${name}处理中)`;
     } else if (pro == 9 && status == 2) {
       return `订单变更退票中 (${name}处理中)`;
+    } else if (pro == 10 && status == 2) {
+      return `订单变更退票中 (${name}处理中)`;
     } else if (status == 4) {
       return "订单变更已完成";
     } else if (pro >= 8 && status == 6) {
@@ -2188,7 +2206,7 @@ const obj = {
     if (e == 2) {
       str2 = i == 0
         ? "(非常满意)" : i == 1
-          ? "(满意 )" : i == 2
+          ? "(满意)" : i == 2
             ? "(一般)" : i == 3 && "(不满意)"
     }
     return str1 + str2;

+ 1 - 1
package.json

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