Browse Source

会员派单优化

dev01 3 years ago
parent
commit
8398082659

+ 4 - 3
js/component/common/projectOperation/index.jsx

@@ -333,7 +333,7 @@ class ProjectOperation extends Component{
                 visible={this.props.visible}
                 onOk={this.props.onCancel}
                 onCancel={this.props.onCancel}
-                width="800px"
+                width="900px"
                 title={readOnly ? "项目任务详情" : "添加项目任务" }
                 footer=""
                 className="admin-desc-content"
@@ -380,6 +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>
                             {!this.state.patentTransfer && <FormItem
                                 className="half-item"
                                 labelCol={{ span: 4 }}
@@ -510,11 +511,11 @@ class ProjectOperation extends Component{
                                 <FormItem
                                     labelCol={{ span: 4 }}
                                     wrapperCol={{ span: 16 }}
-                                    label="服务说明"
+                                    label="项目说明"
                                 >
                                     {readOnly ? this.state.taskComment : <Input
                                         type="textarea"
-                                        placeholder="请输入服务说明"
+                                        placeholder="如会员项目请详细描写会员项目的服务年限、详细服务时间段段,如第一年从2021年1月至2021年12月31日止,第二年从。。。"
                                         value={this.state.taskComment}
                                         onChange={(e) => {
                                             this.setState({ taskComment: e.target.value });

+ 54 - 4
js/component/manageCenter/order/orderNew/billing.jsx

@@ -125,7 +125,9 @@ const MyService = Form.create()(
           contractNo: this.state.contractNoSearch,
           depId: this.state.departmenttList,
           approval: this.state.approvalSearch,
-          amountStatus: this.state.amountStatus
+          amountStatus: this.state.amountStatus,
+          projectType: this.state.projectType,
+          processStatus: this.state.processStatus
         },
         success: function (data) {
           ShowModal(this);
@@ -142,6 +144,7 @@ const MyService = Form.create()(
                 id: thisdata.id,
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
+                projectType: thisdata.projectType, // 会员状态
                 processStatus: thisdata.processStatus, //流程状态
                 liquidationStatus: thisdata.liquidationStatus, //结算状态
                 approval: thisdata.approval, //特批状态
@@ -532,6 +535,20 @@ const MyService = Form.create()(
                                 大客户
                               </div> : null
                         }
+                        {
+                          record.projectType == 1 ?
+                          <div style={{
+                            background:'rgb(22, 155, 213)',
+                            color:'#FFF',
+                            padding: '1px 7px',
+                            borderRadius:'5px',
+                            fontSize:'12px',
+                            display: 'inline-block',
+                            marginRight:'10px'
+                          }}>
+                            会员
+                          </div> : null
+                        }
                         {text}
                       </div>
                     </Tooltip>
@@ -1558,6 +1575,8 @@ const MyService = Form.create()(
       this.state.departmenttList = [];
       this.state.approvalSearch = undefined
       this.state.amountStatus = undefined
+      this.state.projectType = undefined
+      this.state.processStatus = undefined
       this.loadData();
     },
     //部门
@@ -1862,7 +1881,7 @@ const MyService = Form.create()(
                     }}
                   />
                   <Select
-                    style={{ width: 120 }}
+                    style={{ width: 100 }}
                     placeholder="结算状态"
                     value={this.state.liquidationStatusSearch}
                     onChange={e => {
@@ -1876,7 +1895,7 @@ const MyService = Form.create()(
                     <Option value="2">已付清</Option>
                   </Select>
                   <Select
-                    style={{ width: 120 }}
+                    style={{ width: 100 }}
                     placeholder="特批状态"
                     value={this.state.approvalSearch}
                     onChange={e => {
@@ -1889,7 +1908,7 @@ const MyService = Form.create()(
                     <Option value="1">特批</Option>
                   </Select>
                   <Select
-                    style={{ width: 120 }}
+                    style={{ width: 100 }}
                     placeholder="签单金额"
                     value={this.state.amountStatus}
                     onChange={e => {
@@ -1904,6 +1923,37 @@ const MyService = Form.create()(
                     <Option value="3">30~40万元</Option>
                     <Option value="4">40万元以上</Option>
                   </Select>
+                  <Select
+                    style={{ width: 100 }}
+                    placeholder="会员状态"
+                    value={this.state.projectType}
+                    onChange={e => {
+                      this.setState({
+                        projectType: e
+                      });
+                    }}
+                  >
+                    <Option value="1">会员</Option>
+                    <Option value="0">非会员</Option>
+                  </Select>
+                  <Select
+                    style={{ width: 100 }}
+                    placeholder="审核状态"
+                    value={this.state.processStatus}
+                    onChange={e => {
+                      this.setState({
+                        processStatus: e
+                      });
+                    }}
+                  >
+                    <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
                   style={{ width:200 }}

+ 2 - 2
webpack.config.js

@@ -340,7 +340,7 @@ module.exports = (function () {
 
     //let staticHost = 'http://afts.hnzhiming.com';
     // let staticHost = 'http://172.16.0.74:80'
-    let staticHost = 'http://172.16.0.52:80'
+    let staticHost = 'http://172.16.1.187:80'
     // let staticHost = "http://192.168.0.106";
     // let staticHost = "http://192.168.0.103";
     switch (argv.env.deploy) {
@@ -384,7 +384,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '172.16.0.52',
+            host: '172.16.1.187',
             // host: '172.16.0.74',
             port: 80,
             allowedHosts: ['127.0.0.1', '192.168.0.20', '192.168.0.99'],