|
@@ -13,6 +13,7 @@ import {
|
|
|
patent,
|
|
|
currency,
|
|
|
} from './highTechConfig';
|
|
|
+import ProjectDetails from './projectDetails';
|
|
|
|
|
|
const {TabPane} = Tabs;
|
|
|
const { RangePicker } = DatePicker;
|
|
@@ -46,6 +47,7 @@ class HighTech extends Component{
|
|
|
searchContractNo: '',
|
|
|
searchEnterpriseName: '',
|
|
|
declarationBatch: '',
|
|
|
+ projectSituation: '',
|
|
|
projectAmount: '',
|
|
|
depId:'',
|
|
|
thchDepId:'',
|
|
@@ -56,6 +58,8 @@ class HighTech extends Component{
|
|
|
|
|
|
contactsOption: [],
|
|
|
contactsOptionData: [],
|
|
|
+
|
|
|
+ visible: false,
|
|
|
};
|
|
|
|
|
|
this.resetAll = this.resetAll.bind(this);
|
|
@@ -100,8 +104,9 @@ class HighTech extends Component{
|
|
|
projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
|
|
|
orderNo: this.state.searchOrderNo || undefined,//订单编号
|
|
|
contractNo: this.state.searchContractNo || undefined,//合同编号
|
|
|
- userName: this.state.searchEnterpriseName || undefined,//用户名称
|
|
|
+ userName: this.state.searchEnterpriseName || undefined,//企业名称
|
|
|
declarationBatch: this.state.declarationBatch || undefined,//申报批次
|
|
|
+ projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目分类
|
|
|
projectAmount: this.state.projectAmount || undefined,//项目金额
|
|
|
status: this.state.status,
|
|
|
},
|
|
@@ -147,6 +152,7 @@ class HighTech extends Component{
|
|
|
searchContractNo: '',
|
|
|
searchEnterpriseName: '',
|
|
|
declarationBatch: '',
|
|
|
+ projectSituation: '',
|
|
|
projectAmount: '',
|
|
|
projectType: '',
|
|
|
depId:'',
|
|
@@ -252,8 +258,9 @@ class HighTech extends Component{
|
|
|
projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
|
|
|
orderNo: this.state.searchOrderNo || undefined,//订单编号
|
|
|
contractNo: this.state.searchContractNo || undefined,//合同编号
|
|
|
- userName: this.state.searchEnterpriseName || undefined,//用户名称
|
|
|
+ userName: this.state.searchEnterpriseName || undefined,//企业名称
|
|
|
declarationBatch: this.state.declarationBatch || undefined,//申报批次
|
|
|
+ projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目情况
|
|
|
projectAmount: this.state.projectAmount || undefined,//项目金额
|
|
|
}
|
|
|
|
|
@@ -294,13 +301,37 @@ class HighTech extends Component{
|
|
|
marginLeft:'10px',
|
|
|
marginRight:'10px'
|
|
|
}}>
|
|
|
+ <Input
|
|
|
+ placeholder="订单编号"
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ value={this.state.searchOrderNo}
|
|
|
+ onChange={e => {
|
|
|
+ this.setState({ searchOrderNo: e.target.value });
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ <Input
|
|
|
+ placeholder="合同编号"
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ value={this.state.searchContractNo}
|
|
|
+ onChange={e => {
|
|
|
+ this.setState({ searchContractNo: e.target.value });
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ <Input
|
|
|
+ placeholder="企业名称"
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ value={this.state.searchEnterpriseName}
|
|
|
+ onChange={e => {
|
|
|
+ this.setState({ searchEnterpriseName: e.target.value });
|
|
|
+ }}
|
|
|
+ />
|
|
|
<span style={{display:"inline-block"}}>
|
|
|
<span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
|
|
|
<Select
|
|
|
- value={this.state.projectStatus}
|
|
|
+ value={this.state.projectStatus || undefined}
|
|
|
placeholder="请选择项目类别"
|
|
|
notFoundContent="未获取到上级品类列表"
|
|
|
- style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
onChange={(e) => {
|
|
|
let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
|
|
|
this.setState({
|
|
@@ -334,9 +365,9 @@ class HighTech extends Component{
|
|
|
<span style={{display:"inline-block"}}>
|
|
|
<span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
|
|
|
<Select
|
|
|
- value={this.state.projectType}
|
|
|
+ value={this.state.projectType || undefined}
|
|
|
placeholder="请选择项目分类"
|
|
|
- style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
onChange={(e) => {
|
|
|
this.setState({
|
|
|
columns:
|
|
@@ -345,7 +376,8 @@ class HighTech extends Component{
|
|
|
e === 2 ? softWriting :
|
|
|
e === 3 ? currency :
|
|
|
e === 4 ? doubleSoft :
|
|
|
- e === 5 ? highTechColumns : [],
|
|
|
+ e === 5 ? highTechColumns :
|
|
|
+ e === 6 ? currency : [],
|
|
|
changeList: [],
|
|
|
projectType: e,
|
|
|
status: e === 4 ? 2 : e === 2 ? 3 : e === 1 ? 4 : e === 5 ? 1 : 0,
|
|
@@ -361,38 +393,15 @@ class HighTech extends Component{
|
|
|
<Option value={3}>审计</Option>
|
|
|
<Option value={4}>双软</Option>
|
|
|
<Option value={5}>高新</Option>
|
|
|
+ <Option value={6}>商标</Option>
|
|
|
</Select>
|
|
|
</span>
|
|
|
- <Input
|
|
|
- placeholder="订单编号"
|
|
|
- style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
|
|
|
- value={this.state.searchOrderNo}
|
|
|
- onChange={e => {
|
|
|
- this.setState({ searchOrderNo: e.target.value });
|
|
|
- }}
|
|
|
- />
|
|
|
- <Input
|
|
|
- placeholder="合同编号"
|
|
|
- style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
|
|
|
- value={this.state.searchContractNo}
|
|
|
- onChange={e => {
|
|
|
- this.setState({ searchContractNo: e.target.value });
|
|
|
- }}
|
|
|
- />
|
|
|
- <Input
|
|
|
- placeholder="用户名称"
|
|
|
- style={{ width: "150px",marginRight:'10px',marginBottom:'10px' }}
|
|
|
- value={this.state.searchEnterpriseName}
|
|
|
- onChange={e => {
|
|
|
- this.setState({ searchEnterpriseName: e.target.value });
|
|
|
- }}
|
|
|
- />
|
|
|
<span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
|
|
|
<span>订单部门:</span>
|
|
|
<Select
|
|
|
placeholder="请选择部门"
|
|
|
style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
|
|
|
- value={this.state.depId}
|
|
|
+ value={this.state.depId || undefined}
|
|
|
onChange={e => {
|
|
|
this.setState({ depId: e });
|
|
|
}}
|
|
@@ -409,7 +418,7 @@ class HighTech extends Component{
|
|
|
<Select
|
|
|
placeholder="请选择部门"
|
|
|
style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
|
|
|
- value={this.state.thchDepId}
|
|
|
+ value={this.state.thchDepId || undefined}
|
|
|
onChange={e => {
|
|
|
this.setState({ thchDepId: e });
|
|
|
}}
|
|
@@ -424,9 +433,9 @@ class HighTech extends Component{
|
|
|
<span style={{display:"inline-block"}}>
|
|
|
<span style={{marginRight:'10px',marginBottom:'10px'}}>申报批次 :</span>
|
|
|
<Select
|
|
|
- value={this.state.declarationBatch}
|
|
|
+ value={this.state.declarationBatch || undefined}
|
|
|
placeholder="请选择批次"
|
|
|
- style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
onChange={(e) => {
|
|
|
this.setState({
|
|
|
declarationBatch: e,
|
|
@@ -442,9 +451,9 @@ class HighTech extends Component{
|
|
|
<span style={{display:"inline-block"}}>
|
|
|
<span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
|
|
|
<Select
|
|
|
- value={this.state.projectAmount}
|
|
|
+ value={this.state.projectAmount || undefined}
|
|
|
placeholder="请选择项目金额"
|
|
|
- style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
onChange={(e) => {
|
|
|
this.setState({
|
|
|
projectAmount: e,
|
|
@@ -463,6 +472,28 @@ class HighTech extends Component{
|
|
|
</Select>
|
|
|
</span>
|
|
|
<span style={{display:"inline-block"}}>
|
|
|
+ <span style={{marginRight:'10px',marginBottom:'10px'}}>项目情况 :</span>
|
|
|
+ <Select
|
|
|
+ value={this.state.projectSituation || undefined}
|
|
|
+ placeholder="请选择项目情况"
|
|
|
+ style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
|
|
|
+ onChange={(e) => {
|
|
|
+ this.setState({
|
|
|
+ projectSituation: e,
|
|
|
+ });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ {/*0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单*/}
|
|
|
+ <Option value={0}>未开始</Option>
|
|
|
+ <Option value={1}>已开始</Option>
|
|
|
+ <Option value={2}>已暂停</Option>
|
|
|
+ <Option value={3}>已驳回</Option>
|
|
|
+ <Option value={4}>已完成</Option>
|
|
|
+ <Option value={5}>未完成退单</Option>
|
|
|
+ <Option value={6}>已完成退单</Option>
|
|
|
+ </Select>
|
|
|
+ </span>
|
|
|
+ <span style={{display:"inline-block"}}>
|
|
|
<span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
|
|
|
<RangePicker
|
|
|
style={{marginRight:'10px',marginBottom:'10px'}}
|
|
@@ -505,7 +536,10 @@ class HighTech extends Component{
|
|
|
<Table
|
|
|
bordered
|
|
|
size="middle"
|
|
|
- scroll={{ x: this.state.status === 4 || this.state.status === 3 ? 2400 : 2000, y: 0 }}
|
|
|
+ scroll={{
|
|
|
+ x: this.state.status === 4 || this.state.status === 3 ? 1800 : 1000,
|
|
|
+ y: 0
|
|
|
+ }}
|
|
|
columns={
|
|
|
this.state.changeList.length > 0
|
|
|
? this.state.changeList
|
|
@@ -513,9 +547,33 @@ class HighTech extends Component{
|
|
|
}
|
|
|
dataSource={this.state.dataSource}
|
|
|
pagination={this.state.pagination}
|
|
|
+ onRowClick={(record)=>{
|
|
|
+ this.setState({
|
|
|
+ projectdetailsId: record.id,
|
|
|
+ projectdetailsOrderNo: record.orderNo,
|
|
|
+ pname: record.pname,
|
|
|
+ visible: true,
|
|
|
+ })
|
|
|
+ }}
|
|
|
/>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
+ {this.state.visible ? <ProjectDetails
|
|
|
+ visible={this.state.visible}
|
|
|
+ id={this.state.projectdetailsId}
|
|
|
+ orderNo={this.state.projectdetailsOrderNo}
|
|
|
+ taskName={this.state.pname}
|
|
|
+ visitOk={()=>{
|
|
|
+ this.setState({
|
|
|
+ visible: false,
|
|
|
+ });
|
|
|
+ }}
|
|
|
+ visitCancel={()=>{
|
|
|
+ this.setState({
|
|
|
+ visible: false,
|
|
|
+ });
|
|
|
+ }}
|
|
|
+ /> : null}
|
|
|
</div>
|
|
|
)
|
|
|
}
|