Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/router/index.js

@@ -83,6 +83,7 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
+  debugger
   // 判断是否有token
   // const token = Cookies.get('token')
   // 添加动态(菜单)路由

back/src/views/modules/activiti/demo/abilitydemandapply.vue

@@ -59,8 +59,8 @@
         ></el-input>
          </el-tooltip>
       </el-form-item>
-      <el-form-item v-if="dataForm.enclosure" label="申请附件" prop="enclosure">
-        <button
+      <el-form-item v-show="dataForm.enclosure" label="申请附件">
+        <!-- <button
                 style="
                   width: 100px;
                   height: 30px;
@@ -77,8 +77,20 @@
               @click="downloadFile(dataForm.enclosure, '申请附件')"
               >
               附件下载
-              </button>
-          <!-- <el-button     class="DownloadAttachment" @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button> -->
+              </button> -->
+          <el-button style="
+                  width: 100px;
+                  height: 30px;
+                  margin-right: 10px;
+                  background: rgb(237, 244, 252);
+                  color: rgb(0, 135, 255);
+                  font-size: 14px;
+                  border-radius: 6px;
+                  border: 1px solid rgb(187, 211, 239);
+                  padding: 0px;
+                  text-align: center;
+                  cursor: pointer;
+                "  @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button>
       </el-form-item>
     </el-form>
     <!--  流程综合组件   -->