dev01 2 years ago
parent
commit
a9b4ad6060

+ 5 - 5
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2132,8 +2132,7 @@ const NewService = Form.create()(
             outsource: thisData.outsource,
             deleteSign: thisData.deleteSign,
             orderUid: thisData.uid,
-            salesType: thisData.salesType,//销售类型
-            userType: thisData.userType,//客户所属类型
+            userType: thisData.userType,
             updatas: {
               salesType: thisData.salesType,//销售类型
               userType: thisData.userType,//客户所属类型
@@ -2573,7 +2572,7 @@ const NewService = Form.create()(
             });
             this.jiedian(this.state.orderNo);
             this.jiedianNew(this.state.orderNo);
-            this.loaduser();
+            // this.loaduser();
             this.loadData();
           } else {
             message.warning(data.error[0].message);
@@ -5069,10 +5068,11 @@ const NewService = Form.create()(
                                         ups.other = e.other
                                       }
                                       this.setState({
-                                        updatas: ups
+                                        updatas: ups,
+                                        userType: ups.userType
                                       })
                                     }
-                                    // this.loaduser.bind(this, { orderNo: this.state.orderNo })
+                                    // this.loaduser.bind(this, {orderNo: this.state.orderNo })
                                   }
                                 />
                               }

+ 3 - 5
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1005,8 +1005,6 @@ const IntentionCustomer = Form.create()(
               //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
               outsource: thisdata.outsource == 0 ? "否" : "是",
               deleteSign: thisdata.deleteSign,
-              salesType: thisdata.salesType,//销售类型
-              userType: thisdata.userType,//客户所属类型
               updatas: {
                 salesType: thisdata.salesType,//销售类型
                 userType: thisdata.userType,//客户所属类型
@@ -1455,7 +1453,7 @@ const IntentionCustomer = Form.create()(
         });
         contentUrl = picArr.join(",");
       } else {
-        message.info("请上传服务内容图片")
+        message.warning("请上传服务内容图片")
         return
       }
       if (moneyVerify(this.state.totalAmount)) {
@@ -1512,7 +1510,7 @@ const IntentionCustomer = Form.create()(
           return false;
         }
       }
-      if (this.state.salesType == null) {
+      if (this.state.updatas.salesType == null) {
         message.warning("请选择销售类型!");
         return
       }
@@ -1930,7 +1928,7 @@ const IntentionCustomer = Form.create()(
           )}
           <ShowModalDiv ShowModal={this.state.showModal} />
           <div className="content-title" style={{ marginBottom: 10 }}>
-            <span style={{ fontWeight: 900, fontSize: 16 }}>订单审核</span>
+            <span style={{ fontWeight: 900, fontSize: 16 }}>驳回订单列表</span>
           </div>
           <div className="user-search">
             <Tabs

+ 1 - 1
package.json

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