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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev

Browse Source
This commit is contained in:
vce 2024-03-11 14:09:55 +08:00
commit 3d3fe32a91
4 changed files with 214 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -611,56 +611,56 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
nation: [ // nation: [
{ // {
required: true, // required: true,
message: "请选择民族", // message: "请选择民族",
trigger: "change", // trigger: "change",
}, // },
{ // {
required: true, // required: true,
message: "请选择民族", // message: "请选择民族",
trigger: "submit", // trigger: "submit",
}, // },
], // ],
nativePlace: [ // nativePlace: [
{ // {
required: true, // required: true,
message: "请输入籍贯", // message: "请输入籍贯",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
issuingAuthorityForIdcard: [ // issuingAuthorityForIdcard: [
{ // {
required: true, // required: true,
message: "请输入签发机关", // message: "请输入签发机关",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
idCardEndDate: [ // idCardEndDate: [
{ // {
required: true, // required: true,
message: "请选择有效日期", // message: "请选择有效日期",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "请选择有效日期", // message: "请选择有效日期",
trigger: "change", // trigger: "change",
}, // },
], // ],
idCardUpPhotoUrl: [ // idCardUpPhotoUrl: [
{ // {
required: true, // required: true,
message: "请选择上传身份证", // message: "请选择上传身份证",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "请选择上传身份证", // message: "请选择上传身份证",
trigger: "change", // trigger: "change",
}, // },
], // ],
phoneNumber: [ phoneNumber: [
{ {
required: true, required: true,
@ -668,20 +668,20 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
emergentPerson: [ // emergentPerson: [
{ // {
required: true, // required: true,
message: "请输入紧急联系人", // message: "请输入紧急联系人",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
emergentPhone: [ // emergentPhone: [
{ // {
required: true, // required: true,
message: "请输入紧急联系人电话", // message: "请输入紧急联系人电话",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
}, },
queryFails: '查询失败', queryFails: '查询失败',
creditCode: '请输入正确的社会统一信用代码', creditCode: '请输入正确的社会统一信用代码',

128
src/assets/i18n/langs/en/laborManage/personManage.js
View File

@ -519,56 +519,56 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
nation: [ // nation: [
{ // {
required: true, // required: true,
message: "Please select nationality", // message: "Please select nationality",
trigger: "change", // trigger: "change",
}, // },
{ // {
required: true, // required: true,
message: "Please select nationality", // message: "Please select nationality",
trigger: "submit", // trigger: "submit",
}, // },
], // ],
nativePlace: [ // nativePlace: [
{ // {
required: true, // required: true,
message: "Please enter your native place", // message: "Please enter your native place",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
issuingAuthorityForIdcard: [ // issuingAuthorityForIdcard: [
{ // {
required: true, // required: true,
message: "Please enter the issuing authority", // message: "Please enter the issuing authority",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
idCardEndDate: [ // idCardEndDate: [
{ // {
required: true, // required: true,
message: "Please select an effective date", // message: "Please select an effective date",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "Please select an effective date", // message: "Please select an effective date",
trigger: "change", // trigger: "change",
}, // },
], // ],
idCardUpPhotoUrl: [ // idCardUpPhotoUrl: [
{ // {
required: true, // required: true,
message: "Please choose to upload your ID card", // message: "Please choose to upload your ID card",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "Please choose to upload your ID card", // message: "Please choose to upload your ID card",
trigger: "change", // trigger: "change",
}, // },
], // ],
phoneNumber: [ phoneNumber: [
{ {
required: true, required: true,
@ -576,20 +576,20 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
emergentPerson: [ // emergentPerson: [
{ // {
required: true, // required: true,
message: "Please enter an emergency contact", // message: "Please enter an emergency contact",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
emergentPhone: [ // emergentPhone: [
{ // {
required: true, // required: true,
message: "Please enter your emergency contact number", // message: "Please enter your emergency contact number",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
}, },
queryFails: 'The query fails', queryFails: 'The query fails',
creditCode: 'Please enter the correct social uniform credit code', creditCode: 'Please enter the correct social uniform credit code',

105
src/views/projectFront/BIMBASECenter/singleProgressManagement.vue
View File

@ -251,41 +251,49 @@
:modal-append-to-body="false" :modal-append-to-body="false"
title="风险提示" title="风险提示"
:visible.sync="riskTipVisible" :visible.sync="riskTipVisible"
width="667px" width="70%"
@close="closeRiskTipDialog" @close="closeRiskTipDialog"
> >
<div class="dialog_content"> <div class="dialog_content">
<el-form <el-form
ref="riskEditForm" ref="riskEditForm"
label-width="100px"
size="medium" size="medium"
class="dialogFormBox" label-width="120px"
:rules="riskEditRules" :rules="riskEditRules"
:model="riskTipInfo" :model="riskTipInfo"
> >
<el-form-item label="危险点辨识" prop="dangerPointIdentification"> <el-form-item label="危险点辨识" prop="dangerPointIdentification">
<el-input <quill-editor
v-model="riskTipInfo.dangerPointIdentification" v-model="riskTipInfo.dangerPointIdentification"
placeholder="请输入" ref="myQuillEditor"
:rows="3" :options="editorOption"
type="textarea" @blur="onEditorBlur($event)"
></el-input> @focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="风险控制措施" prop="riskControlMeasure"> <el-form-item label="风险控制措施" prop="riskControlMeasure">
<el-input <quill-editor
v-model="riskTipInfo.riskControlMeasure" v-model="riskTipInfo.riskControlMeasure"
placeholder="请输入" ref="myQuillEditor"
:rows="3" :options="editorOption"
type="textarea" @blur="onEditorBlur($event)"
></el-input> @focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="施工要点" prop="constructionKeyPoint"> <el-form-item label="施工要点" prop="constructionKeyPoint">
<el-input <quill-editor
v-model="riskTipInfo.constructionKeyPoint" v-model="riskTipInfo.constructionKeyPoint"
placeholder="请输入" ref="myQuillEditor"
:rows="3" :options="editorOption"
type="textarea" @blur="onEditorBlur($event)"
></el-input> @focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -582,9 +590,38 @@ import {
getBimBaseDetailsApi, getBimBaseDetailsApi,
projectBimBaseListApi, projectBimBaseListApi,
} from "@/assets/js/api/project"; } from "@/assets/js/api/project";
import VueQuillEditor from "vue-quill-editor";
export default { export default {
components: {
VueQuillEditor,
},
data() { data() {
return { return {
editorOption: {
modules: {
toolbar: [
["bold", "italic", "underline", "strike"], //加粗，斜体，下划线，删除线
["blockquote", "code-block"], //引用，代码块
[{ header: 1 }, { header: 2 }], // 标题，键值对的形式；1、2表示字体大小
[{ list: "ordered" }, { list: "bullet" }], //列表
[{ script: "sub" }, { script: "super" }], // 上下标
[{ indent: "-1" }, { indent: "+1" }], // 缩进
[{ direction: "rtl" }], // 文本方向
[{ size: ["small", false, "large", "huge"] }], // 字体大小
[{ header: [1, 2, 3, 4, 5, 6, false] }], //几级标题
[{ color: [] }, { background: [] }], // 字体颜色，字体背景颜色
[{ font: [] }], //字体
[{ align: [] }], //对齐方式
["clean"], //清除字体样式
["image"], //上传图片、上传视频
],
},
theme: "snow",
},
riskTipVisible: false, riskTipVisible: false,
selectedHideList: [], selectedHideList: [],
selectedColorList: [], selectedColorList: [],
@ -646,9 +683,9 @@ export default {
fileUrl: "", fileUrl: "",
dialogVisible: false, //新增弹窗 dialogVisible: false, //新增弹窗
riskTipInfo: { riskTipInfo: {
dangerPointIdentification: '', dangerPointIdentification: "",
riskControlMeasure: '', riskControlMeasure: "",
constructionKeyPoint: '' constructionKeyPoint: "",
}, },
workerInfo: { workerInfo: {
taskName: "", taskName: "",
@ -815,6 +852,15 @@ export default {
this.getCrewListData(); this.getCrewListData();
}, },
methods: { methods: {
onEditorBlur() {
// 失去焦点事件
},
onEditorFocus() {
// 获得焦点事件
},
onEditorChange() {
// 内容改变事件
},
//导入确定提交 //导入确定提交
handleUploadConfirm() { handleUploadConfirm() {
if (this.fileName == "") { if (this.fileName == "") {
@ -956,7 +1002,7 @@ export default {
}, },
// 风险提示 // 风险提示
openRiskTipDialog(val) { openRiskTipDialog(val) {
console.log(val) console.log(val);
this.riskTipInfo = JSON.parse(JSON.stringify(val)); this.riskTipInfo = JSON.parse(JSON.stringify(val));
this.riskTipVisible = true; this.riskTipVisible = true;
}, },
@ -1037,15 +1083,7 @@ export default {
this.$refs.addEditForm.validate((valid) => { this.$refs.addEditForm.validate((valid) => {
if (valid) { if (valid) {
let data = { let data = {
taskName: this.workerInfo.taskName, ...this.workerInfo,
startDate: this.workerInfo.startDate,
finishDate: this.workerInfo.finishDate,
actualStartDate: this.workerInfo.actualStartDate,
actualFinishDate: this.workerInfo.actualFinishDate,
dutyUserId: this.workerInfo.dutyUserId,
progressRatio: this.workerInfo.progressRatio,
remark: this.workerInfo.remark,
parentId: this.workerInfo.parentId,
projectSn: this.projectSn, projectSn: this.projectSn,
}; };
if (this.dialogType == 1) { if (this.dialogType == 1) {
@ -1359,4 +1397,9 @@ export default {
border: 1px solid #ccc; border: 1px solid #ccc;
margin-top: 10px; margin-top: 10px;
} }
::v-deep .ql-editor {
// 样式穿透
min-height: 180px !important;
}
</style> </style>

24
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -2999,18 +2999,18 @@ export default {
) )
return return
} }
if (this.personForm.idCardUpPhotoUrl == '') { // if (this.personForm.idCardUpPhotoUrl == '') {
this.$message.error( // this.$message.error(
this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard') // this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard')
) // )
return // return
} // }
if (this.personForm.idCardDownPhotoUrl == '') { // if (this.personForm.idCardDownPhotoUrl == '') {
this.$message.error( // this.$message.error(
this.$t('message.laborMange.pleaseUploadYourIDCardPortrait') // this.$t('message.laborMange.pleaseUploadYourIDCardPortrait')
) // )
return // return
} // }
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {