Browse Source

修改加急列表

mentoswzq 4 years ago
parent
commit
b4a806657f

+ 11 - 22
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -241,7 +241,12 @@ const IntentionCustomer = Form.create()(
                     客户跟进
                   </Button>
                   {/*指导 0无 1未读*/}
-                  {record.guidance === 1 ? <div
+                  {record.guidance === 1 ? <Button
+                      style={{
+                        marginLeft:'10px',
+                        background:'#87d068',
+                        borderColor:'#87d068'
+                      }}
                       onClick={(e)=>{
                         e.stopPropagation();
                         this.guidanceRead(record.uid).then(()=>{
@@ -252,27 +257,10 @@ const IntentionCustomer = Form.create()(
                           })
                         })
                       }}
-                      style={{
-                        marginLeft:'10px',
-                        width:'60px',
-                        height:'60px',
-                        borderRadio:'50px',
-                        background:'#58a3ff',
-                        display: 'flex',
-                        padding: '3px',
-                        flexFlow: 'column',
-                        alignItems: 'center',
-                        borderRadius: '60px',
-                        backgroundClip: 'content-box',
-                        justifyContent: 'center',
-                        boxShadow: '2px 1px 6px -1px rgba(0,0,0,.6)',
-                        fontSize: '16px',
-                        color: '#FFFFFF',
-                        cursor: 'pointer',
-                      }}>
-                    <div>指导</div>
-                    <div>意见</div>
-                  </div> : <div/>}
+                      type="primary"
+                  >
+                    指导意见
+                  </Button> : <div/>}
                 </div>
               );
             },
@@ -933,6 +921,7 @@ const IntentionCustomer = Form.create()(
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
+                size="middle"
                 columns={this.state.columns}
                 dataSource={this.state.dataSource}
                 rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -269,6 +269,7 @@ const QueryCustomer = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
+			  size="middle"
               columns={this.state.columns}
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -390,6 +390,7 @@ const QueryCustomer = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
+              size="middle"
               columns={this.state.columns}
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -473,6 +473,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
+			  size="middle"
               columns={this.state.columns}
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}

+ 1 - 0
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -432,6 +432,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		<div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
+			  size="middle"
               columns={this.state.columns}
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}

+ 12 - 11
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -37,7 +37,6 @@ const PaiDan = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
     this.setState({
-      page: pageNo,
       loading: true
     });
     $.ajax({
@@ -94,6 +93,7 @@ const PaiDan = React.createClass({
           this.state.pagination.total = 0;
         }
         this.setState({
+          page: data.data.pageNo,
           dataSource: theArr,
           pagination: this.state.pagination
         });
@@ -120,6 +120,7 @@ const PaiDan = React.createClass({
       selectedRows: [],
       loading: false,
       paginations: false,
+      page: 1,
       pagination: {
         defaultCurrent: 1,
         defaultPageSize: 10,
@@ -934,13 +935,13 @@ const PaiDan = React.createClass({
     this.setState({
       visible: false
     });
-    // this.reset();
+    this.loadData(this.state.page);
   },
   visitOk() {
     this.setState({
       visible: false
     });
-    this.reset();
+    this.loadData(this.state.page);
   },
   resets() {
     this.state.orderNo = "";
@@ -1129,7 +1130,7 @@ const PaiDan = React.createClass({
           requestMethod={"post"}
           reset={this.reset}
         />
-        <Modal
+        {this.state.visible ? <Modal
           className="customeDetails"
           footer=""
           title="订单详情"
@@ -1375,8 +1376,8 @@ const PaiDan = React.createClass({
               </div>
             </Spin>
           </Form>
-        </Modal>
-        <Modal
+        </Modal> : <div/>}
+        {this.state.addnextVisible ? <Modal
           maskClosable={false}
           visible={this.state.addnextVisible}
           onOk={this.nextCancel}
@@ -1449,8 +1450,8 @@ const PaiDan = React.createClass({
               </div>
             </Spin>
           </Form>
-        </Modal>
-        <Modal
+        </Modal> : <div/>}
+        {this.state.addserviceVisible ? <Modal
           maskClosable={false}
           visible={this.state.addserviceVisible}
           onOk={this.nextCancel}
@@ -1625,8 +1626,8 @@ const PaiDan = React.createClass({
               </div>
             </Spin>
           </Form>
-        </Modal>
-        <Modal
+        </Modal> : <div/>}
+        {this.state.noVisible ? <Modal
           maskClosable={false}
           visible={this.state.noVisible}
           onOk={this.noCancel}
@@ -1676,7 +1677,7 @@ const PaiDan = React.createClass({
               </div>
             </Spin>
           </Form>
-        </Modal>
+        </Modal> : <div/>}
         {/* <Modal
           visible={this.state.rizhivisible}
           className="admin-desc-content"

+ 7 - 7
js/component/manageCenter/project/task/newSupplier.js

@@ -395,13 +395,13 @@ class NewSupplier extends Component{
                                             style={{ width: '220px' }}
                                             defaultValue="0"
                                         >
-                                            <Option value="0">31个工作日</Option>
-                                            <Option value="1">26-30个工作日</Option>
-                                            <Option value="2">21-25个工作日</Option>
-                                            <Option value="3">16-20个工作日</Option>
-                                            <Option value="4">11-15个工作日</Option>
-                                            <Option value="5">6-10个工作日</Option>
-                                            <Option value="6">3-5个工作日</Option>
+                                            <Option value="0">无加急</Option>
+                                            <Option value="1">加急3-5个工作日</Option>
+                                            <Option value="2">加急6-10个工作日</Option>
+                                            <Option value="3">加急11-15个工作日</Option>
+                                            <Option value="4">加急16-20个工作日</Option>
+                                            <Option value="5">加急21-25个工作日</Option>
+                                            <Option value="6">加急26-30个工作日</Option>
                                         </Select>
                                         <span className="mandatory">*</span>
                                     </Form.Item>

+ 4 - 4
js/component/manageCenter/project/task/taskQuery.jsx

@@ -345,7 +345,7 @@ const Task = React.createClass({
   },
   componentWillMount() {
     this.departmentList();
-    this.loadData();
+    this.loadData(1);
   },
   tableRowClick(record) {
     let str = record.taskName;
@@ -676,13 +676,13 @@ const Task = React.createClass({
       speVisible: false,
       activeKey: "1",
     });
-    this.reset();
+    this.loadData(this.state.page);
   },
   visitOk() {
     this.setState({
       visible: false,
     });
-    this.reset();
+    this.loadData(this.state.page);
   },
   setColor() {
     $(".userName span").after(
@@ -722,7 +722,7 @@ const Task = React.createClass({
     });
   },
   search() {
-    this.loadData();
+    this.loadData(1);
   },
   orderChange(key) {
     this.setState({

+ 7 - 7
js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js

@@ -95,13 +95,13 @@ class AddSoftWritingPrice extends Component{
                                 rules: [{ required: true, message: '请选择加急天数!' }],
                             })(
                                 <Select style={{ width:'200px'}}>
-                                    <Select.Option value={0}>31个工作日</Select.Option>
-                                    <Select.Option value={1}>26-30个工作日</Select.Option>
-                                    <Select.Option value={2}>21-25个工作日</Select.Option>
-                                    <Select.Option value={3}>16-20个工作日</Select.Option>
-                                    <Select.Option value={4}>11-15个工作日</Select.Option>
-                                    <Select.Option value={5}>6-10个工作日</Select.Option>
-                                    <Select.Option value={6}>3-5个工作日</Select.Option>
+                                    <Select.Option value={0}>无加急</Select.Option>
+                                    <Select.Option value={1}>加急3-5个工作日</Select.Option>
+                                    <Select.Option value={2}>加急6-10个工作日</Select.Option>
+                                    <Select.Option value={3}>加急11-15个工作日</Select.Option>
+                                    <Select.Option value={4}>加急16-20个工作日</Select.Option>
+                                    <Select.Option value={5}>加急21-25个工作日</Select.Option>
+                                    <Select.Option value={6}>加急26-30个工作日</Select.Option>
                                 </Select>
                             )}
                         </Form.Item>

+ 14 - 14
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -45,19 +45,19 @@ class SoftwareConfigure extends Component{
                     render: (text) => {
                         switch (text) {
                             case 0:
-                                return '31个工作日';
+                                return '无加急';
                             case 1:
-                                return '26-30个工作日';
+                                return '加急3-5个工作日';
                             case 2:
-                                return '21-25个工作日';
+                                return '加急6-10个工作日';
                             case 3:
-                                return '16-20个工作日';
+                                return '加急11-15个工作日';
                             case 4:
-                                return '11-15个工作日';
+                                return '加急16-20个工作日';
                             case 5:
-                                return '6-10个工作日';
+                                return '加急21-25个工作日';
                             case 6:
-                                return '3-5个工作日';
+                                return '加急26-30个工作日';
                         }
                     }
                 },
@@ -221,13 +221,13 @@ class SoftwareConfigure extends Component{
                                     style={{ width:'200px',marginRight:'10px' }}
                                     value={this.state.urgent}
                                     onChange={(e) => { this.setState({ urgent: e }) }}>
-                                <Select.Option value={0}>31个工作日</Select.Option>
-                                <Select.Option value={1}>26-30个工作日</Select.Option>
-                                <Select.Option value={2}>21-25个工作日</Select.Option>
-                                <Select.Option value={3}>16-20个工作日</Select.Option>
-                                <Select.Option value={4}>11-15个工作日</Select.Option>
-                                <Select.Option value={5}>6-10个工作日</Select.Option>
-                                <Select.Option value={6}>3-5个工作日</Select.Option>
+                                <Select.Option value={0}>无加急</Select.Option>
+                                <Select.Option value={1}>加急3-5个工作日</Select.Option>
+                                <Select.Option value={2}>加急6-10个工作日</Select.Option>
+                                <Select.Option value={3}>加急11-15个工作日</Select.Option>
+                                <Select.Option value={4}>加急16-20个工作日</Select.Option>
+                                <Select.Option value={5}>加急21-25个工作日</Select.Option>
+                                <Select.Option value={6}>加急26-30个工作日</Select.Option>
                             </Select>
                         </div>
                         <Button type="primary" onClick={this.loadData} style={{marginRight:'10px'}}>搜索</Button>

+ 7 - 7
js/component/tools.js

@@ -1677,19 +1677,19 @@ module.exports = {
   //第三方信息状态----加急
   getUrgentStatus: function (val) {
     if (val == 0) {
-      return "31个工作日";
+      return "无加急";
     } else if (val == 1) {
-      return "26-30个工作日";
+      return "加急3-5个工作日";
     } else if (val == 2) {
-      return "21-25个工作日";
+      return "加急6-10个工作日";
     } else if (val == 3) {
-      return "16-20个工作日";
+      return "加急11-15个工作日";
     } else if (val == 4) {
-      return "11-15个工作日";
+      return "加急16-20个工作日";
     } else if (val == 5) {
-      return "6-10个工作日";
+      return "加急21-25个工作日";
     } else if (val == 6) {
-      return "3-5个工作日";
+      return "加急26-30个工作日";
     }
   },
   //审核状态