diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 4ccd172..9b0d791 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
"type" : "uniCloud"
},
{
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/api/workPlan/dayPlan.js b/api/workPlan/dayPlan.js
index 9e52002..d22c715 100644
--- a/api/workPlan/dayPlan.js
+++ b/api/workPlan/dayPlan.js
@@ -152,6 +152,14 @@ export function getImportMonthPlanApi(data) {
data: data
})
}
+// 获取人员信息
+export function getPersonInfoApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getSubPeople',
+ method: 'post',
+ data: data
+ })
+}
/**
* 生产月计划
diff --git a/manifest.json b/manifest.json
index 28c8e18..1b5337f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -90,6 +90,13 @@
"system" : {
"__platform__" : [ "ios", "android" ]
}
+ },
+ "maps" : {
+ "amap" : {
+ "name" : "",
+ "appkey_ios" : "",
+ "appkey_android" : ""
+ }
}
},
"orientation" : [ "portrait-primary" ],
diff --git a/pages/workPlan/custody/index.vue b/pages/workPlan/custody/index.vue
index 514d5fb..81938a2 100644
--- a/pages/workPlan/custody/index.vue
+++ b/pages/workPlan/custody/index.vue
@@ -448,7 +448,7 @@ export default {
// 获取定位位置信息
uni.getLocation({
type: 'gcj02', // 默认为 gcj02，可以选择 'wgs84'
- altitude: true,
+ // altitude: true,
geocode: true,
success: res => {
console.log(res, '位置信息--')
@@ -462,7 +462,7 @@ export default {
},
fail: err => {
console.error('获取位置失败:', err)
- uni.showToast({ title: '位置获取失败，请稍后尝试',icon:'none' })
+ uni.showToast({ title: '位置获取失败，请稍后尝试', icon: 'none' })
}
})
diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue
index 3170e6a..c333323 100644
--- a/pages/workPlan/dayPlan/inf-index.vue
+++ b/pages/workPlan/dayPlan/inf-index.vue
@@ -193,7 +193,7 @@
v-if="f.items_type === 'sel'"
>
-
+
- {{ item.zynr ? item.zynr : '请选择' }}
+ 请选择
+
@@ -309,7 +316,7 @@
:required="f.required"
>
+
+
+
+
+
+
+
+ 请选择
+
+
+
+
+
@@ -731,6 +764,13 @@ export default {
},
{ form_label: '风险类别', items_type: 'ipt', required: true, name: 'fxlb' },
+ {
+ form_label: '风险管控层级',
+ items_type: 'sel',
+ name: 'gkcj',
+ required: true,
+ options: []
+ },
{ form_label: '现场负责人', items_type: 'ipt', required: true, name: 'xcfzr' },
{ form_label: '全体人数', items_type: 'ipt', required: true, name: 'qtrs', isType: 'number' },
{ form_label: '公司职工人数', items_type: 'ipt', required: true, name: 'zgs', isType: 'number' },
@@ -740,13 +780,6 @@ export default {
{ form_label: 'SIP编号', items_type: 'area', required: true, name: 'sipnum' },
{ form_label: '责任管控人', items_type: 'area', required: true, name: 'sipfzr' },
- {
- form_label: '风险管控层级',
- items_type: 'sel',
- name: 'gkcj',
- required: true,
- options: []
- },
{ form_label: '中等以上风险作业管控人等', items_type: 'area', required: false, name: 'gkr' }
],
@@ -872,7 +905,9 @@ export default {
planDate: '',
keyword: ''
},
- workContentList: []
+ workContentList: [],
+ currenPersonIndex: 0,
+ currenPersonIndexNew: 0
}
},
mounted() {
@@ -924,8 +959,17 @@ export default {
userId += e.idNumber + '@'
})
- this_.monthParams[0].selectuser = userId.slice(0, -1)
- this_.monthParams[0].rys = '1'
+ this_.monthParams[this_.currenPersonIndex].selectuser = userId.slice(0, -1)
+
+ this_.monthParams[this_.currenPersonIndex].rys =
+ this_.monthParams[this_.currenPersonIndex].selectuser.split('@').length
+
+ if (activeIndex == '查看报表') {
+ this_.monthDataList[this_.currenPersonIndexNew].selectuser = userId.slice(0, -1)
+
+ this_.monthDataList[this_.currenPersonIndexNew].rys =
+ this_.monthDataList[this_.currenPersonIndexNew].selectuser.split('@').length
+ }
console.log(userNameStr, userId)
})
@@ -1049,8 +1093,11 @@ export default {
state: ''
}
console.log('saveParams保存参数', saveParams)
-
+ uni.showLoading({
+ title: '正在提交，请勿重复点击'
+ })
const result = await setMonthPlanApi(saveParams)
+ uni.hideLoading()
if (result.res == 1) {
uni.showToast({ icon: 'none', title: '保存成功！' })
setTimeout(() => {
@@ -1429,7 +1476,11 @@ export default {
}
console.log('saveParams保存参数', saveParams)
+ uni.showLoading({
+ title: '正在提交，请勿重复点击'
+ })
const result = await setMonthPlanApi(saveParams)
+ uni.hideLoading()
if (result.res == 1) {
uni.showToast({ icon: 'none', title: '保存成功！' })
this.$refs.popupAuditing.close()
@@ -1610,7 +1661,7 @@ export default {
this.monthParams = res.obj
}
},
- onAddSubUserInfo(name) {
+ onAddSubUserInfo(name, index) {
if (name == 'rys') {
// console.log('跳转选人----') proName
@@ -1618,7 +1669,57 @@ export default {
uni.showToast({ icon: 'none', title: '请选择工程！' })
return
}
- uni.navigateTo({ url: `/pages/workPlan/dayPlan/sub-user/index?proName=${this.projectName}` })
+ this.currenPersonIndex = index
+
+ let personList = []
+ this.monthParams.forEach(e => {
+ personList.push(e.selectuser)
+ })
+
+ const personInfo = {
+ personList
+ }
+
+ console.log('personList', personList)
+ uni.navigateTo({
+ url: `/pages/workPlan/dayPlan/sub-user/index?proName=${this.projectName}&personList=${JSON.stringify(
+ personInfo
+ )}&index=${index}`
+ })
+ }
+ },
+ onAddSubUserInfoNew(name, index) {
+ let proName = ''
+ this.projectListSel.forEach(e => {
+ if (e.value == this.queryDataParams.proId) {
+ proName = e.text
+ }
+ })
+ if (name == 'rys') {
+ // console.log('跳转选人----') proName
+
+ // if (!this.projectId) {
+ // uni.showToast({ icon: 'none', title: '请选择工程！' })
+ // return
+ // }
+ this.currenPersonIndexNew = index
+
+ let personList = []
+ this.monthDataList.forEach(e => {
+ console.log(e.selectuser, 'e.selectusere.selectusere.selectuser')
+ personList.push(e.selectuser)
+ })
+
+ const personInfo = {
+ personList
+ }
+
+ console.log('personList', personList)
+ uni.navigateTo({
+ url: `/pages/workPlan/dayPlan/sub-user/index?proName=${proName}&personList=${JSON.stringify(
+ personInfo
+ )}&index=${index}`
+ })
}
},
onSelectWorkInfo(index) {
diff --git a/pages/workPlan/dayPlan/pro-index.vue b/pages/workPlan/dayPlan/pro-index.vue
index f209f04..0e32323 100644
--- a/pages/workPlan/dayPlan/pro-index.vue
+++ b/pages/workPlan/dayPlan/pro-index.vue
@@ -3,7 +3,7 @@
-
-
+
-
+
+ -->
- {{ item.zynr ? item.zynr : '请选择' }}
+ 请选择
+
diff --git a/pages/workPlan/dayPlan/sub-user/index.vue b/pages/workPlan/dayPlan/sub-user/index.vue
index 2af9d5a..638b85c 100644
--- a/pages/workPlan/dayPlan/sub-user/index.vue
+++ b/pages/workPlan/dayPlan/sub-user/index.vue
@@ -74,7 +74,7 @@
-
+
+
+
+
@@ -140,6 +175,7 @@ export default {
},
subUserList: [],
subUserListAll: [],
+ subUserListTemp: [],
teamList: [],
totalAmount: 0,
activeList: [],
@@ -150,7 +186,12 @@ export default {
{ title: '临时人员', id: '2' },
{ title: '暂退人员', id: '3' }
],
- tempUserInfoList: []
+ tempUserInfoList: [],
+ personList: [],
+ currentIndex: 0,
+ fixedPersonList: [],
+ tempPersonList: [],
+ returnPersonList: []
}
},
methods: {
@@ -174,29 +215,102 @@ export default {
// }
const res = await getSubUserInfoListApi(this.subQueryParams)
- // console.log('分包人员信息', res)
- this.subUserListAll = res.obj
+ console.log('人员数据---参数', this.subQueryParams)
+ console.log('人员数据---', res)
+ // 1.先存储所有人员
+ this.subUserListAll = res.obj
+ this.subUserList = []
this.subUserListAll.forEach(e => {
this.$set(e, 'isChecked', false)
})
+ // 判断选择状态
if (this.activeTypeList.length == 1) {
- const isActiveType = this.activeTypeList[0]
-
- if (isActiveType === 1) {
- if (this.tempUserInfoList.length == 0) {
- this.subUserList = []
+ // console.log('选择状态--')
+ if (this.activeTypeList[0] === 1) {
+ // 过滤已选择的数据
+ if (this.subUserListTemp.length > 0) {
+ // this.subUserList = this.subUserListTemp.filter(e => e.isAllChecked == true)
+ this.subUserListAll.forEach(e => {
+ this.subUserListTemp.forEach(j => {
+ if (e.idNumber == j.idNumber) {
+ this.subUserList.push(JSON.parse(JSON.stringify(j)))
+ }
+ })
+ })
} else {
- this.subUserList = this.tempUserInfoList
+ this.subUserList = []
}
}
- if (isActiveType === 2) {
- // 未选择
+ if (this.activeTypeList[0] == 2) {
+ console.log('查询未选择的数据')
+ // 过滤未选择的数据
+ // if (this.subUserListTemp.length > 0) {
+ // this.subUserList = this.subUserListTemp.filter(e => e.isAllChecked == false)
+ // }
+ if (this.subUserListTemp.length > 0) {
+ this.subUserListAll.forEach(e => {
+ this.subUserListTemp.forEach(j => {
+ if (e.idNumber != j.idNumber) {
+ this.subUserList.push(JSON.parse(JSON.stringify(e)))
+ }
+ })
+ })
+ } else {
+ this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll))
+ }
+ }
+ } else {
+ // 然后处理选中状态
+ // if(this.subUserListTemp.length > 0) {
+ // this.subUserListAll.forEach((e)=>{
+ // his.subUserListTemp.forEach((j)=>{
+
+ // })
+ // })
+ // }
+
+ console.log('全部状态---')
+ if (this.subUserListTemp.length == 0) {
+ if (this.personList.length > 0) {
+ this.subUserListAll.forEach(e => {
+ if (this.personList[this.currentIndex].includes(e.idNumber)) {
+ e.isChecked = true
+ this.subUserListTemp.push(JSON.parse(JSON.stringify(e)))
+ }
+ })
+ let tempArray = this.personList.filter((e, index) => index != this.currentIndex)
+ if (tempArray.length > 0) {
+ this.subUserList = []
+ // this.subUserListTemp
+ tempArray.forEach(e => {
+ this.subUserListAll.forEach(j => {
+ if (!e.includes(j.idNumber)) {
+ // this.subUserList.push(j)
+ this.subUserList.push(JSON.parse(JSON.stringify(j)))
+ // this.subUserListTemp.push(JSON.parse(JSON.stringify(j)))
+ }
+ })
+ })
+ } else {
+ this.subUserList = JSON.parse(JSON.stringify(this.subUserListAll))
+ // this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserListAll))
+ }
+ }
+ } else {
+ this.subUserListAll.forEach(e => {
+ this.subUserListTemp.forEach(j => {
+ if (e.idNumber == j.idNumber) {
+ this.subUserList.push(JSON.parse(JSON.stringify(j)))
+ } else {
+ this.subUserList.push(JSON.parse(JSON.stringify(e)))
+ }
+ })
+ })
}
}
- this.subUserList = this.subUserListAll.slice(0, 10)
- this.totalAmount = res.obj.length
+ this.totalAmount = this.subUserList.length
},
onPagination(e) {
this.subUserList = []
@@ -212,11 +326,22 @@ export default {
this.subUserListAll.forEach(e => {
if (e.idNumber == item.idNumber) {
e.isChecked = !eisChecked
-
throw new Error()
}
})
} catch (error) {}
+
+ this.subUserListTemp = []
+ this.subUserList.forEach(e => {
+ if (e.isChecked) {
+ this.subUserListTemp.push(JSON.parse(JSON.stringify(e)))
+ }
+ })
+ // if (this.subUserList.every(e => e.isChecked == true)) {
+ // this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserList))
+ // } else {
+ // this.subUserListTemp = []
+ // }
},
async getUserTeamInfoList() {
const res = await getUserTeamInfoListApi({ proName: this.subQueryParams.proName })
@@ -282,42 +407,81 @@ export default {
},
// 提交
onUserSubmit() {
- const isSelect = this.subUserListAll.some(e => e.isChecked === true)
-
+ const isSelect = this.subUserList.some(e => e.isChecked === true)
if (!isSelect) {
uni.showToast({
title: '请勾选人员数据',
icon: 'none'
})
-
return
} else {
- const userInfo = this.subUserListAll.filter(e => e.isChecked === true)
- uni.navigateBack({
- delta: 1,
- success() {
- uni.$emit('updateUser', userInfo)
+ this.subUserList.forEach(e => {
+ console.log('选择的每一项', e)
+
+ if (e.isChecked) {
+ if (e.userState == 1) {
+ // 固定人员
+ this.fixedPersonList.push(e.name)
+ }
+ if (e.userState == 2) {
+ // 临时人员
+ this.tempPersonList.push(e.name)
+ }
+ if (e.userState == 3) {
+ // 暂退人员
+ this.returnPersonList.push(e.name)
+ }
}
})
+ this.$refs.popupPerson.open('center')
}
},
+ onCancelBtn() {
+ this.$refs.popupPerson.close()
+ },
+ onSubmitBtn() {
+ const userInfo = this.subUserList.filter(e => e.isChecked === true)
+ uni.navigateBack({
+ delta: 1,
+ success() {
+ uni.$emit('updateUser', userInfo)
+ }
+ })
+ },
// 全选
onCheckBoxChangeAll() {
this.subUserList.forEach(e => {
e.isChecked = !e.isChecked
})
+
+ if (this.subUserList.every(e => e.isChecked == true)) {
+ this.subUserListTemp = JSON.parse(JSON.stringify(this.subUserList))
+ } else {
+ this.subUserListTemp = []
+ }
+
+ // this.subUserListTemp.forEach(e => {
+ // e.isChecked = !e.isChecked
+ // })
}
},
onLoad(options) {
this.subQueryParams.proName = options.proName
+
+ this.personList = JSON.parse(options.personList).personList
+
+ // console.log('options.index', options.index)
+ this.currentIndex = options.index
+
+ // console.log('this.personList', options.personList, this.personList)
this.getSubUserInfoList()
this.getUserTeamInfoList()
},
computed: {
onAlreadySelect() {
let amount = 0
- if (this.subUserListAll.length > 0) {
- this.subUserListAll.forEach(e => {
+ if (this.subUserList.length > 0) {
+ this.subUserList.forEach(e => {
if (e.isChecked) {
amount++
}
@@ -327,8 +491,18 @@ export default {
},
isAllChecked() {
let isCheckedAll = false
- if (this.subUserListAll.length > 0) {
- isCheckedAll = this.subUserListAll.every(e => e.isChecked === true)
+ if (this.subUserList.length > 0) {
+ isCheckedAll = this.subUserList.every(e => e.isChecked === true)
+
+ // if (isCheckedAll) {
+ // this.subUserListTemp.forEach(e => {
+ // e.isChecked = true
+ // })
+ // } else {
+ // this.subUserListTemp.forEach(e => {
+ // e.isChecked = false
+ // })
+ // }
}
return isCheckedAll
}
@@ -402,9 +576,12 @@ export default {
border-top: none;
view {
padding: 15rpx 0;
- text-align: center;
+ // text-align: center;
border-left: 1px solid #ccc;
font-size: 22rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
}
.tb-content-box view:first-child {
@@ -508,4 +685,64 @@ export default {
color: #fff !important;
}
}
+
+.popup-person {
+ width: 90vw;
+ background-color: #fff;
+
+ .title {
+ padding: 26rpx;
+ text-align: center;
+ font-size: 36rpx;
+ letter-spacing: 2rpx;
+ border-bottom: 1px solid #ccc;
+ }
+
+ .info {
+ padding: 20rpx;
+ color: #c95645;
+ font-size: 28rpx;
+ }
+
+ .title_1 {
+ text-align: center;
+ font-size: 28rpx;
+ padding: 12rpx 0;
+ border-bottom: 1px solid #ccc;
+ }
+
+ .person-list {
+ height: 30vh;
+ }
+ .person-list view {
+ padding: 8rpx 12rpx;
+
+ text {
+ padding: 8rpx;
+ }
+ }
+
+ .person-btn {
+ display: flex;
+ justify-content: center;
+ padding: 16rpx 0;
+ }
+ .person-btn view {
+ width: 138rpx;
+ height: 58rpx;
+ line-height: 58rpx;
+ text-align: center;
+ border-radius: 12rpx;
+ }
+
+ .person-btn view:first-child {
+ background-color: #dfdfdf;
+ color: #013678;
+ }
+ .person-btn view:last-child {
+ margin-left: 32rpx;
+ background-color: #013678;
+ color: #fff;
+ }
+}
diff --git a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
index cd7118e..9cf8209 100644
--- a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
@@ -69,13 +69,15 @@
:name="f.name"
:required="f.required"
>
-
+
+
+
+
+
+
+ 分包人员
+
+ {{ item.name }}
+
+
+
+ 确定
+
+
+
@@ -209,7 +224,8 @@ import {
getAUditingProcessApi,
getAUditingUserInfoApi,
// setMonthPlanApi,
- setAuditingRejectApi
+ setAuditingRejectApi,
+ getPersonInfoApi
} from '../../../api/workPlan/dayPlan'
export default {
data() {
@@ -225,6 +241,7 @@ export default {
proId: '',
planTime: ''
},
+ personList: [],
btnList: [
{ title: '修改', id: 1, type: 'compose', isShow: ['1', '3', '2'], isRoles: ['22', '23'] },
{ title: '删除', id: 2, type: 'trash', isShow: ['1', '3', '2'], isRoles: ['22', '23'] },
@@ -621,6 +638,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
@@ -768,6 +790,20 @@ export default {
if (value === 0) {
this.remarks = ''
}
+ },
+ async onViewPerson(type, item) {
+ console.log(type, item, '9999')
+
+ const res = await getPersonInfoApi({ contentId: item.contentId })
+ console.log('人员信息--', res)
+ this.personList = res.obj
+
+ if (type == 'rys') {
+ this.$refs.personRef.open('center')
+ }
+ },
+ onSubmitBtn() {
+ this.$refs.personRef.close()
}
},
@@ -1064,4 +1100,36 @@ export default {
color: #000;
font-size: 26rpx;
}
+.person-box {
+ width: 90vw;
+ background-color: #fff;
+ .title {
+ font-size: 38rpx;
+ padding: 20rpx 0;
+ text-align: center;
+ }
+
+ .person-list {
+ padding: 15rpx 26rpx;
+
+ text {
+ padding: 0 6rpx;
+ }
+ }
+
+ .submit-btn {
+ padding-bottom: 18rpx;
+ }
+
+ .submit-btn view {
+ margin: 0 auto;
+ width: 180rpx;
+ height: 78rpx;
+ line-height: 78rpx;
+ text-align: center;
+ border-radius: 16rpx;
+ color: #fff;
+ background-color: #003778;
+ }
+}
diff --git a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
index 112fed4..86f8467 100644
--- a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
@@ -641,6 +641,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/dayPlanDetails/inf-index.vue b/pages/workPlan/dayPlanDetails/inf-index.vue
index 8a6113c..e109f5f 100644
--- a/pages/workPlan/dayPlanDetails/inf-index.vue
+++ b/pages/workPlan/dayPlanDetails/inf-index.vue
@@ -52,13 +52,15 @@
:name="f.name"
:required="f.required"
>
-
+
+
+
+
+
+
+ 分包人员
+
+ {{ item.name }}
+
+
+
+ 确定
+
+
+
@@ -183,7 +198,8 @@ import {
updateInfPlanContentApi,
getAUditingProcessApi,
getAUditingUserInfoApi,
- setMonthPlanApi
+ setMonthPlanApi,
+ getPersonInfoApi
} from '../../../api/workPlan/dayPlan'
export default {
data() {
@@ -311,7 +327,8 @@ export default {
}
],
searchUserName: '',
- auditingUserList: []
+ auditingUserList: [],
+ personList: []
}
},
methods: {
@@ -518,6 +535,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
@@ -590,6 +612,20 @@ export default {
}
return isShowBtn
+ },
+ async onViewPerson(type, item) {
+ console.log(type, item, '9999')
+
+ const res = await getPersonInfoApi({ contentId: item.contentId })
+ console.log('人员信息--', res)
+ this.personList = res.obj
+
+ if (type == 'rys') {
+ this.$refs.personRef.open('center')
+ }
+ },
+ onSubmitBtn() {
+ this.$refs.personRef.close()
}
},
@@ -868,4 +904,37 @@ export default {
color: #000;
font-size: 26rpx;
}
+
+.person-box {
+ width: 90vw;
+ background-color: #fff;
+ .title {
+ font-size: 38rpx;
+ padding: 20rpx 0;
+ text-align: center;
+ }
+
+ .person-list {
+ padding: 15rpx 26rpx;
+
+ text {
+ padding: 0 6rpx;
+ }
+ }
+
+ .submit-btn {
+ padding-bottom: 18rpx;
+ }
+
+ .submit-btn view {
+ margin: 0 auto;
+ width: 180rpx;
+ height: 78rpx;
+ line-height: 78rpx;
+ text-align: center;
+ border-radius: 16rpx;
+ color: #fff;
+ background-color: #003778;
+ }
+}
diff --git a/pages/workPlan/dayPlanDetails/pro-index.vue b/pages/workPlan/dayPlanDetails/pro-index.vue
index 90d517f..af0c5b3 100644
--- a/pages/workPlan/dayPlanDetails/pro-index.vue
+++ b/pages/workPlan/dayPlanDetails/pro-index.vue
@@ -539,6 +539,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/monthPlan/inf-index.vue b/pages/workPlan/monthPlan/inf-index.vue
index 3390c4c..77724d5 100644
--- a/pages/workPlan/monthPlan/inf-index.vue
+++ b/pages/workPlan/monthPlan/inf-index.vue
@@ -1369,6 +1369,8 @@ export default {
month: this.DateValue
}
const res = await getIsPlanApi(params)
+
+ console.log('计划是否存在', res)
if (res.res == 0) {
uni.showToast({
title: '计划已存在，请重新选择！',
diff --git a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
index ad4da62..284aa91 100644
--- a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
@@ -644,6 +644,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
index 3e67ef2..34f027d 100644
--- a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
@@ -595,6 +595,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/monthPlanDetails/inf-index.vue b/pages/workPlan/monthPlanDetails/inf-index.vue
index c2488c9..066e424 100644
--- a/pages/workPlan/monthPlanDetails/inf-index.vue
+++ b/pages/workPlan/monthPlanDetails/inf-index.vue
@@ -544,6 +544,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/monthPlanDetails/pro-index.vue b/pages/workPlan/monthPlanDetails/pro-index.vue
index fa84848..50634b3 100644
--- a/pages/workPlan/monthPlanDetails/pro-index.vue
+++ b/pages/workPlan/monthPlanDetails/pro-index.vue
@@ -354,7 +354,7 @@ export default {
time: '',
auditingResult: '',
imgSrcIndex: 0,
- auditingInfo: [],
+ auditingInfo: [{ operateTime: '', operateUser: '', operateResult: '' }],
imgSrcList: ['../../../static/images/workPlan/xmb_dd.png', ' ', '../../../static/images/workPlan/xmb_tg.png']
},
{
@@ -648,6 +648,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
isSHowBtn(item) {
diff --git a/pages/workPlan/networkPlan/pro-index.vue b/pages/workPlan/networkPlan/pro-index.vue
index 7f2d7d0..d1a0fce 100644
--- a/pages/workPlan/networkPlan/pro-index.vue
+++ b/pages/workPlan/networkPlan/pro-index.vue
@@ -3,7 +3,7 @@
{
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/tempPlan/inf-index.vue b/pages/workPlan/tempPlan/inf-index.vue
index 8199cbe..403cc4d 100644
--- a/pages/workPlan/tempPlan/inf-index.vue
+++ b/pages/workPlan/tempPlan/inf-index.vue
@@ -719,6 +719,12 @@ export default {
wztj: {
rules: [{ required: true, errorMessage: '请选择甲、乙供物资到货是否满足作业条件' }]
},
+ jjtj: {
+ rules: [{ required: true, errorMessage: '请选择施工机具是否满足作业条件' }]
+ },
+ jktj: {
+ rules: [{ required: true, errorMessage: '请选择视频监控是否满足作业条件' }]
+ },
jks: {
rules: [{ required: true, errorMessage: '请填写投入监控设备数(台)' }]
},
@@ -801,6 +807,26 @@ export default {
{ value: '0', text: '否' }
]
},
+ {
+ form_label: '施工机具是否满足作业条件',
+ items_type: 'sel',
+ options: [
+ { value: '1', text: '是' },
+ { value: '0', text: '否' }
+ ],
+ required: true,
+ name: 'jjtj'
+ },
+ {
+ form_label: '视频监控是否满足作业条件',
+ items_type: 'sel',
+ options: [
+ { value: '1', text: '是' },
+ { value: '0', text: '否' }
+ ],
+ required: true,
+ name: 'jktj'
+ },
{ form_label: '投入监控设备数(台)', items_type: 'ipt', required: true, name: 'jks', isType: 'number' },
{ form_label: '公司职工人数', items_type: 'ipt', required: true, name: 'zgs', isType: 'number' },
{ form_label: '分包人员人数', items_type: 'ipt', required: true, name: 'fbrys', isType: 'number' },
diff --git a/pages/workPlan/tempPlan/pro-index.vue b/pages/workPlan/tempPlan/pro-index.vue
index 1afba0b..1777ab8 100644
--- a/pages/workPlan/tempPlan/pro-index.vue
+++ b/pages/workPlan/tempPlan/pro-index.vue
@@ -859,7 +859,7 @@ export default {
{ form_label: '投入车辆(辆)', items_type: 'ipt', required: true, name: 'cls' },
{ form_label: '开始时间', items_type: 'date', required: true, name: 'kssj' },
{ form_label: '结束时间', items_type: 'date', required: true, name: 'jssj' },
- { form_label: '典型中高风险分部分项公工程', items_type: 'ipt', required: false, name: 'fxgc' },
+ { form_label: '典型中高风险分部分项工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '开始时间', items_type: 'date', required: false, name: 'fxkssj' },
{ form_label: '结束时间', items_type: 'date', required: false, name: 'fxjssj' },
{ form_label: '作业地点', items_type: 'area', required: false, name: 'fxgzdd' }
diff --git a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
index bca5448..f025c06 100644
--- a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
@@ -656,6 +656,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
index 0f8e5c4..5bda9e1 100644
--- a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
@@ -686,6 +686,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/tempPlanDetails/inf-index.vue b/pages/workPlan/tempPlanDetails/inf-index.vue
index 468ed59..3d933e1 100644
--- a/pages/workPlan/tempPlanDetails/inf-index.vue
+++ b/pages/workPlan/tempPlanDetails/inf-index.vue
@@ -556,6 +556,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/tempPlanDetails/pro-index.vue b/pages/workPlan/tempPlanDetails/pro-index.vue
index 4523882..15d36dd 100644
--- a/pages/workPlan/tempPlanDetails/pro-index.vue
+++ b/pages/workPlan/tempPlanDetails/pro-index.vue
@@ -586,6 +586,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
index f25ae13..a3fbb38 100644
--- a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
@@ -642,6 +642,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
index 60c7b6c..6b6c4d2 100644
--- a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
@@ -739,6 +739,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/weekPlanDetails/inf-index.vue b/pages/workPlan/weekPlanDetails/inf-index.vue
index 17c2f73..36c1332 100644
--- a/pages/workPlan/weekPlanDetails/inf-index.vue
+++ b/pages/workPlan/weekPlanDetails/inf-index.vue
@@ -631,6 +631,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */
diff --git a/pages/workPlan/weekPlanDetails/pro-index.vue b/pages/workPlan/weekPlanDetails/pro-index.vue
index 8d6506e..e9e37a8 100644
--- a/pages/workPlan/weekPlanDetails/pro-index.vue
+++ b/pages/workPlan/weekPlanDetails/pro-index.vue
@@ -642,6 +642,11 @@ export default {
}
}
})
+ this.processList.forEach(e => {
+ if (e.auditingInfo.length > 1) {
+ e.auditingInfo = e.auditingInfo.splice(-1, 1)
+ }
+ })
}
},
/* 复选框事件 */