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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-26 16:15:27 +08:00
parent 51be1036bc 0d7a2978e3
commit 1c1d8ae86a
6 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/phone/phoneHome.vue
+1 -1
View File
@@ -128,7 +128,7 @@ export default {
top: 15px;
left: 15px;
width: 23vw;
height: 0.8rem;
height: 7.6vh;
background: url("../../assets/images/phone/phoneTitle.png") no-repeat;
background-size: 100% 100%;
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+26 -26
View File
@@ -329,7 +329,7 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
disabled
style="display: none;"
@@ -354,6 +354,31 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
disabled
style="display: none;"
v-model="form.fbgywbdName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in FBGYWBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
</div>
<div style="width: 20%;">
<el-button :disabled="disabledXX"
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('fbgywbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
disabled
@@ -508,31 +533,6 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
disabled
style="display: none;"
v-model="form.fbgywbdName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;line-height: 40px">
<div v-for="(item,index) in FBGYWBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
{{ item.name }}
</div>
</div>
<div style="width: 20%;">
<el-button :disabled="disabledXX"
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('fbgywbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
disabled
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+10 -9
View File
@@ -306,7 +306,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
@@ -314,6 +314,14 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="fbgywbdFileMap.length>0" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
@@ -366,14 +374,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="fbgywbdFileMap.length>0" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+10 -9
View File
@@ -275,7 +275,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
@@ -283,6 +283,14 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
@@ -327,14 +335,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+10 -9
View File
@@ -433,7 +433,7 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
@@ -458,6 +458,14 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -726,14 +734,7 @@
</div>
</div>
</el-form-item>
<el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+10 -9
View File
@@ -306,7 +306,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
@@ -314,6 +314,14 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
@@ -366,14 +374,7 @@
- -
</div>
</el-form-item>
<el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgywbdName" v-for="(value,index) in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>