feat：[档案管理]给药制剂档案

src/api/business/gyzj/gyzj.js

@@ -48,6 +48,14 @@ export function gh(data) {
     data: data
   })
 }
+//借阅
+export function jy(data) {
+  return request({
+    url: '/system/business/gyzj/jy',
+    method: 'post',
+    data: data
+  })
+}
 //申请归还
 export function sqgh(data) {
   return request({

src/views/business/archive/formulation/comps/gyzjList.vue

@@ -99,7 +99,7 @@
                   v-hasPermi="['business:archive:gyzj:tygd']">{{
                     $t('page.business.resource.gyzj.tygd') }}</el-button>
                 <!-- 拒绝归档 -->
-                <el-button type="text" v-if="scope.row.zjzt==7" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjgd', false, 'jjgd')"
+                <el-button type="text" v-if="scope.row.zjzt==7" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjgd', false, 'jjgd',true,true)"
                   v-hasPermi="['business:archive:gyzj:jjgd']">{{
                     $t('page.business.resource.gyzj.jjgd') }}</el-button>
                 <!-- 同意解档 -->
@@ -107,7 +107,7 @@
                   v-hasPermi="['business:archive:gyzj:tyjd']">{{
                     $t('page.business.resource.gyzj.tyjd') }}</el-button>
                 <!-- 拒绝解档 -->
-                <el-button type="text" v-if="scope.row.zjzt==11" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjjd', false, 'jjjd')"
+                <el-button type="text" v-if="scope.row.zjzt==11" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjjd', false, 'jjjd',true,true)"
                   v-hasPermi="['business:archive:gyzj:jjjd']">{{
                     $t('page.business.resource.gyzj.jjjd') }}</el-button>
                 <!-- 同意借阅 -->
@@ -115,7 +115,7 @@
                   v-hasPermi="['business:archive:gyzj:tyjy']">{{
                     $t('page.business.resource.gyzj.tyjy') }}</el-button>
                 <!-- 拒绝借阅 -->
-                <el-button type="text" v-if="scope.row.zjzt==9&&scope.row.jyzt==3" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjjy', true, 'jjjy')"
+                <el-button type="text" v-if="scope.row.zjzt==9&&scope.row.jyzt==3" @click="handleSign(scope.row, 'page.business.resource.gyzj.jjjy', true, 'jjjy',true,true)"
                   v-hasPermi="['business:archive:gyzj:jjjy']">{{
                     $t('page.business.resource.gyzj.jjjy') }}</el-button>
                 <!-- 确认归还 -->
@@ -170,15 +170,14 @@ export default {
     this.getList()
   },
   methods: {
-    handleSign(row, qmyy, showDate, type) {
+    handleSign(row, qmyy, showDate, type,isReson,reasonRequired) {
       this.form.id = row.id
       let title = this.$t(qmyy)
       this.type = type
-      this.$refs.refSign.show(title, title, showDate)
+      this.$refs.refSign.show(title, title, showDate,(type=='jjjy'||type=='tyjy')?[row.jyksrq,row.jyjsrq]:[],isReson,reasonRequired)
     },
     doSign(val) {
       let params = _.merge({}, this.form, val)
-      debugger
       this.$modal.loading()
       if (this.type == 'tygd') {
         tygd(params).then(response => {

src/views/business/comps/common/sign.vue

@@ -3,7 +3,7 @@
     <!-- 签名弹窗 -->
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="title" :visible.sync="open"
       width="500px" append-to-body>
-      <el-form ref="signForm" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN'?'120px':'180px'" v-if="open">
+      <el-form ref="signForm" :model="form" :rules="rules" label-width="120px" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <el-row>
           <el-col :span="24" v-if="showDate">
@@ -13,6 +13,7 @@
                 value-format="yyyy-MM-dd" style="width: 100%" @change="changeDate" />
             </el-form-item>
           </el-col>
+
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" v-model="form.qmyy" maxlength="50" disabled
@@ -20,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
+            <el-form-item :label="isReson ? $t('form.reason') : $t('form.remark')" prop="remark">
               <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
@@ -61,9 +62,11 @@ export default {
         remark: '',
         qmrId: '',
         qmrMc: '',
+        qmrMcEn: '',
         qmrmm: '',
-        jyjsrq: '',
-        jyksrq: ''
+
+        startDate: '',
+        endDate: ''
       },
       dateArr: [],
       showDate: false,
@@ -78,7 +81,9 @@ export default {
           message: ' ',
           trigger: 'change'
         }]
-      }
+      },
+
+      isReson: false
     }
   },
   computed: {
@@ -86,21 +91,56 @@ export default {
   created() {
   },
   methods: {
-    show(title, qmyy, showDate) {
+    show(title, qmyy, showDate, selectedDate, isReson, reasonRequired) {
       this.showDate = showDate == undefined ? false : showDate
-      this.dateArr = []
+      this.dateArr = selectedDate || []
       this.title = title
       this.form = {
         qmyy: qmyy,
         remark: '',
         qmrId: this.$store.getters.id,
         qmrMc: this.$store.getters.nickName,
+        qmrMcEn: this.$store.getters.name,
         qmrmm: '',
-        jyjsrq: '',
-        jyksrq: ''
+        jyksrq: selectedDate && selectedDate.length > 0 ? selectedDate[0] : '',
+        jyjsrq: selectedDate && selectedDate.length > 0 ? selectedDate[1] : ''
       }
       this.resetForm("signForm")
       this.open = true
+
+      this.isReson = isReson || false
+      if (reasonRequired) {
+        this.rules = {
+          qmrmm: [{
+            required: true,
+            message: ' ',
+            trigger: 'blur'
+          }],
+          jyksrq: [{
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }],
+          remark: [{
+            required: true,
+            message: ' ',
+            trigger: 'blur'
+          }]
+        }
+      } else {
+        this.rules = {
+          qmrmm: [{
+            required: true,
+            message: ' ',
+            trigger: 'blur'
+          }],
+          startDate: [{
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }]
+        }
+      }
     },
     cancel() {
       this.open = false

src/views/business/resource/gyzj/comps/gyzj/Jy.vue

@@ -5,15 +5,6 @@
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
-        <div :style="isBatch ? 'display:block' : 'display:none'">
-          <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" />
-            </el-col>
-          </el-row>
-        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.resource.gyzj.jysj') + '：'" prop="startDate">
@@ -66,7 +57,7 @@
 </template>
 
 <script>
-import { jd, jdBatch } from "@/api/business/gyzj/gyzj"
+import { jy, jdBatch } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -154,26 +145,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
             this.$modal.loading()
-            jdBatch(this.form).then(response => {
+            jy(this.form).then(response => {
               this.open = false
               this.$emit('callback')
               this.$modal.closeLoading()
             }).finally(() => {
               this.$modal.closeLoading()
             })
-          } else {
-            this.$modal.loading()
-            jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-              this.$modal.closeLoading()
-            }).finally(() => {
-              this.$modal.closeLoading()
-            })
-          }
-
         }
       })
     }

src/views/business/resource/gyzj/comps/gyzjList.vue

@@ -194,7 +194,7 @@
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:jd']">{{
                   $t('page.business.resource.gyzj.jiedang') }}</el-button>
                 <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:jy']">{{
+                <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:jy']">{{
                   $t('page.business.resource.gyzj.jieyue') }}</el-button>
               </template>
             </template>

src/views/business/study/comp/tbbdList.vue

@@ -116,7 +116,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject && id != scope.row.userId"
+              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103)"
                 @click="fh(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

src/views/business/study/comp/ytbdList.vue

@@ -99,14 +99,14 @@
                 <template>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                    v-if="scope.row.bdzt === 3 && isMatchSubjectt && id != scope.row.userId">{{
+                    v-if="scope.row.bdzt === 3 && isMatchSubjectt && (id != scope.row.userId||id<=103)">{{
                       $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                  v-if="scope.row.bdzt === 3 && isMatchSubject && id != scope.row.userId">{{
+                  v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103)">{{
                     $t('page.business.form.audit')
                   }}</el-button>
               </template>