Browse Source

bug修改

v3
蟑螂恶霸 2 years ago
parent
commit
3abc1b32bf
  1. 17
      src/views/administrative/appointment.vue
  2. 16
      src/views/administrative/appointmentDetail.vue
  3. 17
      src/views/administrative/appointmentEdit.vue
  4. 4
      src/views/administrative/appointmentList.vue
  5. 16
      src/views/administrative/appointmentRelaunch.vue
  6. 18
      src/views/administrative/deptFilter.vue
  7. 18
      src/views/enforce/enforcementPlanAdd.vue
  8. 19
      src/views/enforce/sign.vue
  9. 19
      src/views/enterprise/registrationEdit.vue

17
src/views/administrative/appointment.vue

@ -204,9 +204,10 @@
<!-- @click="data.deptChecked=true"--> <!-- @click="data.deptChecked=true"-->
<!-- />--> <!-- />-->
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <!-- <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>-->
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span> <span class="add-name">{{nameCorrect(item.userName)}}</span>
<span class="add-dept">{{item.deptName}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -879,17 +880,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(1) { /*.add-inspect p:nth-child(1) {
background-color: #fff; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
display: block;
margin-right: 0.2rem; margin-right: 0.2rem;
color: #999; color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #666; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
.add-inspect label { .add-inspect label {

16
src/views/administrative/appointmentDetail.vue

@ -703,17 +703,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(1) { /*.add-inspect p:nth-child(1) {
background-color: #fff; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
margin-right: 0.2rem; display: block;
color: #999; margin-right: 0.2rem;
color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #666; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
.add-inspect label { .add-inspect label {

17
src/views/administrative/appointmentEdit.vue

@ -185,9 +185,10 @@
<!-- @click="selectDepts"--> <!-- @click="selectDepts"-->
<!-- />--> <!-- />-->
<div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1"> <div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <!-- <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>-->
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span> <span class="add-name">{{nameCorrect(item.userName)}}</span>
<span class="add-dept">{{item.deptName}}</span>
</p> </p>
</div> </div>
</van-cell-group> </van-cell-group>
@ -844,17 +845,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(1) { /*.add-inspect p:nth-child(1) {
background-color: #fff; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
display: block;
margin-right: 0.2rem; margin-right: 0.2rem;
color: #999; color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #666; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
.add-inspect label { .add-inspect label {

4
src/views/administrative/appointmentList.vue

@ -85,10 +85,10 @@
<p v-if="item.isReg == 0"><label class="card_box_label">执法状态:</label> <span>未登记</span></p> <p v-if="item.isReg == 0"><label class="card_box_label">执法状态:</label> <span>未登记</span></p>
<p v-if="item.isReg == 1"><label class="card_box_label">执法状态:</label> <span>已登记</span></p> <p v-if="item.isReg == 1"><label class="card_box_label">执法状态:</label> <span>已登记</span></p>
</div> </div>
<div class="btn-list" > <div class="btn-list">
<a v-if="item.isReg != 1 && item.status != 1 && item.status != 3" @click.stop="toEditView(item.id)"><van-icon name="edit" />变更</a> <a v-if="item.isReg != 1 && item.status != 1 && item.status != 3" @click.stop="toEditView(item.id)"><van-icon name="edit" />变更</a>
<a v-if="item.isReg != 1 && item.status != 1" @click.stop="data.showIsCancel = true"><van-icon name="close" />取消</a> <a v-if="item.isReg != 1 && item.status != 1" @click.stop="data.showIsCancel = true"><van-icon name="close" />取消</a>
<a v-if="item.isReg == 1" @click.stop="relaunchView(item.id)"><van-icon name="passed" />再次发起</a> <a v-if="item.isReg == 1" @click.stop="relaunchView(item.id)"><van-icon name="passed" />再次发起</a>
</div> </div>
</div> </div>
</div> </div>

16
src/views/administrative/appointmentRelaunch.vue

@ -813,17 +813,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(even) { /*.add-inspect p:nth-child(1) {
background-color: #f3f4f5; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
margin-right: 0.2rem; display: block;
color: #999; margin-right: 0.2rem;
color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #323233; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
.add-inspect label { .add-inspect label {

18
src/views/administrative/deptFilter.vue

@ -61,7 +61,11 @@
{{item.userName}} {{item.userName}}
</van-checkbox> --> </van-checkbox> -->
<div class="add-staff"> <div class="add-staff">
<van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop></van-checkbox><span class="add-dept">{{ item.dept.deptName}}</span><span class="add-name">{{item.userName}}</span> <van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop></van-checkbox>
<div class="staff-box">
<span class="add-name">{{item.userName}}</span>
<span class="add-dept">{{ item.dept.deptName}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -392,17 +396,25 @@
.add-staff { .add-staff {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
margin: 0.1rem 0; margin: 0.1rem 0;
padding: 0.2rem 0; padding: 0.2rem 0;
} }
.add-staff .staff-box {
width: calc(100% - 0.7rem);
text-align: left;
}
.add-staff span { .add-staff span {
display: block;
margin: auto 0.2rem; margin: auto 0.2rem;
color: #999; color: #323233;
} }
.add-staff span.add-dept { .add-staff span.add-dept {
color: #323233; color: #999;
line-height: 1.25;
} }
</style> </style>

18
src/views/enforce/enforcementPlanAdd.vue

@ -161,6 +161,7 @@
<div class="file-upload"> <div class="file-upload">
<div class="file-upload-center"> <div class="file-upload-center">
<label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label> <span>(仅限PDF文档,50MB以下)</span> <label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label> <span>(仅限PDF文档,50MB以下)</span>
<span class="down-mod"><van-icon name="upgrade" /><a @click="downloadFile">模板下载</a></span>
</div> </div>
<van-uploader v-model="data.fileListObj" max-count="1" class="file" :after-read="uploadFiles" <van-uploader v-model="data.fileListObj" max-count="1" class="file" :after-read="uploadFiles"
multiple @oversize="onOversize" :before-delete="deleteFile" accept=".pdf"> multiple @oversize="onOversize" :before-delete="deleteFile" accept=".pdf">
@ -170,8 +171,7 @@
</van-uploader> </van-uploader>
</div> </div>
<div class="warning-rule"> <div class="warning-rule">
<span><van-icon name="warning-o" /></span>仅支持上传50MB以下的PDF格式文档<span></span> <span><van-icon name="warning-o" /></span>仅支持上传50MB以下的PDF格式文档
<span><van-icon name="warning-o" /></span><a @click="downloadFile">模板下载</a><span></span>
</div> </div>
</van-cell-group> </van-cell-group>
<van-action-bar> <van-action-bar>
@ -865,4 +865,18 @@
.one-label > .van-cell:first-child { .one-label > .van-cell:first-child {
width: calc(65% + 0.22rem); width: calc(65% + 0.22rem);
} }
.down-mod {
position: absolute;
top: 0.05rem;
right: 0;
color: #1367fe;
font-size: 0.3rem;
}
.down-mod i {
margin-right: 0.1rem;
transform: rotateZ(-180deg);
font-size: 0.35rem;
}
</style> </style>

19
src/views/enforce/sign.vue

@ -157,9 +157,10 @@
</van-cell> --> </van-cell> -->
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <!-- <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>-->
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span> <span class="add-name">{{nameCorrect(item.userName)}}</span>
<span class="add-dept">{{item.deptName}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -1248,17 +1249,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(even) { /*.add-inspect p:nth-child(1) {
background-color: #f3f4f5; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
display: block;
margin-right: 0.2rem; margin-right: 0.2rem;
color: #999; color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #666; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
.item-delete { .item-delete {

19
src/views/enterprise/registrationEdit.vue

@ -241,9 +241,10 @@
</van-cell> </van-cell>
<div class="add-inspect" v-if="data.checked"> <div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p> <!-- <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>-->
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span> <span class="add-name">{{nameCorrect(item.userName)}}</span>
<span class="add-dept">{{item.deptName}}</span>
</p> </p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div> <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
</div> </div>
@ -1260,17 +1261,21 @@
//border-bottom: 1px solid #f4f5f6; //border-bottom: 1px solid #f4f5f6;
} }
.add-inspect p:nth-child(even) { /*.add-inspect p:nth-child(1) {
background-color: #f3f4f5; background-color: #fff;
} }*/
.add-inspect span { .add-inspect span {
display: block;
margin-right: 0.2rem; margin-right: 0.2rem;
color: #999; color: #666;
line-height: 1.75;
} }
.add-inspect span.add-dept { .add-inspect span.add-dept {
color: #666; color: #999;
font-size: 0.3rem;
line-height: 1.25;
} }
/deep/ .mult-line .van-field__label { /deep/ .mult-line .van-field__label {

Loading…
Cancel
Save