Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop

src/pages/login/index.vue

@@ -67,8 +67,8 @@ export default {
     loginUser (userName, PWD) {
       this.loading = true
       // 用户名密码加密
-      userName = this.$base64(userName)
+      // userName = this.$base64(userName)
-      PWD = this.$base64(PWD)
+      // PWD = this.$base64(PWD)
       this.$http.post('login',
         {
           username: userName,
@@ -85,9 +85,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

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"

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>

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>

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>

src/pages/processCenter/pages/creatProcess/zqyj/step1.vue

@@ -164,11 +164,9 @@ export default {
       this.active = name
     },
     handleSave() {},
-    handleSubmit() {
+    handleSubmit() {}
-    }
   },
-  mounted () {
+  mounted () {}
-  }
 }
 </script>