Quellcode durchsuchen

总裁功能增加

mentoswzq vor 5 Jahren
Ursprung
Commit
0ca20f11b1
24 geänderte Dateien mit 1317 neuen und 113 gelöschten Zeilen
  1. 2 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  2. 2 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  3. 2 1
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  4. 2 1
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  5. 5 4
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  6. 11 5
      js/component/manageCenter/order/orderNew/addService.jsx
  7. 2 1
      js/component/manageCenter/order/orderNew/addorders.js
  8. 1254 77
      js/component/manageCenter/order/orderNew/approveds.jsx
  9. 1 1
      js/component/manageCenter/order/orderNew/billing.jsx
  10. 2 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  11. 2 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  12. 2 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  13. 2 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  14. 2 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  15. 2 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  16. 2 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  17. 2 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  18. 2 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  19. 2 1
      js/component/manageCenter/order/orderNew/examine.jsx
  20. 2 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  21. 2 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  22. 2 1
      js/component/manageCenter/order/orderNew/reject.jsx
  23. 5 4
      js/component/manageCenter/project/project/projectQuery.jsx
  24. 5 4
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

+ 2 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1560,7 +1560,8 @@ const approvedOutsourcing = React.createClass({
             theArr.push({
               processName: thisdata.processName,
               adminName: thisdata.adminName,
-              createDate: thisdata.createDate
+              createDate: thisdata.createDate,
+              remarks: thisdata.remarks
             });
           }
         }

+ 2 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1560,7 +1560,8 @@ const approvedOutsourcing = React.createClass({
             theArr.push({
               processName: thisdata.processName,
               adminName: thisdata.adminName,
-              createDate: thisdata.createDate
+              createDate: thisdata.createDate,
+              remarks: thisdata.remarks
             });
           }
         }

+ 2 - 1
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -661,7 +661,8 @@ const outsourcingPaiDan = React.createClass({
             theArr.push({
               processName: thisdata.processName,
               adminName: thisdata.adminName,
-              createDate: thisdata.createDate
+              createDate: thisdata.createDate,
+              remarks: thisdata.remarks
             });
           }
         }

+ 2 - 1
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -773,7 +773,8 @@ const outsourcingPaiDan = React.createClass({
             theArr.push({
               processName: thisdata.processName,
               adminName: thisdata.adminName,
-              createDate: thisdata.createDate
+              createDate: thisdata.createDate,
+              remarks: thisdata.remarks
             });
           }
         }

+ 5 - 4
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -451,10 +451,11 @@ const NewService = Form.create()(React.createClass({
 				       for(let i = 0; i < data.data.length; i++) {
 				       	let thisdata = data.data[i];
 				       	theArr.push({
-				       		processName:thisdata.processName,		
-				       		adminName:thisdata.adminName,		
-				       		createDate:thisdata.createDate,
-				       	});
+                  processName: thisdata.processName,
+                  adminName: thisdata.adminName,
+                  createDate: thisdata.createDate,
+                  remarks: thisdata.remarks
+                });
 				       };
 				    };
 					this.setState({

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

@@ -1607,7 +1607,8 @@ const NewService = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }
@@ -1867,8 +1868,12 @@ const NewService = Form.create()(
         this.refs.commodityPrice.focus();
         return false;
       }
-      if (!this.state.commodityQuantity) {
-        message.warning("请输入商品数量!");
+      let reg = /^([0]|[1-9][0-9]*)$/
+      if (
+        !this.state.commodityQuantity ||
+        !reg.test(this.state.commodityQuantity)
+      ) {
+        message.warning("请输入正确商品数量!");
         this.refs.commodityQuantity.focus();
         return false;
       }
@@ -1934,8 +1939,9 @@ const NewService = Form.create()(
         message.warning("金额不能为空!");
         return false;
       }
-      if (!this.state.commodityQuantity) {
-        message.warning("数量不能为空!");
+      let reg = /^([0]|[1-9][0-9]*)$/
+      if (!this.state.commodityQuantity || !reg.test(this.state.commodityQuantity)) {
+        message.warning("请输入正确商品数量!");
         return false;
       }
       if (!this.state.main) {

+ 2 - 1
js/component/manageCenter/order/orderNew/addorders.js

@@ -1391,7 +1391,8 @@ const Addorders = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

Datei-Diff unterdrückt, da er zu groß ist
+ 1254 - 77
js/component/manageCenter/order/orderNew/approveds.jsx


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

@@ -1819,7 +1819,7 @@ const MyService = Form.create()(
                   }}
                   disabled={this.state.selectedRowKeys.length != 1}
                 >
-                  查看开票详情
+                  查看开票记录
                 </Button>
                 <Button
                   type="primary"

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

@@ -513,7 +513,8 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

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

@@ -515,7 +515,8 @@ const checkOutsourcing = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -611,7 +611,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -688,7 +688,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -608,7 +608,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -554,7 +554,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -606,7 +606,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -601,7 +601,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 2 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -621,7 +621,8 @@ const contractChange = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

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

@@ -617,7 +617,8 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

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

@@ -1104,7 +1104,8 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

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

@@ -824,7 +824,8 @@ const outsourcingList = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

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

@@ -1584,7 +1584,8 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 processName: thisdata.processName,
                 adminName: thisdata.adminName,
-                createDate: thisdata.createDate
+                createDate: thisdata.createDate,
+                remarks: thisdata.remarks
               });
             }
           }

+ 5 - 4
js/component/manageCenter/project/project/projectQuery.jsx

@@ -414,10 +414,11 @@ const PaiDan = React.createClass({
 				       for(let i = 0; i < data.data.length; i++) {
 				       	let thisdata = data.data[i];
 				       	theArr.push({
-				       		processName:thisdata.processName,		
-				       		adminName:thisdata.adminName,		
-				       		createDate:thisdata.createDate,
-				       	});
+                  processName: thisdata.processName,
+                  adminName: thisdata.adminName,
+                  createDate: thisdata.createDate,
+                  remarks: thisdata.remarks
+                });
 				       };
 				    };
 					this.setState({

+ 5 - 4
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -518,10 +518,11 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 				       for(let i = 0; i < data.data.length; i++) {
 				       	let thisdata = data.data[i];
 				       	theArr.push({
-				       		processName:thisdata.processName,		
-				       		adminName:thisdata.adminName,		
-				       		createDate:thisdata.createDate,
-				       	});
+                  processName: thisdata.processName,
+                  adminName: thisdata.adminName,
+                  createDate: thisdata.createDate,
+                  remarks: thisdata.remarks
+                });
 				       };
 				    };
 					this.setState({