From d4a47e106f5e645c678be6acebb5a2947a33ef43 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Tue, 10 Feb 2026 14:09:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E9=A5=B2=E5=85=BB=E9=97=B4=E7=AE=A1=E7=90=86]=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/study/studyRoom.js            |  12 +--
 src/views/business/resource/gsp/comps/ffjlList.vue |  11 ++-
 src/views/business/resource/gsp/comps/gspList.vue  |   1 +
 src/views/business/resource/gsp/comps/rkjlList.vue |   3 +-
 src/views/business/study/comp/syjList.vue          | 106 ++++++++++++++++++++-
 5 files changed, 116 insertions(+), 17 deletions(-)

diff --git a/src/lang/en/business/study/studyRoom.js b/src/lang/en/business/study/studyRoom.js
index 4c39538..12dcc30 100644
--- a/src/lang/en/business/study/studyRoom.js
+++ b/src/lang/en/business/study/studyRoom.js
@@ -13,13 +13,13 @@ export default {
     jsr: 'End by',
     jssj: 'End Date',
     zt: 'Status',
-    syz: '使用中',
-    yjs: '已结束',
-    ghlj: '更换笼具',
-    js: '结束',
-    ljjl: '笼具记录',
+    syz: 'In use',
+    yjs: 'Ended',
+    ghlj: 'Replace the cage',
+    js: 'End',
+    ljjl: 'Cage records',
     ghr: '更换人',
-    ghsj: '更换时间',
+    ghsj: 'Change time',
     ghqlj: '更换前笼具',
     ghhlj: '更换后笼具',
 }
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/comps/ffjlList.vue b/src/views/business/resource/gsp/comps/ffjlList.vue
index 138c924..4524ff6 100644
--- a/src/views/business/resource/gsp/comps/ffjlList.vue
+++ b/src/views/business/resource/gsp/comps/ffjlList.vue
@@ -163,12 +163,12 @@
                 v-hasPermi="['business:resource:gsp:ffjlgd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7  && id == scope.row.gdsqrId" @click="handleJd(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7 && id == scope.row.gdsqrId" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:gsp:ffjljd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.gdsqrId" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:gsp:ffjljy']">{{
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.gdsqrId"
+                @click="handleJy(scope.row)" v-hasPermi="['business:resource:gsp:ffjljy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
           </el-table-column>
@@ -316,7 +316,7 @@ export default {
             '&nbsp;' + value.bh +
             '</td>' +
             ' <td>' +
-             (value.mdMcs&&value.mdMcs!=''&&value.mdOther&&value.mdOther!=''? (value.mdMcs +","+value.mdOther) :(value.mdMcs +value.mdOther))+
+            (value.mdMcs && value.mdMcs != '' && value.mdOther && value.mdOther != '' ? (value.mdMcs + "," + value.mdOther) : (value.mdMcs + value.mdOther)) +
             '</td>' +
             ' <td>' +
             value.ffzytj +
@@ -359,6 +359,7 @@ export default {
             '</td>' +
             '</tr>'
         })
+        _datastr = _datastr.replaceAll('null', '')
         tabelStr = tabelStr + _datastr + ' <table>'
         // Worksheet名
         var worksheet = that.$t('page.business.resource.gsp.ffhsjl')
@@ -380,7 +381,7 @@ export default {
         a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
         a.click()
         that.$modal.closeLoading()
-        this.saveSimpleLog({name:'',nameEn:'',jcmc:'供试品发放回收导出',jcmcEn:'Test Item In-and-Out Record Export'})
+        this.saveSimpleLog({ name: '', nameEn: '', jcmc: '供试品发放回收导出', jcmcEn: 'Test Item In-and-Out Record Export' })
       }).finally(() => {
         that.$modal.closeLoading()
       })
diff --git a/src/views/business/resource/gsp/comps/gspList.vue b/src/views/business/resource/gsp/comps/gspList.vue
index 1386551..530ff38 100644
--- a/src/views/business/resource/gsp/comps/gspList.vue
+++ b/src/views/business/resource/gsp/comps/gspList.vue
@@ -385,6 +385,7 @@ export default {
             '</td>' +
             '</tr>'
         })
+        _datastr = _datastr.replaceAll('null', '')
         tabelStr = tabelStr + _datastr + ' <table>'
         // Worksheet名
         var worksheet = that.$t('page.business.resource.gsp.gspgl')
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
index 23dc093..6044664 100644
--- a/src/views/business/resource/gsp/comps/rkjlList.vue
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -177,7 +177,7 @@
       <!-- 新增 -->
       <Xz key="Xz" ref="Xz" @callback="handleQuery" />
       <!-- 导入 -->
-      <RkjlImport key="RkjlImport" ref="RkjlImport"  @callback="handleQuery"/>
+      <RkjlImport key="RkjlImport" ref="RkjlImport" @callback="handleQuery" />
 
     </div>
   </div>
@@ -325,6 +325,7 @@ export default {
             '</td>' +
             '</tr>'
         })
+        _datastr = _datastr.replaceAll('null', '')
         tabelStr = tabelStr + _datastr + ' <table>'
         // Worksheet名
         var worksheet = that.$t('page.business.resource.gsp.gsprkjl')
diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue
index 977e514..25f8589 100644
--- a/src/views/business/study/comp/syjList.vue
+++ b/src/views/business/study/comp/syjList.vue
@@ -100,7 +100,7 @@
     <!-- 笼具更换记录 -->
     <Jl key="Jl" ref="Jl" @callback="search" />
     <!-- 详情 -->
-    <Detail key="Detail" ref="Detail" @callback="search"  @close="xqClose" v-show="showDetail"/>
+    <Detail key="Detail" ref="Detail" @callback="search" @close="xqClose" v-show="showDetail" />
   </div>
 
 </template>
@@ -114,6 +114,7 @@ import Jl from "./syj/Jl";
 import Detail from "./syj/Detail";
 import { mapGetters } from 'vuex'
 import moment from "moment";
+import { deepClone } from "@/utils/index";
 export default {
   name: 'SyjList',
   props: {
@@ -168,7 +169,105 @@ export default {
   },
   created() { },
   methods: {
-
+    //导出
+    handleExport() {
+      let that = this
+      that.$modal.loading()
+      let params = deepClone(this.searchForm)
+      params.pageSize = 999999
+      studyRoom_list(params).then(response => {
+        var tabelStr =
+          '<table border="1"  class="html-tabel">' +
+          '<tr style="background:#eee;">' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.syjh') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.syqy') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.dwzs') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.longju') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.kssyyl') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.qyr') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.kssj') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.jssyyl') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.jsr') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.jssj') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.study.studyRoom.zt') + '</th>' +
+          ' </tr>'
+        let _datastr = ''
+        _.forEach(response.rows, function (value) {
+          let zt = ''
+          switch (value.zt) {
+            case 1:
+              zt = that.$t('page.business.study.studyRoom.syz')
+              break
+            case 3:
+              zt = that.$t('page.business.study.studyRoom.yjs')
+              break
+          }
+          _datastr =
+            _datastr +
+            '<tr style="text-align: center;">' +
+            ' <td>' +
+            value.syjh +
+            '</td>' +
+            ' <td>' +
+            '&nbsp;' + value.syqy +
+            '</td>' +
+            ' <td>' +
+            value.dwzs +
+            '</td>' +
+            ' <td>' +
+            value.lj +
+            '</td>' +
+            ' <td>' +
+            value.kssyyl +
+            '</td>' +
+            ' <td>' +
+            value.qyrMc +
+            '</td>' +
+            ' <td>' +
+            value.createTime +
+            '</td>' +
+            ' <td>' +
+            value.jssyyl +
+            '</td>' +
+            ' <td>' +
+            value.jsrMc +
+            '</td>' +
+            '<td>' +
+            value.jssj +
+            '</td>' +
+            '<td>' +
+            zt +
+            '</td>' +
+            '</tr>'
+        })
+        _datastr = _datastr.replaceAll('null', ' ')
+        tabelStr = tabelStr + _datastr + ' <table>'
+          console.log(tabelStr)
+        // Worksheet名
+        var worksheet = that.$t('page.business.study.studyEnter.syjsygl')
+        var uri = 'data:application/vnd.ms-excel;base64,'
+        // 真正要导出（下载）的HTML模板
+        var exportTemplate = `<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel"
+                    xmlns="http://www.w3.org/TR/REC-html40">
+                    <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
+                        <x:Name>${worksheet}</x:Name>
+                            <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
+                        </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
+                    </head>
+                    <body>
+                        ${tabelStr}
+                    </body>
+                    </html>`
+        var a = document.createElement('a')
+        a.download = worksheet + '.xls'
+        a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
+        a.click()
+        that.$modal.closeLoading()
+        this.saveSimpleLog({ name: '', nameEn: '', jcmc: '饲养间使用管理导出', jcmcEn: 'Animal Room Usage Export' })
+      }).finally(() => {
+        that.$modal.closeLoading()
+      })
+    },
     search() {
       this.searchForm.pageNum = 1
       this.getList()
@@ -215,9 +314,6 @@ export default {
       // this.$emit('showDetail', this.showDetail)
       // this.$refs.Xq.show(row)
     },
-    handleExport() {
-
-    },
     xqClose() {
       this.showDetail = false
       this.$emit('showDetail', this.showDetail)