diff --git a/api/enterprise/index.js b/api/enterprise/index.js index d7bb773..66915c6 100644 --- a/api/enterprise/index.js +++ b/api/enterprise/index.js @@ -33,4 +33,15 @@ export function getEnterPrise(id) { url: `/system/enterprise/get?id=${id}`, method: 'GET', }) +} + +/** + * 审核企业 + * @param {Object} id + */ +export function checkEnterprise(id) { + return request({ + url: `/system/enterprise/audit?id=${id}`, + method: 'PUT', + }) } \ No newline at end of file diff --git a/api/inspections/index.js b/api/inspections/index.js index 5139de7..5648bba 100644 --- a/api/inspections/index.js +++ b/api/inspections/index.js @@ -12,15 +12,7 @@ export const InspectionsApi = { params }) }, - /** - * 获取详情 - */ - getDetail: (id) => { - return request({ - url: `/system/enterprise-inspections/appGet?id=${id}`, - method: 'GET', - }) - }, + /** * 获取反馈结果 */ @@ -68,5 +60,24 @@ export const InspectionsApi = { method: 'PUT', data }) + }, + /** + * 执法反馈 + */ + feeback: data => { + return request({ + url: `/system/inspections-log/inspectionsAudit`, + method: 'POST', + data + }) + }, + /** + * 反馈详情 + */ + feedBackDetail: id => { + return request({ + url: `/system/inspections-log/get?id=${id}`, + method: 'GET', + }) } } \ No newline at end of file diff --git a/components/cs-bottom-wrapper/index.vue b/components/cs-bottom-wrapper/index.vue index f2a8c39..7461156 100644 --- a/components/cs-bottom-wrapper/index.vue +++ b/components/cs-bottom-wrapper/index.vue @@ -21,7 +21,7 @@ export default { diff --git a/sub/task/detail.vue b/sub/task/detail.vue index a7cc418..340d664 100644 --- a/sub/task/detail.vue +++ b/sub/task/detail.vue @@ -137,7 +137,7 @@ isSelect: isSelect.includes(record.id) }" @tap.native.stop="select(record.id)" - v-if="[3, null].includes(record.inspectionStatus)" + v-if="['3', null].includes(record.inspectionStatus)" > @@ -684,6 +684,12 @@ export default { box-shadow: none; --dropdown-menu-title-font-size: 13px; --dropdown-menu-title-text-color: #071437; + .van-dropdown-menu__item { + flex: 0; + .van-dropdown-menu__title { + width: 80px; + } + } } } .isTop { diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue index 4bafc16..847b05c 100644 --- a/sub/task/enforce.vue +++ b/sub/task/enforce.vue @@ -32,38 +32,180 @@ + + + + * + 截止日期 + + + + {{ $util.formatDate(form.date, 'YYYY年M月D日') }} + + + + + + - + {{ form.state == 2 ? '审批通过' : '整改处理' }} + + + + + {{ form.state == 2 ? '是否通过？' : '是否整改？' }} + + 确认后不可再次修改 + + @@ -78,6 +220,7 @@ export default { border: 1px solid #f9f9f9; border-radius: 12px; background-color: #fff; + margin-bottom: 12px; } .operation { padding: 12px; @@ -106,4 +249,29 @@ export default { ::v-deep .uni-easyinput__content-textarea { min-height: 400rpx; } +::v-deep .u-upload__button { + border-radius: 8px !important; + border: 1px solid #f1f1f4; + background-color: #f9f9f9 !important; +} + +::v-deep .u-upload__wrap { + .u-upload__wrap__preview { + width: 192rpx; + height: 192rpx; + border-radius: 8px !important; + overflow: visible !important; + .u-upload__wrap__preview__image { + border-radius: 8px !important; + } + .u-upload__deletable { + border-radius: 100% !important; + background-color: #f8285a !important; + transform: translateX(50%) translateY(-50%); + .u-upload__deletable__icon { + position: relative; + } + } + } +} diff --git a/sub/task/locate.vue b/sub/task/locate.vue index 01aae23..89cf402 100644 --- a/sub/task/locate.vue +++ b/sub/task/locate.vue @@ -211,6 +211,17 @@ export default { this.timer && clearInterval(this.timer) return false }, + watch: { + list: { + handler: function (val) { + if (val.length >= 2) { + this.timer && clearInterval(this.timer) + } + }, + immediate: true, + deep: true + } + }, methods: { async init() { const miniCode = await getMiniCode({ @@ -331,18 +342,19 @@ export default { }, echoQueset() { const timeout = 3 * 60 * 1000 + // const timeout = 10 * 1000 this.timer && clearInterval(this.timer) - // this.timer = setInterval(() => { - // this.getLocateList() - // this.time += 5000 - // if (this.time > timeout) { - // console.log('timeout') - // clearInterval(this.timer) - // uni.navigateBack({ - // delta: 1 - // }) - // } - // }, 5 * 1000) + this.timer = setInterval(() => { + this.getLocateList() + this.time += 5000 + if (this.time > timeout) { + console.log('timeout') + clearInterval(this.timer) + uni.navigateBack({ + delta: 1 + }) + } + }, 5 * 1000) }, goNext() { InspectionsApi.beginEnforce({ diff --git a/sub/task/log.vue b/sub/task/log.vue new file mode 100644 index 0000000..0644d0a --- /dev/null +++ b/sub/task/log.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/sub/task/record.vue b/sub/task/record.vue index a1067db..3c0a555 100644 --- a/sub/task/record.vue +++ b/sub/task/record.vue @@ -1,10 +1,13 @@