Browse Source

调整下发页面

luojun 2 years ago
parent
commit
a11a392b86
3 changed files with 18 additions and 11 deletions
  1. 3 6
      src/api/system/extend.js
  2. 10 0
      src/views/resumption/plan/index.vue
  3. 5 5
      src/views/system/dept/extend.vue

+ 3 - 6
src/api/system/extend.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import {upload} from '@/utils/request'
+import {uploadFileNew} from '@/utils/request'
 // 查询机构扩展列表
 export function listExtend(query) {
   return request({
@@ -24,11 +24,8 @@ export function getExtendByOrgId(id) {
   })
 }
 // 文件上传
-export function uploadFile(formDatas) {
-  return upload({
-    url: '/file/file/upload',
-    FormData: formDatas
-  })
+export function uploadFile(formDatas,busType) {
+  return uploadFileNew('/file/file/uploadFile', formDatas,busType)
 }
 // 新增机构扩展
 export function addExtend(data) {

+ 10 - 0
src/views/resumption/plan/index.vue

@@ -161,6 +161,8 @@
           v-loading="loading"
           :data="pageData"
           @selection-change="handleSelectionChange"
+          row-key="id"
+          :tree-props="{ children: 'children' }"
         >
           <el-table-column
             type="index"
@@ -287,6 +289,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
+                v-if="checkCanPublish(r.row)"
                 @click="showDialogDistribute(r.row)"
                 v-hasPermi="['system:user:remove']"
                 >下发</el-button>
@@ -386,6 +389,13 @@ export default {
   },
   methods: {
     ...mapMutations([]),
+        //已完成下发的计划不显示下发按钮
+    checkCanPublish(row) {
+      if (row.orgType === 1) {
+        return true
+      }
+      return false;
+    },
     sel(selectList){
       this.loading = true;
       api.distribute(selectList).then((response) => {

+ 5 - 5
src/views/system/dept/extend.vue

@@ -882,7 +882,7 @@ export default {
         orgId: this.$route.params.id,
         id: this.extendId,
       };
-      console.log(dat);
+      // console.log(dat);
       if (this.extendId) {
         updateExtend(dat).then((res) => {
           this.$modal.msgSuccess("保存成功");
@@ -905,13 +905,13 @@ export default {
       const file = event.target.files[0];
       if (!file) return;
 
-      // 创建 FormData 对象并添加文件
-      const formData = new FormData();
-      formData.append("file", file);
+      // // 创建 FormData 对象并添加文件
+      // const formData = new FormData();
+      // formData.append("file", file);
 
       // // 发送文件到您的文件上传 API
       try {
-        uploadFile(formData).then((res) => {
+        uploadFile(file,"org").then((res) => {
           console.log(res);
           // this.orgform.certificateEvidence = res.data;
         });