Browse Source

会员派单优化

dev01 3 years ago
parent
commit
c9c9dd10c0

+ 1 - 1
js/component/common/projectOperation/index.jsx

@@ -380,7 +380,7 @@ class ProjectOperation extends Component{
                                 />}
                                 <span className="mandatory">*</span>
                             </FormItem>
-                            <div style={{color : "red", textAlign : "right", position : "relative", top: "-8", left : "0"}}>如会员项目,服务一年,请填写1,服务二年,请填写2,依次类推</div>
+                            <div style={{marginTop: "33px", color : "red", textAlign : "right", position : "relative", top: "-8", left : "0"}}>如会员项目,服务一年,请填写1,服务二年,请填写2,依次类推</div>
                             {!this.state.patentTransfer && <FormItem
                                 className="half-item"
                                 labelCol={{ span: 4 }}

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

@@ -7105,7 +7105,7 @@ const NewService = Form.create()(
             visible={this.state.changeVisible}
             onOk={this.nextCancel}
             onCancel={this.nextCancel}
-            width="800px"
+            width="900px"
             title={"添加变更项目"}
             footer=""
             className="admin-desc-content"
@@ -7155,6 +7155,7 @@ const NewService = Form.create()(
                     />
                     <span className="mandatory">*</span>
                   </FormItem>
+                  <div style={{marginTop: "33px",color : "red", textAlign : "right", position : "relative", top: "-8", left : "0"}}>如会员项目,服务一年,请填写1,服务二年,请填写2,依次类推</div>
                   <FormItem
                     className="half-item"
                     labelCol={{ span: 4 }}
@@ -7282,11 +7283,11 @@ const NewService = Form.create()(
                     <FormItem
                       labelCol={{ span: 4 }}
                       wrapperCol={{ span: 16 }}
-                      label="服务说明"
+                      label="项目说明"
                     >
                       <Input
                         type="textarea"
-                        placeholder="请输入服务说明"
+                        placeholder="如会员项目请详细描写会员项目的服务年限、详细服务时间段段,如第一年从2021年1月至2021年12月31日止,第二年从。。。"
                         value={this.state.taskComment}
                         onChange={(e) => {
                           this.setState({ taskComment: e.target.value });

+ 38 - 29
js/component/manageCenter/order/orderNew/billing.jsx

@@ -16,7 +16,9 @@ import {
   Cascader,
   Tabs,
   Select,
-  Tooltip
+  Tooltip,
+  Row,
+  Col
 } from 'antd';
 import NewService from "./addService.jsx";
 import moment from 'moment';
@@ -1842,9 +1844,11 @@ const MyService = Form.create()(
               </TabPane>
               <TabPane tab="搜索" key="2">
                 <div className="user-search" style={{ marginLeft: 10 }}>
+
+                  <Row>
                   <Input
                     placeholder="订单编号"
-                    style={{ width: "150px" }}
+                    style={{ width: "150px", marginRight: "10px" }}
                     value={this.state.searchOrderNo}
                     onChange={e => {
                       this.setState({ searchOrderNo: e.target.value });
@@ -1852,7 +1856,7 @@ const MyService = Form.create()(
                   />
                   <Input
                     placeholder="客户名称"
-                    style={{ width: "150px" }}
+                    style={{ width: "150px", marginRight: "10px" }}
                     value={this.state.customerName}
                     onChange={e => {
                       this.setState({ customerName: e.target.value });
@@ -1872,7 +1876,7 @@ const MyService = Form.create()(
                   </Select>
                   <Input
                     placeholder="合同编号"
-                    style={{ width: "150px" }}
+                    style={{ width: "150px", marginRight: 10 }}
                     value={this.state.contractNoSearch}
                     onChange={e => {
                       this.setState({
@@ -1881,7 +1885,7 @@ const MyService = Form.create()(
                     }}
                   />
                   <Select
-                    style={{ width: 100 }}
+                    style={{ width: 120 }}
                     placeholder="结算状态"
                     value={this.state.liquidationStatusSearch}
                     onChange={e => {
@@ -1895,7 +1899,7 @@ const MyService = Form.create()(
                     <Option value="2">已付清</Option>
                   </Select>
                   <Select
-                    style={{ width: 100 }}
+                    style={{ width: 120 }}
                     placeholder="特批状态"
                     value={this.state.approvalSearch}
                     onChange={e => {
@@ -1908,7 +1912,7 @@ const MyService = Form.create()(
                     <Option value="1">特批</Option>
                   </Select>
                   <Select
-                    style={{ width: 100 }}
+                    style={{ width: 120 }}
                     placeholder="签单金额"
                     value={this.state.amountStatus}
                     onChange={e => {
@@ -1924,7 +1928,7 @@ const MyService = Form.create()(
                     <Option value="4">40万元以上</Option>
                   </Select>
                   <Select
-                    style={{ width: 100 }}
+                    style={{ width: 120 }}
                     placeholder="会员状态"
                     value={this.state.projectType}
                     onChange={e => {
@@ -1937,8 +1941,8 @@ const MyService = Form.create()(
                     <Option value="0">非会员</Option>
                   </Select>
                   <Select
-                    style={{ width: 100 }}
-                    placeholder="审核状态"
+                    style={{ width: 140 }}
+                    placeholder="流程状态"
                     value={this.state.processStatus}
                     onChange={e => {
                       this.setState({
@@ -1946,6 +1950,7 @@ const MyService = Form.create()(
                       });
                     }}
                   >
+                    <Option value="">全部</Option>
                     <Option value="0">已派营销员</Option>
                     <Option value="1">已派营销员管理员</Option>
                     <Option value="2">已派财务管理员</Option>
@@ -1954,41 +1959,45 @@ const MyService = Form.create()(
                     <Option value="5">已部分派咨询师经理</Option>
                     <Option value="6">已部全部派咨询师经理</Option>
                   </Select>
-                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
-                  <RangePicker
-                  style={{ width:200 }}
-                    value={[
-                      this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                      this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null
-                    ]}
-                    onChange={(data, dataString) => {
-                      this.setState({ releaseDate: dataString });
-                    }}
-                  />
-
                   <Button
                     type="primary"
                     onClick={this.search}
-                    style={{ marginLeft: "10px" }}
+                    style={{ margin: "0 10px" }}
                   >
                     搜索
                     <Icon type="search" />
                   </Button>
-                  <Button onClick={this.reset}>
+                  <Button onClick={this.reset}
+                  style={{ marginRight: "10px" }}>
                     重置 <Icon type="reload" />
                   </Button>
                   <Button
                     type="primary"
-                    className="addButton"
                     onClick={this.addClick}
+                    style={{ marginRight: "10px" }}
                   >
                     开单
                     <Icon type="plus" />
                   </Button>
+                  </Row>
+                  <Row style={{ marginTop: 10 }}>
+                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                  <RangePicker
+                  style={{ width:200 }}
+                    value={[
+                      this.state.releaseDate[0]
+                        ? moment(this.state.releaseDate[0])
+                        : null,
+                      this.state.releaseDate[1]
+                        ? moment(this.state.releaseDate[1])
+                        : null
+                    ]}
+                    onChange={(data, dataString) => {
+                      this.setState({ releaseDate: dataString });
+                    }}
+                  />
+
+                  </Row>
                 </div>
               </TabPane>
               <TabPane tab="查看" key="3">

+ 4 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -2305,7 +2305,7 @@ class ChangeApply extends Component {
             visible={this.state.changeVisible}
             onOk={this.nextCancel}
             onCancel={this.nextCancel}
-            width="800px"
+            width="900px"
             title={"添加变更项目"}
             footer=""
             className="admin-desc-content"
@@ -2355,6 +2355,7 @@ class ChangeApply extends Component {
                   />
                   <span className="mandatory">*</span>
                 </FormItem>
+                <div style={{marginTop: "33px", color : "red", textAlign : "right", position : "relative", top: "-8", left : "0"}}>如会员项目,服务一年,请填写1,服务二年,请填写2,依次类推</div>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -2398,11 +2399,11 @@ class ChangeApply extends Component {
                   <FormItem
                     labelCol={{ span: 4 }}
                     wrapperCol={{ span: 16 }}
-                    label="服务说明"
+                    label="项目说明"
                   >
                     <Input
                       type="textarea"
-                      placeholder="请输入服务说明"
+                      placeholder="如会员项目请详细描写会员项目的服务年限、详细服务时间段段,如第一年从2021年1月至2021年12月31日止,第二年从。。。"
                       value={this.state.taskComment}
                       onChange={(e) => {
                         this.setState({ taskComment: e.target.value });

+ 22 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -137,6 +137,7 @@ const IntentionCustomer = Form.create()(
           starTime: this.state.releaseDate[0], //开始时间
           endTime: this.state.releaseDate[1], //结束时间
           approval: this.state.approvalSearch, //特批状态搜索
+          processStatus: this.state.processStatusSearch,
           amountStatus: this.state.amountStatus,
         },
         success: function (data) {
@@ -200,6 +201,7 @@ const IntentionCustomer = Form.create()(
         activeKey: "1",
         confirmLoading: false,
         approvalSearch: undefined,
+        processStatusSearch: undefined,
         aloading: false,
         orderNos:'',
         pagination: {
@@ -1184,6 +1186,7 @@ const IntentionCustomer = Form.create()(
       this.state.approval = undefined;
       this.state.approvalSearch = undefined;
       this.state.amountStatus = undefined;
+      this.state.processStatusSearch = undefined;
       this.loadData(1);
     },
     outReset() {
@@ -1411,6 +1414,25 @@ const IntentionCustomer = Form.create()(
                   <Option value="3">30~40万元</Option>
                   <Option value="4">40万元以上</Option>
                 </Select>
+                <Select
+                    style={{ width: 150 }}
+                    placeholder="流程状态"
+                    value={this.state.processStatusSearch}
+                    onChange={e => {
+                      this.setState({
+                        processStatusSearch: e
+                      });
+                    }}
+                  >
+                    <Option value="">全部</Option>
+                    <Option value="0">已派营销员</Option>
+                    <Option value="1">已派营销员管理员</Option>
+                    <Option value="2">已派财务管理员</Option>
+                    <Option value="3">已派财务专员</Option>
+                    <Option value="4">已派咨询师管理员</Option>
+                    <Option value="5">已部分派咨询师经理</Option>
+                    <Option value="6">已部全部派咨询师经理</Option>
+                  </Select>
                 <span style={{ marginRight: "10px" }}>下单时间 :</span>
                 <RangePicker
                   value={[

+ 25 - 4
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -149,6 +149,7 @@ const IntentionCustomer = Form.create()(
           depId: this.state.departmenttList,
           amountStatus: this.state.amountStatus,
           approval: this.state.approvalSearch,
+          processStatus: this.state.processStatusSearch
         },
         success: function (data) {
           ShowModal(this);
@@ -1910,6 +1911,7 @@ const IntentionCustomer = Form.create()(
       this.state.departmenttList = [];
       this.state.amountStatus = undefined;
       this.state.approvalSearch = undefined;
+      this.state.processStatusSearch = undefined;
       this.loadData();
     },
     //部门
@@ -2265,7 +2267,7 @@ const IntentionCustomer = Form.create()(
                 <div className="user-search" style={{ marginLeft: 10 }}>
                   <Input
                     placeholder="订单编号"
-                    style={{ width: "150px" }}
+                    style={{ width: "140px" }}
                     value={this.state.searchOrderNo}
                     onChange={(e) => {
                       this.setState({ searchOrderNo: e.target.value });
@@ -2273,7 +2275,7 @@ const IntentionCustomer = Form.create()(
                   />
                   <Input
                     placeholder="客户名称"
-                    style={{ width: "150px" }}
+                    style={{ width: "140px" }}
                     value={this.state.customerName}
                     onChange={(e) => {
                       this.setState({ customerName: e.target.value });
@@ -2281,7 +2283,7 @@ const IntentionCustomer = Form.create()(
                   />
                   <Select
                     placeholder="订单部门"
-                    style={{ width: 150, marginRight: 10 }}
+                    style={{ width: 140, marginRight: 10 }}
                     value={this.state.departmenttList}
                     onChange={(e) => {
                       this.setState({ departmenttList: e });
@@ -2293,7 +2295,7 @@ const IntentionCustomer = Form.create()(
                   </Select>
                   <Input
                     placeholder="合同编号"
-                    style={{ width: "150px" }}
+                    style={{ width: "140px" }}
                     value={this.state.contractNoSearch}
                     onChange={(e) => {
                       this.setState({
@@ -2344,6 +2346,25 @@ const IntentionCustomer = Form.create()(
                     <Option value="3">30~40万元</Option>
                     <Option value="4">40万元以上</Option>
                   </Select>
+                  <Select
+                    style={{ width: 140 }}
+                    placeholder="流程状态"
+                    value={this.state.processStatusSearch}
+                    onChange={e => {
+                      this.setState({
+                        processStatusSearch: e
+                      });
+                    }}
+                  >
+                    <Option value="">全部</Option>
+                    <Option value="0">已派营销员</Option>
+                    <Option value="1">已派营销员管理员</Option>
+                    <Option value="2">已派财务管理员</Option>
+                    <Option value="3">已派财务专员</Option>
+                    <Option value="4">已派咨询师管理员</Option>
+                    <Option value="5">已部分派咨询师经理</Option>
+                    <Option value="6">已部全部派咨询师经理</Option>
+                  </Select>
                   <span style={{ marginRight: "10px" }}>下单时间 :</span>
                   <RangePicker
                     value={[

+ 127 - 0
js/component/manageCenter/order/userMangagement.css

@@ -0,0 +1,127 @@
+.user-content {
+  background: #fff;
+  padding: 20px;
+}
+.user-content .content-title {
+  color: #333;
+  font-size: 16px;
+  overflow: hidden;
+}
+.user-content .user-search {
+  margin-bottom: 10px;
+}
+.user-content .user-search > input {
+  width: 140px;
+}
+.user-content .user-search > button,
+.user-content .user-search .ant-select,
+.user-content .user-search > input {
+  margin-right: 10px;
+  margin-top: 10px;
+}
+.user-content .user-search .ant-switch {
+  margin-left: 10px;
+}
+.user-content .user-search .search-more {
+  margin: 10px 0;
+}
+.user-content .user-search .search-more > span {
+  margin-right: 10px;
+}
+.half-item {
+  float: left;
+  width: 50%;
+  min-height: 36px;
+  margin-bottom: 10px;
+}
+.half-item button {
+  margin-left: 20px;
+}
+.half-middle {
+  width: 80%;
+  margin: 10px auto;
+  height: 36px;
+}
+.half-middle button {
+  margin-left: 20px;
+}
+.patent-table {
+  clear: both;
+}
+.set-submit {
+  margin-right: 20px;
+  font-size: 16px;
+  width: 80px;
+  height: 30px;
+  line-height: 30px;
+}
+.deletButton {
+  float: right;
+  margin-bottom: 15px;
+}
+.clearfix {
+  clear: both;
+}
+.mandatory {
+  color: red;
+  margin-left: 8px;
+}
+.search-more .ant-select-auto-complete.ant-select-lg .ant-input {
+  height: 28px;
+}
+.rolesCol {
+  width: 90%;
+}
+.setSave,
+.operations,
+.cancel {
+  float: left;
+}
+.setSave {
+  margin-right: 10px;
+  margin-left: 188px;
+}
+.toVoid {
+  float: left;
+  margin-right: 10px;
+}
+.btnSave {
+  text-align: center;
+  margin-top: 10px;
+  overflow: hidden;
+}
+.ant-calendar-picker-input {
+  height: 27px;
+}
+/*变更说明*/
+.changeBorder .half-item {
+  margin-bottom: 0;
+}
+.changeRemark {
+  border-bottom: 1px solid #ccc;
+}
+.changeRemark div {
+  margin-bottom: 0px;
+}
+.changeStatusTxt label {
+  color: red;
+}
+.single {
+  display: block;
+  cursor: pointer;
+}
+.single:hover {
+  background: skyblue;
+}
+.ant-tabs-bar {
+  margin-bottom: 0;
+}
+.user-content .user-search {
+  margin-top: 0 !important;
+}
+.ant-tabs-tab {
+  font-weight: 900;
+}
+.ant-table-small .ant-table-thead > tr > th {
+  background: #f5f5f5;
+}

+ 0 - 4
js/component/manageCenter/order/userMangagement.less

@@ -27,10 +27,6 @@
             }
         }
     }
-    .addButton {
-        float: right;
-        margin-right: 50px!important;
-    }
 }
 .half-item {
     float: left;

+ 1 - 1
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -623,7 +623,7 @@ const currency = [
         key: "commodityPrice"
     },
     {
-        title: "特别说明",
+        title: "项目说明",
         dataIndex: "specialComment",
         key: "specialComment",
         render: (v) => (

+ 1 - 1
package.json

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