From 49794583910bd1cf8520f9d49691897626580228 Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Tue, 26 Jul 2022 16:01:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8F=91=E5=B8=83=E7=A8=BF=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 52 +++++++++----------
 .../pages/creatProcess/bzrk/step2.vue         | 19 +++----
 .../pages/creatProcess/bzrk/step3.vue         | 19 +++----
 .../pages/creatProcess/bzrk/step4.vue         | 19 +++----
 .../pages/creatProcess/bzrk/step5.vue         | 19 +++----
 5 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index d302f745b..20ae2067f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -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
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 949dc6de7..b847b9d33 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index fe544e0a5..ab69974b4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index bc50dc65c..a90f75ee2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -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
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 12eead85c..221a6194f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -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>

From 0d7a2978e3c7c3d231f540d940f9c14842513be9 Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Tue, 26 Jul 2022 16:05:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=9B=BE=E6=A0=87LOGO=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/phoneHome.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue
index 97c0a4773..f208f1f58 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -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%;
     }