|
@@ -1,16 +1,17 @@
|
|
import React from "react";
|
|
import React from "react";
|
|
import $ from "jquery/src/ajax";
|
|
import $ from "jquery/src/ajax";
|
|
import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
|
|
import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
|
|
-// import OrderDesc from "../orderDetail/orderDesc";
|
|
|
|
|
|
+import OrderDesc from "../../financialManage/orderDetail/orderDesc"
|
|
import ResolutionDetail from "@/resolutionDetail";
|
|
import ResolutionDetail from "@/resolutionDetail";
|
|
import { ChooseList } from "../../order/orderNew/chooseList"
|
|
import { ChooseList } from "../../order/orderNew/chooseList"
|
|
import ReactToPrint from "react-to-print";
|
|
import ReactToPrint from "react-to-print";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
|
+import ProjectOperationVip from ".././../../common/projectOperation/vip";
|
|
const { TabPane } = Tabs;
|
|
const { TabPane } = Tabs;
|
|
|
|
|
|
//我的会员项目列表
|
|
//我的会员项目列表
|
|
const MyProjectVip = React.createClass({
|
|
const MyProjectVip = React.createClass({
|
|
-
|
|
|
|
|
|
+
|
|
//
|
|
//
|
|
getInitialState() {
|
|
getInitialState() {
|
|
return {
|
|
return {
|
|
@@ -162,22 +163,31 @@ const MyProjectVip = React.createClass({
|
|
dataIndex: "projectName",
|
|
dataIndex: "projectName",
|
|
key: "projectName",
|
|
key: "projectName",
|
|
className: "title-table",
|
|
className: "title-table",
|
|
|
|
+ render: (text, record) => {
|
|
|
|
+ return (
|
|
|
|
+ <div>
|
|
|
|
+ {text}
|
|
|
|
+ {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
|
|
|
|
+ </div>
|
|
|
|
+ )
|
|
|
|
+ }
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: "项目说明",
|
|
title: "项目说明",
|
|
- dataIndex: "projectComment",
|
|
|
|
- key: "projectComment",
|
|
|
|
|
|
+ dataIndex: "taskComment",
|
|
|
|
+ key: "taskComment",
|
|
className: "title-table",
|
|
className: "title-table",
|
|
- width: 200,
|
|
|
|
|
|
+ width: 300,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: "状态",
|
|
title: "状态",
|
|
dataIndex: "status",
|
|
dataIndex: "status",
|
|
key: "status",
|
|
key: "status",
|
|
className: "title-table",
|
|
className: "title-table",
|
|
|
|
+ width: 80,
|
|
render: (text) => {
|
|
render: (text) => {
|
|
return (
|
|
return (
|
|
- <div>
|
|
|
|
|
|
+ <div style={{ color: text == 4 && "red" }}>
|
|
{["", "财务审核", "特批审核", "通过", "驳回"][text]}
|
|
{["", "财务审核", "特批审核", "通过", "驳回"][text]}
|
|
</div>
|
|
</div>
|
|
);
|
|
);
|
|
@@ -193,13 +203,17 @@ const MyProjectVip = React.createClass({
|
|
return (
|
|
return (
|
|
<div>
|
|
<div>
|
|
{
|
|
{
|
|
|
|
+ recard.status == 4 &&
|
|
<Button
|
|
<Button
|
|
type="primary"
|
|
type="primary"
|
|
- onClick={(e) => {
|
|
|
|
-
|
|
|
|
|
|
+ onClick={() => {
|
|
|
|
+ this.setState({
|
|
|
|
+ vipVisible: true,
|
|
|
|
+ dataInfor: recard,
|
|
|
|
+ })
|
|
}}
|
|
}}
|
|
>
|
|
>
|
|
- 编辑
|
|
|
|
|
|
+ 重新提交
|
|
</Button>
|
|
</Button>
|
|
}
|
|
}
|
|
</div>
|
|
</div>
|
|
@@ -214,6 +228,8 @@ const MyProjectVip = React.createClass({
|
|
checkVisible: "",//审核弹窗开关
|
|
checkVisible: "",//审核弹窗开关
|
|
checkId: "",//会员项目编号
|
|
checkId: "",//会员项目编号
|
|
result: -1,//1同意 0驳回
|
|
result: -1,//1同意 0驳回
|
|
|
|
+ vipVisible: false,//编辑弹窗
|
|
|
|
+ dataInfor: {},//编辑的数据
|
|
};
|
|
};
|
|
},
|
|
},
|
|
|
|
|
|
@@ -221,6 +237,14 @@ const MyProjectVip = React.createClass({
|
|
this.loadData();
|
|
this.loadData();
|
|
this.departmentList();
|
|
this.departmentList();
|
|
},
|
|
},
|
|
|
|
+ // 关闭编辑弹窗
|
|
|
|
+ vipClose() {
|
|
|
|
+ this.setState({
|
|
|
|
+ vipVisible: false
|
|
|
|
+ }, () => {
|
|
|
|
+ this.loadData();
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 获取订单部门
|
|
// 获取订单部门
|
|
departmentList() {
|
|
departmentList() {
|
|
$.ajax({
|
|
$.ajax({
|
|
@@ -361,7 +385,7 @@ const MyProjectVip = React.createClass({
|
|
exportPendingLoading: true,
|
|
exportPendingLoading: true,
|
|
});
|
|
});
|
|
let data = {
|
|
let data = {
|
|
- shiroType: 1, //财务审核
|
|
|
|
|
|
+ shiroType: 1, //我的
|
|
};
|
|
};
|
|
let obj1 = JSON.parse(JSON.stringify(this.state.searchValues));
|
|
let obj1 = JSON.parse(JSON.stringify(this.state.searchValues));
|
|
data = Object.assign(data, obj1);
|
|
data = Object.assign(data, obj1);
|
|
@@ -479,7 +503,7 @@ const MyProjectVip = React.createClass({
|
|
return (
|
|
return (
|
|
<div className="user-content">
|
|
<div className="user-content">
|
|
<div className="content-title" style={{ marginBottom: 10 }}>
|
|
<div className="content-title" style={{ marginBottom: 10 }}>
|
|
- <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目审核</span>
|
|
|
|
|
|
+ <span style={{ fontWeight: 900, fontSize: 16 }}>我的会员项目</span>
|
|
</div>
|
|
</div>
|
|
<Tabs defaultActiveKey="2" onChange={this.callback} className="test">
|
|
<Tabs defaultActiveKey="2" onChange={this.callback} className="test">
|
|
<TabPane tab="更改表格显示数据" key="1">
|
|
<TabPane tab="更改表格显示数据" key="1">
|
|
@@ -678,12 +702,13 @@ const MyProjectVip = React.createClass({
|
|
/>
|
|
/>
|
|
</Spin>
|
|
</Spin>
|
|
</div>
|
|
</div>
|
|
|
|
+ <textarea id="copyText" style={{ opacity: 0 }} />
|
|
{/* 订单详情 */}
|
|
{/* 订单详情 */}
|
|
- {/* <OrderDesc
|
|
|
|
|
|
+ <OrderDesc
|
|
data={this.state.RowData}
|
|
data={this.state.RowData}
|
|
showDesc={this.state.showDesc}
|
|
showDesc={this.state.showDesc}
|
|
closeDesc={this.closeDesc.bind(this)}
|
|
closeDesc={this.closeDesc.bind(this)}
|
|
- /> */}
|
|
|
|
|
|
+ />
|
|
{
|
|
{
|
|
//打印预览
|
|
//打印预览
|
|
this.state.dvisible &&
|
|
this.state.dvisible &&
|
|
@@ -719,7 +744,6 @@ const MyProjectVip = React.createClass({
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
</Spin>
|
|
</Spin>
|
|
-
|
|
|
|
<ReactToPrint
|
|
<ReactToPrint
|
|
trigger={() => (
|
|
trigger={() => (
|
|
<Button
|
|
<Button
|
|
@@ -768,6 +792,17 @@ const MyProjectVip = React.createClass({
|
|
/>
|
|
/>
|
|
</Modal>
|
|
</Modal>
|
|
}
|
|
}
|
|
|
|
+ {
|
|
|
|
+ // 会员项目添加编辑
|
|
|
|
+ this.state.vipVisible &&
|
|
|
|
+ <ProjectOperationVip
|
|
|
|
+ readOnly={false}
|
|
|
|
+ orderNo={this.state.dataInfor.orderNo}
|
|
|
|
+ visible={this.state.vipVisible}
|
|
|
|
+ dataInfor={this.state.dataInfor}
|
|
|
|
+ onCancel={this.vipClose}
|
|
|
|
+ />
|
|
|
|
+ }
|
|
</div>
|
|
</div>
|
|
);
|
|
);
|
|
},
|
|
},
|