|
@@ -53,6 +53,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
status: thisdata.status,//组织状态
|
|
|
workingHoursName: thisdata.workingHoursName,
|
|
|
hideSign: thisdata.hideSign,//显示标识
|
|
|
+ approval: thisdata.approval,
|
|
|
});
|
|
|
};
|
|
|
this.state.pagination.current = data.data.pageNo;
|
|
@@ -73,6 +74,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
},
|
|
|
getInitialState() {
|
|
|
return {
|
|
|
+ approval: 1,
|
|
|
editvisible: false,
|
|
|
workingHoursType: 0,
|
|
|
searchMore: true,
|
|
@@ -254,6 +256,9 @@ const Organization = Form.create()(React.createClass({
|
|
|
financeId: _this.state.theTypes2
|
|
|
? _this.state.theTypes2
|
|
|
: _this.state.financeId, //负责人ID
|
|
|
+ approvalAid: _this.state.theTypes1
|
|
|
+ ? _this.state.theTypes1
|
|
|
+ : _this.state.approvalAid, //审核人ID
|
|
|
retrialFinanceId: _this.state.theTypes3
|
|
|
? _this.state.theTypes3
|
|
|
: _this.state.reviewerId, // 复审人
|
|
@@ -266,6 +271,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
workingHoursType: _this.state.workingHoursType,
|
|
|
hideSign: _this.state.hideSign,//显示标识
|
|
|
depNo: _this.state.depNo,//组织编号
|
|
|
+ approval: _this.state.approval, //是否需要特批审核
|
|
|
}
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -301,6 +307,9 @@ const Organization = Form.create()(React.createClass({
|
|
|
financeId: _this.state.theTypes2
|
|
|
? _this.state.theTypes2
|
|
|
: _this.state.financeId, //负责人ID
|
|
|
+ approvalAid: _this.state.theTypes1
|
|
|
+ ? _this.state.theTypes1
|
|
|
+ : _this.state.approvalAid, //审核人ID
|
|
|
retrialFinanceId: _this.state.theTypes3
|
|
|
? _this.state.theTypes3
|
|
|
: _this.state.reviewerId, // 复审人
|
|
@@ -312,6 +321,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
workingHoursType: _this.state.workingHoursType,
|
|
|
hideSign: _this.state.hideSign,//显示标识
|
|
|
depNo: _this.state.depNo,//组织编号
|
|
|
+ approval: _this.state.approval, //是否需要特批审核
|
|
|
}
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -351,6 +361,9 @@ const Organization = Form.create()(React.createClass({
|
|
|
financeId: _this.state.theTypes2
|
|
|
? _this.state.theTypes2
|
|
|
: _this.state.financeId, //负责人ID
|
|
|
+ approvalAid: _this.state.theTypes1
|
|
|
+ ? _this.state.theTypes1
|
|
|
+ : _this.state.approvalAid, //审核人ID
|
|
|
retrialFinanceId: _this.state.theTypes3
|
|
|
? _this.state.theTypes3
|
|
|
: _this.state.reviewerId, // 复审人
|
|
@@ -363,6 +376,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
workingHoursType: _this.state.workingHoursType,
|
|
|
hideSign: _this.state.hideSign,//显示标识
|
|
|
depNo: _this.state.depNo,//组织编号
|
|
|
+ approval: _this.state.approval, //是否需要特批审核
|
|
|
}
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -398,6 +412,9 @@ const Organization = Form.create()(React.createClass({
|
|
|
financeId: _this.state.theTypes2
|
|
|
? _this.state.theTypes2
|
|
|
: _this.state.financeId, //负责人ID
|
|
|
+ approvalAid: _this.state.theTypes1
|
|
|
+ ? _this.state.theTypes1
|
|
|
+ : _this.state.approvalAid, //审核人ID
|
|
|
retrialFinanceId: _this.state.theTypes3
|
|
|
? _this.state.theTypes3
|
|
|
: _this.state.reviewerId, // 复审人
|
|
@@ -410,6 +427,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
workingHoursType: _this.state.workingHoursType,
|
|
|
hideSign: _this.state.hideSign,//显示标识
|
|
|
depNo: _this.state.depNo,//组织编号
|
|
|
+ approval: _this.state.approval,
|
|
|
}
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -463,13 +481,17 @@ const Organization = Form.create()(React.createClass({
|
|
|
editRemarks: thisdata.remarks, //组织职能说明
|
|
|
workingHoursType: thisdata.workingHoursType,//作息时间类型
|
|
|
financeId: thisdata.financeId, // 财务负责人
|
|
|
+ approvalAid: thisdata.approvalAid, // 审核人
|
|
|
reviewerId: thisdata.retrialFinanceId, // 财务复审
|
|
|
hideSign: thisdata.hideSign,//显示标识
|
|
|
+ approval: thisdata.approval, // 特批审核
|
|
|
});
|
|
|
this.setState({
|
|
|
editId: thisdata.id, //每一条记录的ID
|
|
|
financeId: thisdata.financeId,
|
|
|
financeName: thisdata.financeName,
|
|
|
+ approvalAid: thisdata.approvalAid, // 审核人
|
|
|
+ approvalName: thisdata.approvalName, // 审核人
|
|
|
editName: thisdata.name, //组织名称
|
|
|
managerIdOrganization: thisdata.managerName, //负责人名字
|
|
|
managerIdOrganizationId: thisdata.managerId, //负责人idmanagerName
|
|
@@ -487,6 +509,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
editDataSource: theArr,
|
|
|
abbreviation: thisdata.abbreviation,
|
|
|
hideSign: thisdata.hideSign,//显示标识
|
|
|
+ approval: thisdata.approval, // 特批审核
|
|
|
});
|
|
|
} else {
|
|
|
message.warning(data.error[0].message);
|
|
@@ -632,6 +655,23 @@ const Organization = Form.create()(React.createClass({
|
|
|
theTypes: theType
|
|
|
})
|
|
|
},
|
|
|
+ selectAuto1(value, options) {
|
|
|
+ this.setState({
|
|
|
+ approvalAid: value
|
|
|
+ })
|
|
|
+ let theType = '';
|
|
|
+ let contactLists = this.state.customerArr || [];
|
|
|
+ if (value) {
|
|
|
+ contactLists.map(function (item) {
|
|
|
+ if (item.name == value.toString()) {
|
|
|
+ theType = item.id;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ theTypes1: theType
|
|
|
+ })
|
|
|
+ },
|
|
|
selectAuto2(value, options) {
|
|
|
this.setState({
|
|
|
financeId: value
|
|
@@ -694,6 +734,14 @@ const Organization = Form.create()(React.createClass({
|
|
|
managerIdOrganization: e
|
|
|
})
|
|
|
},
|
|
|
+ httpChange1(e) {
|
|
|
+ if (e.length >= 1) {
|
|
|
+ this.supervisor(e);
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ approvalName: e
|
|
|
+ })
|
|
|
+ },
|
|
|
httpChange2(e) {
|
|
|
if (e.length >= 1) {
|
|
|
this.supervisor(e);
|
|
@@ -717,12 +765,16 @@ const Organization = Form.create()(React.createClass({
|
|
|
this.state.managerIdOrganization = '';//负责人ID清零
|
|
|
this.state.financeId = "";//负责人ID清零
|
|
|
this.state.financeName = "";//负责人ID清零
|
|
|
+ this.state.approvalAid = "";//审核人ID清零
|
|
|
+ this.state.approvalName = "";//审核人清零
|
|
|
this.state.reviewerId = "";//复审人
|
|
|
this.state.reviewerName = "";//复审人
|
|
|
+ this.state.approvalName = ""; //特批审核人
|
|
|
this.state.typeOrganization = undefined; //组织类型清零
|
|
|
this.state.upOrganization = undefined;//上级组织清零
|
|
|
this.state.remarksOrganization = '';//组织职能说明清零
|
|
|
this.state.hideSign = 1;//显示标识默认为1(显示)
|
|
|
+ this.state.approval = 1;//特批审核 1(需要)
|
|
|
this.state.RowData = {};
|
|
|
this.setState({
|
|
|
workingHoursType: 0,
|
|
@@ -918,7 +970,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
filterOption={true}
|
|
|
// onBlur={this.blurChange}
|
|
|
onSelect={this.selectAuto}
|
|
|
- style={{ width: '95%' }}
|
|
|
+ // style={{ width: '95%' }}
|
|
|
>
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
@@ -1065,13 +1117,56 @@ const Organization = Form.create()(React.createClass({
|
|
|
filterOption={true}
|
|
|
// onBlur={this.blurChange}
|
|
|
onSelect={this.selectAuto}
|
|
|
- style={{ width: '95%' }}
|
|
|
+ // style={{ width: '95%' }}
|
|
|
>
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
|
{/* <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span> */}
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
+
|
|
|
+ <div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ labelCol={{ span: 7 }}
|
|
|
+ wrapperCol={{ span: 12 }}
|
|
|
+ label="特批审核"
|
|
|
+ >
|
|
|
+ <Select placeholder="特批审核"
|
|
|
+ value={this.state.approval}
|
|
|
+ onChange={(e) => { this.setState({ approval: e }) }}
|
|
|
+ required="required"
|
|
|
+ >
|
|
|
+ <Option value={0}>不需要</Option>
|
|
|
+ <Option value={1}>需要</Option>
|
|
|
+ </Select>
|
|
|
+ </FormItem>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div className="clearfix">
|
|
|
+ <FormItem
|
|
|
+ labelCol={{ span: 7 }}
|
|
|
+ wrapperCol={{ span: 12 }}
|
|
|
+ label="审核人"
|
|
|
+ >
|
|
|
+ <AutoComplete
|
|
|
+ disabled={this.state.approval != 1}
|
|
|
+ className="certain-category-search"
|
|
|
+ dropdownClassName="certain-category-search-dropdown"
|
|
|
+ dropdownMatchSelectWidth={false}
|
|
|
+ dataSource={options}
|
|
|
+ placeholder="输入名称"
|
|
|
+ value={this.state.approvalName}
|
|
|
+ onChange={this.httpChange1}
|
|
|
+ filterOption={true}
|
|
|
+ // onBlur={this.blurChange}
|
|
|
+ onSelect={this.selectAuto1}
|
|
|
+ >
|
|
|
+ <Input />
|
|
|
+ </AutoComplete>
|
|
|
+ {/* <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>特批/变更审核</span> */}
|
|
|
+ </FormItem>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
|
labelCol={{ span: 7 }}
|
|
@@ -1165,7 +1260,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
filterOption={true}
|
|
|
// onBlur={this.blurChange}
|
|
|
onSelect={this.selectAuto2}
|
|
|
- style={{ width: '95%' }}
|
|
|
+ // style={{ width: '95%' }}
|
|
|
>
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
@@ -1190,7 +1285,7 @@ const Organization = Form.create()(React.createClass({
|
|
|
filterOption={true}
|
|
|
onBlur={this.blurChange}
|
|
|
onSelect={this.selectAuto3}
|
|
|
- style={{ width: '95%' }}
|
|
|
+ // style={{ width: '95%' }}
|
|
|
>
|
|
|
<Input />
|
|
|
</AutoComplete>
|