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

fix: 解决冲突

Browse Source
This commit is contained in:
kun 2024-05-27 21:50:52 +08:00
commit b5c0c58ca7
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -98,7 +98,7 @@
></el-input ></el-input
> >
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<el-select v-model="companyTypeId" placeholder="请选择项目类型"> <el-select v-model="companyTypeId" placeholder="请选择项目类型">
<el-option <el-option
v-for="item in companyTypeList" v-for="item in companyTypeList"
@ -107,7 +107,7 @@
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<!-- 查询 --> <!-- 查询 -->

2
src/views/projectFront/projectSummary/cooperatorDatails.vue
View File

@ -562,7 +562,7 @@ export default {
}, },
]; ];
this.infoEnterpriseId = res.result.id; this.infoEnterpriseId = res.result.id;
this.getDataDateils(); // this.getDataDateils();
console.log(this.enterpriseInfo,666777888) console.log(this.enterpriseInfo,666777888)
} }
}); });

4
src/views/projectFront/quality/inspectionLedger.vue
View File

@ -2055,7 +2055,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
<span class="label" style="width: 90px" <span class="label" style="width: 90px"
><span style="color: red">*&nbsp;</span ><span v-if="detailData.status == 2" style="color: red">*&nbsp;</span
>{{ >{{
detailData.status == 2 detailData.status == 2
? "整改照片：" ? "整改照片："
@ -2580,7 +2580,7 @@ export default {
if ( if (
this.replyData.rectifyTime == "" || this.replyData.rectifyTime == "" ||
this.replyData.additionalRemarks == "" || this.replyData.additionalRemarks == "" ||
this.fileListRectification.length == 0 (this.fileListRectification.length == 0 && this.replyData.type == 1)
) { ) {
this.$message.error("请将回复内容输入完整"); this.$message.error("请将回复内容输入完整");
return; return;

4
src/views/projectFront/quality/recordsModule/inspectionRecord.vue
View File

@ -878,7 +878,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
<span class="label" style="width: 90px" <span class="label" style="width: 90px"
><span style="color: red">*&nbsp;</span ><span v-if="detailData.status == 2" style="color: red">*&nbsp;</span
>{{ >{{
detailData.status == 2 detailData.status == 2
? '整改照片：' ? '整改照片：'
@ -1243,7 +1243,7 @@ export default {
} else { } else {
this.replyData.fileUrl = "" this.replyData.fileUrl = ""
} }
if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) {
this.$message.error('请将回复内容输入完整') this.$message.error('请将回复内容输入完整')
return; return;
} }

4
src/views/projectFront/safeSame/inspectionLedger.vue
View File

@ -2036,7 +2036,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
<span class="label" style="width: 90px" <span class="label" style="width: 90px"
><span style="color: red">*&nbsp;</span ><span v-if="detailData.status == 2" style="color: red">*&nbsp;</span
>{{ >{{
detailData.status == 2 detailData.status == 2
? '整改照片：' ? '整改照片：'
@ -2538,7 +2538,7 @@ export default {
} else { } else {
this.replyData.fileUrl = ""; this.replyData.fileUrl = "";
} }
if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) {
this.$message.error('请将回复内容输入完整') this.$message.error('请将回复内容输入完整')
return; return;
} }

5
src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
View File

@ -878,7 +878,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="grid-content"> <div class="grid-content">
<span class="label" style="width: 90px" <span class="label" style="width: 90px"
><span style="color: red">*&nbsp;</span ><span v-if="detailData.status == 2" style="color: red">*&nbsp;</span
>{{ >{{
detailData.status == 2 detailData.status == 2
? '整改照片：' ? '整改照片：'
@ -1243,7 +1243,7 @@ export default {
} else { } else {
this.replyData.fileUrl = "" this.replyData.fileUrl = ""
} }
if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) {
this.$message.error('请将回复内容输入完整') this.$message.error('请将回复内容输入完整')
return; return;
} }
@ -1259,6 +1259,7 @@ export default {
this.replyData.qualityId = valId this.replyData.qualityId = valId
this.replyData.createUser = this.userIdInfo this.replyData.createUser = this.userIdInfo
console.log('整改提交的表单数据：：：', this.replyData); console.log('整改提交的表单数据：：：', this.replyData);
addSafeQualityRectifyRecordApi(this.replyData).then(res => { addSafeQualityRectifyRecordApi(this.replyData).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('提交成功') this.$message.success('提交成功')