Merge branch 'iteration-oss-up' into jenkins

src/views/process/list/create.vue

@@ -241,21 +241,10 @@ export default {
           let filterOrganId = [];
           if ([40, 41, 45, 46, 47].includes(processId)) {
             filterOrganId = [4];
-          } else if ([1, 51].includes(processId)) {
-            /**
-             * 费用申请（借款）
-             * 费用申请
-             * 添加分部  128
-             * 乐小雅
-             */
-            filterOrganId = [
-              1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-              23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 128,
-            ];
           } else {
             filterOrganId = [
-              1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-              23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 124, 125,
+              1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+              22, 23, 25, 26, 27, 28, 34, 37, 40, 71, 72, 124, 125, 128,
             ];
           }
 

src/views/process/list/template-manager.vue

@@ -1,44 +1,50 @@
-<template>
-  <div class="app-container">
-    <el-card class="box-card">
-      <el-table border :data="dataList">
-        <el-table-column label="ID" prop="id" width="120" />
-        <el-table-column label="模板名称" prop="title" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-download"
-              @click="handleView(scope.row)"
-            >下载</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      dataList: [{
-        id: 1,
-        title: '乐团退费模板',
-        url: 'https://daya.ks3-cn-beijing.ksyun.com/202203/乐团退费模板.xlsx'
-      }]
-    }
-  },
-  methods: {
-    // 下载模板
-    handleView(row) {
-      window.location.href = row.url
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <el-table border :data="dataList">
+        <el-table-column label="ID" prop="id" width="120" />
+        <el-table-column label="模板名称" prop="title" />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-download"
+              @click="handleView(scope.row)"
+              >下载</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dataList: [
+        {
+          id: 1,
+          title: "乐团退费模板",
+          url: "https://oss.dayaedu.com/daya/202203/乐团退费模板.xlsx",
+        },
+      ],
+    };
+  },
+  methods: {
+    // 下载模板
+    handleView(row) {
+      window.location.href = row.url;
+    },
+  },
+};
+</script>
+
+<style scoped></style>