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

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

@ -519,56 +519,56 @@ export default {
trigger: "change",
},
],
nation: [
{
required: true,
message: "Please select nationality",
trigger: "change",
},
{
required: true,
message: "Please select nationality",
trigger: "submit",
},
],
nativePlace: [
{
required: true,
message: "Please enter your native place",
trigger: "blur",
},
],
issuingAuthorityForIdcard: [
{
required: true,
message: "Please enter the issuing authority",
trigger: "blur",
},
],
idCardEndDate: [
{
required: true,
message: "Please select an effective date",
trigger: "submit",
},
{
required: true,
message: "Please select an effective date",
trigger: "change",
},
],
idCardUpPhotoUrl: [
{
required: true,
message: "Please choose to upload your ID card",
trigger: "submit",
},
{
required: true,
message: "Please choose to upload your ID card",
trigger: "change",
},
],
// nation: [
// {
// required: true,
// message: "Please select nationality",
// trigger: "change",
// },
// {
// required: true,
// message: "Please select nationality",
// trigger: "submit",
// },
// ],
// nativePlace: [
// {
// required: true,
// message: "Please enter your native place",
// trigger: "blur",
// },
// ],
// issuingAuthorityForIdcard: [
// {
// required: true,
// message: "Please enter the issuing authority",
// trigger: "blur",
// },
// ],
// idCardEndDate: [
// {
// required: true,
// message: "Please select an effective date",
// trigger: "submit",
// },
// {
// required: true,
// message: "Please select an effective date",
// trigger: "change",
// },
// ],
// idCardUpPhotoUrl: [
// {
// required: true,
// message: "Please choose to upload your ID card",
// trigger: "submit",
// },
// {
// required: true,
// message: "Please choose to upload your ID card",
// trigger: "change",
// },
// ],
phoneNumber: [
{
required: true,
@ -576,20 +576,20 @@ export default {
trigger: "blur",
},
],
emergentPerson: [
{
required: true,
message: "Please enter an emergency contact",
trigger: "blur",
},
],
emergentPhone: [
{
required: true,
message: "Please enter your emergency contact number",
trigger: "blur",
},
],
// emergentPerson: [
// {
// required: true,
// message: "Please enter an emergency contact",
// trigger: "blur",
// },
// ],
// emergentPhone: [
// {
// required: true,
// message: "Please enter your emergency contact number",
// trigger: "blur",
// },
// ],
},
queryFails: 'The query fails',
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"
title="风险提示"
:visible.sync="riskTipVisible"
width="667px"
width="70%"
@close="closeRiskTipDialog"
>
<div class="dialog_content">
<el-form
ref="riskEditForm"
label-width="100px"
size="medium"
class="dialogFormBox"
label-width="120px"
:rules="riskEditRules"
:model="riskTipInfo"
>
<el-form-item label="危险点辨识" prop="dangerPointIdentification">
<el-input
<quill-editor
v-model="riskTipInfo.dangerPointIdentification"
placeholder="请输入"
:rows="3"
type="textarea"
></el-input>
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)"
@focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item>
<el-form-item label="风险控制措施" prop="riskControlMeasure">
<el-input
<quill-editor
v-model="riskTipInfo.riskControlMeasure"
placeholder="请输入"
:rows="3"
type="textarea"
></el-input>
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)"
@focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item>
<el-form-item label="施工要点" prop="constructionKeyPoint">
<el-input
<quill-editor
v-model="riskTipInfo.constructionKeyPoint"
placeholder="请输入"
:rows="3"
type="textarea"
></el-input>
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)"
@focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</el-form-item>
</el-form>
</div>
@ -582,9 +590,38 @@ import {
getBimBaseDetailsApi,
projectBimBaseListApi,
} from "@/assets/js/api/project";
import VueQuillEditor from "vue-quill-editor";
export default {
components: {
VueQuillEditor,
},
data() {
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,
selectedHideList: [],
selectedColorList: [],
@ -646,9 +683,9 @@ export default {
fileUrl: "",
dialogVisible: false, //新增弹窗
riskTipInfo: {
dangerPointIdentification: '',
riskControlMeasure: '',
constructionKeyPoint: ''
dangerPointIdentification: "",
riskControlMeasure: "",
constructionKeyPoint: "",
},
workerInfo: {
taskName: "",
@ -815,6 +852,15 @@ export default {
this.getCrewListData();
},
methods: {
onEditorBlur() {
// 失去焦点事件
},
onEditorFocus() {
// 获得焦点事件
},
onEditorChange() {
// 内容改变事件
},
//导入确定提交
handleUploadConfirm() {
if (this.fileName == "") {
@ -956,7 +1002,7 @@ export default {
},
// 风险提示
openRiskTipDialog(val) {
console.log(val)
console.log(val);
this.riskTipInfo = JSON.parse(JSON.stringify(val));
this.riskTipVisible = true;
},
@ -1037,15 +1083,7 @@ export default {
this.$refs.addEditForm.validate((valid) => {
if (valid) {
let data = {
taskName: this.workerInfo.taskName,
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,
...this.workerInfo,
projectSn: this.projectSn,
};
if (this.dialogType == 1) {
@ -1359,4 +1397,9 @@ export default {
border: 1px solid #ccc;
margin-top: 10px;
}
::v-deep .ql-editor {
// 样式穿透
min-height: 180px !important;
}
</style>

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

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