Quellcode durchsuchen

编辑组织增加省份选择
增加项目情况状态种类

HW vor 4 Jahren
Ursprung
Commit
1e51c10935

+ 11 - 2
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -516,7 +516,16 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="当前项目情况"
                             >
-                                <span>{this.state.status ? '暂停' : '开启'}</span>
+                                <span>
+                                    {
+                                        this.state.status === 0 ? '未开始':
+                                            this.state.status === 1 ? '已开始':
+                                                this.state.status === 2 ? '已暂停':
+                                                    this.state.status === 3 ? '已完成':
+                                                        this.state.status === 4 ? '已驳回':
+                                                            this.state.status === 5 ? '已退单': ''
+                                    }
+                                </span>
                                 <Button
                                     type="primary"
                                     size="small"
@@ -1045,4 +1054,4 @@ class projectOverview extends Component{
     }
 }
 
-export default projectOverview;
+export default projectOverview;

+ 11 - 2
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -516,7 +516,16 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="当前项目情况"
                             >
-                                <span>{this.state.status ? '暂停' : '开启'}</span>
+                                <span>
+                                    {
+                                        this.state.status === 0 ? '未开始':
+                                            this.state.status === 1 ? '已开始':
+                                                this.state.status === 2 ? '已暂停':
+                                                    this.state.status === 3 ? '已完成':
+                                                        this.state.status === 4 ? '已驳回':
+                                                            this.state.status === 5 ? '已退单': ''
+                                    }
+                                </span>
                                 <Button
                                     type="primary"
                                     size="small"
@@ -1045,4 +1054,4 @@ class projectOverview extends Component{
     }
 }
 
-export default projectOverview;
+export default projectOverview;

+ 205 - 27
js/component/manageCenter/project/task/myTask.jsx

@@ -1424,7 +1424,7 @@ const Task = React.createClass({
     this.projectTypeTabContent(record.projectType)
   },
   //点击修改项目详情
-  tijiaoOk() {
+  tijiaoOk(status='',fn) {
     let attachmentUrls = []
     if (this.state.attachmentUrl.length) {
       let picArr = []
@@ -1462,7 +1462,7 @@ const Task = React.createClass({
         legalPerson: this.state.legalPerson, //法人
         legalPersonTel: this.state.legalPersonTel, //法人电话
         certificateNumber: this.state.certificateNumber, //证书编号
-        status: this.state.status, //状态
+        status: status || this.state.status, //状态
         formRetrieve: this.state.formRetrieve, //满意度表格
         taskRefund: this.state.taskRefund, //退单
         refundContent: this.state.refundContent, //退单信息
@@ -1486,7 +1486,7 @@ const Task = React.createClass({
         })
         if (!data.error.length) {
           message.success('保存成功!')
-          this.visitCancel()
+          fn ? fn():this.visitCancel();
         } else {
           message.warning(data.error[0].message)
         }
@@ -1580,7 +1580,8 @@ const Task = React.createClass({
             legalPerson: thisdata.legalPerson, //法人
             legalPersonTel: thisdata.legalPersonTel, //法人电话
             certificateNumber: thisdata.certificateNumber, //证书编号
-            status: thisdata.status, //状态
+            status: thisdata.status, //状态  0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+            modifyProjectStatus: thisdata.status,
             formRetrieve: thisdata.formRetrieve, //满意度表格
             taskRefund: thisdata.taskRefund, //退单
             refundContent: thisdata.refundContent, //退单信息
@@ -1741,6 +1742,8 @@ const Task = React.createClass({
       visible: false,
       speVisible: false,
       activeKey: '1',
+      updataSwicth: false,
+      projectSituationVisible: false,
     })
     this.reset()
   },
@@ -3477,6 +3480,31 @@ const Task = React.createClass({
             this.state.orderOutsourceDtailsAjaxObj ? this.state.orderOutsourceDtailsAjaxObj.abort() : null;
           }}
         >
+          <div style={{position:"relative"}}>
+            <div style={{
+              position: "absolute",
+              inset:'-15px',
+              zIndex: 1000,
+              //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+              display: this.state.status === 0 ? 'flex' : 'none',
+              justifyContent:'center',
+              paddingTop: '300px',
+              background: 'rgba(0,0,0,0.7)',
+              borderRadius: '4px',
+              borderTopRightRadius: '96px',
+            }}>
+              <Button
+                  type="primary"
+                  size='large'
+                  onClick={()=>{
+                    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+                    this.tijiaoOk(1,()=>{
+                      this.xiangqing(this.state.id)
+                    });
+                  }}>
+                开始启动项目
+              </Button>
+            </div>
           <Tabs
               tabBarExtraContent={
                 <div style={{fontWeight:'bold',paddingRight:'15px'}}>
@@ -3523,20 +3551,51 @@ const Task = React.createClass({
                         {...formItemLayout}
                         label="当前项目情况"
                       >
-                        <Radio.Group
-                          value={this.state.status}
-                          onChange={(e) => {
-                            this.setState({ status: e.target.value })
-                          }}
-                        >
-                          <Radio value={0}>开启</Radio>
-                          <Radio value={1}>暂停</Radio>
-                        </Radio.Group>
+                        {/*<Radio.Group*/}
+                        {/*  value={this.state.status}*/}
+                        {/*  onChange={(e) => {*/}
+                        {/*    this.setState({ status: e.target.value })*/}
+                        {/*  }}*/}
+                        {/*>*/}
+                        {/*  <Radio value={0}>开启</Radio>*/}
+                        {/*  <Radio value={1}>暂停</Radio>*/}
+                        {/*</Radio.Group>*/}
+                        {/*<Button*/}
+                        {/*  type="primary"*/}
+                        {/*  size="small"*/}
+                        {/*  style={{ marginTop: '5px', position: 'absolute' }}*/}
+                        {/*  onClick={this.caozuorizhi}*/}
+                        {/*>*/}
+                        {/*  操作日志*/}
+                        {/*</Button>*/}
+                        {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
+                        {
+                          this.state.status === 0 ? '未开始':
+                              this.state.status === 1 ? '已开始':
+                                  this.state.status === 2 ? '已暂停':
+                                      this.state.status === 3 ? '已完成':
+                                          this.state.status === 4 ? '已驳回':
+                                              this.state.status === 5 ? '已退单': ''
+                        }
+                        {
+                          this.state.status !== 0 ? <Button
+                              type="primary"
+                              size="small"
+                              style={{ marginTop: "5px" }}
+                              onClick={()=>{
+                                this.setState({
+                                  projectSituationVisible: true,
+                                })
+                              }}
+                          >
+                            修改
+                          </Button> : null
+                        }
                         <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: '5px', position: 'absolute' }}
-                          onClick={this.caozuorizhi}
+                            type="primary"
+                            size="small"
+                            style={{ marginTop: "5px", position: "absolute" }}
+                            onClick={this.caozuorizhi}
                         >
                           操作日志
                         </Button>
@@ -4906,6 +4965,7 @@ const Task = React.createClass({
               ''
             )}
           </Tabs>
+          </div>
         </Modal> : <div/>}
         <Modal
           maskClosable={false}
@@ -5078,6 +5138,31 @@ const Task = React.createClass({
           footer=""
           className="admin-desc-content"
         >
+          <div style={{position:"relative"}}>
+            <div style={{
+              position: "absolute",
+              inset:'-15px',
+              zIndex: 1000,
+              //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+              display: this.state.status === 0 ? 'flex' : 'none',
+              justifyContent:'center',
+              paddingTop: '300px',
+              background: 'rgba(0,0,0,0.7)',
+              borderRadius: '4px',
+              borderTopRightRadius: '96px',
+            }}>
+              <Button
+                  type="primary"
+                  size='large'
+                  onClick={()=>{
+                    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+                    this.tijiaoOk(1,()=>{
+                      this.xiangqing(this.state.id)
+                    });
+                  }}>
+                开始启动项目
+              </Button>
+            </div>
           <Tabs
               tabBarExtraContent={
                 <div style={{fontWeight:'bold',paddingRight:'15px'}}>
@@ -5106,15 +5191,37 @@ const Task = React.createClass({
                   {...formItemLayout}
                   label="当前项目情况"
                 >
-                  <Radio.Group
-                    value={this.state.status}
-                    onChange={(e) => {
-                      this.setState({ status: e.target.value })
-                    }}
-                  >
-                    <Radio value={0}>开启</Radio>
-                    <Radio value={1}>暂停</Radio>
-                  </Radio.Group>
+                  {/*<Radio.Group*/}
+                  {/*  value={this.state.status}*/}
+                  {/*  onChange={(e) => {*/}
+                  {/*    this.setState({ status: e.target.value })*/}
+                  {/*  }}*/}
+                  {/*>*/}
+                  {/*  <Radio value={0}>开启</Radio>*/}
+                  {/*  <Radio value={1}>暂停</Radio>*/}
+                  {/*</Radio.Group>*/}
+                  {
+                    this.state.status === 0 ? '未开始':
+                        this.state.status === 1 ? '已开始':
+                            this.state.status === 2 ? '已暂停':
+                                this.state.status === 3 ? '已完成':
+                                    this.state.status === 4 ? '已驳回':
+                                        this.state.status === 5 ? '已退单': ''
+                  }
+                  {
+                    this.state.status !== 0 ? <Button
+                        type="primary"
+                        size="small"
+                        style={{ marginTop: "5px" }}
+                        onClick={()=>{
+                          this.setState({
+                            projectSituationVisible: true,
+                          })
+                        }}
+                    >
+                      修改
+                    </Button> : null
+                  }
                   <Button
                     type="primary"
                     size="small"
@@ -5615,7 +5722,9 @@ const Task = React.createClass({
                 <Button
                   className="cancel"
                   type="primary"
-                  onClick={this.tijiaoOk}
+                  onClick={()=>{
+                    this.tijiaoOk();
+                  }}
                   style={{ marginLeft: '200px', marginTop: '10px' }}
                   htmlType="submit"
                 >
@@ -6219,6 +6328,7 @@ const Task = React.createClass({
               ''
             )}
           </Tabs>
+          </div>
         </Modal> : <div/>}
         <Modal
           width="800px"
@@ -6325,6 +6435,74 @@ const Task = React.createClass({
               this.payNodeTable(this.state.tid)
             }}
         /> : <div/>}
+        {this.state.projectSituationVisible ? <Modal
+            className="customeDetails"
+            footer=""
+            title=""
+            width="500px"
+            visible={this.state.projectSituationVisible}
+            onOk={()=>{
+              this.setState({
+                projectSituationVisible: false
+              })
+            }}
+            onCancel={()=>{
+              this.setState({
+                projectSituationVisible: false
+              })
+            }}
+        >
+          <div>
+            <div style={{
+              paddingBottom: '15px',
+              fontSize:'18px',
+              fontWeight:"bolder",
+            }}>
+              当前项目情况:
+            </div>
+            <div>
+              {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
+              <Radio.Group
+                  style={{
+                    dispaly:'flex',
+                    flexRow:'column'
+                  }}
+                  value={this.state.modifyProjectStatus}
+                  onChange={(e) => {
+                    this.setState({ modifyProjectStatus: e.target.value });
+                  }}
+              >
+                <Radio value={1}>进行中</Radio>
+                <Radio value={2}>已暂停</Radio>
+                <Radio value={3}>已完成</Radio>
+                <Radio value={4}>已驳回</Radio>
+                <Radio value={5}>已退单</Radio>
+              </Radio.Group>
+              <div style={{
+                display:'flex',
+                justifyContent:'center',
+                paddingTop:'20px',
+                paddingBottom: '20px',
+              }}>
+                <Button
+                    className="cancel"
+                    type="ghost"
+                    onClick={()=>{
+                      this.tijiaoOk(this.state.modifyProjectStatus,()=>{
+                        this.xiangqing(this.state.id)
+                        this.setState({
+                          projectSituationVisible: false
+                        })
+                      })
+                    }}
+                >
+                  保存
+                </Button>
+              </div>
+              <div style={{textAlign:'center'}}>注:请根据实际项目情况填写</div>
+            </div>
+          </div>
+        </Modal> : null}
       </div>
     )
   },

+ 20 - 2
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -1219,7 +1219,16 @@ const MyTaskCount = Form.create()(
                       {...formItemLayout}
                       label="当前项目情况"
                     >
-                      <span>{this.state.status ? "暂停" : "开启"}</span>
+                      <span>
+                        {
+                          this.state.status === 0 ? '未开始':
+                              this.state.status === 1 ? '已开始':
+                                  this.state.status === 2 ? '已暂停':
+                                      this.state.status === 3 ? '已完成':
+                                          this.state.status === 4 ? '已驳回':
+                                              this.state.status === 5 ? '已退单': ''
+                        }
+                      </span>
                       <Button
                         type="primary"
                         size="small"
@@ -1722,7 +1731,16 @@ const MyTaskCount = Form.create()(
                 {...formItemLayout}
                 label="当前项目情况"
               >
-                <span>{this.state.status ? "暂停" : "开启"}</span>
+                <span>
+                  {
+                    this.state.status === 0 ? '未开始':
+                        this.state.status === 1 ? '已开始':
+                            this.state.status === 2 ? '已暂停':
+                                this.state.status === 3 ? '已完成':
+                                    this.state.status === 4 ? '已驳回':
+                                        this.state.status === 5 ? '已退单': ''
+                  }
+                </span>
                 <Button
                   type="primary"
                   size="small"

+ 203 - 27
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -699,6 +699,7 @@ const MyTaskOutsource = React.createClass({
           },
         },
       ],
+      status: 0,
       companyColumns: [
         {
           title: "公司",
@@ -866,7 +867,7 @@ const MyTaskOutsource = React.createClass({
     this.projectTypeTabContent(record.projectType)
   },
   //点击修改项目详情
-  tijiaoOk() {
+  tijiaoOk(status='',fn) {
     if (moneyVerify(this.state.setUpAmount)) {
       return;
     }
@@ -906,7 +907,7 @@ const MyTaskOutsource = React.createClass({
         legalPerson: this.state.legalPerson, //法人
         legalPersonTel: this.state.legalPersonTel, //法人电话
         certificateNumber: this.state.certificateNumber, //证书编号
-        status: this.state.status, //状态
+        status: status ? status : this.state.status, //状态
         formRetrieve: this.state.formRetrieve, //满意度表格
         taskRefund: this.state.taskRefund, //退单
         refundContent: this.state.refundContent, //退单信息
@@ -930,7 +931,7 @@ const MyTaskOutsource = React.createClass({
         });
         if (!data.error.length) {
           message.success("保存成功!");
-          this.visitCancel();
+          fn ? fn():this.visitCancel();
         } else {
           message.warning(data.error[0].message);
         }
@@ -1024,7 +1025,8 @@ const MyTaskOutsource = React.createClass({
             legalPerson: thisdata.legalPerson, //法人
             legalPersonTel: thisdata.legalPersonTel, //法人电话
             certificateNumber: thisdata.certificateNumber, //证书编号
-            status: thisdata.status, //状态
+            status: thisdata.status, //状态  0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+            modifyProjectStatus: thisdata.status,
             formRetrieve: thisdata.formRetrieve, //满意度表格
             taskRefund: thisdata.taskRefund, //退单
             refundContent: thisdata.refundContent, //退单信息
@@ -1163,6 +1165,7 @@ const MyTaskOutsource = React.createClass({
       speVisible: false,
       modKey: "1",
       updataSwicth: false,
+      projectSituationVisible: false,
     });
     this.companyReset();
     this.reset(this.state.page);
@@ -1370,10 +1373,10 @@ const MyTaskOutsource = React.createClass({
             theArr.push({
               key: i,
               id: thisdata.id, //日志ID
-              content: thisdata.content, //流程
+              processName: thisdata.content, //流程
               taskId: thisdata.taskId, //项目ID
-              aName: thisdata.aName, //负责人
-              createTimes: thisdata.createTimes, //时间
+              adminName: thisdata.aName, //负责人
+              createDate: thisdata.createTimes, //时间
             });
           }
         }
@@ -3242,6 +3245,34 @@ const MyTaskOutsource = React.createClass({
           onOk={this.visitOk}
           onCancel={this.visitCancel}
         >
+          <div style={{position:"relative"}}>
+            <div style={{
+              position: "absolute",
+              inset:'-15px',
+              zIndex: 1000,
+              //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+              display: this.state.status === 0 ? 'flex' : 'none',
+              justifyContent:'center',
+              paddingTop: '300px',
+              background: 'rgba(0,0,0,0.7)',
+              borderRadius: '4px',
+              borderTopRightRadius: '96px',
+            }}>
+              <Button
+                  type="primary"
+                  style={{
+
+                  }}
+                  size='large'
+                  onClick={()=>{
+                    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+                    this.tijiaoOk(1,()=>{
+                      this.xiangqing(this.state.id)
+                    });
+                  }}>
+                开始启动项目
+              </Button>
+            </div>
           <Tabs
               onChange={this.callBack}
               activeKey={this.state.modKey}
@@ -3278,15 +3309,38 @@ const MyTaskOutsource = React.createClass({
                         {...formItemLayout}
                         label="当前项目情况"
                       >
-                        <Radio.Group
-                          value={this.state.status}
-                          onChange={(e) => {
-                            this.setState({ status: e.target.value });
-                          }}
-                        >
-                          <Radio value={0}>开启</Radio>
-                          <Radio value={1}>暂停</Radio>
-                        </Radio.Group>
+                        {/*<Radio.Group*/}
+                        {/*  value={this.state.status}*/}
+                        {/*  onChange={(e) => {*/}
+                        {/*    this.setState({ status: e.target.value });*/}
+                        {/*  }}*/}
+                        {/*>*/}
+                        {/*  <Radio value={0}>开启</Radio>*/}
+                        {/*  <Radio value={1}>暂停</Radio>*/}
+                        {/*</Radio.Group>*/}
+                        {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
+                        {
+                          this.state.status === 0 ? '未开始':
+                              this.state.status === 1 ? '已开始':
+                                  this.state.status === 2 ? '已暂停':
+                                      this.state.status === 3 ? '已完成':
+                                          this.state.status === 4 ? '已驳回':
+                                              this.state.status === 5 ? '已退单': ''
+                        }
+                        {
+                          this.state.status !== 0 ? <Button
+                              type="primary"
+                              size="small"
+                              style={{ marginTop: "5px" }}
+                              onClick={()=>{
+                                this.setState({
+                                  projectSituationVisible: true,
+                                })
+                              }}
+                          >
+                            修改
+                          </Button> : null
+                        }
                         <Button
                           type="primary"
                           size="small"
@@ -4000,7 +4054,7 @@ const MyTaskOutsource = React.createClass({
                       <Button
                         className="cancel"
                         type="primary"
-                        onClick={this.tijiaoOk}
+                        onClick={()=>{this.tijiaoOk()}}
                         style={{ marginLeft: "200px", marginTop: "10px" }}
                         htmlType="submit"
                       >
@@ -4483,6 +4537,7 @@ const MyTaskOutsource = React.createClass({
               ""
             )}
           </Tabs>
+          </div>
         </Modal> : <div/>}
         <Modal
           maskClosable={false}
@@ -4644,6 +4699,34 @@ const MyTaskOutsource = React.createClass({
           footer=""
           className="admin-desc-content"
         >
+          <div style={{position:"relative"}}>
+            <div style={{
+              position: "absolute",
+              inset:'-15px',
+              zIndex: 1000,
+              //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+              display: this.state.status === 0 ? 'flex' : 'none',
+              justifyContent:'center',
+              paddingTop: '300px',
+              background: 'rgba(0,0,0,0.7)',
+              borderRadius: '4px',
+              borderTopRightRadius: '96px',
+            }}>
+              <Button
+                  type="primary"
+                  style={{
+
+                  }}
+                  size='large'
+                  onClick={()=>{
+                    //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+                    this.tijiaoOk(1,()=>{
+                      this.xiangqing(this.state.id)
+                    });
+                  }}>
+                开始启动项目
+              </Button>
+            </div>
           <Tabs
             activeKey={this.state.modKey}
             onChange={this.callBack}
@@ -4656,15 +4739,37 @@ const MyTaskOutsource = React.createClass({
                   {...formItemLayout}
                   label="当前项目情况"
                 >
-                  <Radio.Group
-                    value={this.state.status}
-                    onChange={(e) => {
-                      this.setState({ status: e.target.value });
-                    }}
-                  >
-                    <Radio value={0}>开启</Radio>
-                    <Radio value={1}>暂停</Radio>
-                  </Radio.Group>
+                  {/*<Radio.Group*/}
+                  {/*  value={this.state.status}*/}
+                  {/*  onChange={(e) => {*/}
+                  {/*    this.setState({ status: e.target.value });*/}
+                  {/*  }}*/}
+                  {/*>*/}
+                  {/*  <Radio value={0}>开启</Radio>*/}
+                  {/*  <Radio value={1}>暂停</Radio>*/}
+                  {/*</Radio.Group>*/}
+                  {
+                    this.state.status === 0 ? '未开始':
+                        this.state.status === 1 ? '已开始':
+                            this.state.status === 2 ? '已暂停':
+                                this.state.status === 3 ? '已完成':
+                                    this.state.status === 4 ? '已驳回':
+                                        this.state.status === 5 ? '已退单': ''
+                  }
+                  {
+                    this.state.status !== 0 ? <Button
+                        type="primary"
+                        size="small"
+                        style={{ marginTop: "5px" }}
+                        onClick={()=>{
+                          this.setState({
+                            projectSituationVisible: true,
+                          })
+                        }}
+                    >
+                      修改
+                    </Button> : null
+                  }
                   <Button
                     type="primary"
                     size="small"
@@ -5132,7 +5237,9 @@ const MyTaskOutsource = React.createClass({
                 <Button
                   className="cancel"
                   type="primary"
-                  onClick={this.tijiaoOk}
+                  onClick={()=>{
+                    this.tijiaoOk();
+                  }}
                   style={{ marginLeft: "200px", marginTop: "10px" }}
                   htmlType="submit"
                 >
@@ -5201,6 +5308,7 @@ const MyTaskOutsource = React.createClass({
               ""
             )}
           </Tabs>
+          </div>
         </Modal>
         {/* <Modal
           width="800px"
@@ -5311,6 +5419,74 @@ const MyTaskOutsource = React.createClass({
               this.payNodeTable(this.state.tid)
             }}
         /> : <div/>}
+        {this.state.projectSituationVisible ? <Modal
+            className="customeDetails"
+            footer=""
+            title=""
+            width="500px"
+            visible={this.state.projectSituationVisible}
+            onOk={()=>{
+              this.setState({
+                projectSituationVisible: false
+              })
+            }}
+            onCancel={()=>{
+              this.setState({
+                projectSituationVisible: false
+              })
+            }}
+        >
+          <div>
+            <div style={{
+              paddingBottom: '15px',
+              fontSize:'18px',
+              fontWeight:"bolder",
+            }}>
+              当前项目情况:
+            </div>
+            <div>
+              {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
+              <Radio.Group
+                  style={{
+                    dispaly:'flex',
+                    flexRow:'column'
+                  }}
+                  value={this.state.modifyProjectStatus}
+                  onChange={(e) => {
+                    this.setState({ modifyProjectStatus: e.target.value });
+                  }}
+              >
+                <Radio value={1}>进行中</Radio>
+                <Radio value={2}>已暂停</Radio>
+                <Radio value={3}>已完成</Radio>
+                <Radio value={4}>已驳回</Radio>
+                <Radio value={5}>已退单</Radio>
+              </Radio.Group>
+              <div style={{
+                display:'flex',
+                justifyContent:'center',
+                paddingTop:'20px',
+                paddingBottom: '20px',
+              }}>
+                <Button
+                    className="cancel"
+                    type="ghost"
+                    onClick={()=>{
+                      this.tijiaoOk(this.state.modifyProjectStatus,()=>{
+                        this.xiangqing(this.state.id)
+                        this.setState({
+                          projectSituationVisible: false
+                        })
+                      })
+                    }}
+                >
+                  保存
+                </Button>
+              </div>
+              <div style={{textAlign:'center'}}>注:请根据实际项目情况填写</div>
+            </div>
+          </div>
+        </Modal> : null}
       </div>
     );
   },

+ 11 - 2
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -516,7 +516,16 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="当前项目情况"
                             >
-                                <span>{this.state.status ? '暂停' : '开启'}</span>
+                                <span>
+                                    {
+                                        this.state.status === 0 ? '未开始':
+                                            this.state.status === 1 ? '已开始':
+                                                this.state.status === 2 ? '已暂停':
+                                                    this.state.status === 3 ? '已完成':
+                                                        this.state.status === 4 ? '已驳回':
+                                                            this.state.status === 5 ? '已退单': ''
+                                    }
+                                </span>
                                 <Button
                                     type="primary"
                                     size="small"
@@ -1045,4 +1054,4 @@ class projectOverview extends Component{
     }
 }
 
-export default projectOverview;
+export default projectOverview;

+ 20 - 2
js/component/manageCenter/project/task/taskCount.jsx

@@ -1244,7 +1244,16 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="当前项目情况"
                     >
-                      <span>{this.state.status ? "暂停" : "开启"}</span>
+                      <span>
+                        {
+                          this.state.status === 0 ? '未开始':
+                              this.state.status === 1 ? '已开始':
+                                  this.state.status === 2 ? '已暂停':
+                                      this.state.status === 3 ? '已完成':
+                                          this.state.status === 4 ? '已驳回':
+                                              this.state.status === 5 ? '已退单': ''
+                        }
+                      </span>
                       <Button
                         type="primary"
                         size="small"
@@ -1801,7 +1810,16 @@ const IntentionCustomer = Form.create()(
                 {...formItemLayout}
                 label="当前项目情况"
               >
-                <span>{this.state.status ? "暂停" : "开启"}</span>
+                <span>
+                  {
+                    this.state.status === 0 ? '未开始':
+                        this.state.status === 1 ? '已开始':
+                            this.state.status === 2 ? '已暂停':
+                                this.state.status === 3 ? '已完成':
+                                    this.state.status === 4 ? '已驳回':
+                                        this.state.status === 5 ? '已退单': ''
+                  }
+                </span>
                 <Button
                   type="primary"
                   size="small"

+ 28 - 10
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1143,7 +1143,16 @@ const Task = React.createClass({
                         {...formItemLayout}
                         label="当前项目情况"
                       >
-                        <span>{this.state.status ? "暂停" : "开启"}</span>
+                        <span>
+                          {
+                            this.state.status === 0 ? '未开始':
+                                this.state.status === 1 ? '已开始':
+                                    this.state.status === 2 ? '已暂停':
+                                        this.state.status === 3 ? '已完成':
+                                            this.state.status === 4 ? '已驳回':
+                                                this.state.status === 5 ? '已退单': ''
+                          }
+                        </span>
                         <Button
                           type="primary"
                           size="small"
@@ -1569,7 +1578,7 @@ const Task = React.createClass({
                         {this.state.visible && this.state.attachmentUrl && this.state.activeKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
                           <ImgList fileList={this.state.attachmentUrl} domId={'taskQuery1'}/>
                         </div> : <div/>}
-                        <Modal
+                        {this.state.previewVisible ? <Modal
                           maskClosable={false}
                           footer={null}
                           visible={this.state.previewVisible}
@@ -1582,7 +1591,7 @@ const Task = React.createClass({
                             style={{ width: "100%" }}
                             src={this.state.previewImage || ""}
                           />
-                        </Modal>
+                        </Modal> : null}
                       </FormItem>
                     </div>
                     <div className="clearfix">
@@ -1760,7 +1769,16 @@ const Task = React.createClass({
                   {...formItemLayout}
                   label="当前项目情况"
                 >
-                  <span>{this.state.status ? "暂停" : "开启"}</span>
+                  <span>
+                    {
+                      this.state.status === 0 ? '未开始':
+                          this.state.status === 1 ? '已开始':
+                              this.state.status === 2 ? '已暂停':
+                                  this.state.status === 3 ? '已完成':
+                                      this.state.status === 4 ? '已驳回':
+                                          this.state.status === 5 ? '已退单': ''
+                    }
+                  </span>
                   <Button
                     type="primary"
                     size="small"
@@ -2009,7 +2027,7 @@ const Task = React.createClass({
                   {this.state.speVisible && this.state.attachmentUrl && this.state.activeKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
                     <ImgList fileList={this.state.attachmentUrl} domId={'taskQuery1'}/>
                   </div> : <div/>}
-                  <Modal
+                  {this.state.previewVisible ? <Modal
                     maskClosable={false}
                     footer={null}
                     visible={this.state.previewVisible}
@@ -2022,7 +2040,7 @@ const Task = React.createClass({
                       style={{ width: "100%" }}
                       src={this.state.previewImage || ""}
                     />
-                  </Modal>
+                  </Modal> : null}
                 </FormItem>
               </div>
               <div className="clearfix">
@@ -2141,7 +2159,7 @@ const Task = React.createClass({
             )}
           </Tabs>
         </Modal> : <div/>}
-        <Modal
+        {this.state.visibleA ? <Modal
           width="800px"
           visible={this.state.visibleA}
           onCancel={this.visitCancelA}
@@ -2160,7 +2178,7 @@ const Task = React.createClass({
               />
             </Spin>
           </div>
-        </Modal>
+        </Modal> : null}
         {this.state.resVisible ? (
           <ResolutionDetail
             cancel={this.resCancel}
@@ -2175,5 +2193,5 @@ const Task = React.createClass({
     );
   },
 });
- 
-export default Task;
+
+export default Task;

+ 133 - 104
js/component/manageCenter/set/organization/organization.jsx

@@ -3,6 +3,10 @@ import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../content.less';
+import { citySelect } from '../../../NewDicProvinceList';
+import {
+    getNewDiccityArr,
+} from "@/tools.js";
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs } from 'antd';
 import {patternOrganization,conditionOrganization} from '../../../dataDic.js';
 import {getPattern,getCondition} from '../../../tools.js';
@@ -62,7 +66,7 @@ const Organization=Form.create()(React.createClass({
                 loading: false
             });
         }.bind(this));
-       
+
     },
     getInitialState() {
         return {
@@ -109,7 +113,7 @@ const Organization=Form.create()(React.createClass({
                     dataIndex: 'status',
                     key: 'status',
                     render: text => { return getCondition(text) }
-                  
+
                 }
             ],
             dataSource: [],
@@ -120,7 +124,7 @@ const Organization=Form.create()(React.createClass({
         this.selectSuperId();
     },
     //获取上级组织
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -128,18 +132,18 @@ const Organization=Form.create()(React.createClass({
                 crossDomain: false,
                 url: globalConfig.context + "/api/admin/organization/selectSuperId",
                 data:{
-                  
+
                 },
-                success: function (data) {                	  
+                success: function (data) {
                 		let theArr = [];
                 		let theId=[];//用于保存上级组织的ID和名称
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
@@ -150,13 +154,13 @@ const Organization=Form.create()(React.createClass({
 		                        [theData.id,theData.name]
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
-		                    theId: theId, 
+		                    contactsOption: theArr,
+		                    theId: theId,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.loadData();
@@ -167,7 +171,7 @@ const Organization=Form.create()(React.createClass({
 	},
 	//编辑部门,保存
     edithandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	//上级组织字典
         let nameText=this.state.SuperArr
         let superText=this.state.editSuperId;
@@ -208,7 +212,7 @@ const Organization=Form.create()(React.createClass({
                   remarks: remarksText, //组织职能说明
                   id: this.state.editId, //组织ID
                   updateOrganization: this.state.updateOrganization,
-                  abbreviation: this.state.abbreviation
+                  abbreviation: this.state.abbreviation,
                 }
               }).done(
                 function(data) {
@@ -263,7 +267,7 @@ const Organization=Form.create()(React.createClass({
                   }
                 }.bind(this)
               );
-		        } 	
+		        }
     		}
     	}else{
     		if(!(superOne==superText)){
@@ -287,6 +291,7 @@ const Organization=Form.create()(React.createClass({
                     : this.state.financeId, //负责人ID
                   superId: this.state.editSuperId, //上级组织
                   status: this.state.editStatus, //组织状态
+                    province: thisdata.province,//省份
                   remarks: remarksText, //组织职能说明
                   id: this.state.editId, //组织ID
                   abbreviation: this.state.abbreviation
@@ -329,7 +334,8 @@ const Organization=Form.create()(React.createClass({
                 status: this.state.editStatus, //组织状态
                 remarks: remarksText, //组织职能说明
                 id: this.state.editId, //组织ID
-                abbreviation: this.state.abbreviation
+                abbreviation: this.state.abbreviation,
+                  province: this.state.province,
               }
             }).done(
               function(data) {
@@ -345,18 +351,18 @@ const Organization=Form.create()(React.createClass({
                 }
               }.bind(this)
             );
-		        } 
+		        }
     	}
-    },  
+    },
 	//整行点击
     tableRowClick(record, index) {
     	this.selectSuperId();
-    	this.state.RowData = record; 
+    	this.state.RowData = record;
         this.setState({
         	editvisible: true,
         	selectedRowKeys:[],
         	rowId:record.businessId,
-        })    
+        })
         $.ajax({
             method: "post",
             dataType: "json",
@@ -379,6 +385,7 @@ const Organization=Form.create()(React.createClass({
                       editManagerId: thisdata.managerId, //负责人
                       editType: thisdata.type, //组织类型
                       editStatus: thisdata.status, //组织状态
+                        province: thisdata.province,//省份
                       editSuperId: thisdata.superId, //上级组织
                       editDepNo: thisdata.depNo, //组织编号
                       editCreateId: thisdata.createId, //创建人
@@ -386,7 +393,7 @@ const Organization=Form.create()(React.createClass({
                       editRemarks: thisdata.remarks, //组织职能说明
                       financeId: thisdata.financeId
                     });
-                   
+
                 };
                 this.setState({
                   editId: thisdata.id, //每一条记录的ID
@@ -397,6 +404,7 @@ const Organization=Form.create()(React.createClass({
                   managerIdOrganizationId: thisdata.managerId, //负责人idmanagerName
                   editType: thisdata.type, //组织类型
                   editStatus: thisdata.status, //组织状态
+                    province: thisdata.province, //省份
                   editSuperId: thisdata.superId, //上级组织
                   editDepNo: thisdata.depNo, //组织编号
                   editCreateId: thisdata.createId, //创建人
@@ -450,7 +458,7 @@ const Organization=Form.create()(React.createClass({
     },
     //新增一个部门,保存
     addhandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
 //  	if(!this.state.theTypes){
 //  		message.warning('请输入负责人姓名');
 //  		return false;
@@ -460,14 +468,14 @@ const Organization=Form.create()(React.createClass({
     		return false;
     	}
     	if(!this.state.upOrganization){
-    		message.warning('请选择上级组织'); 
+    		message.warning('请选择上级组织');
     		return false;
     	}
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -480,12 +488,12 @@ const Organization=Form.create()(React.createClass({
                         superId:this.state.upOrganization,//上级组织
                         remarks:this.state.remarksOrganization,//组织职能说明
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('保存成功!'); 
+                        message.success('保存成功!');
                         this.handleCancel();
                         this.selectSuperId();
                     } else {
@@ -495,9 +503,9 @@ const Organization=Form.create()(React.createClass({
             }
         });
     },
-    
+
     //主管初始加载(自动补全)
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "post",
             dataType: "json",
@@ -506,23 +514,23 @@ const Organization=Form.create()(React.createClass({
             data:{
             	name:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
@@ -536,7 +544,7 @@ const Organization=Form.create()(React.createClass({
                 if (item.name == value.toString()) {
                     theType = item.id;
                 }
-           });     
+           });
    	    }
 		this.setState({
 			theTypes:theType
@@ -553,7 +561,7 @@ const Organization=Form.create()(React.createClass({
                 if (item.name == value.toString()) {
                     theType = item.id;
                 }
-           });     
+           });
    	    }
 		this.setState({
 			theTypes2:theType
@@ -566,16 +574,16 @@ const Organization=Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			managerIdOrganization:e
 		})
 	},
 	httpChange2(e){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			financeName:e
 		})
@@ -594,7 +602,7 @@ const Organization=Form.create()(React.createClass({
             visible: true
         });
         this.selectSuperId();
-        
+
     },
     editClick() {
         this.state.RowData = {};
@@ -618,7 +626,7 @@ const Organization=Form.create()(React.createClass({
         this.state.name = '';//组织名称清零
         this.state.type = undefined;//组织类型清零
         this.state.depNo = '';//组织编号清零
-        this.loadData();       
+        this.loadData();
     },
     searchSwitch() {
         this.setState({
@@ -648,7 +656,7 @@ const Organization=Form.create()(React.createClass({
                     selectedRowKeys: selectedRowKeys.slice(-1)
                 });
             },
-            onSelect: (recordt, selected, selectedRows) => {			   
+            onSelect: (recordt, selected, selectedRows) => {
 			    this.setState({
 			    	recordt:recordt.id
 			    })
@@ -690,7 +698,7 @@ const Organization=Form.create()(React.createClass({
 	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
                         <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
-	                   			 disabled={!hasSelected} 
+	                   			 disabled={!hasSelected}
 	                    		 >删除<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
@@ -738,18 +746,18 @@ const Organization=Form.create()(React.createClass({
 	                            onRowClick={this.tableRowClick} />
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='600px'
-	                        title='新增组织'                       
+	                        title='新增组织'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="组织名称" >
@@ -759,7 +767,7 @@ const Organization=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem 
+					                    <FormItem
 			                           		 labelCol={{ span: 7 }}
 				                        	 wrapperCol={{ span: 12}}
 				                             label="负责人"
@@ -775,44 +783,44 @@ const Organization=Form.create()(React.createClass({
 											        filterOption={true}
 											        onBlur={this.blurChange}
 											        onSelect={this.selectAuto}
-											        style={{width:'95%'}} 
+											        style={{width:'95%'}}
 											      >
 											        <Input />
-											</AutoComplete> 
+											</AutoComplete>
 											{/*<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>*/}
 							            </FormItem>
 				                    </div>
-				                    
+
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织类型"
-				                         > 
-											  <Select placeholder="组织类型" value={this.state.typeOrganization} 
-				                                onChange={(e)=>{this.setState({typeOrganization:e})}} style={{width:'95%'}} required="required"> 
+				                         >
+											  <Select placeholder="组织类型" value={this.state.typeOrganization}
+				                                onChange={(e)=>{this.setState({typeOrganization:e})}} style={{width:'95%'}} required="required">
 				                                {
 				                                    patternOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                    })
 				                                }
-				                              </Select> 
+				                              </Select>
 				                              <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
-			                               > 
-					                        <Select placeholder="请选择上级组织" 
-					                        	value={this.state.upOrganization} 
+			                               >
+					                        <Select placeholder="请选择上级组织"
+					                        	value={this.state.upOrganization}
 					                        	onChange={(e)=>{this.setState({upOrganization:e})}}
-				                                notFoundContent="未获取到上级组织列表" 
+				                                notFoundContent="未获取到上级组织列表"
 				                                style={{width:'95%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
@@ -820,41 +828,41 @@ const Organization=Form.create()(React.createClass({
 			                   		    <FormItem
 					                        labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="组织职能说明" >					                        
+					                        label="组织职能说明" >
 					                        <Input type="textarea" rows={4} placeholder="组织职能说明" value={this.state.remarksOrganization}
-	                           				 	onChange={(e) => { this.setState({ remarksOrganization: e.target.value }) }} style={{width:'95%'}}/>					                           
+	                           				 	onChange={(e) => { this.setState({ remarksOrganization: e.target.value }) }} style={{width:'95%'}}/>
 					                    </FormItem>
-					                </div>    
+					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
-                	 
+
+
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.editvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.edithandleCancel}
 	                        width='600px'
-	                        title='编辑组织'                       
+	                        title='编辑组织'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.edithandleSubmit} id="edit-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="组织名称" >
-				                    	     <Input placeholder="组织名称" value={this.state.editName} 
+				                    	     <Input placeholder="组织名称" value={this.state.editName}
 				                                onChange={(e)=>{this.setState({editName:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem 
+					                    <FormItem
 			                           		 labelCol={{ span: 7 }}
 				                        	 wrapperCol={{ span: 12}}
 				                             label="负责人"
@@ -870,21 +878,21 @@ const Organization=Form.create()(React.createClass({
 											        filterOption={true}
 											        onBlur={this.blurChange}
 											        onSelect={this.selectAuto}
-											        style={{width:'95%'}} 
+											        style={{width:'95%'}}
 											      >
 											        <Input />
-											</AutoComplete> 
+											</AutoComplete>
 											{/* <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span> */}
 							            </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem  
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织类型"
-				                         > 
-					                          <Select placeholder="组织类型" value={this.state.editType} 
-				                                onChange={(e)=>{this.setState({editType:e})}}> 
+				                         >
+					                          <Select placeholder="组织类型" value={this.state.editType}
+				                                onChange={(e)=>{this.setState({editType:e})}}>
 				                                {
 				                                    patternOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -894,13 +902,13 @@ const Organization=Form.create()(React.createClass({
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem  
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织状态"
-				                         > 
-					                          <Select placeholder="组织状态" value={this.state.editStatus} 
-				                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+				                         >
+					                          <Select placeholder="组织状态" value={this.state.editStatus}
+				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -909,32 +917,53 @@ const Organization=Form.create()(React.createClass({
 				                              </Select>
 				                   		 </FormItem>
 				                    </div>
+                                    <div className="clearfix">
+                                        <FormItem
+                                            labelCol={{ span: 7 }}
+                                            wrapperCol={{ span: 12 }}
+                                            label="省份"
+                                        >
+                                            <Select
+                                                placeholder="请选择省份"
+                                                value={getNewDiccityArr(this.state.province)}
+                                                onChange={e => {
+                                                    this.setState({ province: e });
+                                                }}
+                                            >
+                                                {citySelect().map(function(item) {
+                                                    return (
+                                                        <Select.Option key={item.value} value={item.value}>{item.label}</Select.Option>
+                                                    );
+                                                })}
+                                            </Select>
+                                        </FormItem>
+                                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
-			                               > 
-			                              <Select placeholder="请选择上级组织" 
-			                              		value={this.state.editSuperId} 
+			                               >
+			                              <Select placeholder="请选择上级组织"
+			                              		value={this.state.editSuperId}
 			                              		onChange={(e)=>{this.setState({editSuperId:e})}}
 				                                notFoundContent="未获取到上级组织列表">
 				                                {this.state.contactsOption}
-				                            </Select> 
-				                            
+				                            </Select>
+
 			                   		    </FormItem>
 		                   		    </div>
 									<div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="缩写" >
-				                    	     <Input placeholder="缩写" value={this.state.abbreviation} 
+				                    	     <Input placeholder="缩写" value={this.state.abbreviation}
 				                                onChange={(e)=>{this.setState({abbreviation:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
 									<div className="clearfix">
-					                    <FormItem 
+					                    <FormItem
 			                           		 labelCol={{ span: 7 }}
 				                        	 wrapperCol={{ span: 12}}
 				                             label="财务负责人"
@@ -950,15 +979,15 @@ const Organization=Form.create()(React.createClass({
 											        filterOption={true}
 											        onBlur={this.blurChange}
 											        onSelect={this.selectAuto2}
-											        style={{width:'95%'}} 
+											        style={{width:'95%'}}
 											      >
 											        <Input />
-											</AutoComplete> 
+											</AutoComplete>
 											{/* <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span> */}
 							            </FormItem>
 				                    </div>
 		                   		    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="组织编号"
@@ -967,7 +996,7 @@ const Organization=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix" >
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
@@ -976,7 +1005,7 @@ const Organization=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建时间"
@@ -988,20 +1017,20 @@ const Organization=Form.create()(React.createClass({
 			                   		    <FormItem
 					                        labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="组织职能说明" >					                        
+					                        label="组织职能说明" >
 					                        <Input type="textarea" rows={4} placeholder="组织职能说明" value={this.state.editRemarks}
-	                           				 	onChange={(e) => { this.setState({ editRemarks: e.target.value }) }}/>					                           
+	                           				 	onChange={(e) => { this.setState({ editRemarks: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>    
+					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                   		<Button className="set-submit" type="ghost" onClick={this.edithandleCancel} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
+
             	</div>
             </div>
         );

+ 10 - 1
js/component/project.jsx

@@ -876,7 +876,16 @@ const project = React.createClass({
                       {...formItemLayout}
                       label="当前项目情况"
                     >
-                      <span>{this.state.status ? '暂停' : '开启'}</span>
+                      <span>
+                        {
+                          this.state.status === 0 ? '未开始':
+                              this.state.status === 1 ? '已开始':
+                                  this.state.status === 2 ? '已暂停':
+                                      this.state.status === 3 ? '已完成':
+                                          this.state.status === 4 ? '已驳回':
+                                              this.state.status === 5 ? '已退单': ''
+                        }
+                      </span>
                       <Button
                         type="primary"
                         size="small"

+ 13 - 1
js/component/tools.js

@@ -876,6 +876,18 @@ module.exports = {
       return theType;
     }
   },
+  //与后端一致省份
+  getNewDiccityArr: function (e) {
+    if (e) {
+      let theType = "";
+      provinceList.map(function (item) {
+        if (item.id === e) {
+          theType = item.name;
+        }
+      });
+      return theType;
+    }
+  },
   //客户状态
   getcustomerStatue: function (e) {
     if (e || e == 0) {
@@ -2002,4 +2014,4 @@ module.exports = {
       <span style={{ color: "red", fontWeight: 900, fontSize: 16 }}>{e}</span>
     );
   },
-};
+};