@@ -233,19 +233,18 @@ export default {
data.list.forEach(item => {
item.isEdit = false
item.isNew = false
- let array = item.inspectors.split(',')
- item.inspectorArray = [...array]
+ let arrayInspectors = item.inspectors.split(',')
+ item.inspectorArray = [...arrayInspectors]
+ let arrayReviewTime = item.reviewTime.split(' ')
+ item.reviewTime = arrayReviewTime[0]
});
- let array = item.reviewTime.split(' ')
- item.reviewTime = array[0]
- this.tableData = { ...data.list }
+ this.tableData = [...data.list]
} else {
this.tableData = []
}
-
} else {
this.$message.error(msg)
}
@@ -270,11 +269,13 @@ export default {
let teamId = row.placePatrolTeamId
await this.loadInspectors(teamId, tableIndex)
- let params = JSON.parse(JSON.stringify(row))
- params.isEdit = true
- params.isNew = false
- params.inspectorArray = params.inspectors.split(',')
- this.tableData[tableIndex] = { ...params }
+ let rowData = JSON.parse(JSON.stringify(row))
+ rowData.isEdit = true
+ rowData.isNew = false
+ rowData.inspectorArray = rowData.inspectors.split(',')
+
+ console.log(rowData)
+ this.$set(this.tableData, tableIndex, rowData)
},
async handleComfirm (row, tableIndex) {
@@ -293,21 +294,23 @@ export default {
async addReview (row, tableIndex) {
let url = "/gov/org/placepatrolreviewrecord/add"
+ if (row.placePatrolReviewRecordId) {
+ url = "/gov/org/placepatrolreviewrecord/edit"
+ }
let params = JSON.parse(JSON.stringify(row))
params.inspectors = params.inspectorArray.join(',')
+ params.reviewTime = params.reviewTime + ' 00:00:00'
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.$message({
- type: 'success',
- message: '操作成功'
- })
+ let array = data.reviewTime.split(' ')
+ data.reviewTime = array[0]
+ data.isEdit = false
+ data.isNew = false
- params.isEdit = false
- params.isNew = false
- this.$set(this.tableData, tableIndex, params)
+ this.$set(this.tableData, tableIndex, data)
} else {
@@ -358,8 +361,7 @@ export default {
async deleteRecord (row, tableIndex) {
- const url = "/gov/org/placepatrolrecord/delreview"
- // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
+ const url = "/gov/org/placepatrolreviewrecord/del"
let params = {
placePatrolReviewRecordId: row.placePatrolReviewRecordId
@@ -368,10 +370,10 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.$message({
- type: "success",
- message: "删除成功"
- });
+ // this.$message({
+ // type: "success",
+ // message: "删除成功"
+ // });
this.tableData.splice(tableIndex, 1);
} else {
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
index db819678..2a6252fe 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -113,7 +113,7 @@
v-model="item.name"
class="item_width_3"
clearable
- placeholder="请输入电话">
+ placeholder="请输入姓名">
{{item.name}}
@@ -261,15 +261,15 @@ export default {
this.memberList.splice(index, 1)
},
async addTeam () {
- // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- // if (regPhone.test(this.formData.mobile) === false) {
- // this.btnDisable = false
- // this.$message({
- // type: 'warning',
- // message: '请输入正确的手机号码'
- // })
- // return false;
- // }
+ const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+ if (regPhone.test(this.formData.mobile) === false) {
+ this.btnDisable = false
+ this.$message({
+ type: 'warning',
+ message: '请输入正确的手机号码'
+ })
+ return false;
+ }
if (this.formData.gridIdArray.length > 0) {
this.formData.gridIds = this.formData.gridIdArray.join(',')
} else {
@@ -287,6 +287,7 @@ export default {
type: 'warning',
message: msgMember
})
+ this.btnDisable = false
return false
}
@@ -324,11 +325,18 @@ export default {
if (this.memberList.length === 0) {
return '成员列表不能为空'
}
- this.memberList.forEach(element => {
- if (!element.mobile || !element.name) {
+
+ for (let item of this.memberList) {
+ if (!item.mobile || !item.name) {
return '成员的姓名和电话不能为空'
+ } else {
+ const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+ if (regPhone.test(item.mobile) === false) {
+ return '请输入正确的手机号码';
+ }
}
- });
+ }
+
return ''
},