dev01 2 years ago
parent
commit
f5937e21c1

+ 122 - 122
js/component/common/projectDetailsReadOnly/index.jsx

@@ -1,5 +1,5 @@
-import React,{Component} from 'react';
-import {Form, Input, Modal, Select, Spin} from "antd";
+import React, { Component } from 'react';
+import { Form, Input, Modal, Select, Spin } from "antd";
 import {
     getboutique,
 } from "@/tools";
@@ -11,10 +11,10 @@ const formItemLayout = {
 
 const FormItem = Form.Item;
 
-class ProjectDetailsReadOnly extends Component{
+class ProjectDetailsReadOnly extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             isIso: this.props.infor.commodityName.indexOf("贯标") !== -1,
         }
@@ -39,130 +39,130 @@ class ProjectDetailsReadOnly extends Component{
         const { isIso } = this.state;
         return (
             <Modal
-                    maskClosable={false}
-                    visible={this.props.visible}
-                    onOk={this.props.onCancel}
-                    onCancel={this.props.onCancel}
-                    width="800px"
-                    title="项目任务详情"
-                    footer=""
-                    className="admin-desc-content"
-                >
-                    <Form layout="horizontal" id="demand-form">
-                        <div className="clearfix">
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="项目名称"
-                            >
-                                <span>{commodityName}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="项目数量"
-                            >
-                                <span>{commodityQuantity}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="专利类型"
-                                style={{ display: type === 1 ? 'block' : 'none' }}
-                            >
-                                <span>{patentTypeName}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="官费"
-                                style={{ display: type === 1 ? 'block' : 'none' }}
-                            >
-                              <span>
+                maskClosable={false}
+                visible={this.props.visible}
+                onOk={this.props.onCancel}
+                onCancel={this.props.onCancel}
+                width="800px"
+                title="项目任务详情"
+                footer=""
+                className="admin-desc-content"
+            >
+                <Form layout="horizontal" id="demand-form">
+                    <div className="clearfix">
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="项目名称"
+                        >
+                            <span>{commodityName}</span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="项目数量"
+                        >
+                            <span>{commodityQuantity}</span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="专利类型"
+                            style={{ display: type === 1 ? 'block' : 'none' }}
+                        >
+                            <span>{patentTypeName}</span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="官费"
+                            style={{ display: type === 1 ? 'block' : 'none' }}
+                        >
+                            <span>
                                 {officialCost === 0 ? "无官费" : "有官费"}
-                              </span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="费减"
-                                style={{ display: type === 1 ? 'block' : 'none' }}
-                            >
-                              <span>
+                            </span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="费减"
+                            style={{ display: type === 1 ? 'block' : 'none' }}
+                        >
+                            <span>
                                 {costReduction === 0 ? "无费减" : "有费减"}
-                              </span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="金额(万元)"
-                            >
-                                <span>{commodityPrice}</span>
-                            </FormItem>
+                            </span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="金额(万元)"
+                        >
+                            <span>{commodityPrice === -1 ? '***' : commodityPrice}</span>
+                        </FormItem>
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="主要项目"
+                        >
+                            <span>{getboutique(String(main))}</span>
+                        </FormItem>
+                        {type === 5 && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="企业申报批次"
+                        >
+                            <span>
+                                {
+                                    declarationBatch === 1 ? '第一批' :
+                                        declarationBatch === 2 ? '第二批' :
+                                            declarationBatch === 3 ? '第三批' :
+                                                declarationBatch === 4 ? '第四批' : '未知'
+                                }
+                            </span>
+                        </FormItem>}
+                        {isIso && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费"
+                        >
+                            <span>
+                                {
+                                    ifCertificationFee === 1 ? '包含' :
+                                        ifCertificationFee === 0 ? '不包含' : '未知'
+                                }
+                            </span>
+                        </FormItem>}
+                        {/*{isIso && ifCertificationFee === 1 ?<FormItem*/}
+                        {/*    className="half-item"*/}
+                        {/*    {...formItemLayout}*/}
+                        {/*    label="认证费(万元)"*/}
+                        {/*>*/}
+                        {/*   <span>{certificationFee || '暂无'}</span>*/}
+                        {/*</FormItem> : null}*/}
+                        {/*{isIso && ifCertificationFee === 1 ? <FormItem*/}
+                        {/*    className="half-item"*/}
+                        {/*    {...formItemLayout}*/}
+                        {/*    label=""*/}
+                        {/*/> : null}*/}
+                        {/*{isIso && ifCertificationFee === 1 ? <FormItem*/}
+                        {/*    className="half-item"*/}
+                        {/*    {...formItemLayout}*/}
+                        {/*    label="付款公司名称"*/}
+                        {/*>*/}
+                        {/*    <span>{certificationCorporate || '暂无'}</span>*/}
+                        {/*</FormItem>:null}*/}
+                        <div className="clearfix">
                             <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="主要项目"
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 16 }}
+                                label="服务说明"
                             >
-                                <span>{getboutique(String(main))}</span>
+                                <span>{taskComment}</span>
                             </FormItem>
-                            {type === 5 && <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="企业申报批次"
-                            >
-                                <span>
-                                    {
-                                        declarationBatch === 1 ? '第一批' :
-                                            declarationBatch === 2 ? '第二批' :
-                                                declarationBatch === 3 ? '第三批' :
-                                                    declarationBatch === 4 ? '第四批' : '未知'
-                                    }
-                                </span>
-                            </FormItem>}
-                            {isIso && <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="认证费"
-                            >
-                                <span>
-                                    {
-                                        ifCertificationFee === 1 ? '包含' :
-                                            ifCertificationFee === 0 ? '不包含' :'未知'
-                                    }
-                                </span>
-                            </FormItem> }
-                            {/*{isIso && ifCertificationFee === 1 ?<FormItem*/}
-                            {/*    className="half-item"*/}
-                            {/*    {...formItemLayout}*/}
-                            {/*    label="认证费(万元)"*/}
-                            {/*>*/}
-                            {/*   <span>{certificationFee || '暂无'}</span>*/}
-                            {/*</FormItem> : null}*/}
-                            {/*{isIso && ifCertificationFee === 1 ? <FormItem*/}
-                            {/*    className="half-item"*/}
-                            {/*    {...formItemLayout}*/}
-                            {/*    label=""*/}
-                            {/*/> : null}*/}
-                            {/*{isIso && ifCertificationFee === 1 ? <FormItem*/}
-                            {/*    className="half-item"*/}
-                            {/*    {...formItemLayout}*/}
-                            {/*    label="付款公司名称"*/}
-                            {/*>*/}
-                            {/*    <span>{certificationCorporate || '暂无'}</span>*/}
-                            {/*</FormItem>:null}*/}
-                            <div className="clearfix">
-                                <FormItem
-                                    labelCol={{ span: 4 }}
-                                    wrapperCol={{ span: 16 }}
-                                    label="服务说明"
-                                >
-                                    <span>{taskComment}</span>
-                                </FormItem>
-                            </div>
                         </div>
-                    </Form>
-                </Modal>
+                    </div>
+                </Form>
+            </Modal>
         );
     }
 }

File diff suppressed because it is too large
+ 800 - 70
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx


+ 3 - 6
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -198,10 +198,7 @@ const ShouKuang = React.createClass({
   getInitialState() {
     return {
       cuiTabKey: "1",
-      //默认搜索无流程状态
-      processStatusSearch: [],
 
-      selectedRows: [],
       pubVisible: false,
       pubDataList: [],
       pubpageNo: 1,
@@ -228,7 +225,7 @@ const ShouKuang = React.createClass({
       assignDataX: [],
       assignDataY: [],
       totalPage: 0,
-      // processStatusSearch: "3",
+      processStatusSearch: [],//默认搜索无流程状态
       boHuivisible: false,
       selectedRowKeys: [],
       selectedRows: [],
@@ -1071,7 +1068,7 @@ const ShouKuang = React.createClass({
                   {text}
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
-                    {record.approval == 1 && <Tag color="#ff0000">特批</Tag>}
+                    {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
                   </div>
                 </div>
               </Tooltip>
@@ -2558,7 +2555,7 @@ const ShouKuang = React.createClass({
               />
               <Select
                 placeholder="订单部门"
-                style={{ width: 180, marginRight: 10 }}
+                style={{ width: 190, marginRight: 10 }}
                 value={this.state.departmenttList}
                 onChange={(e) => {
                   this.setState({ departmenttList: e });

+ 13 - 24
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2069,11 +2069,11 @@ const NewService = Form.create()(
             }
             thisData = {};
           }
-          if (thisData.approval == 2) {
-            thisData.approval = "特批通过";
-          } else if (thisData.approval == 3) {
-            thisData.approval = "特批驳回";
-          }
+          // if (thisData.approval == 2) {
+          //   thisData.approval = "特批通过";
+          // } else if (thisData.approval == 3) {
+          //   thisData.approval = "特批驳回";
+          // }
           this.setState({
             id: thisData.id,
             kehuId: thisData.buyerId,
@@ -2084,7 +2084,7 @@ const NewService = Form.create()(
             settlementAmount: thisData.settlementAmount, //结算金额
             liquidationStatus: thisData.liquidationStatus, //清算状态
             processStatus: thisData.processStatus, //流程状态
-            approval: thisData.approval.toString(), //特批状态
+            approval: thisData.approval, //特批状态
             orderRemarks: thisData.orderRemarks, //订单备注
             contractNo: thisData.contractNo, //合同编号
             contacts: thisData.contacts, //联系人
@@ -2122,10 +2122,10 @@ const NewService = Form.create()(
             financeMobile: thisData.financeMobile, //财务电话
             nowFinanceMobile: thisData.nowFinanceMobile,
             nowFinance: thisData.nowFinance,
-            approval:
-              thisData.approval == 0
-                ? thisData.approval.toString()
-                : thisData.approval,
+            // approval:
+            //   thisData.approval == 0
+            //     ? thisData.approval.toString()
+            //     : thisData.approval,
             organizationSearch: thisData.orderDep,
             depName: thisData.depName,
             status: thisData.status,
@@ -5052,17 +5052,7 @@ const NewService = Form.create()(
                               <span>
                                 {(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
                                   (salesList[this.state.updatas.salesType] || "")}
-                                {
-                                  this.state.updatas.other != null && this.state.updatas.other != "" &&
-                                  <Tooltip title={this.state.updatas.other}>
-                                    <span>
-                                      {"(" + this.state.updatas.other.toString().slice(0, 10) + (this.state.updatas.other.toString().length > 9 ? "...)" : ")")}
-                                    </span>
-                                  </Tooltip>
-                                }
                               </span>
-                              {/* <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
-                                (salesList[this.state.updatas.salesType] || "")}</span> */}
                               {
                                 this.state.processStatus === 0 &&
                                 <UpdateSales
@@ -5108,9 +5098,7 @@ const NewService = Form.create()(
                                   <Select
                                     placeholder="请选择客户所属类型"
                                     style={{ width: "240px" }}
-                                    value={getApprovedState(
-                                      this.state.approval
-                                    )}
+                                    value={getApprovedState(this.state.approval)}
                                     onChange={(e) => {
                                       this.setState({ approval: e });
                                     }}
@@ -5180,7 +5168,8 @@ const NewService = Form.create()(
                                   label="特批立项"
                                 >
                                   <span>
-                                    {getApprovedState(this.state.approval)}
+                                    {["非特批", "特批待审核", "特批通过", "特批驳回"][this.state.approval]}
+                                    {/* {getApprovedState(this.state.approval)} */}
                                   </span>
                                 </FormItem>
                                 <FormItem

+ 1 - 1
js/component/manageCenter/order/orderNew/billing.jsx

@@ -510,7 +510,7 @@ const MyService = Form.create()(
                     {text}
                     <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
-                      {record.approval == 1 && <Tag color="#ff0000">特批</Tag>}
+                      {(record.approval == 1 || record.approval == 2) && <Tag color="#ff0000">特批</Tag>}
                     </div>
                   </div>
                 </Tooltip>

+ 5 - 0
js/component/manageCenter/order/source/order.jsx

@@ -115,6 +115,11 @@ class OrderList extends Component {
           key: "depName",
         },
         {
+          title: "营销员",
+          dataIndex: "salesmanName",
+          key: "salesmanName",
+        },
+        {
           title: "下单时间",
           dataIndex: "createDate",
           key: "createDate",