Browse Source

删除供应商信息,会删除对应的付款节点

mentoswzq 4 years ago
parent
commit
8b10e2f5f5

+ 1 - 1
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -164,7 +164,7 @@ class DepartmentStatistics extends Component{
     }
 
     componentDidMount() {
-        this.loadData();
+        // this.loadData();
         this.selectSuperId();
     }
 

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

@@ -2002,7 +2002,7 @@ const checkOutsourcing = Form.create()(
               </Spin>
             </Form>
           </Modal>
-          <Modal
+          {this.state.rizhivisible ? <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
             width="800px"
@@ -2022,7 +2022,7 @@ const checkOutsourcing = Form.create()(
                 />
               </Spin>
             </div>
-          </Modal>
+          </Modal> : <div/>}
         </div>
       )
     },

+ 63 - 103
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -814,7 +814,7 @@ const outsourcingPro = Form.create()(
       );
     },
     thirdTable(id){
-      $.ajax({
+      let ajaxObj = $.ajax({
         method: 'get',
         dataType: 'json',
         crossDomain: false,
@@ -859,7 +859,10 @@ const outsourcingPro = Form.create()(
               loading: false,
             })
           }.bind(this)
-      )
+      );
+      this.setState({
+        selectCompanyAjaxObj: ajaxObj
+      })
     },
     // 获取csort下的数据
     getCsortData(cSort) {
@@ -872,7 +875,7 @@ const outsourcingPro = Form.create()(
       })
     },
     payNodeTable(id) {
-      $.ajax({
+      let ajaxObj = $.ajax({
         method: 'get',
         dataType: 'json',
         crossDomain: false,
@@ -927,13 +930,17 @@ const outsourcingPro = Form.create()(
             })
           }.bind(this)
       )
+      this.setState({
+        payNodeListAjaxObj: ajaxObj
+      })
     },
     waiDetail() {
-      let url = window.location.href.substring(7)
+      let url = window.location.href.substring(7);
+      let ajaxObj = null;
       this.setState({
         loading: true,
       })
-      $.ajax({
+      ajaxObj = $.ajax({
         method: 'get',
         dataType: 'json',
         crossDomain: false,
@@ -970,30 +977,34 @@ const outsourcingPro = Form.create()(
                 })
               }else{
                 this.setState({
-                  startType: data.data.startType, //类型
-                  patentType: data.data.patentType, //专利类型
-                  patentNameType: data.data.patentNameType, //专利名称类型
-                  patentName: data.data.patentName, //专利名称
-                  outsourceRemarks: data.data.outsourceRemarks,
-                  remarks: data.data.remarks,
-                  companyName: data.data.companyName,
-                  amount: data.data.amount,
-                  mid: data.data.id,
-                  unitPrice: data.data.unitPrice,
-                  refundStatus: data.data.refundStatus,
-                  unitNumber: data.data.unitNumber,
-                  pictureUrl: data.data.pictureUrl
-                      ? splitUrl(
-                          data.data.pictureUrl,
-                          ',',
-                          globalConfig.avatarHost + '/upload',
-                          url
-                      )
-                      : [], //图片地址
-                  createTimes: data.data.createTimes,
-                  auditTimes: data.data.auditTimes,
+                  oldInfor: {}
                 })
               }
+
+              this.setState({
+                startType: data.data.startType, //类型
+                patentType: data.data.patentType, //专利类型
+                patentNameType: data.data.patentNameType, //专利名称类型
+                patentName: data.data.patentName, //专利名称
+                outsourceRemarks: data.data.outsourceRemarks,
+                remarks: data.data.remarks,
+                companyName: data.data.companyName,
+                amount: data.data.amount,
+                mid: data.data.id,
+                unitPrice: data.data.unitPrice,
+                refundStatus: data.data.refundStatus,
+                unitNumber: data.data.unitNumber,
+                pictureUrl: data.data.pictureUrl
+                    ? splitUrl(
+                        data.data.pictureUrl,
+                        ',',
+                        globalConfig.avatarHost + '/upload',
+                        url
+                    )
+                    : [], //图片地址
+                createTimes: data.data.createTimes,
+                auditTimes: data.data.auditTimes,
+              })
             } else if (data.error && data.error.length) {
               message.warning(data.error[0].message)
             } else if (!data.data) {
@@ -1002,7 +1013,10 @@ const outsourcingPro = Form.create()(
               })
             }
           }.bind(this)
-      )
+      );
+      this.setState({
+        orderDtailsAjaxObj: ajaxObj
+      })
     },
     tableRowClick(record) {
       this.setState(
@@ -1015,10 +1029,9 @@ const outsourcingPro = Form.create()(
           splitId: record.splitId, //拆分序号
           splitStatus: record.splitStatus, //0未拆分 1已拆分
           splitSuper: record.splitSuper,  //拆分前项目编号
-
-        },
-        () => {
-          console.log(record);
+          orderNo: record.orderNo,
+        }, () => {
+          this.waiDetail();
         }
       );
       this.xiangqing(record.orderNo);
@@ -1031,74 +1044,6 @@ const outsourcingPro = Form.create()(
       this.payNodeTable(record.tid);
       // 获取Csort
       this.getCsortData(localStorage.getItem('cSort'))
-      let url = window.location.href.substring(7);
-
-      $.ajax({
-        method: "get",
-        dataType: "json",
-        crossDomain: false,
-        url:
-          globalConfig.context + "/api/admin/outsourceOrg/orderOutsourceDtails",
-        data: {
-          orderNo: record.orderNo,
-          tid: record.tid,
-        },
-        success: function (data) {
-          if (data.error.length || data.data.list == "") {
-            if (data.error && data.error.length) {
-              message.warning(data.error[0].message);
-            }
-          } else {
-            let thisdata = data.data;
-            if(data.data.unitNumber){
-              this.setState({
-                oldInfor: {
-                  companyName:thisdata.companyName,
-                  unitPrice:thisdata.unitPrice,
-                  unitNumber:thisdata.unitNumber,
-                  amount:thisdata.amount,
-                  outsourceRemarks:thisdata.outsourceRemarks,
-                  pictureUrl: data.data.pictureUrl
-                      ? splitUrl(
-                          data.data.pictureUrl,
-                          ',',
-                          globalConfig.avatarHost + '/upload',
-                          url
-                      )
-                      : [], //图片地址
-                }
-              })
-            }else{
-              this.setState({
-                id: thisdata.id,
-                orderNo: thisdata.orderNo,
-                createTimes: thisdata.createTimes,
-                auditTimes: thisdata.auditTimes,
-                remarks: thisdata.remarks,
-                pictureUrl: thisdata.pictureUrl
-                    ? splitUrl(
-                        thisdata.pictureUrl,
-                        ",",
-                        globalConfig.avatarHost + "/upload"
-                    )
-                    : [], //图片地址
-                amount: thisdata.amount,
-                refundStatus: thisdata.refundStatus,
-                companyName: thisdata.companyName,
-                outsourceRemarks: thisdata.outsourceRemarks,
-                unitNumber: thisdata.unitNumber,
-                unitPrice: thisdata.unitPrice,
-              });
-            }
-          }
-        }.bind(this),
-      }).always(
-        function () {
-          this.setState({
-            loading: false,
-          });
-        }.bind(this)
-      );
     },
     //页面加载函数
     componentWillMount() {
@@ -1476,7 +1421,22 @@ const outsourcingPro = Form.create()(
             {this.state.visible ? <Modal
               maskClosable={false}
               visible={this.state.visible}
-              onCancel={this.cancel}
+              onCancel={()=>{
+                this.state.orderDtailsAjaxObj && this.state.orderDtailsAjaxObj.abort();
+                this.state.payNodeListAjaxObj && this.state.payNodeListAjaxObj.abort();
+                this.state.selectCompanyAjaxObj && this.state.selectCompanyAjaxObj.abort();
+                this.setState({
+                  visible: false,
+                  remarks: undefined,
+                  activeKey: "1",
+                  oldInfor: {},
+
+                  thirdInfoList: [],
+                  payNodeList: [],
+                  orderNo: '',
+                  tid: '',
+                });
+              }}
               width="900px"
               title={""}
               footer=""
@@ -2066,7 +2026,7 @@ const outsourcingPro = Form.create()(
                 </TabPane>
               </Tabs>
             </Modal> : <div/>}
-            <Modal
+            {this.state.rizhivisible ? <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -2086,7 +2046,7 @@ const outsourcingPro = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> : <div/>}
           </div>
         </div>
       );

+ 40 - 13
js/component/manageCenter/project/task/myTask.jsx

@@ -3060,6 +3060,33 @@ const Task = React.createClass({
   },
   // 删除供应商信息
   confirmDeletNew(index,resolve=()=>{},reject=()=>{}) {
+    let arr = this.state.payNodeList.filter((v)=>{
+      return v.companyName === index.companyName
+    });
+    let _this = this;
+    if(arr.length > 0){
+      confirm({
+        title: '确定要删除此供应商信息吗?',
+        content: '此供应商存在'+arr.length+'条付款节点信息,删除后对应的付款节点也会一起删除',
+        onOk() {
+          return new Promise((resolve, reject) => {
+            let str = '';
+            arr.map((value)=>{
+              str+=value.id+',';
+            })
+            _this.payNodeConfirmDeletNew({
+              id: str
+            });
+            _this.handleConfirmDelet(index,resolve,reject)
+          }).catch(() => console.log('Oops errors!'));
+        },
+        onCancel() {},
+      });
+    }else{
+      this.handleConfirmDelet(index,resolve,reject)
+    }
+  },
+  handleConfirmDelet(index,resolve=()=>{},reject=()=>{}) {
     this.setState({
       loading: true,
       ThirdListVisible: false,
@@ -3083,19 +3110,19 @@ const Task = React.createClass({
         id: id,
       },
     }).done(
-      function (data) {
-        this.setState({
-          loading: false,
-        })
-        if (!data.error.length) {
-          message.success('删除成功!')
-          this.thirdTable(this.state.tid)
-          resolve();
-        } else {
-          message.warning(data.error[0].message)
-          reject();
-        }
-      }.bind(this)
+        function (data) {
+          this.setState({
+            loading: false,
+          })
+          if (!data.error.length) {
+            message.success('删除成功!')
+            this.thirdTable(this.state.tid)
+            resolve();
+          } else {
+            message.warning(data.error[0].message)
+            reject();
+          }
+        }.bind(this)
     )
   },
   // 删除付款节点

+ 12 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1608,6 +1608,12 @@ const Task = React.createClass({
                     pictureUrl={this.state.contractPictureUrl}
                   />
                 </Spin> : <div/>}
+                <OrderRiZi
+                    dataSourcerizhi={this.state.dataSourceY}
+                    closeOrderLog={this.closeOrderLog}
+                    visible={this.state.avisible}
+                    loading={this.state.loading}
+                />
               </TabPane>
             ) : (
               ""
@@ -2089,6 +2095,12 @@ const Task = React.createClass({
                     pictureUrl={this.state.contractPictureUrl}
                   />
                 </Spin> : <div/>}
+                <OrderRiZi
+                    dataSourcerizhi={this.state.dataSourceY}
+                    closeOrderLog={this.closeOrderLog}
+                    visible={this.state.avisible}
+                    loading={this.state.loading}
+                />
               </TabPane>
             ) : (
               ""