|
@@ -292,7 +292,7 @@ class NewAddProject extends Component {
|
|
|
}
|
|
|
|
|
|
let sonList = this.state.subProList.map(item => {
|
|
|
- if (this.state.projectType == 1) {
|
|
|
+ if (this.state.projectType == 1 && item.newCheck) {
|
|
|
item.htMember = item.newCheck.includes(1) ? 1 : 0
|
|
|
item.additionalDeduction = item.newCheck.includes(2) ? 1 : 0
|
|
|
item.rdAwardsubsidy = item.newCheck.includes(3) ? 1 : 0
|
|
@@ -1380,31 +1380,7 @@ class NewAddProject extends Component {
|
|
|
</FormItem>
|
|
|
</div> : null
|
|
|
}
|
|
|
- {((isVip != 6) || (isVip == 6 && !isEdit)) &&
|
|
|
- <div className="clearfix">
|
|
|
- <FormItem
|
|
|
- wrapperCol={{ span: 12, offset: 8 }}
|
|
|
- className="half-middle"
|
|
|
- >
|
|
|
- <Button
|
|
|
- className="submitSave"
|
|
|
- type="primary"
|
|
|
- onClick={() => {
|
|
|
- this.onSubmit();
|
|
|
- }}
|
|
|
- >
|
|
|
- 保存
|
|
|
- </Button>
|
|
|
- <Button
|
|
|
- className="submitSave"
|
|
|
- type="ghost"
|
|
|
- onClick={this.props.onCancel}
|
|
|
- >
|
|
|
- 取消
|
|
|
- </Button>
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
- }
|
|
|
+
|
|
|
{
|
|
|
// 会员项目子集列表
|
|
|
isEdit &&
|
|
@@ -1643,7 +1619,98 @@ class NewAddProject extends Component {
|
|
|
</div>
|
|
|
)
|
|
|
}) }
|
|
|
- { this.state.subProList.length < this.state.serviceLife.length &&
|
|
|
+
|
|
|
+ {((isVip != 6) || (isVip == 6 && !isEdit)) &&
|
|
|
+ <div className="clearfix">
|
|
|
+ { isVip != 6 ? (
|
|
|
+ <FormItem
|
|
|
+ wrapperCol={{ span: 12, offset: 8 }}
|
|
|
+ className="half-middle"
|
|
|
+ >
|
|
|
+
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="primary"
|
|
|
+ onClick={() => {
|
|
|
+ this.onSubmit();
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 保存
|
|
|
+ </Button>
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="ghost"
|
|
|
+ onClick={() => this.props.onCancel()}
|
|
|
+ >
|
|
|
+ 取消
|
|
|
+ </Button>
|
|
|
+
|
|
|
+ </FormItem>
|
|
|
+ ) : (
|
|
|
+ <FormItem
|
|
|
+ wrapperCol={{ span: 12, offset: 8 }}
|
|
|
+ className="half-middle"
|
|
|
+ >
|
|
|
+ { this.state.subProList && this.state.subProList.length ? (
|
|
|
+ <div>
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="primary"
|
|
|
+ onClick={() => {
|
|
|
+ const { subProList } = this.state;
|
|
|
+ if (!subProList[subProList.length - 1].serviceYear) {
|
|
|
+ message.warning("请先选择上一个派单的年份!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ subProList.push({});
|
|
|
+ this.setState({ subProList });
|
|
|
+ }}
|
|
|
+ disabled={this.state.subProList.length >= this.state.serviceLife.length}
|
|
|
+ >
|
|
|
+ + 继续添加,本次派单
|
|
|
+ </Button>
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="primary"
|
|
|
+ onClick={() => {
|
|
|
+ this.onSubmit();
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 保存,确定本次派单
|
|
|
+ </Button>
|
|
|
+ </div>
|
|
|
+ ) : (
|
|
|
+ <div>
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="primary"
|
|
|
+ onClick={() => {
|
|
|
+ const { subProList } = this.state;
|
|
|
+ subProList.push({});
|
|
|
+ this.setState({ subProList });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ + 添加本次派单
|
|
|
+ </Button>
|
|
|
+ <Button
|
|
|
+ className="submitSave"
|
|
|
+ type="primary"
|
|
|
+ onClick={() => {
|
|
|
+ this.onSubmit();
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 暂不开启工作
|
|
|
+ </Button>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ ) }
|
|
|
+
|
|
|
+ </FormItem>
|
|
|
+ ) }
|
|
|
+
|
|
|
+ </div>
|
|
|
+ }
|
|
|
+ {/* { this.state.subProList.length < this.state.serviceLife.length &&
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
wrapperCol={{ span: 19, offset: 8 }}
|
|
@@ -1662,7 +1729,7 @@ class NewAddProject extends Component {
|
|
|
<span style={{ color: "#61BBE2", marginLeft: 10 }}>请填写本次派单的年份,派单表示立即安排人员开始相关的工作!!!</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- }
|
|
|
+ } */}
|
|
|
{/* {
|
|
|
this.state.splitList.length < this.state.yearSum &&
|
|
|
<div
|