From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚

---
 src/views/business/reportPreparation/index.vue |  151 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 114 insertions(+), 37 deletions(-)

diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 9dd603c..a9e4513 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -11,22 +11,37 @@
             <el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">
-          <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">
-            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="鎶ュ憡绫诲瀷" prop="reportType">-->
+<!--          <el-select v-model="entity.reportType" clearable size="small" @change="refreshTable()">-->
+<!--            <el-option v-for="item in reportTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="涓嬪崟绫诲埆" prop="typeSource">-->
+<!--          <el-select v-model="entity.typeSource" clearable size="small" @change="refreshTable()">-->
+<!--            <el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
+<!--          <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">-->
+<!--            <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
+<!--                       :value="dict.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="妫�楠岀被鍒�" prop="orderType">
           <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
             <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
           <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
-          <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+          <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
         </el-form-item>
       </el-form>
+    </div>
+    <div style="text-align: right;margin-bottom: 10px">
+      <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+      <el-button :loading="outExportLoading" size="mini" type="primary" @click="handleExport">鎶ヨ〃瀵煎嚭</el-button>
     </div>
     <div>
       <lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -57,7 +72,8 @@
               <el-button link type="text" size="small">鏇村</el-button>
             </template>
             <div>
-              <el-button style="margin-left: 10px" type="text" size="small" @click="download(scope.row)">涓嬭浇</el-button>
+              <el-button style="margin-left: 10px" type="text" size="small"
+                :disabled="!scope.row.url && !scope.row.urlS" @click="download(scope.row)">涓嬭浇</el-button>
               <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
               <el-button type="text" size="small" @click="handleFileLook(scope.row)">闄勪欢涓婁紶</el-button>
             </div>
@@ -184,7 +200,7 @@
           <el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
         </el-upload>
       </div>
-      <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
+      <lims-table :tableData="tableDataFile" :column="columnFile" height="600px"
         key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
     </el-dialog>
   </div>
@@ -195,12 +211,14 @@
 // import ShowInfo from "../do/b1-material-ins-order/showInfo.vue";
 import {
   downAll,
+  downloadReport,
   examineReport,
   pageInsReport,
   ratifyReport,
   sendBackTask,
   upReportUrl,
-  writeReport
+  writeReport,
+  reportAllExport
 } from "@/api/business/insReport";
 import { mapGetters } from "vuex";
 import { selectUserCondition } from "@/api/business/inspectionTask";
@@ -209,12 +227,16 @@
 export default {
   name: 'ReportPreparation',
   components: { limsTable, onlyoffice },
+  dicts: ['material_prop_type'],
   data() {
     return {
       entity: {
         queryStatus: null,
         code: null,
         typeSource: null,
+        orderType: null,
+        materialProp: null,
+        reportType: null
       },
       page: {
         current: 1,
@@ -239,6 +261,7 @@
       option: null,
       mutiList: [],
       outLoading: false,
+      outExportLoading: false,
       inLoading: false,
       addApproverDia: false, // 鎸囧畾瀹℃壒浜哄憳寮规
       approver: '', // 瀹℃壒浜哄憳
@@ -248,14 +271,19 @@
       verifyUser: null, // 瀹℃牳浜哄憳
       loadingVerify: false, // 瀹℃牳浜哄憳
       typeSourceList: [
-        { label: '鎴愬搧涓嬪崟', value: 0 },
+        { label: '濮旀墭涓嬪崟', value: -1 },
+        { label: '澶栬喘涓嬪崟', value: 0 },
         { label: '鍘熸潗鏂欎笅鍗�', value: 1 },
       ],
       orderTypeList: [
         { label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
         { label: '鎶芥', value: '鎶芥' },
-        { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
-        { label: '瀛e害妫�楠�', value: 'Quarterly inspection' },
+        // { label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
+        // { label: '瀛e害妫�楠�', value: 'Quarterly inspection' },
+      ],
+      reportTypeList: [
+        { label: '妫�娴嬫姤鍛�', value: 0 },
+        { label: '妫�楠屾姤鍛�', value: 1 },
       ],
       showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
       isReport: 1,
@@ -340,19 +368,44 @@
           dataType: "link",
           linkMethod: "selectAllByOne",
         },
-        {
-          label: "涓嬪崟绫诲埆",
-          prop: "typeSource",
-          width: "100px",
-          dataType: "tag",
-          formatData: (params) => {
-            if (params == 0) {
-              return "鎴愬搧涓嬪崟";
-            } else {
-              return "鍘熸潗鏂欎笅鍗�";
-            }
-          },
-        },
+        // {
+        //   label: '鎶ュ憡绫诲瀷',
+        //   prop: 'reportType',
+        //   width: '100px',
+        //   dataType: 'tag',
+        //   formatData: (params) => params === 0 ? '妫�娴嬫姤鍛�' : '妫�楠屾姤鍛�',
+        //   formatType: (params) => params === 0 ? 'warning' : 'success',
+        // },
+        // {
+        //   label: "涓嬪崟绫诲埆",
+        //   prop: "typeSource",
+        //   width: "100px",
+        //   dataType: "tag",
+        //   formatData: (params) => {
+        //     if (params == 0) {
+        //       return "澶栬喘涓嬪崟";
+        //     } else if(params==1) {
+        //       return "鍘熸潗鏂欎笅鍗�";
+        //     }else{
+        //       return "濮旀墭涓嬪崟";
+        //     }
+        //   },
+        // },
+        // {
+        //   label: '鐗╂枡灞炴��',
+        //   prop: 'materialProp',
+        //   formatData: (params) => {
+        //     if (!params) return null
+        //
+        //     for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+        //       const item = this.dict.type.material_prop_type[i]
+        //       if (item.value == params) {
+        //         return item.label
+        //       }
+        //     }
+        //     return null
+        //   }
+        // },
         {
           label: "妫�楠岀被鍨�",
           prop: "orderType",
@@ -519,7 +572,7 @@
     // 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
     getFileList() {
       this.tableLoadingFile = true
-      getFileList({ insOrderId: this.filesLookInfo.insOrderId }).then(res => {
+      getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => {
         this.tableLoadingFile = false
         if (res.code === 200) {
           this.tableDataFile = res.data.records
@@ -598,6 +651,17 @@
       })
 
     },
+    // 鎶ヨ〃瀵煎嚭
+    handleExport() {
+      this.outExportLoading = true
+      reportAllExport({
+        ...this.entity
+      }).then(res => {
+        this.outExportLoading = false
+        const blob = new Blob([res], { type: 'application/octet-stream' });
+        this.$download.saveAs(blob, "鎶ュ憡鎶ヨ〃瀵煎嚭.xlsx");
+      })
+    },
     beforeUpload(file) {
       const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
       if (!isZip) {
@@ -662,7 +726,7 @@
         case 0:
           // 鍘熸潗鏂�
           this.$router.push({
-            path: "/materialOrder/customsInspection", query: {
+            path: "/materialOrder/customsInspectionView", query: {
               customsInspection: row,
               active: this.activeFace,
               currentId: row.insOrderId,
@@ -673,7 +737,7 @@
         case null:
           // 鎴愬搧
           this.$router.push({
-            path: "/productOrder/add", query: {
+            path: "/productOrder/addView", query: {
               examine: this.examine,
               active: this.activeFace,
               currentId: row.insOrderId
@@ -683,7 +747,7 @@
         case 1:
           // 閾滄潗
           this.$router.push({
-            path: "/materialOrder/copperOrder", query: {
+            path: "/materialOrder/CopperView", query: {
               active: this.activeFace,
               currentId: row.insOrderId
             }
@@ -692,12 +756,25 @@
       }
     },
     download(row) {
-      let url = row.urlS ? row.urlS : row.url;
-      const link = document.createElement('a');
-      link.href = this.javaApi + url;
-      link.target = '_blank';
-      document.body.appendChild(link);
-      link.click();
+      downloadReport(row.id).then(res => {
+        if (res.type && res.type.includes('application/json')) {
+          const reader = new FileReader()
+          reader.onload = () => {
+            try {
+              this.$message.error(JSON.parse(reader.result).msg || '鎶ュ憡涓嬭浇澶辫触')
+            } catch (e) {
+              this.$message.error('鎶ュ憡涓嬭浇澶辫触')
+            }
+          }
+          reader.readAsText(res)
+          return
+        }
+        const reportUrl = row.urlS || row.url || ''
+        const filename = decodeURIComponent(reportUrl.substring(reportUrl.lastIndexOf('/') + 1)) || `${row.code}.docx`
+        this.$download.saveAs(res, filename)
+      }).catch(() => {
+        this.$message.error('鎶ュ憡涓嬭浇澶辫触')
+      })
     },
     // 杩樺師鎿嶄綔
     handleRestore(row) {
@@ -815,7 +892,7 @@
     },
     // 鑾峰彇浜哄憳鍒楄〃
     getAuthorizedPerson() {
-      selectUserCondition({ type: 0 }).then((res) => {
+      selectUserCondition({ type: 1 }).then((res) => {
         let data = [];
         res.data.forEach((a) => {
           data.push({

--
Gitblit v1.9.3