FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240408' into 'master'

Browse Source 
Fix foton 20240408

See merge request laws-foton-slrs/foton-laws-system-front!178
This commit is contained in:
王晓勇
2024-04-17 09:40:22 +00:00
parent 4417e4a3ea 0eeca475fd
commit ce1af29cb0
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+9 -10
View File
@@ -564,7 +564,7 @@
<div <div
v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' " v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' "
:key="child.id" :key="child.id"
:class="'modular-item half'" :class="'modular-item' + ($route.params.pageType === 'FOREIGN_STAND' ? '' : ' half')"
> >
<label :title="child.attrName" class="modular-content-p-name">{{ child.attrName }}</label> <label :title="child.attrName" class="modular-content-p-name">{{ child.attrName }}</label>
<span <span
@@ -579,15 +579,14 @@
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)"
> >
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG' <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a v-if="$route.params.pageType === 'INLAND_STAND'" :title="file.oldFileName" target="_blank" style=" width: 200px" <a :title="file.oldFileName" target="_blank"
@click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a> @click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a>
<a v-else :title="file.oldFileName" target="_blank"
@click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a>
<i <i
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
class="icon-download" class="icon-download"
@@ -602,10 +601,8 @@
/> />
</template> </template>
<template v-else> <template v-else>
<a v-if="$route.params.pageType === 'INLAND_STAND'" :title="file.oldFileName" target="_blank" style=" width: 200px" <a :title="file.oldFileName" target="_blank"
@click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a> @click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a>
<a v-else :title="file.oldFileName" target="_blank"
@click="openFileInPdf(file.id, file.oldFileName)">{{ file.oldFileName}}</a>
<i <i
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
class="icon-download" class="icon-download"
@@ -4245,6 +4242,7 @@ export default {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
width: calc(~'100% - 40px'); width: calc(~'100% - 40px');
white-space: break-spaces; white-space: break-spaces;
word-break: break-all;
} }
} }
@@ -4348,7 +4346,8 @@ export default {
.other-standard-details { .other-standard-details {
padding: 15px 30px 0; padding: 15px 30px 0;
width: 1200px; width: 85%;
min-width: 1200px;
margin: 0 auto; margin: 0 auto;
height: 100%; height: 100%;
src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue
+4
View File
@@ -565,6 +565,10 @@ export default {
const form = Object.assign(data, data.attrInfoMap); const form = Object.assign(data, data.attrInfoMap);
const keys = Object.keys(this.form) const keys = Object.keys(this.form)
const initForm = JSON.parse(JSON.stringify(this.initForm)) const initForm = JSON.parse(JSON.stringify(this.initForm))
if (this.form.standStatus === '2') {
form.putTime = undefined
form.issueTime = undefined
}
this.form = Object.assign(initForm, pick(form, keys), { standStatus: this.form.standStatus }) this.form = Object.assign(initForm, pick(form, keys), { standStatus: this.form.standStatus })
// 对象空值转为空字符串 // 对象空值转为空字符串
Object.entries(this.form).forEach(([ key, value ]) => { Object.entries(this.form).forEach(([ key, value ]) => {