Browse Source

项目编辑框年限多选bug

dev01 6 days ago
parent
commit
fc7d73d6b2

+ 6 - 3
js/component/common/projectOperation/newEditProject.jsx

@@ -1755,11 +1755,14 @@ class newEditProject extends Component {
               let slist = this.state.serviceLife
               let newYear = this.state.addyear
               if (this.state.isGive == 0) {
-                newYear = newYear
+                newYear.map(year => {
+                  slist.push(year)
+                })
               } else if (this.state.isGive == 1) {
-                newYear = newYear + "(赠)"
+                newYear.map(year => {
+                  slist.push(year + "(赠)")
+                })
               }
-              slist = slist.concat(newYear)
               this.setState({
                 serviceLife: slist,
                 commodityQuantity: slist.length,

+ 2 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -2298,6 +2298,7 @@ const Task = React.createClass({
         outsourceStatusSearch: [],
         projectName: undefined,
         approvaType: [],
+        memberProjectType: undefined
       })
     }
     this.setState({
@@ -4110,7 +4111,7 @@ const Task = React.createClass({
                 allowClear	
               >
                 <Select.Option key={1}>高新会员</Select.Option>
-                <Select.Option key={2}>加扣除</Select.Option>
+                <Select.Option key={2}>加扣除</Select.Option>
                 <Select.Option key={3}>研发奖补</Select.Option>
               </Select>
               <Button type="primary" onClick={this.search}>