refactor:[资源库管理][麻精药管理]完善功能

src/api/business/mjy/mjy.js

@@ -18,6 +18,54 @@ export function mjy_info(query) {
   })
 }
 
+// 编辑
+export function mjy_bj(data) {
+  return request({
+    url: '/system/business/mjy/bj',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核编辑
+export function mjy_shbj(data) {
+  return request({
+    url: '/system/business/mjy/shbj',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function mjy_xgkc(data) {
+  return request({
+    url: '/system/business/mjy/xgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核修改库存
+export function mjy_shxgkc(data) {
+  return request({
+    url: '/system/business/mjy/shxgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 解锁
+export function mjy_js(data) {
+  return request({
+    url: '/system/business/mjy/js',
+    method: 'post',
+    data: data
+  })
+}
+
+
 // 锁定
 export function mjy_sd(data) {
   return request({
@@ -29,36 +77,52 @@ export function mjy_sd(data) {
 
 
 //批量锁定
-export function mjy_sdBatch(data) {
+export function mjy_plsd(data) {
   return request({
-    url: '/system/business/mjy/sdBatch',
+    url: '/system/business/mjy/plsd',
     method: 'post',
     data: data
   })
 }
 
+//处置容器
+export function mjy_czrq(data) {
+  return request({
+    url: '/system/business/mjy/czrq',
+    method: 'post',
+    data: data
+  })
+}
 
-// 解锁
-export function mjy_js(data) {
+//批量处置容器
+export function mjy_plczrq(data) {
   return request({
-    url: '/system/business/mjy/js',
+    url: '/system/business/mjy/plczrq',
     method: 'post',
     data: data
   })
 }
 
 
-//批量解锁
-export function mjy_jsBatch(data) {
+//处置药剂
+export function mjy_czyj(data) {
   return request({
-    url: '/system/business/mjy/jsBatch',
+    url: '/system/business/mjy/czyj',
     method: 'post',
     data: data
   })
 }
 
+//批量处置药剂
+export function mjy_plczyj(data) {
+  return request({
+    url: '/system/business/mjy/plczyj',
+    method: 'post',
+    data: data
+  })
+}
 
-// 归档
+//归档
 export function mjy_gd(data) {
   return request({
     url: '/system/business/mjy/gd',
@@ -67,12 +131,11 @@ export function mjy_gd(data) {
   })
 }
 
-
 //批量归档
-export function mjy_gdBatch(data) {
+export function mjy_plgd(data) {
   return request({
-    url: '/system/business/mjy/gdBatch',
+    url: '/system/business/mjy/plgd',
     method: 'post',
     data: data
   })
-}
+}

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

@@ -7,7 +7,10 @@ export default {
     zjzt:'制剂状态',
     sxrq:'失效日期',
     nd:'浓度',
+    nddw:'浓度单位',
     kcl:'库存量',
+    kc:'库存',
+    kcdw:'库存单位',
     zcgMc:'暂存柜',
     cctj:'存储条件',
     ccwz:'存储位置',
@@ -30,9 +33,25 @@ export default {
     ysff:'钥匙发放',
     czrq:'处置容器',
     czyj:'处置药剂',
+    yuanyin:'原因',
     xgkc:'修改库存',
     shxgkc:'审核修改库存',
     shbj:'审核编辑',
+    clr:'处理人',
+    czfs:'处置方式',
+    fhr:'复核人',
+    xgbz:'修改备注',
+    jdr:'监督人',
+    xgr:'修改人',
+    czl:'处置量',
+
+    lqr1:'领取人1',
+    lqr2:'领取人2',
+    ffr1:'发放人1',
+    ffr2:'发放人2',
+    zytj:'转移条件',
+    md:'目的',
+    ckmz:'出库毛重',
 
   
 }

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

@@ -1,54 +1,60 @@
 G<template>
-  <div >
+  <div>
     <!-- 编辑弹窗 -->
-    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.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.zykgl.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>
-        </template>
         <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
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mcbj">
+              <el-input type="text" v-model="form.mcbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <el-input type="text" v-model="form.bhbj" 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('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nd')" prop="ndbj">
+              <el-input type="number" v-model="form.ndbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nddw')" prop="nddwbj">
+              <el-input type="text" v-model="form.nddwbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.sxrq')" prop="sxrqbj">
+              <el-input type="text" v-model="form.sxrqbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.cctj')" prop="cctjbj">
+              <el-input type="text" v-model="form.cctjbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwzbj">
+              <el-input type="text" v-model="form.ccwzbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <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-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -57,8 +63,17 @@ G