From caabeda8b9ed280199fce975b30d635bf11f41f2 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 16 Jun 2021 10:45:51 +0800
Subject: [PATCH 1/2] commit

---
 .../processCenter/pages/components/ProcessFooter.vue      | 8 ++++----
 src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 1 -
 src/pages/processCenter/pages/creatProcess/bzff/step1.vue | 1 -
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 1 -
 src/pages/processCenter/pages/creatProcess/zqyj/step1.vue | 6 ++----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 356bdf2b9..97ef475e7 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -7,7 +7,7 @@
       <el-button
         type="warning"
         icon="el-icon-edit-outline"
-        round
+        size="small"
         class="common-button-warning"
         @click="handleOnLineEdit"
         v-if="showEdit">在线编辑</el-button>
@@ -22,7 +22,7 @@
 <!--        委托</el-button>-->
       <el-button
               type="primary"
-              size="mini"
+              size="small"
               class="common-button-primary"
               icon="el-icon-message"
               @click="handleSendEmail"
@@ -31,7 +31,7 @@
       >发送邮件</el-button>
       <el-button
               type="danger"
-              size="mini"
+              size="small"
               class="common-button-danger"
               icon="el-icon-close"
               @click="handleOver"
@@ -59,7 +59,7 @@
         {{ backBTNText }}</el-button>
       <el-button
         type="primary"
-        size="mini"
+        size="small"
         class="common-button-primary"
         icon="el-icon-check"
         @click="handleSubmit"
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 97009dfc8..3d2d360f7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -17,7 +17,6 @@
             class="label-input-form"
             label-width="210px"
         >
-
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
diff --git a/src/pages/processCenter/pages/creatProcess/bzff/step1.vue b/src/pages/processCenter/pages/creatProcess/bzff/step1.vue
index fe03e1d26..92e3361fe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzff/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzff/step1.vue
@@ -142,7 +142,6 @@
                                     v-model="textarea">
                             </el-input>
                         </div>
-                        <div>注：文件需求日期应从该申请单审批完成后2日开始计算，日翻译量10000字符（可以每页700-800字符估算），周末及节假日除外。</div>
                     </el-collapse-item>
                 </el-collapse>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 321a72b4b..28005569e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -467,7 +467,6 @@
                                     v-model="textarea">
                             </el-input>
                         </div>
-                        <div>注：文件需求日期应从该申请单审批完成后2日开始计算，日翻译量10000字符（可以每页700-800字符估算），周末及节假日除外。</div>
                     </el-collapse-item>
                 </el-collapse>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue
index e53f2e41c..041e1ceb1 100644
--- a/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue
@@ -164,11 +164,9 @@ export default {
       this.active = name
     },
     handleSave() {},
-    handleSubmit() {
-    }
+    handleSubmit() {}
   },
-  mounted () {
-  }
+  mounted () {}
 }
 </script>
 

From 5099160c473fcb1cb0941139680b4bf529a2f697 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 16 Jun 2021 13:23:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7admin=20=E6=9A=82=E4=B8=8D=E5=8A=A0=E5=AF=86=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 53de8eff5..65890c62b 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -67,8 +67,8 @@ export default {
     loginUser (userName, PWD) {
       this.loading = true
       // 用户名密码加密
-      userName = this.$base64(userName)
-      PWD = this.$base64(PWD)
+      // userName = this.$base64(userName)
+      // PWD = this.$base64(PWD)
       this.$http.post('login',
         {
           username: userName,
@@ -84,9 +84,9 @@ export default {
               this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
               return
             }
+            // debugger
             let Base64 = require('js-base64').Base64
             let userInfoStr = Base64.decode(res.data)
-            // debugger
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
             this.setToken(userInfoObj.usid) // vuex存储token