From c694cffc8541d921e5256d33e14e3237454de950 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 26 一月 2024 09:43:31 +0800
Subject: [PATCH] 新提交

---
 src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue |   60 ++++++++++++++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue b/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
index 6882547..11544dc 100644
--- a/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
@@ -50,6 +50,11 @@
                                 <el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
                             </el-row>
                             <el-table ref="multipleTableRef" :data="applyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
+                              <el-table-column property="workPermitNo" label="作业编号" align="center">
+                                <template #default="scope">
+                                  {{scope.row.workPermitNo?scope.row.workPermitNo:'—'}}
+                                </template>
+                              </el-table-column>
                                 <el-table-column property="seDepName" label="事业部" align="center"/>
                                 <el-table-column property="applyDepName" label="作业所在车间" align="center"/>
                                 <el-table-column property="workContent" label="作业内容" align="center"/>
@@ -87,7 +92,7 @@
                                     {{scope.row.guardianList.length}}
                                   </template>
                                 </el-table-column>
-                                <el-table-column label="风险研判" align="center">
+                                <el-table-column label="作业状态" align="center">
                                     <template #default="scope">
                                         <el-tag>{{ statusList.find(i=>i.value === scope.row.status)?.label }}</el-tag>
                                     </template>
@@ -98,7 +103,7 @@
                                         <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
 <!--                                        <el-button link type="success" size="small" :icon="Finished">修改</el-button>-->
 <!--                                        <el-button link type="success" size="small" :icon="Download">正式办票</el-button>-->
-<!--                                        <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>-->
+                                        <el-button link type="primary" size="small" :icon="Download" @click="downLoadRecord(scope.row)">作业票预览</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -203,15 +208,15 @@
                         </span>
                     </template>
                 </el-dialog>
-                <el-dialog v-model="downLoadDialog" title="提示" width="30%" center>
-                    <span>您确定要导出该条记录吗?</span>
-                    <template #footer>
-                                <span class="dialog-footer">
-                                    <el-button @click="downLoadDialog = false" size="default">取消</el-button>
-                                    <el-button type="primary" @click="conFirmDownLoad" size="default">确认</el-button>
-                                </span>
-                    </template>
-                </el-dialog>
+<!--                <el-dialog v-model="downLoadDialog" title="提示" width="30%" center>-->
+<!--                    <span>您确定要导出该条记录吗?</span>-->
+<!--                    <template #footer>-->
+<!--                                <span class="dialog-footer">-->
+<!--                                    <el-button @click="downLoadDialog = false" size="default">取消</el-button>-->
+<!--                                    <el-button type="primary" @click="conFirmDownLoad" size="default">确认</el-button>-->
+<!--                                </span>-->
+<!--                    </template>-->
+<!--                </el-dialog>-->
 <!--            </el-tab-pane>-->
 <!--            <el-tab-pane label="已通过" name="2">-->
 <!--                <div style="height: 100%">-->
@@ -276,13 +281,10 @@
     dialogDetails: boolean;
     dialogStatus: boolean;
     deleteDialog: boolean;
-    downLoadDialog: boolean;
     pageIndex1: number;
     pageSize1: number;
     chosenIndex: null | number;
     deleteId: null | number;
-    downLoadId: null | number;
-    downLoadName: string;
     totalSize1: number;
     activeName: string;
     addRecord: {};
@@ -340,13 +342,10 @@
             dialogDetails: false,
             dialogStatus: false,
             deleteDialog: false,
-            downLoadDialog: false,
             addRecord: {},
             details: {},
             statusInfo: {},
             deleteId: null,
-            downLoadId: null,
-            downLoadName: '',
             deleteArr: [],
             dep4List: [
               {id:49,name:'电石事业部'},
@@ -567,26 +566,21 @@
             state.deleteDialog = false;
         };
 
-        // 导出图表
-        const downLoadBtn = (row:any) =>{
-            state.downLoadId = row.workApplyId;
-            state.downLoadName = row.workTypeDesc + row.workPermitNo
-            state.downLoadDialog = true;
-        }
 
         // 导出方法
-        const downLoadRecord = async (data: any) => {
+        const downLoadRecord = (row: any) => {
             // let res = await workApplyApi().postPrinting(data);
-            axios.post(import.meta.env.VITE_API_URL + `/work/apply/printingPdf`,data,{headers:{'Content-Type': 'application/json','Authorization': `${Cookies.get('token')}`,'uid':`${Cookies.get('uid')}`},responseType: 'blob'}).then(res=>{
+            console.log(row,555)
+            axios.post(import.meta.env.VITE_API_URL + `/specialwork9step/work/down/load/pdf`,{ id: row.id},{headers:{'Content-Type': 'application/json','Authorization': `${Cookies.get('token')}`,'uid':`${Cookies.get('uid')}`},responseType: 'blob'}).then(res=>{
                 if (res) {
                     const link = document.createElement('a')
                     let blob = new Blob([res.data],{type: 'application/pdf'})
                     link.style.display = "none";
                     link.href = URL.createObjectURL(blob); // 创建URL
-                    link.setAttribute("download", state.downLoadName + "作业证.pdf");
-                    document.body.appendChild(link);
-                    link.click();
-                    document.body.removeChild(link);
+                    link.setAttribute("download", row.workTypeDesc + row.workPermitNo + "作业证.pdf");
+                    document.body.appendChild(link)
+                    window.open(link.href)
+                    document.body.removeChild(link)
                 } else {
                     ElMessage({
                         type: 'warning',
@@ -595,11 +589,6 @@
                 }
             })
 
-        };
-
-        const conFirmDownLoad = () => {
-            downLoadRecord({ applyWorkId: state.downLoadId });
-            state.downLoadDialog = false;
         };
 
         const handleSizeChange1 = (val: number) => {
@@ -649,9 +638,8 @@
             viewRecord,
             viewStatus,
             deleteRecordBtn,
-            downLoadBtn,
+            downLoadRecord,
             conFirmDelete,
-            conFirmDownLoad,
             getListByPage,
             handleSizeChange1,
             handleCurrentChange1,

--
Gitblit v1.9.2