chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug修改

v3
蟑螂恶霸 2 years ago
parent
6706a03821
commit
5949844d8c
3 changed files with 67 additions and 46 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. 16
      src/views/administrative/deptFilter.vue
  2. 25
      src/views/enforce/enforceNotice.vue
  3. 72
      src/views/enforce/enforcementPlanAdd.vue

16
src/views/administrative/deptFilter.vue
View File

@ -246,20 +246,20 @@
} }
.popup-content { .popup-content {
margin: 0.25rem 3% 0; margin: 0.25rem 0 0;
padding-bottom: 3rem; padding-bottom: 3rem;
width: 94%; width: 100%;
height: calc(100% - 1.6rem); height: calc(100% - 1.6rem);
overflow-y: auto; overflow-y: auto;
font-size: 0.37rem; font-size: 0.37rem;
} }
.subsearch { .subsearch {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 3%; margin: 3% 0.43rem;
width: 94%; width: calc(100% - 0.86rem);
height: 1.25rem; height: 1.25rem;
font-size: 0.37rem; font-size: 0.37rem;
} }

25
src/views/enforce/enforceNotice.vue
View File

@ -34,9 +34,6 @@
<div class="item-cont"> <div class="item-cont">
<span class="item-title">{{ item.planName }}</span> <span class="item-title">{{ item.planName }}</span>
<!-- <span class="item-time"> {{ item.enforcementDepartment }} - {{ item.createTime }}</span>--> <!-- <span class="item-time"> {{ item.enforcementDepartment }} - {{ item.createTime }}</span>-->
<div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)">
<a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a>
</div>
<!-- <div class="item-time" style="display: flex; justify-content: space-between;"> <!-- <div class="item-time" style="display: flex; justify-content: space-between;">
<span>{{ item.bureauDeptName }}</span> <span>{{ item.bureauDeptName }}</span>
<span>{{ item.createTime }}</span> <span>{{ item.createTime }}</span>
@ -51,7 +48,9 @@
<div class="item-text"> <div class="item-text">
<p><label class="card_box_label">发布时间：</label> <span>{{ item.createTime }}</span></p> <p><label class="card_box_label">发布时间：</label> <span>{{ item.createTime }}</span></p>
</div> </div>
<div class="item-text">
<p><label class="card_box_label">附&nbsp; &nbsp; &nbsp; &nbsp;件：</label> <span> <a @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)">{{ null==item.fileObject?'':item.fileObject.fileName }}</a></span></p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -421,23 +420,23 @@
margin: 1% 0; margin: 1% 0;
padding: 0 1% 0 0; padding: 0 1% 0 0;
width: 98%; width: 98%;
align-items: center; align-items: flex-start;
/*border-bottom: 1px solid #f3f4f5;*/ /*border-bottom: 1px solid #f3f4f5;*/
} }
.notice-item > i { .notice-item > i {
display: inline-block; display: inline-block;
margin: 5% 0 5% 0.2rem; margin: 1% 0.1rem 0 0.2rem;
width: 1.5rem; width: 1.25rem;
height: 1.5rem; height: 1.25rem;
background: url("../../assets/images/icon_notice2.png") no-repeat left top 50%; background: url("../../assets/images/icon_notice2.png") no-repeat left top 50%;
background-size: auto 80%; background-size: auto 80%;
} }
.item-cont { .item-cont {
display: inline-block; display: inline-block;
margin: 3% 0; margin: 3% 0 0 0;
width: calc(100% - 1.75rem); width: calc(100% - 1.55rem);
} }
.item-time { .item-time {
@ -477,12 +476,18 @@
.item-text p { .item-text p {
display: flex; display: flex;
margin: 0; margin: 0;
padding: 0.12rem 0;
line-height: 1.25;
} }
.item-text label { .item-text label {
color: #323233; color: #323233;
} }
.item-text p span {
white-space: break-spaces;
}
/deep/ .van-search__content { /deep/ .van-search__content {
height: 0.9rem; height: 0.9rem;

72
src/views/enforce/enforcementPlanAdd.vue
View File

@ -41,39 +41,40 @@
required required
:rules="[{ required: true, message: '请输入计划名称' }]" :rules="[{ required: true, message: '请输入计划名称' }]"
/>--> />-->
<div class="flex-div"> <div class="one-label">
<van-field <van-field
label="计划名称" label="计划名称"
v-model="submitData.planYear" v-model="submitData.planYear"
is-link is-link
placeholder="选择年份" placeholder="请选择年份"
required required
/> />
<div class="right-txt">
<van-field <div class="flex-div">
v-model="submitData.planTime" <van-field
placeholder="请输入季度/月度" label=" "
/> v-model="data.fieldValue"
placeholder="请选择年/季/月度"
is-link
@click="data.dateShowPicker = true"
/>
<div class="right-txt">
<van-field
v-model="submitData.planTime"
placeholder="请选择"
is-link
/>
</div>
</div> </div>
</div>
<div class="flex-div">
<van-field <van-field
label=" " label=" "
v-model="data.fieldValue" v-model="submitData.planName"
is-link placeholder="行政检查计划"
readonly
@click="data.dateShowPicker = true"
/> />
<div class="right-txt">
<van-field
v-model="submitData.planName"
placeholder="行政检查计划"
/>
</div>
</div> </div>
<div class="warning-rule"> <!-- <div class="warning-rule">
<span><van-icon name="warning-o" /></span><span>"执法部门"+"年份"+"年度/月度/季度"+行政检查计划</span> <span><van-icon name="warning-o" /></span><span>"执法部门"+"年份"+"年度/月度/季度"+行政检查计划</span>
</div> </div>-->
<van-popup v-model:show="data.dateShowPicker" round position="bottom"> <van-popup v-model:show="data.dateShowPicker" round position="bottom">
<van-picker <van-picker
:columns="data.dateColumns" :columns="data.dateColumns"
@ -131,7 +132,7 @@
</van-uploader> </van-uploader>
</div> </div>
<div class="warning-rule"> <div class="warning-rule">
<span><van-icon name="warning-o" /></span>仅支持上传<b><i>50MB</i></b>以下的<b><i>PDF</i></b>格式文档<span></span> <span><van-icon name="warning-o" /></span>仅支持上传50MB以下的PDF格式文档<span></span>
</div> </div>
</van-cell-group> </van-cell-group>
<van-action-bar> <van-action-bar>
@ -181,7 +182,7 @@
//vant组件上传照片列表 //vant组件上传照片列表
fileListObj: [], fileListObj: [],
dateShowPicker: false, dateShowPicker: false,
fieldValue: "年度", fieldValue: "",
dateColumns: [ dateColumns: [
{ text: '年度', value: 'year' }, { text: '年度', value: 'year' },
{ text: '季度', value: 'quarter' }, { text: '季度', value: 'quarter' },
@ -591,7 +592,7 @@
align-items: center; align-items: center;
margin: 2% 0.27rem 1%; margin: 2% 0.27rem 1%;
padding: 0.2rem; padding: 0.2rem;
border-radius: 0.27rem; border-radius: 0.15rem;
background-color: #fff4e8; background-color: #fff4e8;
color: #fb710b; color: #fb710b;
font-size: 0.3rem; font-size: 0.3rem;
@ -611,7 +612,7 @@
align-items: center; align-items: center;
justify-content: right; justify-content: right;
margin-top: -1px; margin-top: -1px;
padding: 0 0.43rem 0 0.23rem; padding: 0 0.43rem;
color: #666; color: #666;
font-size: 0.37rem; font-size: 0.37rem;
white-space: nowrap; white-space: nowrap;
@ -622,7 +623,7 @@
left: 0.43rem; left: 0.43rem;
bottom: 0; bottom: 0;
width: calc(100% - 0.86rem); width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7; //border-bottom: 1px solid #f5f6f7;
content: ""; content: "";
} }
@ -637,11 +638,11 @@
.flex-div > .van-field { .flex-div > .van-field {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: 55%; width: 75%;
} }
.right-txt { .right-txt {
width: 45%; width: 25%;
} }
/deep/ .right-txt > .van-field { /deep/ .right-txt > .van-field {
@ -658,4 +659,19 @@
margin-left: 0; margin-left: 0;
} }
.one-label {
position: relative;
}
.one-label::after {
position: absolute;
left: 0.43rem;
bottom: 0;
width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7;
content: "";
}
.one-label .van-cell:after {
border-bottom: 0;
}
</style> </style>

Write Preview
Loading…
Cancel
Save