fix：[资源库管理][给药制剂]发放

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

@@ -1,105 +1,102 @@
 export default {
-    mc:'名称',
-    bh:'编号',
-    jyzt:'借阅状态',
-    zjzt:'制剂状态',
-    jlzt:'记录状态',
-    sxrq:'失效日期',
-    nd:'浓度',
-    nddw:'浓度单位',
-    kcl:'库存量',
-    kc:'库存',
-    kcdw:'库存单位',
-    zcg:'暂存柜',
-    cctj:'存储条件',
-    ccwz:'存储位置',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    ckjz:'出库量',
-    rkjz:'入库量',
-    syl:'使用量',
-    lqr1:'领取人',
-    lqr2:'领取人2',
-    kgy1:'库管员',
-    kgy2:'库管员2',
+  mc: '名称',
+  bh: '编号',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  jlzt: '记录状态',
+  sxrq: '失效日期',
+  nd: '浓度',
+  nddw: '浓度单位',
+  kcl: '库存量',
+  kc: '库存',
+  kcdw: '库存单位',
+  zcg: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  ckjz: '出库量',
+  rkjz: '入库量',
+  syl: '使用量',
+  lqr1: '领取人',
+  lqr2: '领取人2',
+  kgy1: '库管员',
+  kgy2: '库管员2',
 
-    plff:'批量发放',
-    plczyj:'批量处置药剂',
-    plczrq:'批量处置容器',
-    ysff:'钥匙发放',
-    plsd:'批量锁定',
-    plgd:'批量归档',
-    lock:'锁定',
-    unlock:'解锁',
-    detail:'详情',
-    guidang:'归档',
-    jiedang:'解档',
-    jieyue:'借阅',
-    guihuan:'确认归还',
-    fafang:'发放',
-    ysff:'钥匙发放',
-    czrq:'处置容器',
-    czyj:'处置药剂',
-    yuanyin:'原因',
-    xgkc:'修改库存',
-    shxgkc:'审核修改库存',
-    shbj:'审核编辑',
-    clr:'处理人',
-    czfs:'处置方式',
-    fhr:'复核人',
-    xgbz:'修改备注',
-    jdr:'监督人',
-    xgr:'修改人',
-    czl:'处置量',
-    ffr:'发放人',
-    ffr1:'发放人',
-    ffr2:'发放人2',
-    zytj:'转移条件',
-    md:'目的',
-    ckl:'出库量',
-    ckldw:'出库单位',
-    ffzytj:'发放转移条件',
-    ghzytj:'归还转移条件',
-    ys1lrq:'钥匙1领取人',
-    ys2lrq:'钥匙2领取人',
-    sssy:'所属试验',
-    ssbd:'所属表单',
-    bdssr:'表单所属人',
-    syr:'使用人',
-    lqghr:'领取/归还人',
-    ffjsr:'发放/接收人',
-    czlx:'操作类型',
-    czl:'操作量',
-    bzyy:'备注/原因',
-    ccsj:'操作时间',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    jiaqian:'加签',
-    gyzjgl:'给药制剂管理',
-    ffhsjl:'发放回收记录',
+  plff: '批量发放',
+  plczyj: '批量处置药剂',
+  plczrq: '批量处置容器',
+  ysff: '钥匙发放',
+  plsd: '批量锁定',
+  plgd: '批量归档',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  guihuan: '确认归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  yuanyin: '原因',
+  xgkc: '修改库存',
+  shxgkc: '审核修改库存',
+  shbj: '审核编辑',
+  clr: '处理人',
+  czfs: '处置方式',
+  fhr: '复核人',
+  xgbz: '修改备注',
+  jdr: '监督人',
+  xgr: '修改人',
+  czl: '处置量',
+  ffr: '发放人',
+  ffr1: '发放人',
+  ffr2: '发放人2',
+  zytj: '转移条件',
+  md: '目的',
+  ckl: '出库量',
+  ckldw: '出库单位',
+  ffzytj: '发放转移条件',
+  ghzytj: '归还转移条件',
+  ys1lrq: '钥匙1领取人',
+  ys2lrq: '钥匙2领取人',
+  sssy: '所属试验',
+  ssbd: '所属表单',
+  bdssr: '表单所属人',
+  syr: '使用人',
+  lqghr: '领取/归还人',
+  ffjsr: '发放/接收人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bzyy: '备注/原因',
+  ccsj: '操作时间',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  jiaqian: '加签',
+  gyzjgl: '给药制剂管理',
+  ffhsjl: '发放回收记录',
 
-    bdxx:'表单信息',
-    jbxx:'基本信息',
-    rkwz:'入库位置',
-    rktj:'入库条件',
-    zytj:'转移条件',
-    rkmz:'入库净量',
-    jsl:'减少量',
-    syl:'使用量',
-    ghr1Id:'归还人',
-    ghr2Id:'归还人2',
-    jsr1Id:'库管员',
-    jsr2Id:'库管员2',
-  tz:'台账',
-  gdsqrId:'归档申请人',
-  lqsj:'领取时间',
-    jcgj:'稽查轨迹',
-    ffbz:'发放备注',
-    ghbz:'归还备注',
-    cjsj:'创建时间',
-    rkl:'入库量',
-    jysj:'借阅时间',
-    ffjlxq:'发放回收记录详情',
-    gyzjxq:'给药制剂详情',
-    sqguihuan:'归还'
-}
+  bdxx: '表单信息',
+  jbxx: '基本信息',
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkl: '入库净重',
+  ghr1Id: '归还人',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员',
+  jsr2Id: '库管员2',
+  tz: '台账',
+  gdsqrId: '归档申请人',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  cjsj: '创建时间',
+  jysj: '借阅时间',
+  ffjlxq: '发放回收记录详情',
+  gyzjxq: '给药制剂详情',
+  sqguihuan: '归还'
+}

src/views/business/comps/select/SelectStudyDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-template">
+  <div >
     <el-dialog :title="$t('page.business.study.study.qxzsy')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false" style="padding: 20px 20px;">
       <div class="dialog-container">
@@ -75,8 +75,8 @@ export default {
     return {
       checkedOther: false,
       others: '',
-      selectedId: null,
-      selectedName: null,
+      selectedId: '',
+      selectedName: '',
       selectList: [],
       loading: false,
       open: false,
@@ -109,20 +109,20 @@ export default {
     },
     show(val) {
       this.searchForm = _.merge({}, this.searchForm, val)
-      this.selectedId = null
-      this.selectedName = null
+      this.selectedId = ''
+      this.selectedName = ''
       this.checkedOther = false
-      this.others = null
+      this.others = ''
       this.$emit('callback', { id: '', name: '', other: '' })
       this.search()
     },
     search() {
       this.searchForm.pageNum = 1;
       this.open = true
-      this.selectedId = null
-      this.selectedName = null
+      this.selectedId = ''
+      this.selectedName = ''
       this.checkedOther = false
-      this.others = null
+      this.others = ''
       this.$emit('callback', { id: '', name: '', other: '' })
       this.getList();
     },
@@ -151,13 +151,9 @@ export default {
       }else{
         name=this.selectedName+this.others
       }
-      this.$emit('callback', { id: this.selectedId, name: name, other: this.others })
+      this.$emit('callback', { id: this.selectedId, name: name, mdOther: this.others })
       this.open = false
     }
   }
 };
 </script>
-
-<style rel="stylesheet/scss" lang="scss">
-.select-template {}
-</style>

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

@@ -104,7 +104,7 @@
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.rkl') }}</div>
-            <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
+            <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
                 }}</template>
             </el-input>
 

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

@@ -104,12 +104,12 @@
           <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.ckl')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
+              {{ scope.row.ckl }} {{ scope.row.ckldw }}
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.rkl')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
+              {{ scope.row.rkl }} {{ scope.row.rkldw }}
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.syl')" align="center" width="150px">

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

@@ -34,18 +34,9 @@
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
-                <!-- <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="250px">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.ckmz" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"><template slot="append">{{ scope.row.ckmzdw
-                      }}</template>
-                    </el-input>
-                  </template>
-                </el-table-column> -->
                 <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.mdIds" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                      <SelectStudy v-model="scope.row.mdIds"  />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('form.remark')" align="center" width="250px">
@@ -77,7 +68,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
@@ -124,13 +114,6 @@
                <SelectStudy v-model="form.mdIds"  @change="selectStudyChange" />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
-                <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
-                  <template slot="append">{{ form.ckmzdw }}</template>
-                </el-input>
-              </el-form-item>
-            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -275,33 +258,16 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        ckmzdw: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ckmz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        xmId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         zytj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }]
-
-
       }
     }
   },
@@ -336,9 +302,7 @@ export default {
       let tmp = []
       _.forEach(val, function (item) {
         let a = item
-        a.ckmzdw = a.kcdw
         a.zytj = null
-        a.ckmz = null
         a.mdIds = null
         a.mdMcs = null
         a.mdOther = null
@@ -357,12 +321,10 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        ckmzdw: null,
         zytj: null,
         mdIds: null,
         mdMcs: null,
         mdOther: null,
-        ckmz: null,
         lqr1Id: null,
         lqr1Mc: null,
         lqr2Id: null,
@@ -389,8 +351,6 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
-      this.form.ckmzdw = row.kcdw
-
       this.form.sxrq = row.sxrq
       this.form.nd = row.nd
       this.form.nddw = row.nddw

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- 归还弹窗 -->
+    <!-- 确认归还弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="800px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -83,7 +83,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkl">
+            <el-form-item :label="$t('page.business.resource.gyzj.rkl')" prop="rkl">
               <el-input type="number" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.ckldw }}</template>
               </el-input>
@@ -99,8 +99,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')">
@@ -112,25 +110,8 @@
               <el-input type="text" v-model="form.ghr2Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')+$t('form.password')" prop="ghr1mm">
-              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')+$t('form.password')" prop="ghr2mm">
-              <el-input type="password" v-model="form.ghr2mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row>
-          <!-- <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')" prop="jsr1Id">
-              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled />
@@ -209,36 +190,6 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        jsl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        syl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ghr1Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ghr1mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ghr2Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ghr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         jsr1Id: [{
           required: true,
           message: ' ',
@@ -270,34 +221,12 @@ export default {
   created() {
   },
   methods: {
-    // rklChange() {
-    //   if (!isNaN(this.form.rkmz)) {
-    //     this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
-    //   }else{
-    //     this.form.jsl = ''
-    //   }
-    // },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
-        id: null,
-        rkwz: null,
-        rktj: null,
-        ghzytj: null,
-        rkmz: null,
-        jsl: null,
-        syl: null,
-        ghr1Id: null,
-        ghr1mm: null,
-        ghr2Id: null,
-        ghr2mm: null,
-        jsr1Id: null,
-        jsr1mm: null,
-        jsr2Id: null,
-        jsr2mm: null,
-        qmyy: '归还',
+        qmyy: '确认归还',
       }
       this.resetForm("form")
     },

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- 归还弹窗 -->
+    <!-- 申请归还弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.sqguihuan')" :visible.sync="open" width="800px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -118,7 +118,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -166,21 +165,6 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        rkmz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        syl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         ghr1Id: [{
           required: true,
           message: ' ',
@@ -200,26 +184,6 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
-        }],
-        jsr1Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsr1mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsr2Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
         }]
       }
     }
@@ -232,29 +196,11 @@ export default {
   created() {
   },
   methods: {
-    // rklChange() {
-    //   if (!isNaN(this.form.rkmz)) {
-    //     this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
-    //   }else{
-    //     this.form.jsl = ''
-    //   }
-    // },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
-        rkwz: null,
-        rktj: null,
-        ghzytj: null,
-        ghr1Id: null,
-        ghr1mm: null,
-        ghr2Id: null,
-        ghr2mm: null,
-        jsr1Id: null,
-        jsr1mm: null,
-        jsr2Id: null,
-        jsr2mm: null,
         qmyy: '归还',
       }
       this.resetForm("form")