fix：[资源库]发放记录

src/lang/en/business/resource/mjy.js

@@ -109,6 +109,7 @@ export default {
   ssbd:'In Record',
   qmr1Id:'Signed By 1',
   qmr2Id:'Signed By 2',
+  gdsqrId: '归档申请人',
   lqff:'Distribution',
   sqgd:'Apply for Archiving',
   sqjd:'Apply for De-archiving',

src/lang/zh/business/resource/mjy.js

@@ -24,6 +24,7 @@ export default {
   yslqr2: '钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
+  gdsqrId: '归档申请人',
   plff: '批量发放',
   plczyj: '批量处置药剂',
   plczrq: '批量处置容器',

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

@@ -13,6 +13,7 @@
         <el-radio-button :label="3" v-if="showLj">{{ $t('page.business.study.studyRoom.ghlj') }}</el-radio-button>
         <el-radio-button :label="5" v-if="showRy">{{ $t('page.business.study.study.ry') }}</el-radio-button>
         <el-radio-button :label="7" v-if="showXg">{{ $t('page.business.study.study.xg') }}</el-radio-button>
+        <el-radio-button :label="9" v-if="showBcsm">{{ $t('page.business.resource.mjy.bcsm') }}</el-radio-button>
       </el-radio-group>
     </div>
     <div class="jcgjList-content">
@@ -71,6 +72,10 @@ export default {
       type:Boolean,
       default:true
     },
+    showBcsm:{
+      type:Boolean,
+      default:false
+    },
     // 更换笼具
     showLj: {
       type:Boolean,
@@ -108,7 +113,6 @@ export default {
         try {
           item.jcnrList = JSON.parse(a.jcnr)
           item.jcnrListEn = JSON.parse(a.jcnrEn)
-          debugger
         } catch (e) {
           item.jcnrList = []
           item.jcnrListEn = []

src/views/business/resource/gyzj/comps/ffjl/Xq.vue

@@ -11,7 +11,7 @@
       </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>
+    }}<img src="@/assets/images/detail-title.png" /></div>
 
     <div class="detail-content">
       <div class="content-left">
@@ -37,7 +37,7 @@
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.nd') }}</div>
             <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
@@ -55,7 +55,7 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.ckl') }}</div>
             <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
           <div class="right">
@@ -66,12 +66,13 @@
         <div class="pal">
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.ffzytj') }}</div>
-             <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
+            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.md') }}</div>
-            <el-input type="text" v-if="form.mdOther&&form.mdOther!=''&&form.mdMcs&&form.mdMcs!=''" :value="form.mdMcs+','+form.mdOther" maxlength="50" disabled />
-            <el-input type="text" v-else :value="form.mdMcs+form.mdOther" maxlength="50" disabled />
+            <el-input type="text" v-if="form.mdOther && form.mdOther != '' && form.mdMcs && form.mdMcs != ''"
+              :value="form.mdMcs + ',' + form.mdOther" maxlength="50" disabled />
+            <el-input type="text" v-else :value="form.mdMcs + form.mdOther" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
@@ -102,29 +103,30 @@
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.rkl') }}</div>
             <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
-         <div class="pal">
+        <div class="pal">
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.rkmz') }}</div>
             <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
         <div class="pal">
-          <div class="left">
+          <div class="left" style="width: 100%;">
             <div class="left-title">{{ $t('page.business.resource.gyzj.ffbz') }}</div>
             <el-input type="text" :value="form.ffbz" maxlength="50" disabled />
           </div>
-          <div class="right">
+        </div>
+        <div class="pal">
+          <div class="right" style="width: 100%;">
             <div class="right-title">{{ $t('page.business.resource.gyzj.ghbz') }}</div>
             <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
           </div>
         </div>
-
         <div class="pal">
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.gdsqrId') }}</div>
@@ -161,7 +163,7 @@
           <div class="line"></div>
           <div class="subtitle"> {{ $t('page.business.resource.gyzj.jcgj') }}</div>
         </div>
-        <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+        <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showBcsm="true" :showBj="false"/>
 
         <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
           @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />
@@ -217,6 +219,7 @@ export default {
       this.queryJcgjParams.ffjlId = row.id
       info({ id: row.id }).then(response => {
         this.form = response.data
+        debugger
         this.open = true
         this.getJjcgjList()
         this.$modal.closeLoading()

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

@@ -115,7 +115,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>

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

@@ -129,7 +129,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>

src/views/business/resource/mjy/comps/ffjl/Xq.vue

@@ -11,7 +11,7 @@
       </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>
+    }}<img src="@/assets/images/detail-title.png" /></div>
     <div class="detail-content">
       <div class="content-left">
         <div class="content-title">
@@ -36,7 +36,7 @@
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.nd') }}</div>
             <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
@@ -54,13 +54,13 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.ckl') }}</div>
             <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.ckmz') }}</div>
             <el-input type="text" :value="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
@@ -68,13 +68,14 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.lqsj') }}</div>
             <el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.md') }}</div>
-            <el-input type="text" v-if="form.mdOther&&form.mdOther!=''&&form.mdMcs&&form.mdMcs!=''" :value="form.mdMcs+','+form.mdOther" maxlength="50" disabled />
-            <el-input type="text" v-else :value="form.mdMcs+form.mdOther" maxlength="50" disabled />
+            <el-input type="text" v-if="form.mdOther && form.mdOther != '' && form.mdMcs && form.mdMcs != ''"
+              :value="form.mdMcs + ',' + form.mdOther" maxlength="50" disabled />
+            <el-input type="text" v-else :value="form.mdMcs + form.mdOther" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
@@ -111,25 +112,26 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.rkmz') }}</div>
             <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
-                }}</template>
+            }}</template>
             </el-input>
           </div>
         </div>
         <div class="pal">
-          <div class="left">
+          <div class="left" style="width: 100%;">
             <div class="left-title">{{ $t('page.business.resource.mjy.ffbz') }}</div>
             <el-input type="text" :value="form.ffbz" maxlength="50" disabled />
           </div>
-          <div class="right">
+        </div>
+        <div class="pal">
+          <div class="right" style="width: 100%;">
             <div class="right-title">{{ $t('page.business.resource.mjy.ghbz') }}</div>
             <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
           </div>
         </div>
-
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ghbz') }}</div>
-            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.mjy.gdsqrId') }}</div>
+            <el-input type="text" :value="form.gdsqrMc" maxlength="50" disabled />
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.cjsj') }}</div>
@@ -162,7 +164,7 @@
           <div class="line"></div>
           <div class="subtitle"> {{ $t('page.business.resource.mjy.jcgj') }}</div>
         </div>
-        <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+        <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showBcsm="true" :showBj="false"/>
 
         <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
           @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />

src/views/business/resource/mjy/comps/mjy/Czrq.vue

@@ -114,7 +114,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -252,9 +252,7 @@ export default {
           let params = this.form
           if (this.isBatch) {
             params.list = this.selectList
-            if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
-            } else {
+             //循环验证
               this.$modal.loading()
               plczrq(params).then(response => {
                 this.open = false
@@ -263,7 +261,6 @@ export default {
               }).finally(() => {
                 this.$modal.closeLoading()
               })
-            }
           } else {
             this.$modal.loading()
             czrq(params).then(response => {

src/views/business/resource/mjy/comps/mjy/Czyj.vue

@@ -131,7 +131,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>