dev01 2 jaren geleden
bovenliggende
commit
2de8eeaead

+ 8 - 2
js/component/common/projectOperation/index.jsx

@@ -536,15 +536,21 @@ class ProjectOperation extends Component {
                                     wrapperCol={{ span: 16 }}
                                     label="项目说明"
                                 >
-                                    {readOnly ? this.state.taskComment : <Input
+                                    {readOnly ? this.state.taskComment : 
+                                    <Input
                                         type="textarea"
-                                        placeholder="如会员项目请详细描写会员项目的服务年限、详细服务时间段段,如第一年从2021年1月至2021年12月31日止,第二年从。。。"
+                                        placeholder="如:派2023年会员服务,总会员服务三年,客户付款情况说明"
+                                        autosize={{ minRows: 4 }}
                                         value={this.state.taskComment}
                                         onChange={(e) => {
                                             this.setState({ taskComment: e.target.value });
                                         }}
                                     />}
                                 </FormItem>
+                                <div style={{ color: "red", marginLeft: 144 }}>
+                                    请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2023年会员服务,总会员服务三年,客户付款情况说明</span>
+                                    <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
+                                </div>
                             </div>
                             {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
                             {this.state.addProjectType === 5 ?

+ 3 - 2
js/component/common/projectOperation/vip.jsx

@@ -314,7 +314,8 @@ class ProjectOperationVip extends Component {
                   {readOnly ? this.state.taskComment :
                     <Input
                       type="textarea"
-                      placeholder="如:增派2022.6-2023.5,总会员服务为3年,客户未付款,承诺10月份进行补付款"
+                      placeholder="如:派2023年会员服务,总会员服务三年,客户付款情况说明"
+                      autosize={{ minRows: 4 }}
                       value={this.state.taskComment}
                       onChange={(e) => {
                         this.setState({ taskComment: e.target.value });
@@ -322,7 +323,7 @@ class ProjectOperationVip extends Component {
                     />}
                 </FormItem>
                 <div style={{ color: "red", marginLeft: 144 }}>
-                  请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>增派2022.6-2023.5,总会员服务为3年,客户未付款,承诺10月份进行补付款</span>
+                  请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2023年会员服务,总会员服务三年,客户付款情况说明</span>
                   <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
                 </div>
               </div>

+ 19 - 18
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -8,6 +8,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
 const { TabPane } = Tabs;
@@ -42,22 +43,22 @@ const ProjectVip = React.createClass({
         },
       },
       columns: [
-        // {
-        //   title: "销售类型",
-        //   dataIndex: "salesType",
-        //   key: "salesType",
-        //   render: (text, record) => {
-        //     return (
-        //       <Tooltip
-        //         title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
-        //       >
-        //         <span>
-        //           {salesList[text]}
-        //         </span>
-        //       </Tooltip>
-        //     );
-        //   },
-        // },
+        {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
         {
           title: "合同编号",
           dataIndex: "contractNo",
@@ -85,7 +86,7 @@ const ProjectVip = React.createClass({
                 <div>
                   {text}
                   <div style={{ display: "flex" }}>
-                    {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                    <OrderItemStatus deleteSign={record.deleteSign} />
                     {
                       record.approval == 1
                         ? <Tag color="#faa755">特批待审</Tag> :
@@ -137,7 +138,7 @@ const ProjectVip = React.createClass({
                 <div>
                   {text}
                   <div>
-                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
                     {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                   </div>
                 </div>

+ 19 - 18
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -6,6 +6,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";
 const { TabPane } = Tabs;
@@ -41,22 +42,22 @@ const ProjectVipAll = React.createClass({
         },
       },
       columns: [
-        // {
-        //   title: "销售类型",
-        //   dataIndex: "salesType",
-        //   key: "salesType",
-        //   render: (text, record) => {
-        //     return (
-        //       <Tooltip
-        //         title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
-        //       >
-        //         <span>
-        //           {salesList[text]}
-        //         </span>
-        //       </Tooltip>
-        //     );
-        //   },
-        // },
+        {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
         {
           title: "合同编号",
           dataIndex: "contractNo",
@@ -84,7 +85,7 @@ const ProjectVipAll = React.createClass({
                 <div>
                   {text}
                   <div style={{ display: "flex" }}>
-                    {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                    <OrderItemStatus deleteSign={record.deleteSign} />
                     {
                       record.approval == 1
                         ? <Tag color="#faa755">特批待审</Tag> :
@@ -136,7 +137,7 @@ const ProjectVipAll = React.createClass({
                 <div>
                   {text}
                   <div>
-                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
                     {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                   </div>
                 </div>

+ 19 - 18
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -6,6 +6,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
 const { TabPane } = Tabs;
@@ -40,22 +41,22 @@ const ApprovedVipProject = React.createClass({
         },
       },
       columns: [
-        // {
-        //   title: "销售类型",
-        //   dataIndex: "salesType",
-        //   key: "salesType",
-        //   render: (text, record) => {
-        //     return (
-        //       <Tooltip
-        //         title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
-        //       >
-        //         <span>
-        //           {salesList[text]}
-        //         </span>
-        //       </Tooltip>
-        //     );
-        //   },
-        // },
+        {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
         {
           title: "合同编号",
           dataIndex: "contractNo",
@@ -83,7 +84,7 @@ const ApprovedVipProject = React.createClass({
                 <div>
                   {text}
                   <div style={{ display: "flex" }}>
-                    {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                    <OrderItemStatus deleteSign={record.deleteSign} />
                     {
                       record.approval == 1
                         ? <Tag color="#faa755">特批待审</Tag> :
@@ -135,7 +136,7 @@ const ApprovedVipProject = React.createClass({
                 <div>
                   {text}
                   <div>
-                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
                     {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                   </div>
                 </div>

+ 19 - 18
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -6,6 +6,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import { salesList } from "@/dataDic.js";
 import ProjectOperationVip from ".././../../common/projectOperation/vip";
 import ShowModalDiv from "@/showModal.jsx";
 import VipLogs from "../../../common/logPopup/viplogs";//会员日志
@@ -39,22 +40,22 @@ const MyProjectVip = React.createClass({
         },
       },
       columns: [
-        // {
-        //   title: "销售类型",
-        //   dataIndex: "salesType",
-        //   key: "salesType",
-        //   render: (text, record) => {
-        //     return (
-        //       <Tooltip
-        //         title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
-        //       >
-        //         <span>
-        //           {salesList[text]}
-        //         </span>
-        //       </Tooltip>
-        //     );
-        //   },
-        // },
+        {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
         {
           title: "合同编号",
           dataIndex: "contractNo",
@@ -82,7 +83,7 @@ const MyProjectVip = React.createClass({
                 <div>
                   {text}
                   <div style={{ display: "flex" }}>
-                    {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                    <OrderItemStatus deleteSign={record.deleteSign} />
                     {
                       record.approval == 1
                         ? <Tag color="#faa755">特批待审</Tag> :
@@ -134,7 +135,7 @@ const MyProjectVip = React.createClass({
                 <div>
                   {text}
                   <div>
-                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
                     {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                   </div>
                 </div>

+ 3 - 1
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -26,6 +26,7 @@ import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import { salesList } from "@/dataDic.js"
 import DepartmentList from "../../../common/departmentList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 
 const IntentionCustomer = Form.create()(
@@ -89,6 +90,7 @@ const IntentionCustomer = Form.create()(
                 commodityName: thisdata.commodityName,
                 approval: thisdata.approval, //特批状态
                 memberType: thisdata.memberType, //会员状态
+                deleteSign: thisdata.deleteSign,//变更状态
               });
             }
             this.state.pagination.total = data.data.totalCount;
@@ -203,7 +205,7 @@ const IntentionCustomer = Form.create()(
                   <div>
                     {text}
                     <div style={{ display: "flex" }}>
-                      {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
+                      <OrderItemStatus deleteSign={record.deleteSign} />
                       {
                         record.approval == 1
                           ? <Tag color="#faa755">特批待审</Tag> :