持续集成分支

This commit is contained in:
aixianling
2024-10-31 14:34:57 +08:00
parent 6a833be062
commit 8c56cf808b
2165 changed files with 4116 additions and 8716 deletions

View File

@@ -0,0 +1,210 @@
<template>
<div class="Add">
<div class="flex mar-b16">
<div class="label">
<span class="tips">*</span>党员信息
</div>
<div class="value">
<AiPagePicker type="party" @select="handlePartySelect" single :isFourParty="true">
<AiMore v-model="form.partyName" placeholder="请选择"/>
</AiPagePicker>
</div>
</div>
<div class="flex mar-b16">
<div class="label">
<span class="tips">*</span>四邻对象
</div>
<div class="value" @click="selectUser">
<span :class="form.residentName ? '' : 'color-999'">{{form.residentName || '请选择'}}</span>
<u-icon name="arrow-right" color="#ddd" size="28"></u-icon>
</div>
</div>
<div class="flex mar-b16">
<div class="label">
<span class="tips">*</span>事件日期
</div>
<div class="value" @click="showTimeSelect=true">
<span :class="form.linksageDate ? '' : 'color-999'">{{form.linksageDate || '请选择'}}</span>
<u-icon name="arrow-right" color="#ddd" size="28"></u-icon>
</div>
</div>
<div class="flex">
<div class="label">
<span class="tips">*</span>事件描述
</div>
</div>
<div class="text-area">
<u-input v-model="form.description" type="textarea" :height="150" :auto-height="true" maxlength="200" placeholder="请输入事件内容描述" placeholder-style="font-size:16px;" />
<div class="hint">{{ form.description.length }}/200</div>
</div>
<div class="footer" @click="confirm">
<div class="btn">确认提交</div>
</div>
<u-picker v-model="showTimeSelect" mode="time" :params="params" @confirm="confirmSelectTime"></u-picker>
<u-select :list="userList" value-name="id" label-name="name" v-model="showUserSelect" @confirm="confirmSelectUser"></u-select>
</div>
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'Add',
data() {
return {
value: '',
form: {
partyName: '',
partyId: '',
residentName: '',
residentId: '',
linksageDate: '',
description: ''
},
showTimeSelect: false,
userList: [],
showUserSelect: false,
params: {year: true, month: true, day: true, hour: false, minute: false, second: false},
isFlag: true
}
},
computed: {
...mapState(['user']),
},
created() {
this.$dict.load('appSpecialTypeFive')
},
onShow() {
document.title = '新增'
},
methods: {
rules() {
return {
partyId: '请选择党员信息',
residentId: '请选择四邻对象',
linksageDate: '请选择事件日期',
description: '请输入事件描述',
}
},
confirm() {
const rules = this.rules()
for (let v of Object.keys(rules)) {
if (!this.form[v]) {
return this.$u.toast(rules[v])
}
}
if(!this.isFlag) {
return
}
this.$http.post('/app/apppartyfourlinkage/addOrUpdate', {...this.form}).then(res => {
if (res.code == 0) {
this.isFlag = false
this.$u.toast('提交成功')
uni.$emit('reload')
setTimeout(() => {
uni.navigateBack({
delta: 1
})
}, 600)
}
}).catch((err) => {
this.$u.toast(err)
})
},
confirmSelectTime(e) {
this.form.linksageDate = e.year + '-' + e.month + '-' + e.day
},
selectUser() {
if(!this.form.partyId) {
return this.$u.toast('请先选择党员信息')
}
this.showUserSelect = true
},
confirmSelectUser(e) {
this.form.residentId = e[0].value
this.form.residentName = e[0].label
},
handlePartySelect(e) {
this.form.partyId = e[0].id
this.form.partyName = e[0].name
this.getUserList()
},
getUserList() {
this.$http.post('/app/apppartyfourresident/listFourResident', null, {
params: {
size: 10,
partyId: this.form.partyId,
},
}).then((res) => {
if (res.code == 0) {
this.userList = res.data.records
}
})
}
},
}
</script>
<style lang="scss" scoped>
.Add {
.flex{
display: flex;
justify-content: space-between;
padding: 34px 32px 34px 12px;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 44px;
background-color: #fff;
.label{
width: 150px;
.tips{
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #F46;
}
}
.value{
span{
display: inline-block;
margin-right: 12px;
}
.color-999{
color: #999;
}
}
}
.mar-b16{
margin-bottom: 16px;
}
.text-area{
width: 100%;
padding: 0 32px 32px;
background-color: #fff;
box-sizing: border-box;
.hint{
width: 100%;
color: #999;
text-align: right;
}
}
.footer {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
}
.btn {
width: 100%;
height: 112px;
line-height: 112px;
text-align: center;
background: #3975C6;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #fff;
}
}
</style>

View File

@@ -0,0 +1,236 @@
<template>
<div class="AppFourNeighbor">
<AiTopFixed>
<div flex>
<div class="time-select" @click="showTimeSelect=true">
<img src="./components/img/time-icon.png" alt="" class="time-icon">
<span>{{search.linksageDate || '日期选择' }}</span>
<img src="./components/img/down-icon-666.png" alt="" v-if="!search.linksageDate" class="mar-r16">
</div>
<u-icon name="close-circle" color="#999" size="32" v-if="search.linksageDate" @click="clearTime" class="mar-r16"></u-icon>
<u-search placeholder="请输入四邻对象、描述、党员信息" :show-action="false" search-icon-color="#ccc" v-model="search.residentName"
@search="getListInit" @clear="clearName" :clearabled="true" />
</div>
</AiTopFixed>
<div class="list-content" v-if="list.length">
<div class="item" @click="toDetail(item.id)" v-for="(item, index) in list" :key="index">
<div class="top">
<p class="title">{{item.description}}</p>
<div class="info"><span class="label">党员信息</span>{{item.partyName}}</div>
<div class="info"><span class="label">四邻对象</span>{{item.residentName}}</div>
<div class="info"><span class="label">事件日期</span>{{item.linksageDate}}</div>
</div>
<div class="bottom" :class="`status${item.status}`">
<span class="tips"></span>{{$dict.getLabel('partyFourLinkageStatus', item.status)}}
</div>
</div>
</div>
<AiEmpty v-else></AiEmpty>
<div class="footer" @click="toAdd">
<div class="btn">新增联动记录</div>
</div>
<u-picker v-model="showTimeSelect" mode="time" :params="params" @confirm="selectTime"></u-picker>
</div>
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'AppFourNeighbor',
appName: '四邻联动',
data() {
return {
search: {residentName : '', linksageDate: ''},
showTimeSelect: false,
params: {year: true, month: true, day: true, hour: false, minute: false, second: false},
current: 1,
list: []
}
},
computed: {
...mapState(['user']),
},
created() {
this.$dict.load('partyFourLinkageStatus').then(() => {
this.getList()
})
uni.$on('reload', () => {
this.getListInit()
})
},
onShow() {
document.title = '四邻联动'
},
methods: {
getList() {
this.$http.post('/app/apppartyfourlinkage/list', null, {
params: {
size: 20,
current: this.current,
linksageDate: this.search.linksageDate,
residentName : this.search.residentName
},
}).then((res) => {
if (res.code == 0) {
this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
}
})
},
getListInit() {
this.current = 1
this.datas = []
this.getList()
},
clearTime() {
this.search.linksageDate = ''
this.getListInit()
},
clearName() {
console.log(888)
this.search.residentName = ''
this.getListInit()
},
selectTime(e) {
this.search.linksageDate = e.year + '-' + e.month + '-' + e.day
this.getListInit()
},
toAdd() {
uni.navigateTo({url: './Add'})
},
toDetail(id) {
uni.navigateTo({url: `./Detail?id=${id}`})
}
},
onReachBottom() {
this.current = this.current + 1
this.getList()
},
}
</script>
<style lang="scss" scoped>
.AppFourNeighbor {
// background-color: #F3F6F9;
::v-deep .AiTopFixed .u-search {
margin-bottom: 0 !important;
}
.mar-r16{
margin-right: 16px;
}
.time-select{
img{
width: 32px;
height: 32px;
vertical-align: bottom;
}
.time-icon{
width: 40px;
height: 40px;
}
span{
display: inline-block;
margin: 0 4px;
font-size: 28px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #666;
line-height: 40px;
}
}
.list-content{
padding: 24px 32px 144px;
.item{
width: 100%;
background: #FFF;
box-shadow: inset 0px 0px 0px 0px #DDDDDD;
border-radius: 16px;
margin-bottom: 24px;
.top{
padding: 32px 32px 24px;
border-bottom: 1px solid #ddd;
.title{
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
line-height: 44px;
margin-bottom: 32px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: hidden;
}
.info{
font-size: 26px;
font-family: PingFangSC-Regular, PingFang SC;
line-height: 36px;
margin-bottom: 8px;
color: #333;
.label{
display: inline-block;
color: #999;
width: 150px;
}
}
}
.bottom{
padding: 32px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
line-height: 40px;
.tips{
display: inline-block;
width: 8px;
height: 8px;
margin-right: 8px;
border-radius: 50%;
vertical-align: middle;
}
}
.status0{
color: #FF883C;
.tips{
background: #FF883C;
}
}
.status1{
color: #2EA222;
.tips{
background: #2EA222;
}
}
.status2{
color: #F46;
.tips{
background: #F46;
}
}
}
}
.footer {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
}
.btn {
width: 100%;
height: 112px;
line-height: 112px;
text-align: center;
background: #3975C6;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #fff;
}
}
</style>

View File

@@ -0,0 +1,125 @@
<template>
<div class="Add">
<div class="flex">
<div class="label">
<span class="tips">*</span>审核意见
</div>
</div>
<div class="text-area">
<u-input v-model="remark" type="textarea" :height="200" :auto-height="true" maxlength="500" placeholder="请输入审核意见" placeholder-style="font-size:16px;" />
<div class="hint">{{ remark.length }}/200</div>
</div>
<div class="footer" @click="pass">
<div class="btn">确认提交</div>
</div>
</div>
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'Add',
data() {
return {
id: '',
remark: '',
isFlag: true
}
},
computed: {
...mapState(['user']),
},
onLoad(option) {
this.id = option.id
},
onShow() {
document.title = '新增'
},
methods: {
pass() {
if(!this.remark) {
return this.$u.toast('请输入审核意见')
}
if(!this.isFlag) {
return
}
this.$http.post(`/app/apppartyfourlinkage/auditById?id=${this.id}&status=0&remark=${this.remark}`).then((res) => {
if (res.code == 0) {
this.isFlag = false
this.$u.toast('审核成功')
uni.$emit('reload')
setTimeout(() => {
uni.navigateBack({
delta: 2
})
}, 600)
}
})
}
},
}
</script>
<style lang="scss" scoped>
.Add {
.flex{
display: flex;
justify-content: space-between;
padding: 34px 32px 34px 12px;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 44px;
background-color: #fff;
.label{
width: 150px;
.tips{
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #F46;
}
}
.value{
span{
display: inline-block;
margin-right: 12px;
}
.color-999{
color: #999;
}
}
}
.mar-b16{
margin-bottom: 16px;
}
.text-area{
width: 100%;
padding: 0 32px 32px;
background-color: #fff;
box-sizing: border-box;
.hint{
width: 100%;
color: #999;
text-align: right;
}
}
.footer {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
}
.btn {
width: 100%;
height: 112px;
line-height: 112px;
text-align: center;
background: #3975C6;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #fff;
}
}
</style>

View File

@@ -0,0 +1,154 @@
<template>
<div class="detail">
<div class="flex mar-b16">
<div class="label">审核状态</div>
<div class="value" :class="`status${form.status}`">{{$dict.getLabel('partyFourLinkageStatus', form.status)}}</div>
</div>
<div class="flex mar-b16">
<div class="label">党员信息</div>
<div class="value">{{form.partyName}}</div>
</div>
<div class="flex mar-b16">
<div class="label">四邻对象</div>
<div class="value">{{form.residentName}}</div>
</div>
<div class="flex mar-b16">
<div class="label">事件日期</div>
<div class="value">{{form.linksageDate}}</div>
</div>
<div class="flex">
<div class="label">事件描述</div>
</div>
<div class="content mar-b16">{{form.description}}</div>
<div class="flex" v-if="form.status == 2">
<div class="label">审核意见</div>
</div>
<div class="content" v-if="form.status == 2">{{form.remark}}</div>
<div class="footer" v-if="form.status == 0">
<div @click="toContent">审核不通过</div>
<div class="btn" @click="pass">审核通过</div>
</div>
</div>
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'detail',
data() {
return {
id: '',
form: {}
}
},
computed: {
...mapState(['user']),
},
onLoad(option) {
this.id = option.id
this.$dict.load('partyFourLinkageStatus').then(() => {
this.getDetail()
})
uni.$on('reload', () => {
this.getDetail()
})
},
onShow() {
document.title = '四邻联动'
},
methods: {
toContent() {
uni.navigateTo({url: `./Content?id=${this.id}`})
},
getDetail() {
this.$http.post(`/app/apppartyfourlinkage/queryDetailById?id=${this.id}`).then((res) => {
if (res.code == 0) {
this.form = res.data
}
})
},
pass() {
this.$confirm('是否确认审核通过?').then(() => {
this.$http.post(`/app/apppartyfourlinkage/auditById?id=${this.id}&status=1`).then((res) => {
if (res.code == 0) {
this.$u.toast('审核成功')
uni.$emit('reload')
setTimeout(() => {
uni.navigateBack({
delta: 1
})
}, 600)
}
})
})
}
},
}
</script>
<style lang="scss" scoped>
.detail {
.flex{
display: flex;
justify-content: space-between;
padding: 34px 32px 34px 32px;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 44px;
background-color: #fff;
.label{
width: 150px;
}
}
.mar-b16{
margin-bottom: 16px;
}
.content{
width: 100%;
padding: 0 32px 32px;
background-color: #fff;
box-sizing: border-box;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 44px;
word-break: break-all;
}
.footer {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
display: flex;
background: #fff;
color: #f46;
div{
flex: 1;
height: 112px;
line-height: 112px;
text-align: center;
font-size: 32px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
}
.btn {
background: #3975C6;
color: #fff;
}
}
.status0{
color: #FF883C;
}
.status1{
color: #2EA222;
}
.status2{
color: #F46;
}
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB