|
@@ -41,6 +41,7 @@ import Project from "../../../../component/project";
|
|
import ImgList from "../../../common/imgList";
|
|
import ImgList from "../../../common/imgList";
|
|
import { getProjectName } from "../../../tools";
|
|
import { getProjectName } from "../../../tools";
|
|
import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
|
|
import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
|
|
|
|
+import NewEditProject from "../../../common/projectOperation/newEditProject"
|
|
import DepartmentList from "../../../common/departmentList";
|
|
import DepartmentList from "../../../common/departmentList";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
@@ -252,10 +253,11 @@ const IntentionCustomer = Form.create()(
|
|
key: "approval",
|
|
key: "approval",
|
|
className: "title-table",
|
|
className: "title-table",
|
|
render: (text) => {
|
|
render: (text) => {
|
|
- if (text == 1) {
|
|
|
|
- return <Tag color="#f50">{getApproval(text)}</Tag>;
|
|
|
|
- }
|
|
|
|
- return getApproval(text);
|
|
|
|
|
|
+ return <Tag color="#f50">{getApproval(text)}</Tag>;
|
|
|
|
+ // if (text == 1) {
|
|
|
|
+ // return <Tag color="#f50">{getApproval(text)}</Tag>;
|
|
|
|
+ // }
|
|
|
|
+ // return getApproval(text);
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -368,7 +370,7 @@ const IntentionCustomer = Form.create()(
|
|
return (
|
|
return (
|
|
<span>
|
|
<span>
|
|
{text}{" "}
|
|
{text}{" "}
|
|
- <Tag
|
|
|
|
|
|
+ {/* <Tag
|
|
color="#108ee9"
|
|
color="#108ee9"
|
|
onClick={(e) => {
|
|
onClick={(e) => {
|
|
e.stopPropagation();
|
|
e.stopPropagation();
|
|
@@ -376,7 +378,7 @@ const IntentionCustomer = Form.create()(
|
|
}}
|
|
}}
|
|
>
|
|
>
|
|
已拆
|
|
已拆
|
|
- </Tag>
|
|
|
|
|
|
+ </Tag> */}
|
|
</span>
|
|
</span>
|
|
);
|
|
);
|
|
} else {
|
|
} else {
|
|
@@ -1269,6 +1271,10 @@ const IntentionCustomer = Form.create()(
|
|
message.warning("请填写备注");
|
|
message.warning("请填写备注");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ if (!this.state.reason.replace(/\s+/g, '')) {
|
|
|
|
+ message.warning("请填写备注");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
this.setState({
|
|
this.setState({
|
|
loading: true,
|
|
loading: true,
|
|
});
|
|
});
|
|
@@ -1310,6 +1316,10 @@ const IntentionCustomer = Form.create()(
|
|
message.warning("请填写备注");
|
|
message.warning("请填写备注");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ if (!this.state.reason.replace(/\s+/g, '')) {
|
|
|
|
+ message.warning("请填写备注");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
this.setState({
|
|
this.setState({
|
|
loading: true,
|
|
loading: true,
|
|
});
|
|
});
|
|
@@ -1908,7 +1918,112 @@ const IntentionCustomer = Form.create()(
|
|
});
|
|
});
|
|
this.loadData(1, 9999999);
|
|
this.loadData(1, 9999999);
|
|
},
|
|
},
|
|
|
|
+ // 可展开颜色不同
|
|
|
|
+ addRowColor(record) {
|
|
|
|
+ if (!!record.splitList && record.splitList.length > 0) {
|
|
|
|
+ return 'light'
|
|
|
|
+ } else {
|
|
|
|
+ return 'dark'
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+
|
|
render() {
|
|
render() {
|
|
|
|
+ const expandedRowRenderVip = (e) => {
|
|
|
|
+ const data = e.splitList;
|
|
|
|
+ let columns = [];
|
|
|
|
+ if (data instanceof Array && data.length) {
|
|
|
|
+ if (e.cSort == 6) {
|
|
|
|
+ columns = [
|
|
|
|
+ {
|
|
|
|
+ title: "负责人",
|
|
|
|
+ dataIndex: "receiverName",
|
|
|
|
+ key: "receiverName",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "负责人电话",
|
|
|
|
+ dataIndex: "receiverMobile",
|
|
|
|
+ key: "receiverMobile",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "项目状态",
|
|
|
|
+ dataIndex: "projectStatus",
|
|
|
|
+ key: "projectStatus",
|
|
|
|
+ render: (text) => {
|
|
|
|
+ return getProjectName(text);
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "本次派单",
|
|
|
|
+ dataIndex: "serviceYear",
|
|
|
|
+ key: "serviceYear",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "项目说明",
|
|
|
|
+ dataIndex: "taskComment",
|
|
|
|
+ key: "taskComment",
|
|
|
|
+ render: (text) => {
|
|
|
|
+ return (
|
|
|
|
+ <Tooltip title={text}>
|
|
|
|
+ <div
|
|
|
|
+ // style={{
|
|
|
|
+ // width: 100,
|
|
|
|
+ // overflow: "hidden",
|
|
|
|
+ // whiteSpace: "nowrap",
|
|
|
|
+ // textOverflow: "ellipsis",
|
|
|
|
+ // }}
|
|
|
|
+ >{text}</div>
|
|
|
|
+ </Tooltip>
|
|
|
|
+ )
|
|
|
|
+ },
|
|
|
|
+ },
|
|
|
|
+ ];
|
|
|
|
+ } else {
|
|
|
|
+ columns = [
|
|
|
|
+ {
|
|
|
|
+ title: "子项目名称",
|
|
|
|
+ dataIndex: "taskName",
|
|
|
|
+ key: "taskName"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "子项目数量",
|
|
|
|
+ dataIndex: "commodityQuantity",
|
|
|
|
+ key: "commodityQuantity"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "拆分操作人",
|
|
|
|
+ dataIndex: "splitAname",
|
|
|
|
+ key: "splitAname"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "项目负责人",
|
|
|
|
+ dataIndex: "receiverName",
|
|
|
|
+ key: "receiverName"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: "拆分时间",
|
|
|
|
+ dataIndex: "splitTimes",
|
|
|
|
+ key: "splitTimes"
|
|
|
|
+ }
|
|
|
|
+ ]
|
|
|
|
+ }
|
|
|
|
+ return (
|
|
|
|
+ <Table
|
|
|
|
+ columns={columns}
|
|
|
|
+ dataSource={data}
|
|
|
|
+ pagination={false}
|
|
|
|
+ />
|
|
|
|
+ );
|
|
|
|
+ } else {
|
|
|
|
+ columns = [];
|
|
|
|
+ return (
|
|
|
|
+ <p
|
|
|
|
+ style={{ fontWeight: "bold", color: "red", textAlign: "center" }}
|
|
|
|
+ >
|
|
|
|
+ {e.cSort == 6 ? "暂无派单" : "此项目暂未拆分"}
|
|
|
|
+ </p>
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+ };
|
|
const formItemLayout = {
|
|
const formItemLayout = {
|
|
labelCol: { span: 8 },
|
|
labelCol: { span: 8 },
|
|
wrapperCol: { span: 14 },
|
|
wrapperCol: { span: 14 },
|
|
@@ -2531,6 +2646,8 @@ const IntentionCustomer = Form.create()(
|
|
dataSource={this.state.dataSourceX}
|
|
dataSource={this.state.dataSourceX}
|
|
pagination={this.state.paginations}
|
|
pagination={this.state.paginations}
|
|
onRowClick={this.tableRowClickX}
|
|
onRowClick={this.tableRowClickX}
|
|
|
|
+ expandedRowRender={expandedRowRenderVip}
|
|
|
|
+ rowClassName={this.addRowColor}
|
|
bordered
|
|
bordered
|
|
size="small"
|
|
size="small"
|
|
/>
|
|
/>
|
|
@@ -3082,11 +3199,26 @@ const IntentionCustomer = Form.create()(
|
|
/>
|
|
/>
|
|
</Modal> : <div />}
|
|
</Modal> : <div />}
|
|
</div>
|
|
</div>
|
|
- {this.state.addnextVisible && <ProjectDetailsReadOnly
|
|
|
|
- infor={this.state.dataInfor}
|
|
|
|
- visible={this.state.addnextVisible}
|
|
|
|
- onCancel={this.nextCancel}
|
|
|
|
- />}
|
|
|
|
|
|
+ {/* {this.state.addnextVisible &&
|
|
|
|
+ <ProjectDetailsReadOnly
|
|
|
|
+ infor={this.state.dataInfor}
|
|
|
|
+ visible={this.state.addnextVisible}
|
|
|
|
+ onCancel={this.nextCancel}
|
|
|
|
+ />} */}
|
|
|
|
+ {
|
|
|
|
+ // 项目业务详情
|
|
|
|
+ this.state.addnextVisible &&
|
|
|
|
+ <NewEditProject
|
|
|
|
+ readOnly={
|
|
|
|
+ this.state.dataInfor &&
|
|
|
|
+ Object.keys(this.state.dataInfor).length > 0 &&
|
|
|
|
+ this.state.processStatus !== 0
|
|
|
|
+ }
|
|
|
|
+ visible={this.state.addnextVisible}
|
|
|
|
+ dataInfor={this.state.dataInfor}
|
|
|
|
+ onCancel={this.nextCancel}
|
|
|
|
+ />
|
|
|
|
+ }
|
|
</div>
|
|
</div>
|
|
);
|
|
);
|
|
},
|
|
},
|