Browse Source

修改指导意见列表

mentoswzq 4 years ago
parent
commit
7db7d09f2a

+ 86 - 69
js/component/manageCenter/components/checkProject/index.jsx

@@ -127,6 +127,9 @@ class CheckProject extends Component {
           },
           },
         },
         },
       ],//支付记录
       ],//支付记录
+
+      outsourcingLogLoading: false,
+      payRecordsLoading: false,
     }
     }
   }
   }
 
 
@@ -877,6 +880,9 @@ class CheckProject extends Component {
 
 
   //外包日志列表
   //外包日志列表
   getSelectOutsourceLog(){
   getSelectOutsourceLog(){
+    this.setState({
+      outsourcingLogLoading: true
+    })
     $.ajax({
     $.ajax({
       method: 'get',
       method: 'get',
       dataType: 'json',
       dataType: 'json',
@@ -898,13 +904,18 @@ class CheckProject extends Component {
       }.bind(this),
       }.bind(this),
     }).always(
     }).always(
         function () {
         function () {
-
+          this.setState({
+            outsourcingLogLoading: false
+          })
         }.bind(this)
         }.bind(this)
     )
     )
   }
   }
 
 
   //支付列表
   //支付列表
   getSelectOrderPayment() {
   getSelectOrderPayment() {
+    this.setState({
+      payRecordsLoading: true
+    })
     $.ajax({
     $.ajax({
       method: 'get',
       method: 'get',
       dataType: 'json',
       dataType: 'json',
@@ -926,7 +937,9 @@ class CheckProject extends Component {
       }.bind(this),
       }.bind(this),
     }).always(
     }).always(
         function () {
         function () {
-
+          this.setState({
+            payRecordsLoading: false
+          })
         }.bind(this)
         }.bind(this)
     )
     )
   }
   }
@@ -1112,74 +1125,78 @@ class CheckProject extends Component {
                     </Modal>
                     </Modal>
                   </div> : <div/>}
                   </div> : <div/>}
                 </div>
                 </div>
-                {parseInt(this.props.startType) !== 1 && this.state.outsourceLogs.length !== 0 ? <div className="outsourceLogConent">
-                  <div className="title" style={{
-                    paddingBottom: 0,
-                  }}>外包状态</div>
-                  <div className="outsourceLogList">
-                    {
-                      this.state.outsourceLogs && this.state.outsourceLogs.map((value,index)=>(
-                          <div key={index} className="outsourceLogItem outsource">
-                            <div style={{
-                              display:'flex',
-                              flexFlow:'row nowrap',
-                              paddingBottom: '3px',
-                              paddingTop: '3px',
-                            }}>
-                              <div>
-                                {value.aname}
-                              </div>
-                              <div style={{paddingLeft:'5px'}}>
-                                {
-                                  value.status === 0 ?
-                                      <Tag color="#2db7f5">发起外包审核</Tag> :
-                                      value.status === 1 ? <Tag color="#87d068">通过</Tag> :
-                                          <Tag color="#f50">驳回</Tag>
-                                }
-                              </div>
-                              <div style={{
-                                wordBreak: 'break-all',
-                                maxWidth:'67%',
-                              }}>
-                                {value.remarks}
-                              </div>
-                              <div style={{paddingLeft: '10px'}}>
-                                {value.createTimes}
-                              </div>
-                            </div>
-                          </div>
-                      ))
-                    }
-                  </div>
-                </div> : <div/>}
-                {this.state.selectOrderPayments.length !== 0 ? <div className="outsourceLogConent">
-                  <div className="title">支付记录</div>
-                  <Spin spinning={this.state.loading}>
-                    <Form layout="horizontal">
-                      <Table
-                          pagination={false}
-                          columns={this.state.orderPaymentseColunms}
-                          dataSource={this.state.selectOrderPayments}
-                          onRowClick={(record)=>{
-                            this.setState({
-                              payRecordVisible: true,
-                              orderPaymentsId: record.id,
-                            })
-                          }}
-                          scroll={{ x: 'max-content', y: 0 }}
-                          bordered
-                          size="small"
-                      />
-                      <Col span={24} offset={9} style={{ marginTop: '15px' }}/>
-                    </Form>
-                  </Spin>
-                </div> : <div/>}
+                <Spin spinning={this.state.outsourcingLogLoading}>
+                  {parseInt(this.props.startType) !== 1 && this.state.outsourceLogs.length !== 0 ? <div className="outsourceLogConent">
+                     <div className="title" style={{
+                       paddingBottom: 0,
+                     }}>外包状态</div>
+                     <div className="outsourceLogList">
+                       {
+                         this.state.outsourceLogs && this.state.outsourceLogs.map((value,index)=>(
+                             <div key={index} className="outsourceLogItem outsource">
+                               <div style={{
+                                 display:'flex',
+                                 flexFlow:'row nowrap',
+                                 paddingBottom: '3px',
+                                 paddingTop: '3px',
+                               }}>
+                                 <div>
+                                   {value.aname}
+                                 </div>
+                                 <div style={{paddingLeft:'5px'}}>
+                                   {
+                                     value.status === 0 ?
+                                         <Tag color="#2db7f5">发起外包审核</Tag> :
+                                         value.status === 1 ? <Tag color="#87d068">通过</Tag> :
+                                             <Tag color="#f50">驳回</Tag>
+                                   }
+                                 </div>
+                                 <div style={{
+                                   wordBreak: 'break-all',
+                                   maxWidth:'67%',
+                                 }}>
+                                   {value.remarks}
+                                 </div>
+                                 <div style={{paddingLeft: '10px'}}>
+                                   {value.createTimes}
+                                 </div>
+                               </div>
+                             </div>
+                         ))
+                       }
+                     </div>
+                  </div> : <div/>}
+                </Spin>
+                <Spin spinning={this.state.payRecordsLoading}>
+                  {this.state.selectOrderPayments.length !== 0 ? <div className="outsourceLogConent">
+                    <div className="title">支付记录</div>
+                    <Spin spinning={this.state.loading}>
+                      <Form layout="horizontal">
+                        <Table
+                            pagination={false}
+                            columns={this.state.orderPaymentseColunms}
+                            dataSource={this.state.selectOrderPayments}
+                            onRowClick={(record)=>{
+                              this.setState({
+                                payRecordVisible: true,
+                                orderPaymentsId: record.id,
+                              })
+                            }}
+                            scroll={{ x: 'max-content', y: 0 }}
+                            bordered
+                            size="small"
+                        />
+                        <Col span={24} offset={9} style={{ marginTop: '15px' }}/>
+                      </Form>
+                    </Spin>
+                  </div> : <div/>}
+                </Spin>
                 {/*
                 {/*
-            申请付款
-            tid:项目id
-            nodeId: 付款节点id
-            previewPayInfor: 项目或者节点信息
-         */}
+                  申请付款
+                  tid:项目id
+                  nodeId: 付款节点id
+                  previewPayInfor: 项目或者节点信息
+               */}
                 {this.state.previewPayVisible ? <ApplyPaymentModal
                 {this.state.previewPayVisible ? <ApplyPaymentModal
                     {...this.props}
                     {...this.props}
                     tid={this.props.tid}
                     tid={this.props.tid}

+ 35 - 21
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -240,31 +240,45 @@ const IntentionCustomer = Form.create()(
                   >
                   >
                     客户跟进
                     客户跟进
                   </Button>
                   </Button>
-                  {/*指导 0无 1未读*/}
-                  {record.guidance === 1 ? <Button
-                      style={{
-                        marginLeft:'10px',
-                        background:'#87d068',
-                        borderColor:'#87d068'
-                      }}
-                      onClick={(e)=>{
-                        e.stopPropagation();
-                        this.guidanceRead(record.uid).then(()=>{
-                          this.setState({
-                            tabsKey:"4",
-                          },()=>{
-                            this.tableRowClick(record)
-                          })
-                        })
-                      }}
-                      type="primary"
-                  >
-                    指导意见
-                  </Button> : <div/>}
                 </div>
                 </div>
               );
               );
             },
             },
           },
           },
+          {
+            title: "指导意见",
+            dataIndex: "guidance",
+            key: "guidance",
+            render: (text, record, index) => {
+              return (
+                  <div style={{
+                    display: 'flex',
+                    flexFlow:'row',
+                    alignItems:'center',
+                  }}>
+                    {/*指导 0无 1未读 2已读*/}
+                    {text === 1 || text === 2 ? <Button
+                        style={text === 1 ? {
+                          background:'#F00000',
+                          borderColor:'#F00000'
+                        } : {}}
+                        onClick={(e)=>{
+                          e.stopPropagation();
+                          this.guidanceRead(record.uid).then(()=>{
+                            this.setState({
+                              tabsKey:"4",
+                            },()=>{
+                              this.tableRowClick(record)
+                            })
+                          })
+                        }}
+                        type="primary"
+                    >
+                      {text === 1 ? '未读' : '查看'}
+                    </Button> : <div>暂无指导</div>}
+                  </div>
+              );
+            },
+          }
         ],
         ],
         tabsKey:'',
         tabsKey:'',
         data: [],
         data: [],

+ 4 - 1
js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx

@@ -15,7 +15,8 @@ import {
     Tag
     Tag
 } from "antd";
 } from "antd";
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
-import {getSocialAttribute, beforeUploadFile, getLevel, ShowModal} from "@/tools.js";
+import {getSocialAttribute, ShowModal} from "@/tools.js";
+import ShowModalDiv from "@/showModal.jsx";
 import moment from "moment";
 import moment from "moment";
 import $ from "jquery/src/ajax";
 import $ from "jquery/src/ajax";
 import IntentionDetail from "../../NEW/intentionCustomer/intentionDetail/intentionDetail";
 import IntentionDetail from "../../NEW/intentionCustomer/intentionDetail/intentionDetail";
@@ -213,6 +214,7 @@ class CustomerFollow extends Component{
                 sortType:this.state.sortType,
                 sortType:this.state.sortType,
             },
             },
             success: function (data) {
             success: function (data) {
+                ShowModal(this);
                 let theArr = [];
                 let theArr = [];
                 if (data.error.length !== 0) {
                 if (data.error.length !== 0) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
@@ -366,6 +368,7 @@ class CustomerFollow extends Component{
     render() {
     render() {
         return(
         return(
             <div className="user-content">
             <div className="user-content">
+                <ShowModalDiv ShowModal={this.state.showModal} />
                 <div className="content-title">
                 <div className="content-title">
                     <span>指导意见</span>
                     <span>指导意见</span>
                 </div>
                 </div>

+ 1 - 1
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -292,7 +292,7 @@ class DepartmentStatistics extends Component{
         return(
         return(
             <div className="user-content">
             <div className="user-content">
                 <div className="content-title">
                 <div className="content-title">
-                    <span>指导意见</span>
+                    <span>部门统计</span>
                 </div>
                 </div>
                 <div className="user-search" style={{display:'flex',alignItems:'center'}}>
                 <div className="user-search" style={{display:'flex',alignItems:'center'}}>
                     <div>
                     <div>

+ 5 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -4913,7 +4913,11 @@ const NewService = Form.create()(
                                   {/*  }}*/}
                                   {/*  }}*/}
                                   {/*/>*/}
                                   {/*/>*/}
                                   <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
                                   <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                    {this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl?  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                                    {
+                                      this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl?
+                                          <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/> :
+                                          <div/>
+                                    }
                                   </div>
                                   </div>
                                   <Modal
                                   <Modal
                                     maskClosable={false}
                                     maskClosable={false}

+ 39 - 6
js/component/manageCenter/order/orderNew/reject.jsx

@@ -137,6 +137,7 @@ const IntentionCustomer = Form.create()(
         releaseDate: [],
         releaseDate: [],
         selectedRowKeys: [],
         selectedRowKeys: [],
         orgCodeUrl: [],
         orgCodeUrl: [],
+        replenishUrl: [],
         customerArr: [],
         customerArr: [],
         resVisible: false,
         resVisible: false,
         pagination: {
         pagination: {
@@ -1389,6 +1390,20 @@ const IntentionCustomer = Form.create()(
         });
         });
         theorgCodeUrl = picArr.join(",");
         theorgCodeUrl = picArr.join(",");
       }
       }
+      let theReplenishUrl = [];
+      if (this.state.replenishUrl.length) {
+        let picArr = [];
+        this.state.replenishUrl.map(function (item) {
+          if (
+              item.response &&
+              item.response.data &&
+              item.response.data.length
+          ) {
+            picArr.push(item.response.data);
+          }
+        });
+        theReplenishUrl = picArr.join(",");
+      }
       if (moneyVerify(this.state.totalAmount)) {
       if (moneyVerify(this.state.totalAmount)) {
         this.setState({
         this.setState({
           flag: false,
           flag: false,
@@ -1489,6 +1504,7 @@ const IntentionCustomer = Form.create()(
           contractNo: this.state.contractNo, //合同编号
           contractNo: this.state.contractNo, //合同编号
           orderRemarks: this.state.orderRemarks, //订单备注
           orderRemarks: this.state.orderRemarks, //订单备注
           contractPictureUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
           contractPictureUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
+          agreementUrl: theReplenishUrl.length ? theReplenishUrl : "",
           orderDep: this.state.organizationSearch,
           orderDep: this.state.organizationSearch,
         },
         },
         success: function (data) {
         success: function (data) {
@@ -2273,13 +2289,30 @@ const IntentionCustomer = Form.create()(
                           pictureUrl={this.state.orgCodeUrl}
                           pictureUrl={this.state.orgCodeUrl}
                         />
                         />
                         <p>图片建议:要清晰。</p>
                         <p>图片建议:要清晰。</p>
+                      </FormItem>
+                      <FormItem
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 18 }}
+                          label={
+                            <span>
+                            <strong style={{ color: "#f00" }}>*</strong>
+                            补充协议
+                          </span>
+                          }
+                      >
+                        <PicturesWall
+                            domId={'reject2'}
+                            fileList={this.getReplenishUrl}
+                            pictureUrl={this.state.replenishUrl}
+                        />
+                        <p>图片建议:要清晰。</p>
                         <Button
                         <Button
-                          style={{
-                            float: "right",
-                            marginRight: "140px",
-                            marginTop: "20px",
-                          }}
-                          onClick={this.getOrderLog}
+                            style={{
+                              float: "right",
+                              marginRight: "140px",
+                              marginTop: "20px",
+                            }}
+                            onClick={this.getOrderLog}
                         >
                         >
                           查看订单 日志
                           查看订单 日志
                         </Button>
                         </Button>

+ 13 - 5
js/component/manageCenter/project/task/myTask.jsx

@@ -2040,10 +2040,10 @@ const Task = React.createClass({
     this.state.unitPrice = undefined
     this.state.unitPrice = undefined
     this.state.unitNumber = undefined
     this.state.unitNumber = undefined
     this.state.amount = undefined
     this.state.amount = undefined
-    this.state.outsourceRemarks = undefined
     this.state.pictureUrl = []
     this.state.pictureUrl = []
     this.setState({
     this.setState({
-      oldInfor: {}
+      oldInfor: {},
+      outsourceRemarks: undefined
     })
     })
   },
   },
   searchSwitch() {
   searchSwitch() {
@@ -2608,7 +2608,7 @@ const Task = React.createClass({
   //查看第三方信息表格
   //查看第三方信息表格
   thirdTable(id) {
   thirdTable(id) {
     this.setState({
     this.setState({
-      loadData: true,
+      loading: true,
     })
     })
     $.ajax({
     $.ajax({
       method: 'get',
       method: 'get',
@@ -2679,6 +2679,9 @@ const Task = React.createClass({
   },
   },
   //外包日志列表
   //外包日志列表
   getSelectOutsourceLog(tid){
   getSelectOutsourceLog(tid){
+    this.setState({
+      loading: true,
+    })
     $.ajax({
     $.ajax({
       method: 'get',
       method: 'get',
       dataType: 'json',
       dataType: 'json',
@@ -2697,16 +2700,21 @@ const Task = React.createClass({
             outsourceLogs: data.data
             outsourceLogs: data.data
           })
           })
         }
         }
+        this.setState({
+          loading: false,
+        })
       }.bind(this),
       }.bind(this),
     }).always(
     }).always(
         function () {
         function () {
-
+          this.setState({
+            loading: false,
+          })
         }.bind(this)
         }.bind(this)
     )
     )
   },
   },
   payNodeTable(id) {
   payNodeTable(id) {
     this.setState({
     this.setState({
-      loadData: true,
+      loading: true,
     })
     })
     $.ajax({
     $.ajax({
       method: 'get',
       method: 'get',

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "afanti",
   "name": "afanti",
-  "version": "1.1.51",
+  "version": "1.1.52",
   "description": "",
   "description": "",
   "main": "index.js",
   "main": "index.js",
   "scripts": {
   "scripts": {