dev01 2 years ago
parent
commit
52d1879023

+ 1 - 1
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -463,7 +463,7 @@ class DetailedList extends Component {
   }
 
   changeList(arr) {
-    debugger;
+    //debugger;
     const newArr = [];
     this.state.columns.forEach((item) => {
       arr.forEach((val) => {

+ 1 - 1
js/component/manageCenter/customer/publicStatistics/index.jsx

@@ -320,7 +320,7 @@ class ProjecCount extends Component{
     }
 // 导出
     exportExec(){
-        debugger
+        //debugger
         let data = {
             clockStart:this.state.releaseDate[0],
             clockEnd:this.state.releaseDate[1],

+ 14 - 18
js/component/manageCenter/order/orderNew/addService.jsx

@@ -3494,20 +3494,18 @@ const NewService = Form.create()(
         message.warning("服务名称不匹配!");
         return false;
       }
-      if (this.state.displayFees === "block") {
-        if (this.state.officialCost === "") {
-          message.warning("请选择官费!");
-          return false;
-        }
-        debugger;
-        if (this.state.officialCost == "1") {
-          if (this.state.costReduction === "") {
-            message.warning("请选择费减!");
-            return false;
-          }
-          // 不含官费
-        }
-      }
+      // if (this.state.displayFees === "block") {
+      //   if (this.state.officialCost === "") {
+      //     message.warning("请选择官费!");
+      //     return false;
+      //   }
+      //   if (this.state.officialCost == "1") {
+      //     if (this.state.costReduction === "") {
+      //       message.warning("请选择费减!");
+      //       return false;
+      //     }
+      //   }
+      // }
       if (!this.state.commodityPrice) {
         message.warning("请输入金额!");
         this.refs.commodityPrice.focus();
@@ -7262,10 +7260,8 @@ const NewService = Form.create()(
                   >
                     <span style={{ color: "red", marginRight: "27px" }}>*</span>
                     <Radio.Group
-                      disabled={
-                        this.state.officialCost === "0" ||
-                        this.state.patentType === 1
-                      }
+                      //disabled={this.state.officialCost === "0" || this.state.patentType === 1}
+                      disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
                       value={this.state.costReduction}
                       onChange={(e) => {
                         this.setState({ costReduction: e.target.value });

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -154,7 +154,7 @@ const ActivityForm = Form.create()(React.createClass({
         };
     },
     intellectualChange(nextTargetKeys, direction, moveKeys) {
-        debugger
+        //debugger
         this.setState({ targetKeys: nextTargetKeys });
     },
     intellectualSelectChange(sourceSelectedKeys, targetSelectedKeys) {

+ 2 - 2
js/component/tools.js

@@ -1361,7 +1361,7 @@ module.exports = {
   },
   //合同进度
   getContractProgress: function (e) {
-    debugger
+    //debugger
     console.log(e);
     if (e) {
       let theType = "";
@@ -2054,7 +2054,7 @@ module.exports = {
   },
   // 咨询师以及咨询师经理审核内容显示
   shenghePeo(arr, status) {
-    debugger
+    //debugger
     if (status == 2) {
       arr = arr || [];
       let str = "咨询师(";