kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-05-20 17:01:28 +08:00
parent 2d6e69b68f b9d0c8f323
commit f40f2d913a
4 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/AppHelpDeclaration/add.vue
View File

@@ -12,13 +12,13 @@
<div class="left"> <div class="left">
<span>*</span><span>申请人身份证号</span> <span>*</span><span>申请人身份证号</span>
</div> </div>
<input type="number" class="right__text" v-model="form.idNumber" placeholder="请输入" maxlength="20"/> <input type="text" class="right__text" v-model="form.idNumber" placeholder="请输入" maxlength="18"/>
</div> </div>
<div class="item"> <div class="item">
<div class="left"> <div class="left">
<span>*</span><span>联系方式</span> <span>*</span><span>联系方式</span>
</div> </div>
<input type="number" class="right__text" v-model="form.phone" placeholder="请输入" maxlength="11"/> <input type="tel" class="right__text" v-model="form.phone" placeholder="请输入" maxlength="11"/>
</div> </div>
</div> </div>
@@ -27,7 +27,7 @@
<div class="left"> <div class="left">
<span>*</span><span>家庭人口数</span> <span>*</span><span>家庭人口数</span>
</div> </div>
<input type="number" class="right__text" v-model="form.householdNumber" placeholder="请输入" maxlength="10"/> <input type="tel" class="right__text" v-model="form.householdNumber" placeholder="请输入" maxlength="10"/>
</div> </div>
<div class="item"> <div class="item">
<div class="left"> <div class="left">
@@ -56,7 +56,8 @@
<div class="left"> <div class="left">
<span>*</span><span>返贫致贫风险说明</span> <span>*</span><span>返贫致贫风险说明</span>
</div> </div>
<input type="text" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险说明" maxlength="200"/> <u-input type="textarea" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险"
placeholder-style="font-size: 14px;color: #999;" maxlength="500" auto-height/>
</div> </div>
<div class="items"> <div class="items">
<div class="left"> <div class="left">
@@ -76,6 +77,7 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex'
export default { export default {
data() { data() {
return { return {
@@ -109,6 +111,10 @@ export default {
}) })
}, },
computed: {
...mapState(['user'])
},
onShow() { onShow() {
document.title = '添加帮扶申报' document.title = '添加帮扶申报'
}, },
@@ -154,7 +160,7 @@ export default {
} }
} }
if(!this.form.riskDescription) { if(!this.form.riskDescription) {
return this.$u.toast('请输入帮扶原因说明') return this.$u.toast('请输入返贫致贫风险说明')
} }
this.flag = true this.flag = true

21
src/apps/AppHelpDeclaration/details.vue
View File

@@ -30,7 +30,7 @@
</div> </div>
<div class="item"> <div class="item">
<label>申报方式</label> <label>申报方式</label>
<div>自主申报</div> <div>{{ $dict.getLabel('helpDeclarationType',data.declareType) }}</div>
</div> </div>
<div class="item"> <div class="item">
<label>身份证号</label> <label>身份证号</label>
@@ -38,7 +38,7 @@
</div> </div>
<div class="item"> <div class="item">
<label>所在地区</label> <label>所在地区</label>
<div>{{ data.areaName }}</div> <div>{{ data.areaName }}{{ data.address }}</div>
</div> </div>
<div class="items" v-if="data.files && data.files.length"> <div class="items" v-if="data.files && data.files.length">
<p>照片</p> <p>照片</p>
@@ -53,7 +53,7 @@
<div class="plan"> <div class="plan">
<div class="nav"> <div class="nav">
<span>办理进度</span> <span>办理进度</span>
<span> ({{ $dict.getLabel('helpDeclarationStatus', data.status) }})</span> <span style="color: #999;"> ({{ $dict.getLabel('helpDeclarationStatus', data.status) }})</span>
</div> </div>
<div class="cards" v-for="(item, index) in data.processList" :key="index"> <div class="cards" v-for="(item, index) in data.processList" :key="index">
@@ -70,7 +70,7 @@
<div class="cardsss-right-left"> <div class="cardsss-right-left">
<div class="cardssss-right-left-top"> <div class="cardssss-right-left-top">
<span>{{ item.description }}</span> <span>{{ item.description }}</span>
<div style="color: #2ea222; font-size: 16px; margin-top: 5px"> <div :style="{color: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}" style="font-size: 16px; margin-top: 5px">
{{ $dict.getLabel('helpDeclarationStatus', item.status) }} {{ $dict.getLabel('helpDeclarationStatus', item.status) }}
</div> </div>
</div> </div>
@@ -85,13 +85,13 @@
<div class="cardes-msg-top" v-if="item.doExplain">{{ item.doExplain }}</div> <div class="cardes-msg-top" v-if="item.doExplain">{{ item.doExplain }}</div>
<div class="imgs"> <div class="imgs">
<img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index" @click="previewImage(item.files, e.url)" /> <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index" @click="preview(item.files, e.url)" />
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="fixedBtn" v-if="data.status == 0"> <div class="fixedBtn" v-if="data.status == 0 || data.status == 1">
<div class="status00"> <div class="status00">
<div class="columns" @click="toContent(1)"> <div class="columns" @click="toContent(1)">
<span class="hint">转交事件</span> <span class="hint">转交事件</span>
@@ -115,7 +115,7 @@ export default {
} }
}, },
onLoad(o) { onLoad(o) {
this.$dict.load('helpDeclarationStatus') this.$dict.load('helpDeclarationStatus','helpDeclarationType')
if (o.id) { if (o.id) {
this.id = o.id this.id = o.id
this.getDetail() this.getDetail()
@@ -232,6 +232,13 @@ export default {
div { div {
margin-top: 32px; margin-top: 32px;
} }
.picture {
img {
width: 200px;
height: 200px;
margin-right: 10px;
}
}
} }
.status0 { .status0 {
color: #FF883C color: #FF883C

40
src/apps/AppHelpDeclaration/list.vue
View File

@@ -13,16 +13,14 @@
<u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect(e)"></u-icon> <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect(e)"></u-icon>
</div> </div>
</AiAreaPicker> </AiAreaPicker>
<u-icon name="close-circle" v-if="areaId" @click="clearArea" color="#999" size="24"></u-icon>
</div> </div>
<div class="right"> <div class="right">
<AiSelect dict="helpDeclarationReason" v-model="declareReason"> <AiSelect v-model="declareReason" :list="riskList" @data="typeSelect">
<span v-if="!declareReason" style="color: #999;">风险类型</span> <span v-if="!declareReason" style="color: #999;">风险类型</span>
<span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span> <span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span>
<u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon> <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
<!-- <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon> -->
</AiSelect> </AiSelect>
<u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon>
<!-- style="margin-left: 4px;width: 14px; display:inline-block;" -->
</div> </div>
</div> </div>
</AiTopFixed> </AiTopFixed>
@@ -31,7 +29,10 @@
<div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)"> <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
<div class="top"> <div class="top">
<div class="title">{{ item.riskDescription }}</div> <div class="title">{{ item.riskDescription }}</div>
<div class="time">{{ item.declareTime }}</div>
<div class="info"><span>申请人姓名</span><span>{{ item.createUserName }}</span></div>
<div class="info"><span>所在地区</span><span>{{ item.areaName }}{{ item.address }}</span></div>
<div class="info"><span>风险类型</span><span>{{ item.reason }}</span></div>
</div> </div>
<div class="bottom"> <div class="bottom">
<span :style="{background: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}"></span> <span :style="{background: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}"></span>
@@ -63,6 +64,7 @@ export default {
areaName: '', areaName: '',
declareReason: '', declareReason: '',
list: [], list: [],
riskList: [],
} }
}, },
computed: { computed: {
@@ -70,6 +72,11 @@ export default {
}, },
onShow() { onShow() {
this.$dict.load('helpDeclarationStatus').then(() => { this.$dict.load('helpDeclarationStatus').then(() => {
this.riskList = this.$dict.getDict('helpDeclarationReason').map((item) => ({
label: item.dictName,
value: item.dictValue
}))
this.riskList.unshift({label: "全部", value: ""})
uni.$on('update', () => { uni.$on('update', () => {
this.getList() this.getList()
}) })
@@ -85,13 +92,19 @@ export default {
}, },
areaSelect(e) { areaSelect(e) {
console.log(e);
this.areaId =e this.areaId =e
this.$nextTick(() => { this.$nextTick(() => {
this.getList() this.getList()
}) })
}, },
typeSelect(e) {
this.declareReason = e[0].value
this.current = 1,
this.list = [],
this.getList()
},
clearArea() { clearArea() {
this.areaId = '', this.areaId = '',
this.areaName = '', this.areaName = '',
@@ -221,11 +234,22 @@ export default {
display:-webkit-box; display:-webkit-box;
-webkit-box-orient:vertical; -webkit-box-orient:vertical;
-webkit-line-clamp:2; -webkit-line-clamp:2;
margin-bottom: 24px;
} }
.time { .info {
margin-top: 32px; span:first-child {
color: #999999; color: #999999;
font-size: 26px; font-size: 26px;
display: inline-block;
width: 160px;
}
span:last-child {
display: inline-block;
width: calc(100% - 160px);
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
} }
} }
.bottom { .bottom {

13
src/apps/AppHelpDeclaration/result.vue
View File

@@ -4,7 +4,7 @@
<div class="type"> <div class="type">
<div class="left"> <div class="left">
<span>*</span> <span>*</span>
<span v-if="status == 1">处理意见</span> <span v-if="status == 1">转交给</span>
<span v-if="status == 2">处理结果</span> <span v-if="status == 2">处理结果</span>
</div> </div>
<div class="right"> <div class="right">
@@ -23,16 +23,16 @@
<div class="remark"> <div class="remark">
<div class="top"> <div class="top">
<span style="margin-right: 8px;"></span><span>办理意见</span> <span>*</span><span>办理意见</span>
</div> </div>
<div class="bottom"> <div class="bottom">
<u-input type="textarea" v-model="description" placeholder="请写下你的办理意见" maxlength="500" height="200"/> <u-input type="textarea" v-model="description" placeholder="请写下你的办理意见" maxlength="100" height="200" />
</div> </div>
</div> </div>
<div class="picture"> <div class="picture">
<div class="top"> <div class="top">
<span style="margin-right: 8px"></span><span>图片上传<span style="color: #999;font-size:14px;">最多9张</span></span> <span style="margin-right: 8px"></span><span>图片上传<span style="color: #999;font-size:14px;">(最多9张)</span></span>
</div> </div>
<div class="bottom"> <div class="bottom">
<AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader> <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
@@ -87,6 +87,9 @@ export default {
return this.$u.toast('请选择处理结果') return this.$u.toast('请选择处理结果')
} }
} }
if (!this.description) {
return this.$u.toast('请输入办理意见')
}
let url = '' let url = ''
let form = {} let form = {}
@@ -122,7 +125,7 @@ export default {
} }
}, },
onShow() { onShow() {
document.title = this.checkType == 1? "处理意见":this.checkType == 2? "处理结果": '' document.title = this.status == 1? "转交": "审核处理"
} }
} }
</script> </script>