Merge pull request 'projects/mesxc-zjl' (#218) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #218
This commit is contained in:
		@@ -383,9 +383,9 @@ export default {
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    // 完成,终止,作废
 | 
					    // 完成,终止,作废
 | 
				
			||||||
    handleEditStatus(val, tip, status) {
 | 
					    handleEditStatus(val, tip, status) {
 | 
				
			||||||
      console.log(val)
 | 
					      let _this = this
 | 
				
			||||||
      if (val.orderIdNum > 0) {// 有下级订单
 | 
					      if (val.orderIdNum > 0) {// 有下级订单
 | 
				
			||||||
        this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
 | 
					        _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
 | 
				
			||||||
          type: 'warning',
 | 
					          type: 'warning',
 | 
				
			||||||
          distinguishCancelAndClose: true,
 | 
					          distinguishCancelAndClose: true,
 | 
				
			||||||
          confirmButtonText: '同步',
 | 
					          confirmButtonText: '同步',
 | 
				
			||||||
@@ -393,26 +393,26 @@ export default {
 | 
				
			|||||||
        }).then(function() {
 | 
					        }).then(function() {
 | 
				
			||||||
          console.log('同步')
 | 
					          console.log('同步')
 | 
				
			||||||
          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
 | 
					          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
 | 
				
			||||||
            this.getList();
 | 
					            _this.getList();
 | 
				
			||||||
            this.$modal.msgSuccess("操作成功");
 | 
					            _this.$modal.msgSuccess("操作成功");
 | 
				
			||||||
          })
 | 
					          })
 | 
				
			||||||
        }).catch(action => {
 | 
					        }).catch(action => {
 | 
				
			||||||
          if (action === 'cancel') {
 | 
					          if (action === 'cancel') {
 | 
				
			||||||
            console.log('不同步')
 | 
					            console.log('不同步')
 | 
				
			||||||
            groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
 | 
					            groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
 | 
				
			||||||
              this.getList();
 | 
					              _this.getList();
 | 
				
			||||||
              this.$modal.msgSuccess("操作成功");
 | 
					              _this.$modal.msgSuccess("操作成功");
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
          }else {
 | 
					          }else {
 | 
				
			||||||
            return console.log('关闭')
 | 
					            return console.log('关闭')
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
      }else{// 无下级订单
 | 
					      }else{// 无下级订单
 | 
				
			||||||
        this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
 | 
					        _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
 | 
				
			||||||
          return groupOrderStatusSet({ id: val.id, status: status})
 | 
					          return groupOrderStatusSet({ id: val.id, status: status})
 | 
				
			||||||
        }).then(() => {
 | 
					        }).then(() => {
 | 
				
			||||||
          this.getList();
 | 
					          _this.getList();
 | 
				
			||||||
          this.$modal.msgSuccess("操作成功");
 | 
					          _this.$modal.msgSuccess("操作成功");
 | 
				
			||||||
        }).catch(() => {});
 | 
					        }).catch(() => {});
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user