Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/api/business/mjy/mjy.js

@@ -191,6 +191,15 @@ export function gh(data) {
   })
 }
 
+//入库
+export function rk(data) {
+  return request({
+    url: '/system/business/mjy/rk',
+    method: 'post',
+    data: data
+  })
+}
+
 //台账列表
 export function tzList(query) {
   return request({

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

@@ -24,7 +24,7 @@ export default {
     yslqr2:'钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
-
+rkmz:'入库毛重',
   plff: '批量发放',
   plczyj: '批量处置药剂',
   plczrq: '批量处置容器',
@@ -90,7 +90,7 @@ export default {
   ghr2Id: '归还人2',
   jsr1Id: '库管员',
   jsr2Id: '库管员2',
-  tz: '台账',
+  tz: '给药制剂台账',
   gdsqrId: '归档申请人',
   lqsj: '领取时间',
   jcgj: '稽查轨迹',

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

@@ -1,109 +1,112 @@
 export default {
-    mc:'名称',
-    bh:'编号',
-    jyzt:'借阅状态',
-    zjzt:'制剂状态',
-    jlzt:'记录状态',
-    sxrq:'失效日期',
-    nd:'浓度',
-    nddw:'浓度单位',
-    kcl:'库存量',
-    kc:'库存',
-    kcdw:'库存单位',
-    zcg:'暂存柜',
-    cctj:'存储条件',
-    ccwz:'存储位置',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    ckjz:'出库净重',
-    rkjz:'入库净重',
-    syl:'使用量',
-    lqr1:'领取人',
-    lqr2:'领取人2',
-    yslqr1:'钥匙1领取人',
-    yslqr2:'钥匙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',
+  yslqr1: '钥匙1领取人',
+  yslqr2: '钥匙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:'发放人1',
-    ffr2:'发放人2',
-    zytj:'转移条件',
-    md:'目的',
-    ckmz:'出库毛重',
-    ckl:'出库量',
-    ckldw:'出库单位',
-    ffzytj:'发放转移条件',
-    ghzytj:'归还转移条件',
-    ckmz:'出库毛重',
-    ckmzdw:'出库毛重单位',
-    ys1lrq:'钥匙1领取人',
-    ys2lrq:'钥匙2领取人',
-    sssy:'所属试验',
-    ssbd:'所属表单',
-    bdssr:'表单所属人',
-    syr:'使用人',
-    lqghr:'领取/归还人',
-    ffjsr:'发放/接收人',
-    czlx:'操作类型',
-    czl:'操作量',
-    bzyy:'备注/原因',
-    ccsj:'操作时间',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    jiaqian:'加签',
-    mjygl:'麻精药管理',
-    ffhsjl:'发放回收记录',
-
-    bdxx:'表单信息',
-    jbxx:'基本信息',
-    rkwz:'入库位置',
-    rktj:'入库条件',
-    zytj:'转移条件',
-    rkmz:'入库毛重',
-    jsl:'减少量',
-    syl:'使用量',
-    ghr1Id:'归还人',
-    ghr2Id:'归还人2',
-    jsr1Id:'库管员',
-    jsr2Id:'库管员2',
-    tz:'麻精药台账',
-    lqsj:'领取时间',
-    jcgj:'稽查轨迹',
-    ffbz:'发放备注',
-    ghbz:'归还备注',
-    cjsj:'创建时间',
-    rkl:'入库毛重',
-    jysj:'借阅时间',
-    mjyxq:'麻精药详情',
-    ffjlxq:'发放回收记录详情',
-    
-}
+  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: '发放人1',
+  ffr2: '发放人2',
+  zytj: '转移条件',
+  md: '目的',
+  ckmz: '出库毛重',
+  ckl: '出库量',
+  ckldw: '出库单位',
+  ffzytj: '发放转移条件',
+  ghzytj: '归还转移条件',
+  ckmz: '出库毛重',
+  ckmzdw: '出库毛重单位',
+  ys1lrq: '钥匙1领取人',
+  ys2lrq: '钥匙2领取人',
+  sssy: '所属试验',
+  ssbd: '所属表单',
+  bdssr: '表单所属人',
+  syr: '使用人',
+  lqghr: '领取/归还人',
+  ffjsr: '发放/接收人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bzyy: '备注/原因',
+  ccsj: '操作时间',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  jiaqian: '加签',
+  mjygl: '麻精药管理',
+  ffhsjl: '发放回收记录',
+  ruku: '入库',
+  bdxx: '表单信息',
+  jbxx: '基本信息',
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkmz: '入库毛重',
+  jsl: '减少量',
+  syl: '使用量',
+  ghr1Id: '归还人',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员',
+  jsr2Id: '库管员2',
+  tz: '麻精药台账',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  cjsj: '创建时间',
+  rkl: '入库毛重',
+  jysj: '借阅时间',
+  mjyxq: '麻精药详情',
+  ffjlxq: '发放回收记录详情',
+  sswjj:'所属文件夹',
+  ssbd:'所属表单',
+  qmr1Id:'签名人1',
+  qmr2Id:'签名人2',
+}

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

@@ -1,6 +1,7 @@
 export default {
   zjzt: {
     rk: '入库',
+    wrk: '未入库',
     yff: '已发放',
     ysd: '已锁定',
     dgd: '待归档',

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

@@ -39,7 +39,8 @@
             {{$t('form.qmyy')}}：{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn  }}
           </div>
           <div v-if="item.qmrId&&item.qmrId>0">
-            {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }}
+            <!-- {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }} -->
+            {{$t('form.signer')}}：{{ item.qmrMc  }}
           </div>
         </div>
       </el-timeline-item>

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

@@ -2,8 +2,9 @@
 
 <template>
   <div>
-    <el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
-    <el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <!-- <el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" /> -->
     <SelectDeptUserDialog ref="selectDeptUserDialog" @change="handleChange" />
   </div>
 </template>

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

@@ -21,8 +21,10 @@
           node-key="id"
           >
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio>
-            <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
+            <!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio> -->
+            <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{data.name }}</el-radio>
+            <!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
+            <span v-else>{{ data.name }}</span>
           </span>
         </el-tree>
       </el-col>
@@ -30,7 +32,8 @@
         <div>已选</div>
         <div class="select-user-selected" v-if="selected.id!=''">
           <div class="select-user-selected-item">
-            <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div>
+            <!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div> -->
+            <div class="select-user-selected-name">{{selected.name}}</div>
             <div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected"></i></div>
           </div>
         </div>
@@ -90,7 +93,8 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      // return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      return data.name.indexOf(value) !== -1;
     },
     getList() {
       this.listData = []

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

@@ -21,9 +21,10 @@
           node-key="id"
           >
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox>
-            <!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id">{{ data.name }}</el-radio> -->
-            <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
+            <!-- <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox> -->
+            <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ data.name }}</el-checkbox>
+            <!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
+            <span v-else>{{ data.name }}</span>
           </span>
         </el-tree>
       </el-col>
@@ -31,7 +32,8 @@
         <div>已选</div>
         <div class="select-user-selected" v-if="selected.length>0">
           <div class="select-user-selected-item" v-for="(item,index) in selected" :key="index">
-            <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div>
+            <!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div> -->
+            <div class="select-user-selected-name">{{item.name}}</div>
             <div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected(item)"></i></div>
           </div>
         </div>
@@ -99,7 +101,8 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      // return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      return data.name.indexOf(value) !== -1;
     },
     getList() {
       this.listData = []

src/views/business/form/drug/comp/sign.vue

@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <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')" autocomplete="off" auto-complete="new-password" />

src/views/business/form/drug/comp/ytbdList.vue

@@ -54,7 +54,7 @@
               v-hasPermi="['business:drugFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
 
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.drug.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.drug.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -207,6 +207,8 @@ export default {
         this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.studyStatus = newVal.status
+        this.formCount = newVal.formCount
+        this.formFinishCount = newVal.formFinishCount
         this.search()
       },
       immediate: true,
@@ -216,6 +218,8 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
+      formCount:0,
+      formFinishCount:0,
       formPreview: {
         templateSn: null
       },

src/views/business/form/drug/list.vue

@@ -74,7 +74,8 @@
 
           <el-table-column :label="$t('page.business.study.drug.formCount')" align="center" prop="formCount" width="100" />
           <el-table-column :label="$t('page.business.study.drug.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <el-table-column :label="$t('page.business.study.drug.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
+          <!-- <el-table-column :label="$t('page.business.study.drug.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
+          <el-table-column :label="$t('page.business.study.drug.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.drug.dept')" align="center" prop="deptName" width="120" />
           <el-table-column :label="$t('page.business.study.drug.createDate')" align="center" prop="createTime" width="140" />
           

src/views/business/form/nonTrial/comp/sign.vue

@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <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')" autocomplete="off" auto-complete="new-password" />

src/views/business/form/nonTrial/comp/ytbdList.vue

@@ -54,7 +54,7 @@
               v-hasPermi="['business:nonTrialFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
 
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -207,6 +207,8 @@ export default {
         this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.studyStatus = newVal.status
+        this.formCount = newVal.formCount
+        this.formFinishCount = newVal.formFinishCount
         this.search()
       },
       immediate: true,
@@ -216,6 +218,8 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
+      formCount:0,
+      formFinishCount:0,
       formPreview: {
         templateSn: null
       },

src/views/business/form/nonTrial/list.vue

@@ -74,7 +74,8 @@
 
           <el-table-column :label="$t('page.business.study.nonTrial.formCount')" align="center" prop="formCount" width="100" />
           <el-table-column :label="$t('page.business.study.nonTrial.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center"  :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
+          <!-- <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center"  :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
+          <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.nonTrial.dept')" align="center" prop="deptName" width="120" />
           <el-table-column :label="$t('page.business.study.nonTrial.createDate')" align="center" prop="createTime" width="140" />
           

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

@@ -8,7 +8,6 @@
       </div>
       <div class="right-top">
         <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')
@@ -61,9 +60,7 @@
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.lqsj') }}</div>
-            <el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
-            </el-input>
+            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
@@ -107,7 +104,14 @@
             <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
                 }}</template>
             </el-input>
-
+          </div>
+        </div>
+         <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>
+            </el-input>
           </div>
         </div>
         <div class="pal">
@@ -189,9 +193,6 @@ export default {
   created() {
   },
   methods: {
-    exportExcel() {
-      alert('todo')
-    },
     cancel() {
       this.open = false
       this.$emit('callback')

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

@@ -92,6 +92,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+           <el-col :span="12">
+            <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.ckldw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -190,6 +197,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
         rkl: [{
           required: true,
           message: ' ',

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

@@ -24,7 +24,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signerform.signer')">
+            <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>

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

@@ -13,7 +13,7 @@
         </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>
+      }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -96,22 +96,42 @@
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center" prop="qmrMc"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.qmrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.qmrMcEn }}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('page.business.resource.gyzj.lqghr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+
+                  </div>
+                  <div v-else>
+                    {{ scope.row.lqrMcEn }}{{ scope.row.ghrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.ffrMcEn }}{{ scope.row.jsrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.resource.gyzj.czlx')" align="center" prop="qmyy"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.czlx')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="100" />
               <el-table-column :label="$t('page.business.resource.gyzj.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">

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

@@ -8,7 +8,6 @@
       </div>
       <div class="right-top">
         <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')
@@ -195,9 +194,7 @@ export default {
   created() {
   },
   methods: {
-    exportExcel() {
-      alert('todo')
-    },
+   
     cancel() {
       this.open = false
       this.$emit('callback')

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

@@ -0,0 +1,289 @@
+<template>
+  <div>
+    <!-- 入库弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.ruku')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.mc')">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.bh')">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.sxrq')">
+              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.nd')">
+              <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
+              }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.sswjj')">
+              <el-input type="text" v-model="form.studyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.ssbd')">
+              <el-input type="text" v-model="form.bdMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.rkwz')" prop="rkwz">
+              <BusinessSelect v-model="form.rkwz" dictType="business_ccwz"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.rktj')" prop="rktj">
+              <BusinessSelect v-model="form.rktj" dictType="business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.zytj')" prop="zytj">
+              <BusinessSelect v-model="form.zytj" dictType="business_zytj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.rkmz')" prop="rkl">
+              <el-input type="number" v-model="form.rkl" maxlength="50"
+                :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.kcdw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id')" prop="qmr1Id">
+              <SelectDeptUser v-model="form.qmr1Id" key="qmr1Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id') + $t('form.password')" prop="qmr1mm">
+              <el-input type="password" v-model="form.qmr1mm" 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.mjy.qmr2Id')" prop="qmr2Id">
+              <SelectDeptUser v-model="form.qmr2Id" key="qmr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr2Id') + $t('form.password')" prop="qmr2mm">
+              <el-input type="password" v-model="form.qmr2mm" 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.mjy.jsr1Id')" >
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id') + $t('form.password')" prop="jsr1mm">
+              <el-input type="password" v-model="form.jsr1mm" 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.mjy.jsr2Id')" prop="jsr2Id">
+              <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id') + $t('form.password')" prop="jsr2mm">
+              <el-input type="password" v-model="form.jsr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { rk, info } from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Rk",
+  components: { SelectDeptUser, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2mm: [{
+          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'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        rkwz: null,
+        rktj: null,
+        zytj: null,
+        rkl: null,
+        qmr1Id: null,
+        qmr1mm: null,
+        qmr2Id: null,
+        qmr2mm: null,
+        jsr1Id: null,
+        jsr1mm: null,
+        jsr2Id: null,
+        jsr2mm: null,
+        qmyy: '麻精药入库',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      let that = this
+      info({ id: row.id }).then(response => {
+        that.form = _.merge({}, that.form, response.data)
+        that.form.rkl=that.form.kc
+        that.open = true
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          rk(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -96,22 +96,41 @@
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center" prop="qmrMc"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.qmrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.qmrMcEn }}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('page.business.resource.mjy.lqghr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.lqrMcEn }}{{ scope.row.ghrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.ffrMcEn }}{{ scope.row.jsrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center" prop="qmyy"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="100" />
               <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
@@ -136,8 +155,7 @@
           </div>
           <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
-          <pagination v-show="jcgjTotal > 0" :total="jcgjTotal"
-            @pagination="getJjcgjList" />
+          <pagination v-show="jcgjTotal > 0" :total="jcgjTotal" @pagination="getJjcgjList" />
         </div>
       </div>
     </div>

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

@@ -116,6 +116,7 @@
           <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 2">{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>
               <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
               <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
               <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
@@ -184,6 +185,11 @@
                 <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
                   $t('page.business.resource.mjy.guihuan') }}</el-button>
               </template>
+               <template v-if="scope.row.zjzt == 2">
+                <!-- 入库 -->
+                <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:mjy:rk']">{{
+                  $t('page.business.resource.mjy.ruku') }}</el-button>
+              </template>
               <template v-if="scope.row.zjzt == 9">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
@@ -219,6 +225,8 @@
       <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 归还 -->
       <Gh key="Gh" ref="Gh" @callback="handleQuery" />
+      <!-- 入库 -->
+      <Rk key="Rk" ref="Rk" @callback="handleQuery" />
       <!-- 发放 -->
       <Ff key="Ff" ref="Ff" @callback="handleQuery" />
       <!-- 处置药剂 -->
@@ -246,6 +254,7 @@ import Xgkc from "./mjy/Xgkc";
 import Shxgkc from "./mjy/Shxgkc";
 import Jy from "./mjy/Jy";
 import Gh from "./mjy/Gh";
+import Rk from "./mjy/Rk";
 import Ff from "./mjy/Ff";
 import Czrq from "./mjy/Czrq";
 import Czyj from "./mjy/Czyj";
@@ -254,7 +263,7 @@ import moment from "moment";
 
 export default {
   name: "MjyList",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
+  components: { Rk,Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
   data() {
     return {
       daterange: [],
@@ -339,6 +348,10 @@ export default {
     handleGh(row) {
       this.$refs.Gh.show(row)
     },
+     //入库
+    handleRk(row) {
+      this.$refs.Rk.show(row)
+    },
     //是否可勾选
     checkSelectable(row) {
       return true;

src/views/business/resource/zcg/comps/Ysff.vue

@@ -43,7 +43,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.lqr1mm')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.lqr2mm')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.ffrmm')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <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')" autocomplete="off" auto-complete="new-password" />

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

@@ -35,7 +35,7 @@
             </el-form-item>
           </el-col>
           <el-col>
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5 && studyInfo.formCount===studyInfo.formFinishCount">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
           </el-col>
         </el-row>
       </el-form>

src/views/business/study/list.vue

@@ -74,7 +74,8 @@
 
           <el-table-column :label="$t('page.business.study.study.formCount')" align="center" prop="formCount" width="100" />
           <el-table-column :label="$t('page.business.study.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <el-table-column :label="$t('page.business.study.study.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
+          <!-- <el-table-column :label="$t('page.business.study.study.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
+          <el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.study.createDate')" align="center" prop="createTime" width="140" />
           
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">