dev01 2 anni fa
parent
commit
662de043e8

+ 2 - 2
js/component/common/projectOperation/vip.jsx

@@ -47,10 +47,10 @@ class ProjectOperationVip extends Component {
     if (!(dataInfor && Object.keys(dataInfor).length > 0)) { return; }
     this.setState({
       fid: dataInfor.id,
-      commodityId: dataInfor.commodityId, //服务ID
+      commodityId: dataInfor.commodityId, //项目ID
       commodityName: dataInfor.commodityName, //项目名称
-      memberType: dataInfor.memberType,// 付款情况
       commodityQuantity: dataInfor.commodityQuantity, // 数量
+      memberType: dataInfor.memberType.toString(),// 付款情况
       taskComment: dataInfor.taskComment, // 备注
     });
   }

+ 15 - 5
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -166,19 +166,29 @@ const ProjectVip = React.createClass({
           dataIndex: "projectName",
           key: "projectName",
           className: "title-table",
+          render: (text, record) => {
+            return (
+              <div>
+                {text}
+                {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
+              </div>
+            )
+          }
         },
         {
           title: "项目说明",
-          dataIndex: "projectComment",
-          key: "projectComment",
+          dataIndex: "taskComment",
+          key: "taskComment",
           className: "title-table",
-          width: 200,
+          width: 
+          300,
         },
         {
           title: "状态",
           dataIndex: "status",
           key: "status",
           className: "title-table",
+          width: 80,
           render: (text) => {
             return (
               <div>
@@ -380,7 +390,7 @@ const ProjectVip = React.createClass({
       url: globalConfig.context + "/api/admin/orderProject/examineMemberProject",
       data: {
         id: this.state.checkId,
-        remarks: this.state.content,
+        remarks: this.state.checkData,
         result: this.state.result, //1同意 0驳回
         type: 0, //0财务审核  1特批审核
       },
@@ -740,6 +750,7 @@ const ProjectVip = React.createClass({
             />
           </Spin>
         </div>
+        <textarea id="copyText" style={{ opacity: 0 }} />
         {/* 订单详情 */}
         <OrderDesc
           data={this.state.RowData}
@@ -781,7 +792,6 @@ const ProjectVip = React.createClass({
                 />
               </div>
             </Spin>
-
             <ReactToPrint
               trigger={() => (
                 <Button

+ 13 - 42
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -165,19 +165,28 @@ const ProjectVipAll = React.createClass({
           dataIndex: "projectName",
           key: "projectName",
           className: "title-table",
+          render: (text, record) => {
+            return (
+              <div>
+                {text}
+                {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
+              </div>
+            )
+          }
         },
         {
           title: "项目说明",
-          dataIndex: "projectComment",
-          key: "projectComment",
+          dataIndex: "taskComment",
+          key: "taskComment",
           className: "title-table",
-          width: 200,
+          width: 300,
         },
         {
           title: "状态",
           dataIndex: "status",
           key: "status",
           className: "title-table",
+          width: 80,
           render: (text) => {
             return (
               <div>
@@ -186,44 +195,6 @@ const ProjectVipAll = React.createClass({
             );
           }
         },
-        // {
-        //   title: "操作",
-        //   dataIndex: "caozuo",
-        //   key: "caouzo",
-        //   className: "title-table",
-        //   width: 150,
-        //   render: (text, recard) => {
-        //     return (
-        //       <div>
-        //         {
-        //           recard.status == 1 &&
-        //           <Button
-        //             type="primary"
-        //             onClick={(e) => {
-        //               e.stopPropagation(),
-        //                 this.checkRemark(recard, 1);
-        //             }}
-        //           >
-        //             通过
-        //           </Button>
-        //         }
-        //         {
-        //           recard.status == 1 &&
-        //           <Button
-        //             type="danger"
-        //             style={{ marginLeft: "5px", }}
-        //             onClick={(e) => {
-        //               e.stopPropagation(),
-        //                 this.checkRemark(recard, 0);
-        //             }}
-        //           >
-        //             驳回
-        //           </Button>
-        //         }
-        //       </div>
-        //     );
-        //   },
-        // },
       ],
       dataSource: [],
       fjlist: [],// 营销员列表
@@ -737,6 +708,7 @@ const ProjectVipAll = React.createClass({
             />
           </Spin>
         </div>
+        <textarea id="copyText" style={{ opacity: 0 }} />
         {/* 订单详情 */}
         <OrderDesc
           data={this.state.RowData}
@@ -778,7 +750,6 @@ const ProjectVipAll = React.createClass({
                 />
               </div>
             </Spin>
-
             <ReactToPrint
               trigger={() => (
                 <Button

+ 1 - 0
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -136,6 +136,7 @@ const OrderDetail = Form.create()(
             title: "服务市价(万元)",
             dataIndex: "commodityPrice",
             key: "commodityPrice",
+            width: 100,
           },
           {
             title: "项目状态",

+ 3 - 4
js/component/manageCenter/order/orderNew/addService.jsx

@@ -337,7 +337,6 @@ const NewService = Form.create()(
             title: "项目数量",
             dataIndex: "commodityQuantity",
             key: "commodityQuantity",
-            width: 50,
             render: (text, record) => {
               if (record.splitStatus == 1) {
                 return (
@@ -397,14 +396,14 @@ const NewService = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
-            width: 180,
+            width: 200,
             render: (text) => {
               return (
                 <Tooltip
                   title={text}
                 >
                   <div>
-                    {text && text.length > 12 ? text.substr(0, 12) + "…" : text}
+                    {text && text.length > 15 ? text.substr(0, 15) + "…" : text}
                   </div>
                 </Tooltip>
               )
@@ -7712,7 +7711,7 @@ const NewService = Form.create()(
             />
           }
           {
-            // 会员项目添加编辑
+            // 会员项目添加编辑(暂时废弃)
             this.state.vipVisible &&
             <ProjectOperationVip
               readOnly={

+ 16 - 7
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import $ from "jquery/src/ajax";
 import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
-// import OrderDesc from "../orderDetail/orderDesc";
+import OrderDesc from "../../financialManage/orderDetail/orderDesc"
 import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
@@ -164,19 +164,28 @@ const ApprovedVipProject = React.createClass({
           dataIndex: "projectName",
           key: "projectName",
           className: "title-table",
+          render: (text, record) => {
+            return (
+              <div>
+                {text}
+                {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
+              </div>
+            )
+          }
         },
         {
           title: "项目说明",
-          dataIndex: "projectComment",
-          key: "projectComment",
+          dataIndex: "taskComment",
+          key: "taskComment",
           className: "title-table",
-          width: 200,
+          width: 300,
         },
         {
           title: "状态",
           dataIndex: "status",
           key: "status",
           className: "title-table",
+          width: 80,
           render: (text) => {
             return (
               <div>
@@ -738,12 +747,13 @@ const ApprovedVipProject = React.createClass({
             />
           </Spin>
         </div>
+        <textarea id="copyText" style={{ opacity: 0 }} />
         {/* 订单详情 */}
-        {/* <OrderDesc
+        <OrderDesc
           data={this.state.RowData}
           showDesc={this.state.showDesc}
           closeDesc={this.closeDesc.bind(this)}
-        /> */}
+        />
         {
           //打印预览
           this.state.dvisible &&
@@ -779,7 +789,6 @@ const ApprovedVipProject = React.createClass({
                 />
               </div>
             </Spin>
-
             <ReactToPrint
               trigger={() => (
                 <Button

+ 49 - 14
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -1,16 +1,17 @@
 import React from "react";
 import $ from "jquery/src/ajax";
 import { AutoComplete, Button, Input, Spin, Table, Select, message, Tabs, Tag, Tooltip, Modal } from "antd";
-// import OrderDesc from "../orderDetail/orderDesc";
+import OrderDesc from "../../financialManage/orderDetail/orderDesc"
 import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import ProjectOperationVip from ".././../../common/projectOperation/vip";
 const { TabPane } = Tabs;
 
 //我的会员项目列表
 const MyProjectVip = React.createClass({
- 
+
   //
   getInitialState() {
     return {
@@ -162,22 +163,31 @@ const MyProjectVip = React.createClass({
           dataIndex: "projectName",
           key: "projectName",
           className: "title-table",
+          render: (text, record) => {
+            return (
+              <div>
+                {text}
+                {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
+              </div>
+            )
+          }
         },
         {
           title: "项目说明",
-          dataIndex: "projectComment",
-          key: "projectComment",
+          dataIndex: "taskComment",
+          key: "taskComment",
           className: "title-table",
-          width: 200,
+          width: 300,
         },
         {
           title: "状态",
           dataIndex: "status",
           key: "status",
           className: "title-table",
+          width: 80,
           render: (text) => {
             return (
-              <div>
+              <div style={{ color: text == 4 && "red" }}>
                 {["", "财务审核", "特批审核", "通过", "驳回"][text]}
               </div>
             );
@@ -193,13 +203,17 @@ const MyProjectVip = React.createClass({
             return (
               <div>
                 {
+                  recard.status == 4 &&
                   <Button
                     type="primary"
-                    onClick={(e) => {
-
+                    onClick={() => {
+                      this.setState({
+                        vipVisible: true,
+                        dataInfor: recard,
+                      })
                     }}
                   >
-                    编辑
+                    重新提交
                   </Button>
                 }
               </div>
@@ -214,6 +228,8 @@ const MyProjectVip = React.createClass({
       checkVisible: "",//审核弹窗开关
       checkId: "",//会员项目编号
       result: -1,//1同意 0驳回
+      vipVisible: false,//编辑弹窗
+      dataInfor: {},//编辑的数据
     };
   },
 
@@ -221,6 +237,14 @@ const MyProjectVip = React.createClass({
     this.loadData();
     this.departmentList();
   },
+  // 关闭编辑弹窗
+  vipClose() {
+    this.setState({
+      vipVisible: false
+    }, () => {
+      this.loadData();
+    })
+  },
   // 获取订单部门
   departmentList() {
     $.ajax({
@@ -361,7 +385,7 @@ const MyProjectVip = React.createClass({
       exportPendingLoading: true,
     });
     let data = {
-      shiroType: 1, //财务审核
+      shiroType: 1, //我的
     };
     let obj1 = JSON.parse(JSON.stringify(this.state.searchValues));
     data = Object.assign(data, obj1);
@@ -479,7 +503,7 @@ const MyProjectVip = React.createClass({
     return (
       <div className="user-content">
         <div className="content-title" style={{ marginBottom: 10 }}>
-          <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目审核</span>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>我的会员项目</span>
         </div>
         <Tabs defaultActiveKey="2" onChange={this.callback} className="test">
           <TabPane tab="更改表格显示数据" key="1">
@@ -678,12 +702,13 @@ const MyProjectVip = React.createClass({
             />
           </Spin>
         </div>
+        <textarea id="copyText" style={{ opacity: 0 }} />
         {/* 订单详情 */}
-        {/* <OrderDesc
+        <OrderDesc
           data={this.state.RowData}
           showDesc={this.state.showDesc}
           closeDesc={this.closeDesc.bind(this)}
-        /> */}
+        />
         {
           //打印预览
           this.state.dvisible &&
@@ -719,7 +744,6 @@ const MyProjectVip = React.createClass({
                 />
               </div>
             </Spin>
-
             <ReactToPrint
               trigger={() => (
                 <Button
@@ -768,6 +792,17 @@ const MyProjectVip = React.createClass({
             />
           </Modal>
         }
+        {
+          // 会员项目添加编辑
+          this.state.vipVisible &&
+          <ProjectOperationVip
+            readOnly={false}
+            orderNo={this.state.dataInfor.orderNo}
+            visible={this.state.vipVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.vipClose}
+          />
+        }
       </div>
     );
   },

+ 2 - 1
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -820,7 +820,7 @@ const IntentionCustomer = Form.create()(
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 scroll={{ x: "max-content", y: 0 }}
-                onRowClick={this.tableRowClick}
+                onRowDoubleClick={this.tableRowClick}
                 bordered
                 size="small"
               />
@@ -933,6 +933,7 @@ const IntentionCustomer = Form.create()(
               </div>
             </Modal>
           </div>
+          <textarea id="copyText" style={{ opacity: 0 }} />
           {/* 订单详情 */}
           <OrderDesc
             data={this.state.RowData}

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

@@ -282,7 +282,7 @@ const PaiDan = React.createClass({
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
         {
           title: "项目数量",
@@ -312,22 +312,24 @@ const PaiDan = React.createClass({
         {
           title: "金额(万元)",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
+          width: 80,
         },
         {
           title: "负责人",
           dataIndex: "contacts",
-          key: "contacts"
+          key: "contacts",
         },
         {
           title: "负责人电话",
           dataIndex: "contactsMobile",
-          key: "contactsMobile"
+          key: "contactsMobile",
         },
         {
           title: "主要项目",
           dataIndex: "main",
           key: "main",
+          width: 50,
           render: text => {
             return text ? "是" : "否";
           }
@@ -336,30 +338,37 @@ const PaiDan = React.createClass({
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: text => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-          }
+          width: 200,
+          render: (text) => {
+            return (
+              <Tooltip
+                title={text}
+              >
+                <div>
+                  {text && text.length > 15 ? text.substr(0, 15) + "…" : text}
+                </div>
+              </Tooltip>
+            )
+          },
         },
         {
           title: "操作",
           dataIndex: "caozuo",
           key: "caouzo",
+          width: 100,
           render: (text, record) => {
             return (
               <div>
-                {this.state.processStatus == 4 || record.taskStatus == 0 ? (
+                {(this.state.processStatus == 4 || record.taskStatus == 0) &&
                   <Button
                     type="primary"
-                    style={{ margin: "0 10px" }}
                     onClick={e => {
                       e.stopPropagation(), this.evaluate(record);
                     }}
                   >
                     分配任务
                   </Button>
-                ) : (
-                  ""
-                )}
+                }
               </div>
             );
           }

+ 5 - 4
js/component/manageCenter/publicComponent/assign.jsx

@@ -154,7 +154,8 @@ const Assign = React.createClass({
                 pageSize: 99,
                 departmentId: this.state.departmenttList,
                 name: this.state.financeNameSearch,
-                roleName: this.props.roleName
+                roleName: this.props.roleName,
+                status: !nub ? undefined : "正常",//不是常用联系人时 只要需要查询账号正常的咨询师
             },
             success: function (data) {
                 let theArr = [];
@@ -319,7 +320,7 @@ const Assign = React.createClass({
         });
     },
     //初始加载组件,和主页面一起加载
-    componentDidMount() {},
+    componentDidMount() { },
     //组件调用初始加载函数,可用条件控制,在调用组件时可以拿到参数
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showDesc;
@@ -432,7 +433,7 @@ const Assign = React.createClass({
                                     htmlType="submit"
                                 >
                                     确定
-                    </Button>
+                                </Button>
                                 <Button
                                     className="cancel"
                                     type="ghost"
@@ -444,7 +445,7 @@ const Assign = React.createClass({
                                     style={{ marginLeft: "50px" }}
                                 >
                                     取消
-                    </Button>
+                                </Button>
                             </div>
                         </Spin>
                     </Form>

+ 1 - 1
package.json

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