联调提交OA接口、下载接口

src/api/marketing/dealer-authorization.js

@@ -23,7 +23,7 @@ const insert = (data) => {
 
 // 经销商授权信息列表
 const remove = (params) => {
-// ?id=${params.id}
+  // ?id=${params.id}
   return request({
     url: `/dealer/delete`,
     method: 'get',
@@ -55,6 +55,10 @@ const download = (data) => {
     url: `/dealer/download`,
     method: 'post',
     data,
+    responseType: "blob",
+    headers: {
+      'Content-Type': 'application/json; application/octet-stream'
+    },
   })
 }
 

src/utils/request.js

@@ -6,7 +6,6 @@ import errorCode from "@/utils/errorCode";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from "@/plugins/cache";
 import { saveAs } from "file-saver";
-import judgeFileFormat from "@/views/material/tools/attachment-file";
 
 let downloadLoadingInstance;
 // 是否显示重新登录

src/views/marketing/dealer-authorization/authprivAdd.vue

@@ -114,11 +114,13 @@ export default {
             startTime: isTime ? this.formData.time[0] : '',
             endTime: isTime ? this.formData.time[1] : '',
             updatePerson: nickName,
+            updateBy: name,
             updateTime: new Date().Format(),
             ...(
               this.isAdd ? {
                 status: '0',
                 createPerson: nickName,
+                createBy: name,
                 createTime: new Date().Format(),
               } : {}
             )

src/views/marketing/dealer-authorization/index.vue

@@ -67,7 +67,8 @@
           <!-- <el-button @click="handleOpenSeeDialog(scope.row)" type="text" size="small">查看</el-button> -->
           <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'"
             @click="handleSubmit(scope.row)">提交</el-button>
-          <el-button type="text" size="mini" v-if="scope.row.status == '2'" @click="handleDownload">下载授权书</el-button>
+          <el-button type="text" size="mini" v-if="scope.row.status == '2'"
+            @click="handleDownload(scope.row)">下载授权书</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -234,39 +235,57 @@ export default {
 
     },
     // 提交OA
-    handleSubmit(row) {
+    async handleSubmit(row) {
+      try {
+        // name:工号   nickName:名字
+        const { name, nickName } = this.$store.state.user;
 
-      let params = {
-        applicant: '',
-        date: new Date().Format()
-      }
-      console.log(row, '提交', params);
-      // try {
-      //   this.loading = true;
-      //   let { code, msg } = await dealerApi.submitOA();
-      //   if (code == 200) {
-      //     this.handleRefresh();
-      //   }
-      // } catch (error) {
-      //   console.log(error);
-      // } finally {
-      //   this.loading = false;
+        const { id, authorizedProductsCode } = row;
+
+        let data = {
+          authorizedProductsCode,
+          id,
+          createPerson: nickName,
+          createBy: name,
+          date: new Date().Format()
+        }
+
+        this.loading = true;
+        let { code, msg } = await dealerApi.submitOA(data);
+        if (code == 200) {
+          this.handleRefresh();
+        }
+      } catch (error) {
+        console.log(error);
+      } finally {
+        this.loading = false;
 
-      // }
+      }
 
 
 
     },
     // 下载
-    handleDownload() {
-      console.log('下载');
-      // try {
-      //   let { code, msg } = await dealerApi.download();
-      //   if (code == 200) {
-      //   }
-      // } catch (error) {
-      //   console.log(error);
-      // } finally {}
+    async handleDownload(row) {
+      console.log('下载', row);
+      try {
+        const { id, authorizedProductsCode, dealerName, authorizedAreaName, authorizedProductsName } = row;
+
+        const data = {
+          dealerName,
+          authorizedAreaName,
+          authorizedProductsName,
+          id,
+          authorizedProductsCode,
+        }
+
+        await this.download('/dealer/download', data, `授权书${new Date().getTime()}.doc`);
+
+        // await dealerApi.download(data);
+
+      } catch (error) {
+        console.log(error);
+      } finally { }
     },
 
   },