admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-gmj' into 'master'

Browse Source 
修改表单星号样式及修改核酸过期人员列表分页样式

See merge request !21
This commit is contained in:
杜海鹏 2022-06-27 15:58:20 +08:00
commit 22aaa1efe0
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/projectFront/buildersDiary/diaryMod.vue
View File

@ -49,8 +49,8 @@
</el-col>
<el-col :span="10">
<!-- 单位工程名称 -->
<label class="xingxing"></label>
<el-form-item :label="$t('message.buildersDiary.unitProjectName')+'：'" prop="buildName">
<!-- <label class="xingxing"></label> -->
<el-form-item class="xingxing" :label="$t('message.buildersDiary.unitProjectName')+'：'" prop="buildName">
<el-input v-model="ruleForm.buildName"></el-input>
</el-form-item>
</el-col>
@ -68,8 +68,8 @@
</el-col>
<el-col :span="10">
<!-- 施工项目部门 -->
<label class="xingxing"></label>
<el-form-item :label="$t('message.buildersDiary.constructionProjectDepartment')+'：'" prop="buildProjectDept">
<!-- <label class="xingxing"></label> -->
<el-form-item class="xingxing" :label="$t('message.buildersDiary.constructionProjectDepartment')+'：'" prop="buildProjectDept">
<el-input v-model="ruleForm.buildProjectDept"></el-input>
</el-form-item>
</el-col>
@ -87,15 +87,15 @@
</el-col>
<el-col :span="5">
<!-- 项目负责人 -->
<label class="xingxing"></label>
<el-form-item :label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector">
<!-- <label class="xingxing"></label> -->
<el-form-item class="xingxing":label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector">
<el-input v-model="ruleForm.projectDirector"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<!-- 单位工程施工员 -->
<label class="xingxing"></label>
<el-form-item :label="$t('message.buildersDiary.unitConstructionPeople')+'：'" prop="constructionCrew">
<!-- <label class="xingxing"></label> -->
<el-form-item class="xingxing" :label="$t('message.buildersDiary.unitConstructionPeople')+'：'" prop="constructionCrew">
<el-input v-model="ruleForm.constructionCrew"></el-input>
</el-form-item>
</el-col>
@ -757,6 +757,7 @@ export default {
created() {
this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL;
this.projectSn = this.$store.state.projectSn;
this.type = this.$props.status;
},
@ -784,6 +785,7 @@ export default {
//上传成功
handleSuccess(file) {
let data = { name: file.data[0].filename, url: file.data[0].imageUrl };
console.log(data,'datadatadatadata')
this.fileList.push(data);
},
//删除成功
@ -803,7 +805,7 @@ export default {
},
//提交保存
submitForm() {
if(!this.ruleForm.buildName){
this.$message.error("请输入单位工程名称")
return false;
@ -953,11 +955,17 @@ export default {
};
</script>
<style lang="less" scoped>
.xingxing{
position: relative;
}
.xingxing::before{
content: "*";
color: red;
font-size: 14px;
margin-right: 6px;
position: absolute;
top: 10px;
left: 0px;
}
.diaryMod {

24
src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
View File

@ -60,17 +60,17 @@
</el-table>
<div class="pagination">
<el-pagination
class="pagerBox"
:current-page="pageNo"
background
layout="prev, pager, next"
:page-size="pageSize"
@current-change="handleCurrentChange"
:total="total"
>
</el-pagination>
class="pagerBox"
@current-change="handleCurrentChange"
:current-page="pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pageSize"
layout="total, sizes, prev, pager, next"
:total="total"
background
></el-pagination>
</div>
</div>
</div>
@ -109,7 +109,7 @@ export default {
classParame: 1,
pageNo: 1,
pageSize: 10,
total: ''
total: 0
}
},
created() {
@ -121,11 +121,13 @@ export default {
this.pageNo = val;
this.getDataList();
},
//刷选
screen(v) {
this.classParame = v;
this.pageNo = 1;
this.getDataList();
},
//获取数据列表
getDataList() {
selectWorkScheduleListApi({
selectType: this.classParame,