From fb1d91d2fda8de6af03af3d99d75fd4a9e894d40 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 26 Dec 2025 20:26:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       |  1 +
 src/App.vue                                        | 13 ++-
 src/lang/en/business/resource/gyzj/gyzj.js         |  3 +
 src/lang/en/business/resource/mjy/mjy.js           |  4 +
 src/lang/zh/business/resource/gyzj/gyzj.js         |  3 +
 src/lang/zh/business/resource/mjy/mjy.js           |  4 +
 src/layout/components/AppMain.vue                  |  1 +
 src/main.js                                        |  5 +-
 src/views/business/resource/gyzj/comps/ffjl/Jy.vue | 85 +++++++++++++------
 src/views/business/resource/gyzj/comps/ffjl/Xq.vue |  4 +-
 .../business/resource/gyzj/comps/ffjlList.vue      | 24 ++++--
 src/views/business/resource/gyzj/comps/gyzj/Gh.vue | 20 +++--
 src/views/business/resource/gyzj/comps/gyzj/Jy.vue | 50 ++++++++++--
 src/views/business/resource/gyzj/comps/gyzj/Xq.vue |  3 +-
 .../business/resource/gyzj/comps/gyzjList.vue      | 13 ++-
 src/views/business/resource/gyzj/index.vue         | 94 +++++++++++++++++-----
 src/views/business/resource/mjy/comps/ffjl/Jy.vue  | 85 +++++++++++++------
 src/views/business/resource/mjy/comps/ffjl/Xq.vue  |  3 +-
 src/views/business/resource/mjy/comps/ffjlList.vue | 12 ++-
 src/views/business/resource/mjy/comps/mjy/Jy.vue   | 50 ++++++++++--
 src/views/business/resource/mjy/comps/mjy/Xq.vue   |  3 +-
 src/views/business/resource/mjy/comps/mjyList.vue  |  9 ++-
 src/views/business/resource/mjy/index.vue          | 94 +++++++++++++++++-----
 23 files changed, 447 insertions(+), 136 deletions(-)

diff --git a/package.json b/package.json
index 428960d..c2a0c30 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "lodash": "^4.17.21",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "quill": "2.0.2",
     "screenfull": "5.0.2",
diff --git a/src/App.vue b/src/App.vue
index 7bbfe16..601d4ee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -150,7 +150,6 @@ export default {
 /*详情 */
 .detail-container {
   background: #ffffff !important;
-  margin: 10px 10px;
 
   .detail-top {
     background: #fff;
@@ -161,6 +160,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+
     .left-top {
       flex-shrink: 0;
       display: flex;
@@ -178,7 +178,18 @@ export default {
     }
   }
 
+  .detail-title {
+    line-height: 60px;
+    font-size: 16px;
+    font-weight: bold;
+    width: 100%;
+    margin-top: 10px;
+    display: flex;
+    justify-content: center;
+  }
+
   .detail-content {
+  padding: 10px 10px;
 
     display: flex;
     justify-content: space-between;
diff --git a/src/lang/en/business/resource/gyzj/gyzj.js b/src/lang/en/business/resource/gyzj/gyzj.js
index 4b28804..23ef8bb 100644
--- a/src/lang/en/business/resource/gyzj/gyzj.js
+++ b/src/lang/en/business/resource/gyzj/gyzj.js
@@ -99,4 +99,7 @@ export default {
     gdsqr:'发放备注',
     cjsj:'创建时间',
     rkl:'入库净重',
+    jysj:'借阅时间',
+    ffjlxq:'发放回收记录详情',
+    gyzjxq:'给药制剂详情',
 }
\ No newline at end of file
diff --git a/src/lang/en/business/resource/mjy/mjy.js b/src/lang/en/business/resource/mjy/mjy.js
index e22134c..dac5243 100644
--- a/src/lang/en/business/resource/mjy/mjy.js
+++ b/src/lang/en/business/resource/mjy/mjy.js
@@ -99,4 +99,8 @@ export default {
     gdsqr:'发放备注',
     cjsj:'创建时间',
     rkl:'入库毛重',
+    jysj:'借阅时间',
+    mjyxq:'麻精药详情',
+    ffjlxq:'发放回收记录详情',
+    
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/gyzj/gyzj.js b/src/lang/zh/business/resource/gyzj/gyzj.js
index 4b28804..23ef8bb 100644
--- a/src/lang/zh/business/resource/gyzj/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj/gyzj.js
@@ -99,4 +99,7 @@ export default {
     gdsqr:'发放备注',
     cjsj:'创建时间',
     rkl:'入库净重',
+    jysj:'借阅时间',
+    ffjlxq:'发放回收记录详情',
+    gyzjxq:'给药制剂详情',
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js
index e22134c..dac5243 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -99,4 +99,8 @@ export default {
     gdsqr:'发放备注',
     cjsj:'创建时间',
     rkl:'入库毛重',
+    jysj:'借阅时间',
+    mjyxq:'麻精药详情',
+    ffjlxq:'发放回收记录详情',
+    
 }
\ No newline at end of file
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5085200..e5f43d5 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -51,6 +51,7 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
+  background: #f3f3f3;
 }
 
 .fixed-header + .app-main {
diff --git a/src/main.js b/src/main.js
index 8ae6dfa..379fb46 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,7 @@ import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
+
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -80,7 +81,9 @@ DictData.install()
 import i18n from './lang'
 
 import _ from 'lodash'
-
+import moment from "moment";
+// 将 moment 挂载到 Vue 原型上
+Vue.prototype.$moment = moment;
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value),
   size: Cookies.get('size') || 'mini' // set element-ui default size
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
index 2b8dea5..a35e459 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -1,24 +1,34 @@
 G<template>
-  <div >
+  <div>
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.gyzj.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.bh')" prop="glyj">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.jysj') + '：'" prop="startDate">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -47,7 +57,8 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -70,12 +81,23 @@ export default {
     return {
       open: false,
       form: {},
+      daterange: [],
       rules: {
         qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        endDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        startDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -90,11 +112,22 @@ export default {
     cancel() {
       this.open = false
     },
+    daterangeChange() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.form.startDate = this.daterange[0]
+        this.form.endDate = this.daterange[1];
+      } else {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
+    },
     reset() {
       this.form = {
         id: null,
         ids: null,
         mc: null,
+        startDate: null,
+        endDate: null,
         bh: null,
         qmyy: '申请借阅',
         qmrmm: null
@@ -111,12 +144,12 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-         
-            jy(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
+
+          jy(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
 
       })
     }
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
index 131874f..df67289 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -7,10 +7,12 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
+        <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.gyzj.ffjlxq') }}<img src="@/assets/images/detail-title.png" /></div>
+
     <div class="detail-content">
       <div class="content-left">
         <div class="content-title">
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index 5024587..fc44d51 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -2,7 +2,7 @@
   <div>
     <div>
       <!-- 列表 -->
-      <div class="app-container" v-show="!showDetail">
+      <div class="ffjl" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <el-row>
             <el-col :span="24">
@@ -97,14 +97,14 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" />
           <el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.gyzj.ckjz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.ckl }} {{ scope.row.ckldw }}
+              {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gyzj.rkjz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.gyzj.rkmz')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.rkl }} {{ scope.row.rkldw }}
+              {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.syl')" align="center" width="150px">
@@ -116,9 +116,9 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="kgy1Mc"
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="kgy2Mc"
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
@@ -166,7 +166,7 @@
                 v-hasPermi="['business:resource:gyzj:ffjljd']">{{
                   $t('page.business.resource.gyzj.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7&&scope.row.jyzt == 1" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:gyzj:ffjljy']">{{
                   $t('page.business.resource.gyzj.jieyue') }}</el-button>
             </template>
@@ -264,11 +264,13 @@ export default {
     },
       closeXq(){
       this.showDetail=false
+      this.$emit('showDetail',this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
       this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
       this.$refs.Xq.show(row)
     },
     //归档
@@ -329,3 +331,9 @@ export default {
   }
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+.ffjl {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index 61e640b..4ebc250 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -94,7 +94,7 @@ G<template>
             <el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkmz">
               <el-input type="number" v-model="form.rkmz" maxlength="50"
                 :placeholder="$t('form.placeholderInput')">
-                <template slot="append">{{ form.kcdw }}</template>
+                <template slot="append">{{ form.ckldw }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -104,14 +104,14 @@ G<template>
             <el-form-item :label="$t('page.business.resource.gyzj.jsl')" prop="jsl">
               <el-input type="number" v-model="form.jsl" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')">
-                <template slot="append">{{ form.kcdw }}</template>
+                <template slot="append">{{ form.ckldw }}</template>
               </el-input>
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.syl')" prop="syl">
               <el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
-                <template slot="append">{{ form.kcdw }}</template>
+                <template slot="append">{{ form.ckldw }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -129,13 +129,13 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')" prop="ghr1Id">
-              <el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')" >
+              <el-input type="text" v-model="form.ghr1Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')" prop="ghr2Id">
-              <el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')" >
+              <el-input type="text" v-model="form.ghr2Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -343,8 +343,12 @@ export default {
         that.form.ckldw = response.data.ckldw
         that.form.ffrq = response.data.ffrq
         that.form.ckmz = response.data.ckmz
-        that.form.ckmzdw = response.data.ckmzdw
+        that.form.ckmzdw = response.data.ckldw
         that.form.mdIds = response.data.mdIds
+        that.form.ghr1Mc = response.data.ghr1Mc
+        that.form.ghr2Mc = response.data.ghr2Mc
+        that.form.ghr1Id = response.data.ghr1Id
+        that.form.ghr2Id = response.data.ghr2Id
         that.open = true
       })
     },
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
index 9ca1d7e..3d084ec 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -1,18 +1,19 @@
 G<template>
-  <div >
+  <div>
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.jieyue')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.resource.gyzj.jdts') " type="error" :closable="false">
+          <el-alert :title="$t('page.business.resource.gyzj.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </div>
-          <div v-if="!isBatch">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
@@ -32,6 +33,15 @@ G<template>
         </div>
         <el-row>
           <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.jysj') + '：'" prop="startDate">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -58,7 +68,8 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -84,6 +95,7 @@ export default {
       isBatch: false,
       ids: [],
       selectList: [],
+      daterange: [],
       open: false,
       form: {},
       rules: {
@@ -91,7 +103,17 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        endDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        startDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -113,13 +135,25 @@ export default {
     cancel() {
       this.open = false
     },
+    daterangeChange() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.form.startDate = this.daterange[0]
+        this.form.endDate = this.daterange[1];
+      } else {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
+    },
+
     reset() {
       this.form = {
         id: null,
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        startDate: null,
+        endDate: null,
+        qmyy: '申请借阅',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 296db9d..59db9b8 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -8,10 +8,11 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
+        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.gyzj.gyzjxq') }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index ccf3fa5..a0177bd 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <div >
     <!-- 列表 -->
     <div>
-      <div class="app-container gyzj" v-show="!showDetail">
+      <div class="gyzj" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
           <el-form-item :label="$t('page.business.resource.gyzj.mc') + '：'">
@@ -178,7 +178,7 @@
                 <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:gyzj:gd']">{{
                   $t('page.business.resource.gyzj.guidang') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 3">
+              <template v-if="scope.row.zjzt == 3&&scope.row.ghzt == 3">
                 <!-- 归还 -->
                 <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gyzj:gh']">{{
                   $t('page.business.resource.gyzj.guihuan') }}</el-button>
@@ -344,10 +344,12 @@ export default {
     closeXq(){
       this.showDetail=false
       this.handleQuery()
+      this.$emit('showDetail',this.showDetail)
     },
     //详情
     handleXq(row) {
       this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
       this.$refs.Xq.show(row)
     },
     //批量解锁
@@ -415,5 +417,8 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.gyzj {}
+.gyzj {
+  background: #fff;
+  padding: 10px 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/resource/gyzj/index.vue b/src/views/business/resource/gyzj/index.vue
index cd8975c..da557ec 100644
--- a/src/views/business/resource/gyzj/index.vue
+++ b/src/views/business/resource/gyzj/index.vue
@@ -1,38 +1,94 @@
 <template>
-  <div class="gyzj">
-    <el-tabs v-model="activeName" type="border-card" >
-      <el-tab-pane :label="$t('page.business.resource.gyzj.gyzjgl')" name="gyzjList">
-        <gyzjList key="gyzjList"/>
-      </el-tab-pane>
-      <el-tab-pane :label="$t('page.business.resource.gyzj.ffhsjl')" name="ffjlList">
-        <ffjlList  key="ffjlList"/>
-      </el-tab-pane>
-    </el-tabs>
+  <div class="gyzj-index">
+    <div class="content-list">
+      <div class="search-box" v-show="!showDetail">
+        <div class="search-item" :class="active === item.key ? 'active' : ''" v-for="(item, index) in tabList"
+          :key="index" @click="changeTab(item)">
+          {{ item.name }}
+        </div>
+      </div>
+
+      <div class="content-box">
+        <gyzjList v-if="active === 'gyzjList'" @showDetail="showDetailCallback" />
+        <ffjlList v-if="active === 'ffjlList'" @showDetail="showDetailCallback" />
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import gyzjList from "./comps/gyzjList";
 import ffjlList from "./comps/ffjlList";
-
 export default {
-  name: "Gyzj",
+  name: 'Gyzj',
   components: { gyzjList, ffjlList },
   data() {
     return {
-      activeName: 'gyzjList'
+      showDetail: false,
+      tabList: [
+        { key: 'gyzjList', name: this.$t('page.business.resource.gyzj.gyzjgl') },
+        { key: 'ffjlList', name: this.$t('page.business.resource.gyzj.ffhsjl') },
+      ],
+      active: 'gyzjList',
     }
   },
-  created() {
-  },
+  created() { },
   methods: {
-
+    show(row) {
+      this.study = row
+    },
+    changeTab(item) {
+      if (this.active !== item.key) {
+        this.active = item.key
+      }
+    },
+    showDetailCallback(val) {
+      this.showDetail = val
+    }
   }
 }
 </script>
+<style lang="scss" scoped>
+.gyzj-index {
+  padding: 10px 10px;
+
+  .search-box {
+    background: #fff;
+    padding: 0;
+    border-radius: 3px;
+    margin-bottom: 10px;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .search-item {
+      padding: 10px 20px;
+      font-size: 14px;
+      cursor: pointer;
+
+      &.active {
+        background: #1890ff;
+        color: #fff;
+      }
+
+      &:hover {
+        background: #46a6ff;
+        color: #fff;
+      }
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &:last-child {
+        border-top-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+      }
+    }
+  }
 
-<style rel="stylesheet/scss" lang="scss">
-.gyzj {
-  margin: 10px 10px;
+  .content-box {}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jy.vue b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
index 6594c04..0818f2c 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -1,24 +1,34 @@
 G<template>
-  <div >
+  <div>
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.mjy.jysj') + '：'" prop="startDate">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -47,7 +57,8 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -70,12 +81,23 @@ export default {
     return {
       open: false,
       form: {},
+      daterange: [],
       rules: {
         qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        endDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        startDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -90,11 +112,22 @@ export default {
     cancel() {
       this.open = false
     },
+    daterangeChange() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.form.startDate = this.daterange[0]
+        this.form.endDate = this.daterange[1];
+      } else {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
+    },
     reset() {
       this.form = {
         id: null,
         ids: null,
         mc: null,
+        startDate: null,
+        endDate: null,
         bh: null,
         qmyy: '申请借阅',
         qmrmm: null
@@ -111,12 +144,12 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-         
-            jy(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
+
+          jy(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
 
       })
     }
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 1b2aa85..5a14337 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -7,10 +7,11 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
+        <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.ffjlxq') }}<img src="@/assets/images/detail-title.png" /></div>
     <div class="detail-content">
       <div class="content-left">
         <div class="content-title">
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index d372969..373f3e8 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -2,7 +2,7 @@
   <div>
     <div>
       <!-- 列表 -->
-      <div class="app-container" v-show="!showDetail">
+      <div class="ffjl" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <el-row>
             <el-col :span="24">
@@ -166,7 +166,7 @@
                 v-hasPermi="['business:resource:mjy:ffjljd']">{{
                   $t('page.business.resource.mjy.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7&&scope.row.jyzt == 1" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:mjy:ffjljy']">{{
                   $t('page.business.resource.mjy.jieyue') }}</el-button>
             </template>
@@ -264,11 +264,13 @@ export default {
     },
       closeXq(){
       this.showDetail=false
+      this.$emit('showDetail',this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
       this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
       this.$refs.Xq.show(row)
     },
     //归档
@@ -329,3 +331,9 @@ export default {
   }
 }
 </script>
+<style rel="stylesheet/scss" lang="scss">
+.ffjl {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/comps/mjy/Jy.vue b/src/views/business/resource/mjy/comps/mjy/Jy.vue
index 508571d..b2aea9b 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -1,18 +1,19 @@
 G<template>
-  <div >
+  <div>
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.resource.mjy.jdts') " type="error" :closable="false">
+          <el-alert :title="$t('page.business.resource.mjy.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </div>
-          <div v-if="!isBatch">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
@@ -32,6 +33,15 @@ G<template>
         </div>
         <el-row>
           <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.mjy.jysj') + '：'" prop="startDate">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -58,7 +68,8 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -84,6 +95,7 @@ export default {
       isBatch: false,
       ids: [],
       selectList: [],
+      daterange: [],
       open: false,
       form: {},
       rules: {
@@ -91,7 +103,17 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        endDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        startDate: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -113,13 +135,25 @@ export default {
     cancel() {
       this.open = false
     },
+    daterangeChange() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.form.startDate = this.daterange[0]
+        this.form.endDate = this.daterange[1];
+      } else {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
+    },
+
     reset() {
       this.form = {
         id: null,
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        startDate: null,
+        endDate: null,
+        qmyy: '申请借阅',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index 09e4880..9fbb85d 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -8,10 +8,11 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
+        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.mjyxq') }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 595e998..5b2b682 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -2,7 +2,7 @@
   <div>
     <!-- 列表 -->
     <div>
-      <div class="app-container mjy" v-show="!showDetail">
+      <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
           <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
@@ -344,11 +344,13 @@ export default {
     },
     closeXq(){
       this.showDetail=false
+      this.$emit('showDetail',this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
       this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
       this.$refs.Xq.show(row)
     },
     //批量解锁
@@ -416,5 +418,8 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.mjy {}
+.mjy {
+  background: #fff;
+  padding: 10px 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/index.vue b/src/views/business/resource/mjy/index.vue
index 819e57f..9d77687 100644
--- a/src/views/business/resource/mjy/index.vue
+++ b/src/views/business/resource/mjy/index.vue
@@ -1,38 +1,94 @@
 <template>
-  <div class="mjy">
-    <el-tabs v-model="activeName" type="border-card" >
-      <el-tab-pane :label="$t('page.business.resource.mjy.mjygl')" name="mjyList">
-        <mjyList key="mjyList"/>
-      </el-tab-pane>
-      <el-tab-pane :label="$t('page.business.resource.mjy.ffhsjl')" name="ffjlList">
-        <ffjlList  key="ffjlList"/>
-      </el-tab-pane>
-    </el-tabs>
+  <div class="mjy-index">
+    <div class="content-list">
+      <div class="search-box" v-show="!showDetail">
+        <div class="search-item" :class="active === item.key ? 'active' : ''" v-for="(item, index) in tabList"
+          :key="index" @click="changeTab(item)">
+          {{ item.name }}
+        </div>
+      </div>
+
+      <div class="content-box">
+        <mjyList v-if="active === 'mjyList'" @showDetail="showDetailCallback" />
+        <ffjlList v-if="active === 'ffjlList'" @showDetail="showDetailCallback" />
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import mjyList from "./comps/mjyList";
 import ffjlList from "./comps/ffjlList";
-
 export default {
-  name: "Mjy",
+  name: 'Gyzj',
   components: { mjyList, ffjlList },
   data() {
     return {
-      activeName: 'mjyList'
+      showDetail: false,
+      tabList: [
+        { key: 'mjyList', name: this.$t('page.business.resource.mjy.mjygl') },
+        { key: 'ffjlList', name: this.$t('page.business.resource.mjy.ffhsjl') },
+      ],
+      active: 'mjyList',
     }
   },
-  created() {
-  },
+  created() { },
   methods: {
-
+    show(row) {
+      this.study = row
+    },
+    changeTab(item) {
+      if (this.active !== item.key) {
+        this.active = item.key
+      }
+    },
+    showDetailCallback(val) {
+      this.showDetail = val
+    }
   }
 }
 </script>
+<style lang="scss" scoped>
+.mjy-index {
+  padding: 10px 10px;
+
+  .search-box {
+    background: #fff;
+    padding: 0;
+    border-radius: 3px;
+    margin-bottom: 10px;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .search-item {
+      padding: 10px 20px;
+      font-size: 14px;
+      cursor: pointer;
+
+      &.active {
+        background: #1890ff;
+        color: #fff;
+      }
+
+      &:hover {
+        background: #46a6ff;
+        color: #fff;
+      }
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &:last-child {
+        border-top-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+      }
+    }
+  }
 
-<style rel="stylesheet/scss" lang="scss">
-.mjy {
-  margin: 10px 10px;
+  .content-box {}
 }
-</style>
\ No newline at end of file
+</style>