HB
/
ruoyi-miniapp
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复package.json

master
爱~海~爱海爱海~右 1 month ago
parent
68c9b17c66
commit
b3c7271372
13 changed files with 250 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      pages/enterprise.vue
  2. 11
      pages/index.vue
  3. 13
      pages/owner.vue
  4. 4
      pages/task.vue
  5. 3
      sub/chat/index.vue
  6. 2
      sub/enterprise/detail.vue
  7. 115
      sub/enterprise/edit.vue
  8. 162
      sub/invite/addEnterprise.vue
  9. 2
      sub/invite/enterpriseTags.vue
  10. 33
      sub/invite/index.vue
  11. 37
      sub/invite/prove.vue
  12. 2
      sub/task/enforce.vue
  13. 2
      uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

4
pages/enterprise.vue
Unescape View File

@ -54,7 +54,7 @@
@refresherpulling="refresherpulling" @refresherpulling="refresherpulling"
@scrolltolower="loadMore" @scrolltolower="loadMore"
class="list" class="list"
:style="{ maxHeight: `${listHeight - sreachHeight}px` }" :style="{ height: `${listHeight - sreachHeight}px` }"
> >
<view <view
v-for="enterprise in list" v-for="enterprise in list"
@ -166,7 +166,7 @@ export default {
query query
.select('#page') .select('#page')
.boundingClientRect(data => { .boundingClientRect(data => {
this.listHeight = data.height - 35 this.listHeight = data.height - 35 - 25
}) })
.exec() .exec()
}, },

11
pages/index.vue
Unescape View File

@ -156,7 +156,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class=""> <view style="min-height: 220px">
<view <view
v-for="(item, index) in list" v-for="(item, index) in list"
:key="index" :key="index"
@ -221,6 +221,9 @@ export default {
animation: false animation: false
}) })
this.getDict() this.getDict()
if (!this.$roles.checkRole(['director'])) {
this.queryParams.deptId = this.$store.getters.deptId
}
this.init() this.init()
}, },
onReady() { onReady() {
@ -283,9 +286,9 @@ export default {
] ]
}, },
async init() { async init() {
if (!this.$roles.checkRole(['director'])) { // if (!this.$roles.checkRole(['director'])) {
this.queryParams.deptId = this.$store.getters.deptId // this.queryParams.deptId = this.$store.getters.deptId
} // }
const res = await HomeApi.getPieData(this.queryParams) const res = await HomeApi.getPieData(this.queryParams)
this.detail = res.data this.detail = res.data
let curIndex = 0 let curIndex = 0

13
pages/owner.vue
Unescape View File

@ -54,7 +54,7 @@
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</view> </view>
<view class="section wd-flex wd-flex-row wd-justify-between"> <!-- <view class="section wd-flex wd-flex-row wd-justify-between">
<view class="wd-flex wd-flex-row" style="gap: 8px"> <view class="wd-flex wd-flex-row" style="gap: 8px">
<u--image <u--image
src="/static/images/owner/edit.png" src="/static/images/owner/edit.png"
@ -73,8 +73,11 @@
></u-count-to> ></u-count-to>
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</view> </view> -->
<view class="section wd-flex wd-flex-row wd-justify-between"> <view
class="section wd-flex wd-flex-row wd-justify-between"
@click="btnPolicy"
>
<view class="wd-flex wd-flex-row" style="gap: 8px"> <view class="wd-flex wd-flex-row" style="gap: 8px">
<u--image <u--image
src="/static/images/owner/list.png" src="/static/images/owner/list.png"
@ -84,7 +87,7 @@
></u--image> ></u--image>
<text class="wd-font-800">政策法规</text> <text class="wd-font-800">政策法规</text>
</view> </view>
<view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px" @click="btnPolicy"> <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
<u-count-to <u-count-to
:startVal="0" :startVal="0"
:endVal="policyTotal" :endVal="policyTotal"
@ -163,7 +166,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}).then(res => { }).then(res => {
this.policyTotal = res.data.total this.policyTotal = res.data.total
}) })
}, },
openSubMessage() { openSubMessage() {

4
pages/task.vue
Unescape View File

@ -48,7 +48,7 @@
@scrolltolower="loadMore" @scrolltolower="loadMore"
class="list" class="list"
:enable-flex="true" :enable-flex="true"
:style="{ maxHeight: `${listHeight}px` }" :style="{ height: `${listHeight}px` }"
> >
<view <view
v-for="task in list" v-for="task in list"
@ -169,7 +169,7 @@ export default {
query query
.select('.page') .select('.page')
.boundingClientRect(data => { .boundingClientRect(data => {
this.listHeight = data.height - 55 this.listHeight = data.height - 55 - 25
}) })
.exec() .exec()
}, },

3
sub/chat/index.vue
Unescape View File

@ -1,5 +1,6 @@
<template> <template>
<web-view src="https://mb.jzce.com/chat/f07644a8e53c750a"></web-view> <!-- <web-view src="https://mb.jzce.com/chat/f07644a8e53c750a"></web-view> -->
<web-view src="https://chat.deepseek.com/"></web-view>
</template> </template>
<script> <script>

2
sub/enterprise/detail.vue
Unescape View File

@ -30,7 +30,7 @@
<view class="wd-flex" style="align-items: center"> <view class="wd-flex" style="align-items: center">
<text class="address" style="margin-right: 8px">环保负责人</text> <text class="address" style="margin-right: 8px">环保负责人</text>
<text style="margin-right: 16px"> <text style="margin-right: 16px">
{{ detail.enterprisesName }} {{ detail.contactName }}
</text> </text>
<text class="address" style="margin-right: 8px">联系方式</text> <text class="address" style="margin-right: 8px">联系方式</text>
<text style="text-decoration: underline"> <text style="text-decoration: underline">

115
sub/enterprise/edit.vue
Unescape View File

@ -188,22 +188,22 @@
<text class="placeholder" v-else>请选择到期日期</text> <text class="placeholder" v-else>请选择到期日期</text>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
<!-- 企业照片 --> <!-- 企业照片 -->
<u-form-item <u-form-item
label="资质照片" label="资质照片"
prop="photo" prop="photo"
borderBottom borderBottom
labelPosition="top" labelPosition="top"
labelWidth="80" labelWidth="80"
> >
<u-upload <u-upload
:fileList="prove.form.photo" :fileList="prove.form.photo"
@afterRead="addEnterpriseProvePhoto" @afterRead="addEnterpriseProvePhoto"
@delete="delEnterpriseProvePhoto" @delete="delEnterpriseProvePhoto"
multiple multiple
:maxCount="3" :maxCount="3"
></u-upload> ></u-upload>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
label="描述" label="描述"
prop="qualificationDescription" prop="qualificationDescription"
@ -386,21 +386,21 @@ export default {
qualificationDescription: '', qualificationDescription: '',
handleDate: '', handleDate: '',
enterpriseAuth: '', enterpriseAuth: '',
photo: [] photo: []
} }
} }
} }
}, },
onLoad(res) { onLoad(res) {
if (res.invateId) { if (res.invateId) {
console.log(res) console.log(res)
this.invateId = res.invateId this.invateId = res.invateId
} }
this.getDict() this.getDict()
}, },
onReady() { onReady() {
this.step.active == 0 && this.step.active == 0 &&
this.$refs.infoFormRef.setRules(this.info.rules) this.$refs.infoFormRef.setRules(this.info.rules)
this.initProveList() this.initProveList()
}, },
methods: { methods: {
@ -450,44 +450,43 @@ export default {
delEnterpriseProvePhoto(e) { delEnterpriseProvePhoto(e) {
this.prove.form.photo.splice(e.index, 1) this.prove.form.photo.splice(e.index, 1)
}, },
/**
/** * 选择图片并上传
* 选择图片并上传 * @param {Object} e
* @param {Object} e */
*/ async addEnterprisePhoto(e) {
async addEnterprisePhoto(e) { this.info.form.photo = e.file.map(p => {
this.info.form.photo = e.file.map(p => { console.log(p.url)
console.log(p.url) return {
return { ...p,
...p, status: 'uploading',
status: 'uploading', message: '上传中'
message: '上传中' }
} })
}) // 使用promise.all()方法上传到后端做统一接收
// 使用promise.all()方法上传到后端做统一接收 await Promise.all(
await Promise.all( this.info.form.photo.map(async (p, i) => {
this.info.form.photo.map(async (p, i) => { const res = await uploadFile({ name: `file`, filePath: p.url })
const res = await uploadFile({ name: `file`, filePath: p.url }) return {
return { ...res.data,
...res.data, status: 'success',
status: 'success', message: ''
message: '' }
} })
}) ).then(res => {
).then(res => { this.info.form.photo = res
this.info.form.photo = res console.log('pthoto3', this.info.form.photo)
console.log('pthoto3', this.info.form.photo) })
}) },
}, /**
/** * 删除图片
* 删除图片 * @param {Object} e
* @param {Object} e */
*/ delEnterprisePhoto(e) {
delEnterprisePhoto(e) { this.info.form.photo.splice(e.index, 1)
this.info.form.photo.splice(e.index, 1) },
},
/** /**
* 弹出选择器 * 弹出选择器
* @param {String} type 字典类型 * @param {String} type 字典类型
@ -629,7 +628,7 @@ export default {
let prove let prove
let data = this.prove.form let data = this.prove.form
data.enterpriseId = this.info.form.id data.enterpriseId = this.info.form.id
data.files = this.prove.form.photo.map(p => p.id) data.files = this.prove.form.photo.map(p => p.id)
if (data.id) { if (data.id) {
prove = await updateProve(data) prove = await updateProve(data)
} else { } else {

162
sub/invite/addEnterprise.vue
Unescape View File

@ -117,14 +117,24 @@
负责人电话 负责人电话
</view> </view>
<view class="value"> <view class="value">
<input <!-- <input
class="input-value" class="input-value"
type="text" type="text"
placeholder-class="txt" placeholder-class="txt"
placeholder="请输入负责人电话" placeholder="请输入负责人电话"
v-model="form.environmentalContactPhone" v-model="form.environmentalContactPhone"
@blur="proofName" @blur="proofName"
/> /> -->
<uni-easyinput
type="text"
placeholder="请输入负责人电话"
:inputBorder="false"
style="text-align: center"
v-model="form.environmentalContactPhone"
@blur="proofName"
:clearable="false"
:autoHeight="true"
></uni-easyinput>
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</view> </view>
@ -150,44 +160,41 @@
<u-icon name="plus-circle" color="#17C653" size="14"></u-icon> <u-icon name="plus-circle" color="#17C653" size="14"></u-icon>
<text style="line-height: 1rem">新增资质</text> <text style="line-height: 1rem">新增资质</text>
</view> </view>
<view </view>
class="wd-flex" <view
style="justify-content: space-between" class="prove"
v-for="(p, index) in prove" v-for="(p, index) in prove"
:key="index" :key="index"
v-if="prove.length > 0" v-if="prove.length > 0"
> @tap="editProve(p)"
<image >
src="@/static/images/enterprise/zz.png" <image
style="width: 90px; height: 70px" :src="p.photo[0].url"
mode="widthFix" style="width: 90px; height: 70px"
></image> mode="widthFix"
<view ></image>
style="flex: 1; justify-content: space-between" <view class="info">
class="wd-flex wd-flex-col" <view class="wd-flex" style="gap: 8px; align-items: center">
> <text class="label">资质名称</text>
<view class="wd-flex" style="gap: 8px; align-items: center"> <view class="wd-font-800">
<text class="label">资质名称</text> {{
<view> $dict.echoDicValue(
{{ dictMap.enterprise_qua,
$dict.echoDicValue( p.qualificationName.toString()
dictMap.enterprise_qua, )
prove.qualificationName.toString() }}
)
}}
</view>
</view> </view>
<view class="wd-flex" style="gap: 8px; align-items: center"> </view>
<text class="label">资质编号</text> <view class="wd-flex" style="gap: 8px; align-items: center">
<view> <text class="label">资质编号</text>
{{ prove.enterpriseAuth }} <view class="wd-font-800">
</view> {{ p.enterpriseAuth }}
</view> </view>
<view class="wd-flex" style="gap: 8px; align-items: center"> </view>
<text class="label">资质到期</text> <view class="wd-flex" style="gap: 8px; align-items: center">
<view> <text class="label">资质到期</text>
{{ $util.formatDate(prove.expiryDate, 'YYYY/M/D') }} <view class="wd-font-800">
</view> {{ $util.formatDate(p.expiryDate, 'YYYY/M/D') }}
</view> </view>
</view> </view>
</view> </view>
@ -217,7 +224,22 @@ export default {
tags: {} tags: {}
}, },
dictMap: {}, dictMap: {},
prove: [], prove: [
{
enterpriseAuth: '123',
expiryDate: '2025-02-24',
id: '',
photo: [
{
id: 1890,
message: '',
status: 'success',
url: 'http://60.23.29.213:19001/huanbao/7f71a5ed324fd6d35d61c7b6d68d8e6e06f16557f3150af3dece8ab386f9f189.png'
}
],
qualificationName: '1'
}
],
inviteId: undefined inviteId: undefined
} }
}, },
@ -309,6 +331,11 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/sub/invite/prove' url: '/sub/invite/prove'
}) })
},
editProve(prove) {
uni.navigateTo({
url: `/sub/invite/prove?prove=${JSON.stringify(prove)}`
})
} }
} }
} }
@ -345,6 +372,12 @@ export default {
text-align: right; text-align: right;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
cursor: auto;
display: block;
font-family: UICTFontTextStyleBody;
height: 1.4rem;
min-height: 1.4rem;
overflow: hidden;
} }
.input-textarea { .input-textarea {
flex: 1; flex: 1;
@ -352,15 +385,38 @@ export default {
overflow: hidden; overflow: hidden;
text-align: right; text-align: right;
max-height: 3rem; max-height: 3rem;
line-height: 1rem;
text-overflow: ellipsis; text-overflow: ellipsis;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-break: break-all; word-break: break-all;
cursor: auto;
display: block;
font-family: UICTFontTextStyleBody;
height: 1.4rem;
min-height: 1.4rem;
overflow: hidden;
} }
} }
} }
.prove {
border-radius: var(--Number-12px, 12px);
border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
background: var(--LightMode-Light-Light, #fff);
display: flex;
padding: var(--Number-12px, 12px);
align-items: center;
gap: var(--Number-12px, 12px);
font-size: 28rpx;
flex-flow: row nowrap;
.info {
height: 72px;
display: flex;
flex-flow: column nowrap;
justify-content: space-between;
}
}
.upload-wrapper { .upload-wrapper {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
@ -370,6 +426,32 @@ export default {
gap: 12px; gap: 12px;
} }
::v-deep .uni-easyinput__content-input {
flex: 1;
text-align: right;
white-space: nowrap;
text-overflow: ellipsis;
cursor: auto;
display: block;
font-family: UICTFontTextStyleBody;
height: 1.4rem;
min-height: 1.4rem;
overflow: hidden;
padding-right: 0;
}
::v-deep .uni-easyinput__placeholder-class {
flex: 1;
text-align: right;
white-space: nowrap;
text-overflow: ellipsis;
cursor: auto;
display: block;
font-family: UICTFontTextStyleBody;
height: 1.4rem;
min-height: 1.4rem;
font-size: 14px;
overflow: hidden;
}
.operation { .operation {
padding: 12px; padding: 12px;
display: flex; display: flex;

2
sub/invite/enterpriseTags.vue
Unescape View File

@ -27,7 +27,7 @@
></u-picker> ></u-picker>
<cs-bottom-wrapper> <cs-bottom-wrapper>
<view class="operation"> <view class="operation">
<button class="btn green" @tap="submit">提交审核</button> <button class="btn green" @tap="submit">保存</button>
</view> </view>
</cs-bottom-wrapper> </cs-bottom-wrapper>
</view> </view>

33
sub/invite/index.vue
Unescape View File

@ -1,6 +1,14 @@
<template> <template>
<view> <view class="view">
<scroll-view direction="vertical"></scroll-view> <view class="emty">
<image
src="/static/images/emty.png"
style="width: 79px; height: 79px"
mode="widthFix"
></image>
<text>暂无数据</text>
</view>
<cs-bottom-wrapper> <cs-bottom-wrapper>
<view class="operation"> <view class="operation">
<button class="btn green" @tap="addEnterprise">新增企业</button> <button class="btn green" @tap="addEnterprise">新增企业</button>
@ -33,6 +41,27 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.view {
padding: 12px;
display: flex;
flex-flow: column nowrap;
gap: 12px;
overflow: hidden;
overflow-y: scroll;
max-height: 100vh;
padding-bottom: 12vh;
}
.emty {
border-radius: 8px;
height: 550rpx;
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
background-color: #fff;
gap: 12px;
color: #99a1b7;
}
.operation { .operation {
padding: 12px; padding: 12px;
display: flex; display: flex;

37
sub/invite/prove.vue
Unescape View File

@ -151,8 +151,11 @@ export default {
}, },
onLoad(res) { onLoad(res) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: !res ? '编辑资质' : '新增资质' title: res.prove ? '编辑资质' : '新增资质'
}) })
if (res.prove) {
this.prove = JSON.parse(res.prove)
}
this.getDict() this.getDict()
}, },
onShow() {}, onShow() {},
@ -173,28 +176,18 @@ export default {
* @param {Object} e * @param {Object} e
*/ */
async addPhoto(e) { async addPhoto(e) {
e.file.forEach(p => { this.prove.photo.push({
this.prove.photo.push({ ...e.file,
...p, status: 'uploading',
status: 'uploading', message: '上传中'
message: '上传中'
})
}) })
// 使用promise.all()方法上传到后端做统一接收 uploadFile({ name: `file`, filePath: e.file.url }).then(res => {
await Promise.all( this.prove.photo = []
this.prove.photo.map(async (p, i) => { this.prove.photo.push({
if (p.status == 'uploading') { ...res.data,
const res = await uploadFile({ name: `file`, filePath: p.url }) status: 'success',
return { message: ''
...res.data,
status: 'success',
message: ''
}
}
return p
}) })
).then(res => {
this.prove.photo = res
}) })
}, },
/** /**
@ -202,7 +195,7 @@ export default {
* @param {Object} e * @param {Object} e
*/ */
delPhoto(e) { delPhoto(e) {
this.prove.photo.splice(e.index, 1) this.prove.photo = {}
}, },
/** /**
* 选择器确认回调 * 选择器确认回调

2
sub/task/enforce.vue
Unescape View File

@ -106,7 +106,7 @@ export default {
state: undefined, state: undefined,
inspectionsId: undefined, inspectionsId: undefined,
advice: undefined, advice: undefined,
photo: undefined, photo: [],
date: '' date: ''
}, },
showModel: false showModel: false

2
uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
Unescape View File

@ -419,7 +419,7 @@ export default {
const paddingRight = const paddingRight =
this.type === 'password' || this.clearable || this.prefixIcon this.type === 'password' || this.clearable || this.prefixIcon
? '' ? ''
: '10px' : '0px'
return obj2strStyle({ return obj2strStyle({
'padding-right': paddingRight, 'padding-right': paddingRight,
'padding-left': this.prefixIcon ? '' : '10px' 'padding-left': this.prefixIcon ? '' : '10px'

Write Preview
Loading…
Cancel
Save