|
@@ -281,7 +281,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
|
|
|
id:record.id,
|
|
|
orderNok:thisData.orderNo,
|
|
|
orderList:thisData,
|
|
|
- technicianName:thisData.technicianName, //项目负责人
|
|
|
+ technicianName:thisData.technicianName, //任务负责人
|
|
|
});
|
|
|
}.bind(this),
|
|
|
}).always(function () {
|
|
@@ -724,47 +724,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
|
|
|
}
|
|
|
}.bind(this));
|
|
|
},
|
|
|
- //品类数据获取
|
|
|
- category(){
|
|
|
- this.setState({
|
|
|
- loading: true
|
|
|
- });
|
|
|
- $.ajax({
|
|
|
- method: "get",
|
|
|
- dataType: "json",
|
|
|
- crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/admin/Varieties/getSuperList",
|
|
|
- data: {
|
|
|
-
|
|
|
- },
|
|
|
- success: function(data) {
|
|
|
- let thedata = data.data;
|
|
|
- let theArr=[];
|
|
|
- if(!thedata) {
|
|
|
- if(data.error && data.error.length) {
|
|
|
- message.warning(data.error[0].message);
|
|
|
- };
|
|
|
- thedata = {};
|
|
|
- }else{
|
|
|
- thedata.map(function(item,index){
|
|
|
- theArr.push({
|
|
|
- key:index,
|
|
|
- name:item.cname,
|
|
|
- id:item.id,
|
|
|
- })
|
|
|
- })
|
|
|
- }
|
|
|
- this.setState({
|
|
|
- contractType:undefined,
|
|
|
- categoryArr:theArr,
|
|
|
- })
|
|
|
- }.bind(this),
|
|
|
- }).always(function() {
|
|
|
- this.setState({
|
|
|
- loading: false
|
|
|
- });
|
|
|
- }.bind(this));
|
|
|
- },
|
|
|
tableRowClick(record, index) {
|
|
|
this.setState({
|
|
|
addTaskState:false,
|
|
@@ -781,7 +740,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
|
|
|
this.loadData(nextProps.datauser);
|
|
|
}
|
|
|
}else{
|
|
|
- this.category();
|
|
|
this.setState({
|
|
|
customerArr:[],
|
|
|
customerName:'',
|
|
@@ -813,7 +771,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
|
|
|
})
|
|
|
},
|
|
|
};
|
|
|
- const categoryList=this.state.categoryArr ||[];
|
|
|
+ const categoryList=this.props.categoryArr ||[];
|
|
|
let departmentArr = this.props.departmentArr || [];
|
|
|
const hasSelected = this.state.selectedRowKey.length > 0;
|
|
|
const orderDetaiel=this.state.orderList || [];
|