Merge branch 'fix_foton_20240408' into 'master'

Fix foton 20240408

See merge request laws-foton-slrs/foton-laws-system-front!179
This commit is contained in:
王晓勇
2024-04-19 09:43:08 +00:00
2 changed files with 6 additions and 14 deletions
@@ -298,9 +298,9 @@
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span> <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
</p> </p>
<p class="half"><label style=" margin-right: 150px;">标准体系</label> <p class="half" style="display: flex"><label style=" margin-right: 150px;">标准体系</label>
<el-tooltip class="item" effect="dark" :content="sarStandardsInfoEO.standSystem" placement="top"> <el-tooltip class="item" effect="dark" :content="sarStandardsInfoEO.standSystem" placement="top">
<span>{{sarStandardsInfoEO.standSystem | ellipsis20 }}</span> <span style="width: 60%;display: inline-block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{sarStandardsInfoEO.standSystem}}</span>
</el-tooltip> </el-tooltip>
</p> </p>
<p class="half"> <p class="half">
@@ -677,6 +677,7 @@
v-for="(file, fileIndex) in child.value" v-for="(file, fileIndex) in child.value"
:key="fileIndex" :key="fileIndex"
class="files-title" class="files-title"
style="width: calc(100% - 80px)"
> >
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>--> <!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
@@ -423,18 +423,7 @@ export default {
type: this.qbfsForm.nextStatus, type: this.qbfsForm.nextStatus,
id: this.qbfsForm.standId, id: this.qbfsForm.standId,
} }
this.$http._getData('lawss/sarBussionessStand/repeal',params,{}).then(res => { this.completeTask(json)
if(res && res.ok){
this.completeTask(json)
} else {
this.isSubmit = false;
this.saveLoading = false;
}
}).catch(e=>{
console.log(e)
this.isSubmit = false;
this.saveLoading = false;
})
}else{ }else{
this.$message.warning('请完善基础信息') this.$message.warning('请完善基础信息')
} }
@@ -451,6 +440,8 @@ export default {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
}else {
this.$message.warning(res.message);
} }
this.isSubmit = false; this.isSubmit = false;
this.saveLoading = false; this.saveLoading = false;