HW 3 years ago
parent
commit
5ac4225cdb

+ 2 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/channel.jsx

@@ -251,8 +251,8 @@ class Channel extends Component{
                 title: "剩余签单(天)",
                 dataIndex: "days",
                 key: "days",
-                render: (text) => (
-                    <Tag color='#f00'>{text}天</Tag>
+                render: (text,record) => (
+                    record.status !== 7 ? <Tag color='#f00'>{text}天</Tag> : ''
                 )
             });
         }

+ 2 - 1
js/component/manageCenter/customerService/administration/correspondingDetails.jsx

@@ -44,9 +44,10 @@ class CorrespondingDetails extends Component{
             >
                 <div>
                     <Table
+                        bordered
                         columns={this.state.columns}
                         dataSource={this.props.detailsInfor || []}
-                        pagination={null}
+                        pagination={false}
                     />
                 </div>
             </Modal>

+ 2 - 2
js/component/manageCenter/customerService/administration/customerServiceRecord.jsx

@@ -29,7 +29,7 @@ class CustomerServiceRecord extends Component{
                     key: "addWechat",
                     width: 100,
                     render: (text,record) => {
-                        let str = text === 1 ? '是('+record.wechat+')' : text === 0 ? '否' : '未知';
+                        let str = text === 1 ? '是('+record.wechat+')' : text === 0 ? '否' : '';
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{
@@ -54,7 +54,7 @@ class CustomerServiceRecord extends Component{
                                     text === 3 ? '否,企业不打算申报/注销' :
                                         text === 4 ? '否,客户考虑中,无报价' :
                                             text === 5 ? '否,客户考虑中,已报价' :
-                                                text === 6 ? '是,已续签/复审,续签时间、续签项目('+record.renewalTimes+')' : '未知'
+                                                text === 6 ? '是,已续签/复审,续签时间、续签项目('+record.renewalTimes+')' : ''
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{

+ 31 - 11
js/component/manageCenter/customerService/administration/followUp.jsx

@@ -3,6 +3,7 @@ import {Button, DatePicker, Icon, Input, message, Select, Spin, Table, Tabs, Tag
 import {ChooseList} from "../../order/orderNew/chooseList";
 import FollowUpDetails from './followUpDetails';
 import CorrespondingDetails from './correspondingDetails';
+import OrderItemStatus from '../../../../component/common/orderItemStatus';
 import $ from "jquery";
 
 import {ShowModal} from "@/tools";
@@ -35,23 +36,20 @@ class FollowUp extends Component{
                     title: "状态",
                     dataIndex: "deleteSign",
                     key: "deleteSign",
-                    width:90,
+                    width:80,
                     fixed:'left',
                     render: (text) => {
                         //0=正常, 1=作废, 2=锁定, 3=变更中
-                        return <Tag color="#f50">{
-                            text === 0 ? '正常' :
-                                text === 1 ? '作废' :
-                                    text === 2 ? '锁定' :
-                                        text === 3 ? '变更中' : '未知'
-                        }</Tag>
+                        return <div>
+                            <OrderItemStatus deleteSign={text}/>
+                        </div>
                     }
                 },
                 {
                     title: "订单部门",
                     dataIndex: "depName",
                     key: "depName",
-                    width: 130,
+                    width: 160,
                     fixed:'left',
                 },
                 {
@@ -159,7 +157,7 @@ class FollowUp extends Component{
                     key: "addWechat",
                     width: 100,
                     render: (text,record) => {
-                        let str = text === 1 ? '是('+record.wechat+')' : text === 0 ? '否' : '未知';
+                        let str = text === 1 ? '是('+record.wechat+')' : text === 0 ? '否' : '';
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{
@@ -184,7 +182,7 @@ class FollowUp extends Component{
                                     text === 3 ? '否,企业不打算申报/注销' :
                                         text === 4 ? '否,客户考虑中,无报价' :
                                             text === 5 ? '否,客户考虑中,已报价' :
-                                                text === 6 ? '是,已续签/复审,续签时间、续签项目('+record.renewalTimes+')' : '未知'
+                                                text === 6 ? '是,已续签/复审,续签时间、续签项目('+record.renewalTimes+')' : ''
                         return (
                             <Tooltip placement="topLeft" title={str}>
                                 <div style={{
@@ -274,6 +272,7 @@ class FollowUp extends Component{
         this.search = this.search.bind(this);
         this.reset = this.reset.bind(this);
         this.departmentList = this.departmentList.bind(this);
+        this.download = this.download.bind(this);
     }
 
     componentDidMount() {
@@ -337,10 +336,28 @@ class FollowUp extends Component{
                         this.state.pagination.current = 0;
                         this.state.pagination.total = 0;
                     }
+                    let obj = {
+                        userName:this.state.customerName || undefined,
+                        depId:this.state.depId || undefined,
+                        addWechat:this.state.addWechat || undefined,
+                        renewal:this.state.renewal || undefined,
+                        startFollowTimes:this.state.releaseDate[0] || undefined,
+                        endFollowTimes:this.state.releaseDate[1] || undefined,
+                        startSignTimes:this.state.signTimes[0] || undefined,
+                        endSignTimes:this.state.signTimes[1] || undefined,
+                    }
+                    let arr = Object.keys(obj);
+                    let str = '?';
+                    for(let i of arr){
+                        if(obj[i]){
+                            str+=i+'='+obj[i]+'&'
+                        }
+                    }
                     this.setState({
                         dataSource: theArr,
                         page: data.data.pageNo,
                         pagination: this.state.pagination,
+                        downloadSrc:str,
                     });
                 }
             }.bind(this),
@@ -404,7 +421,7 @@ class FollowUp extends Component{
     download() {
         window.location.href =
             globalConfig.context +
-            "/api/admin/userServiceExport"
+            "/api/admin/userServiceExport" + this.state.downloadSrc
     }
 
     render() {
@@ -533,6 +550,7 @@ class FollowUp extends Component{
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             scroll={{ x: "max-content", y: 0 }}
+                            bordered
                             onRowClick={(record)=>{
                                 this.setState({
                                     visible:true,
@@ -552,6 +570,8 @@ class FollowUp extends Component{
                             visible:false,
                             orderNo:'',
                             uid:'',
+                        },()=>{
+                            this.loadData(this.state.page);
                         })
                     }}/> : ''}
                 {this.state.detailsVisible ?

+ 13 - 2
js/component/manageCenter/order/orderNew/billing.jsx

@@ -23,6 +23,7 @@ import { ChooseList } from "../orderNew/chooseList";
 import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -136,7 +137,8 @@ const MyService = Form.create()(
                 depName: thisdata.depName, //部门名称
                 contractNo: thisdata.contractNo, //合同编号
                 invoiceAmount: thisdata.invoiceAmount, //开票金额
-                settlementAmount: thisdata.settlementAmount //已收款
+                settlementAmount: thisdata.settlementAmount, //已收款
+                deleteSign: thisdata.deleteSign,
               });
             }
             this.state.pagination.current = data.data.pageNo;
@@ -438,6 +440,15 @@ const MyService = Form.create()(
             }
           },
           {
+            title: "状态",
+            dataIndex: "deleteSign",
+            key: "deleteSign",
+            width:80,
+            render: text => {
+              return <OrderItemStatus deleteSign={text}/>;
+            }
+          },
+          {
             title: "订单部门",
             dataIndex: "depName",
             key: "depName"
@@ -1596,7 +1607,7 @@ const MyService = Form.create()(
                 hours: thisdata.hours,
                 taskDistributionTime: thisdata.taskDistributionTime,
                 taskEndTime: thisdata.taskEndTime,
-                dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发"
+                dunStatus: thisdata.dunStatus == 0 ? "未触发" : "已触发",
               });
             }
           }

+ 24 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -55,6 +55,7 @@ import NowProjectStatus from '../../../common/nowProjectStatus';
 import OperationPayNode from "./operationPayNode";
 import DeclarationProgress from "../../../common/declarationProgress";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import ProjectLog from "./projectLog";
 const FormItem = Form.Item;
 const { Option } = Select;
 const { TextArea } = Input;
@@ -496,6 +497,19 @@ const MyTaskOutsource = React.createClass({
                 >
                   工时记录
                 </Button>
+                <Button
+                    type="primary"
+                    style={{ marginLeft: '10px' }}
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      this.setState({
+                        projectLogVisible: true,
+                        projectLogId : record.id
+                      })
+                    }}
+                >
+                  项目日志
+                </Button>
               </div>
             );
           },
@@ -5628,6 +5642,16 @@ const MyTaskOutsource = React.createClass({
                 }}
             /> : null
         }
+        {this.state.projectLogVisible && <ProjectLog
+            projectLogId={this.state.projectLogId}
+            visible={this.state.projectLogVisible}
+            onCancel={()=>{
+              this.setState({
+                projectLogId: '',
+                projectLogVisible: false,
+              })
+            }}
+        />}
       </div>
     );
   },

+ 10 - 10
js/component/manageCenter/project/task/projectLog.jsx

@@ -25,24 +25,24 @@ class ProjectLog extends Component{
                 //     key: "key",
                 // },
                 {
-                    title: "原咨询师/咨询经理",
-                    dataIndex: "key",
-                    key: "key",
+                    title: "操作人",
+                    dataIndex: "aName",
+                    key: "aName",
                 },
                 {
-                    title: "现咨询师/咨询经理",
-                    dataIndex: "key",
-                    key: "key",
+                    title: "接收人",
+                    dataIndex: "receiveName",
+                    key: "receiveName",
                 },
                 {
                     title: "操作类型",
-                    dataIndex: "key",
-                    key: "key",
+                    dataIndex: "statusName",
+                    key: "statusName",
                 },
                 {
                     title: "操作时间",
-                    dataIndex: "key",
-                    key: "key",
+                    dataIndex: "createTimes",
+                    key: "createTimes",
                 },
             ]
         }

+ 6 - 6
webpack.config.js

@@ -148,12 +148,6 @@ module.exports = (function () {
             template: './template/template.html',
             chunks: ['user/account/demand', 'vendors'],
         }),
-        new HtmlWebpackPlugin({
-            title: '管理员-科技服务管理-科技评估信息',
-            filename: 'user/account/evaluateInfo.html',
-            template: './template/template.html',
-            chunks: ['user/account/evaluateInfo', 'vendors'],
-        }),
         //admin
         new HtmlWebpackPlugin({
             title: '管理员-首页',
@@ -287,6 +281,12 @@ module.exports = (function () {
             template: './template/template.html',
             chunks: ['admin/personnel', 'vendors'],
         }),
+        new HtmlWebpackPlugin({
+            title: '管理员-科技服务管理-科技评估信息',
+            filename: 'user/account/evaluateInfo.html',
+            template: './template/template.html',
+            chunks: ['user/account/evaluateInfo', 'vendors'],
+        }),
         //portal 门户
         // new HtmlWebpackPlugin({
         //     title: '主页-需求搜索',