|
@@ -450,9 +450,8 @@ export default {
|
|
.then((response) => {
|
|
.then((response) => {
|
|
for (var i = 0; i < response.records.length; i++) {
|
|
for (var i = 0; i < response.records.length; i++) {
|
|
if (response.records[i].addressUrl != null) {
|
|
if (response.records[i].addressUrl != null) {
|
|
- response.records[i].addressUrlArray = response.records[
|
|
|
|
- i
|
|
|
|
- ].addressUrl.split(',')
|
|
|
|
|
|
+ response.records[i].addressUrlArray =
|
|
|
|
+ response.records[i].addressUrl.split(',')
|
|
} else {
|
|
} else {
|
|
response.records[i].addressUrlArray = []
|
|
response.records[i].addressUrlArray = []
|
|
}
|
|
}
|
|
@@ -590,29 +589,14 @@ export default {
|
|
// deletecontract(){},
|
|
// deletecontract(){},
|
|
//删除
|
|
//删除
|
|
handleDelete(row) {
|
|
handleDelete(row) {
|
|
- console.log(row.deliverType,"sjkdsjkdj")
|
|
|
|
- if (row.deliverType == 1 ) {
|
|
|
|
- //删除对应的临时库提示框
|
|
|
|
- this.$confirm('删除该合同将同时永久删除合同对应的临时库相关数据,是否确定删除?',{
|
|
|
|
- confirmButtonText:'删除',
|
|
|
|
- cancelButtonText: '取消',
|
|
|
|
- })
|
|
|
|
- .then(() => {
|
|
|
|
- deletecontract({ id: row.id })
|
|
|
|
- .toPromise()
|
|
|
|
- .then((response) => {
|
|
|
|
- this.$notify.success({
|
|
|
|
- title: '成功',
|
|
|
|
- message: '删除成功',
|
|
|
|
- })
|
|
|
|
- this.getList()
|
|
|
|
- })
|
|
|
|
- .catch((response) => {
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- })
|
|
|
|
|
|
+ var text = ''
|
|
|
|
+ if (row.deliverType == 1) {
|
|
|
|
+ text =
|
|
|
|
+ '删除该合同将同时永久删除合同对应的临时库相关数据,是否确定删除?'
|
|
} else {
|
|
} else {
|
|
- this.$confirm(`合同删除后不可恢复,是否继续删除?`, '提示', {
|
|
|
|
|
|
+ text = '合同删除后不可恢复,是否继续删除?'
|
|
|
|
+ }
|
|
|
|
+ this.$confirm(text, '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
@@ -627,15 +611,11 @@ export default {
|
|
})
|
|
})
|
|
this.getList()
|
|
this.getList()
|
|
})
|
|
})
|
|
- .catch((response) => {
|
|
|
|
-
|
|
|
|
- })
|
|
|
|
|
|
+ .catch((response) => {})
|
|
})
|
|
})
|
|
.catch(() => {
|
|
.catch(() => {
|
|
return false
|
|
return false
|
|
})
|
|
})
|
|
- }
|
|
|
|
-
|
|
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|