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

src/api/business/gsp/gsp.js

@@ -9,6 +9,16 @@ export function list(query) {
   })
 }
 
+// 试验物资列表
+export function studyList(query) {
+  return request({
+    url: '/system/business/gsp/studyList',
+    method: 'get',
+    params: query
+  })
+}
+
+
 // 稽查轨迹列表
 export function jcgjList(query) {
   return request({

src/api/business/sj/sj.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询试剂库存列表
+// 查询试剂列表
 export function sj_list(query) {
   return request({
     url: '/system/business/sj/list',
@@ -9,6 +9,15 @@ export function sj_list(query) {
   })
 }
 
+// 试验物资列表
+export function studyList(query) {
+  return request({
+    url: '/system/business/sj/studyList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询试剂库存详情
 export function sj_info(query) {
   return request({
@@ -18,10 +27,10 @@ export function sj_info(query) {
   })
 }
 
-// 保存试剂
-export function sj_save(data) {
+// 试剂编辑
+export function sj_bj(data) {
   return request({
-    url: '/system/business/sj/save',
+    url: '/system/business/sj/bj',
     method: 'post',
     data: data
   })

src/api/business/yq/yq.js

@@ -27,6 +27,15 @@ export function yq_save(data) {
   })
 }
 
+// 编辑仪器管理
+export function yq_update(data) {
+  return request({
+    url: '/system/business/yq/update',
+    method: 'post',
+    data: data
+  })
+}
+
 export function yqJcgj_list(query) {
 return request({
     url: '/system/business/yq/jcgj/list',

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

@@ -1,60 +1,57 @@
 export default {
   sdts: '请确认是否锁定以下麻精药',
   gdts: '请确认是否归档以下麻精药',
-  mc: '名称',
-  bh: '编号',
-  ssbm: '所属部门',
-  gxsjk: '更新试剂库',
-  jyzt: '借阅状态',
-  zjzt: '制剂状态',
-  sxrq: '失效日期',
-  nd: '浓度/含量/纯度',
-  kcl: '库存量',
-  gg: '规格',
-  ly: '来源',
-  sssy: '所属试验',
-  ph: '批号',
-  yxzq: '有效周期',
+  mc: 'Name',
+  bh: 'ID',
+  ssbm: 'Department',
+  gxsjk: 'Refresh',
+  jyzt: 'Check-out',
+  zjzt: 'Form',
+  sxrq: 'Expiration',
+  nd: 'Concentration/Purity',
+  kcl: 'Inventory',
+  gg: 'Specification',
+  ly: 'Source',
+  sssy: 'Study',
+  ph: 'Batch Num',
+  yxzq: 'Validity Period',
   zcgMc: '暂存柜',
-  cctj: '存储条件',
-  ccwz: '存储位置',
-  sxr: '失效日',
-  pzrq: '配置日期',
-  plcz: '批量处置',
-  plsd: '批量锁定',
-  plgd: '批量归档',
+  cctj: 'Storage Condition',
+  ccwz: 'Storage Location',
+  sxr: 'Expiration',
+  pzrq: 'Formulation Date',
+  plcz: 'Batch Dispose',
+  plsd: 'Batch Dispose',
+  plgd: 'Batch Dispose',
 
-  cz: '处置',
-  sjczfs: '试剂处置方式',
-  czl: '处置量',
-  yuanyin: '原因',
-  lock: '锁定',
-  unlock: '解锁',
-  detail: '详情',
-  guidang: '归档',
-  jiedang: '解档',
-  jieyue: '借阅',
-  guihuan: '归还',
-  fafang: '发放',
-  ysff: '钥匙发放',
-  czrq: '处置容器',
-  czyj: '处置药剂',
-  xgkc: '修改库存',
-  shxgkc: '审核修改库存',
-  shbj: '审核编辑',
+  cz: 'Dispose',
+  sjczfs: 'Dispose Method',
+  czl: 'Amount',
+  yuanyin: 'Reason',
+  lock: 'Lock',
+  unlock: 'Unlock',
+  detail: 'Enter',
+  guidang: 'Archived',
+  jiedang: 'De-archive',
+  jieyue: 'Check out',
+  guihuan: 'Return',
+  fafang: 'Distribute',
+  ysff: 'Key',
+  xgkc: 'Change Inventory',
+  shxgkc: 'Approve Inventory Change',
+  shbj: 'Approve Edit',
 
-  ssbd: '所属表单',
-  bdsssy: '表单所属试验',
-  bdssr: '表单所属人',
-  bdssbm: '表单所属部门',
+  ssbd: 'In Record',
+  bdsssy: 'In Study',
+  bdssr: 'By User',
+  bdssbm: 'Department',
 
-  tz: '试剂台账',
-  tz: '试剂台账',
-  qmr: '签名人',
-  czlx: '操作类型',
-  czl: '操作量',
-  bz: '备注/原因',
-  czsj: '操作时间',
+  tz: 'Reagent Table',
+  qmr: 'Signed By',
+  czlx: 'Action',
+  czl: 'Amount',
+  bz: 'Comment/Reason',
+  czsj: 'Datetime',
 
-  jcgj: '稽查轨迹',
+  jcgj: 'Track Record',
 }

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

@@ -1,10 +1,11 @@
 export default {
-
-    yqbh: '仪器编号',
-    yqmc: '仪器名称',
-    xcjzrq: '下次校准日期',
-    ssbm: '所属部门',
-    yqxh: '仪器型号',
-    yqly: '仪器来源'
-
-}
+  refresh: 'Refresh',
+  add: 'Add',
+  yqbh: 'ID',
+  yqmc: 'Name',
+  xcjzrq: 'Next Calibration',
+  ssbm: 'Department',
+  yqxh: 'Type',
+  yqly: 'Source',
+  wc: 'Compartment'
+}

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

@@ -19,7 +19,7 @@ export default {
   cctj: '存储条件',
   ccwz: '存储位置',
   sxr: '失效日',
-  pzrq: '配置日期',
+  pzrq: '配制日期',
   plcz: '批量处置',
   plsd: '批量锁定',
   plgd: '批量归档',
@@ -38,8 +38,6 @@ export default {
   guihuan: '归还',
   fafang: '发放',
   ysff: '钥匙发放',
-  czrq: '处置容器',
-  czyj: '处置药剂',
   xgkc: '修改库存',
   shxgkc: '审核修改库存',
   shbj: '审核编辑',

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

@@ -1,5 +1,6 @@
 export default {
-
+    refresh: '更新仪器库',
+    add: '新增',
     yqbh: '仪器编号',
     yqmc: '仪器名称',
     xcjzrq: '下次校准日期',

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

@@ -14,8 +14,7 @@
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.yuanyin')" align="center">
@@ -50,7 +49,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -126,10 +125,11 @@
 import { czrq, plczrq } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Bj",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -183,7 +183,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {

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

@@ -14,8 +14,7 @@
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.yuanyin')" align="center">
@@ -58,7 +57,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -140,10 +139,11 @@
 import { czyj, plczyj } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Czyj",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,BusinessSelect },
   data() {
     return {
       isBatch: false,

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

@@ -30,8 +30,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.zytj" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.zytj" dictType="business_zytj"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
@@ -78,7 +77,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                    }}</template>
+                }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -99,13 +98,13 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.ckl')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                    }}</template>
+                }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="zytj">
-                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                <BusinessSelect v-model="form.zytj" dictType="business_zytj"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -156,7 +155,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr1')">
-               <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
                 disabled />
             </el-form-item>
           </el-col>
@@ -203,10 +202,11 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import SelectStudy from '@/views/business/comps/select/SelectStudy';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser, SelectStudy },
+  components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -275,7 +275,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {

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

@@ -67,19 +67,19 @@
           </el-col>
            <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
-              <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <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.gyzj.rktj')" prop="rktj">
-              <el-input type="text" v-model="form.rktj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.rktj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -161,10 +161,11 @@
 import { gh, info } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Gh",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,BusinessSelect },
   data() {
     return {
       isBatch: false,

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

@@ -65,22 +65,21 @@
               <el-input type="text" v-else :value="form.mdMcs + form.mdOther" disabled />
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
-              <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <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.gyzj.rktj')" prop="rktj">
-              <el-input type="text" v-model="form.rktj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.rktj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -139,10 +138,11 @@
 import { sqgh, info } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Gh",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,BusinessSelect },
   data() {
     return {
       isBatch: false,

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

@@ -14,8 +14,7 @@
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.yuanyin')" align="center">
@@ -50,7 +49,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -125,10 +124,11 @@
 import { czrq, plczrq } 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: "Bj",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser ,BusinessSelect},
   data() {
     return {
       isBatch: false,

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

@@ -14,8 +14,7 @@
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.yuanyin')" align="center">
@@ -58,7 +57,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -142,10 +141,11 @@
 import { czyj, plczyj } 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: "Czyj",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,BusinessSelect },
   data() {
     return {
       isBatch: false,

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

@@ -30,8 +30,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.zytj" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                    <BusinessSelect v-model="scope.row.zytj" dictType="business_zytj"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" width="250px">
@@ -114,7 +113,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.zytj')" prop="zytj">
-                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                <BusinessSelect v-model="form.zytj" dictType="business_zytj"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -219,10 +218,11 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import SelectStudy from '@/views/business/comps/select/SelectStudy';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser, SelectStudy },
+  components: { SelectList, SelectDeptUser, SelectStudy,BusinessSelect },
   data() {
     return {
       isBatch: false,

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

@@ -26,7 +26,7 @@
           <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>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -47,7 +47,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
               <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckmz')">
               <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -77,19 +77,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.rkwz')" prop="rkwz">
-              <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <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">
-              <el-input type="text" v-model="form.rktj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <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="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -157,8 +157,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')" prop="jsr1Id">
-              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
+            <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">
@@ -203,10 +204,11 @@
 import { gh, 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: "Gh",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -290,7 +292,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {

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

@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import { sj_save } from "@/api/business/sj/sj"
+import { sj_bj } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@@ -160,7 +160,7 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sj_save(this.form).then(response => {
+          sj_bj(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })

src/views/business/resource/sj/list.vue

@@ -56,26 +56,26 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <!-- 更新试剂库 -->
-            <el-button type="primary" v-hasPermi="['business:resource:mjy:ff']">{{
+            <el-button type="primary" v-hasPermi="['business:resource:sj:gxsjk']">{{
               $t('page.business.resource.sj.gxsjk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量处置 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlcz"
-              v-hasPermi="['business:resource:mjy:czyj']">{{
+              v-hasPermi="['business:resource:sj:cz']">{{
                 $t('page.business.resource.sj.plcz') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlsd"
-              v-hasPermi="['business:resource:mjy:sd']">{{
-                $t('page.business.resource.mjy.plsd') }}</el-button>
+              v-hasPermi="['business:resource:sj:sd']">{{
+                $t('page.business.resource.sj.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量归档 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlgd"
-              v-hasPermi="['business:resource:mjy:gd']">{{
-                $t('page.business.resource.mjy.plgd') }}</el-button>
+              v-hasPermi="['business:resource:sj:gd']">{{
+                $t('page.business.resource.sj.plgd') }}</el-button>
           </el-col>
         </el-row>
 
@@ -106,7 +106,7 @@
           <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj" width="130px" />
           <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
 
-          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="150px"  fixed="right">
+          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="150px" 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 == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
@@ -116,7 +116,7 @@
               <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="150px"  fixed="right">
+          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="150px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
               <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
@@ -129,39 +129,39 @@
               <!-- 详情 -->
               <template
                 v-if="scope.row.zjzt == 1 || scope.row.zjzt == 5 || (scope.row.zjzt == 9 && scope.row.jyzt == 5)">
-                <el-button type="text" @click="handleXq(scope.row)">{{
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:sj:xq']">{{
                   $t('page.business.resource.sj.detail') }}</el-button>
               </template>
               <!-- 处置 -->
               <template v-if="scope.row.zjzt == 1">
-                <el-button type="text" @click="handleCz(scope.row)">{{
+                <el-button type="text" @click="handleCz(scope.row)" v-hasPermi="['business:resource:sj:cz']">{{
                   $t('page.business.resource.sj.cz') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 1">
                 <!-- 编辑 -->
-                <el-button type="text" @click="handleBj(scope.row)">{{
+                <el-button type="text" @click="handleBj(scope.row)" v-hasPermi="['business:resource:sj:bj']">{{
                   $t('form.edit') }}</el-button>
                 <!-- 修改库存 -->
-                <el-button type="text" @click="handleXgkc(scope.row)">{{
+                <el-button type="text" @click="handleXgkc(scope.row)" v-hasPermi="['business:resource:sj:xgkc']">{{
                   $t('page.business.resource.sj.xgkc') }}</el-button>
                 <!-- 锁定 -->
-                <el-button type="text" @click="handleSd(scope.row)">{{
+                <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:sj:sd']">{{
                   $t('page.business.resource.sj.lock') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 5">
                 <!-- 解锁 -->
-                <el-button type="text" @click="handleJs(scope.row)">{{
+                <el-button type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:sj:js']">{{
                   $t('page.business.resource.sj.unlock') }}</el-button>
                 <!-- 归档 -->
-                <el-button type="text" @click="handleGd(scope.row)">{{
+                <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:sj:gd']">{{
                   $t('page.business.resource.sj.guidang') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 9 && scope.row.jyzt == 1">
                 <!-- 解档 -->
-                <el-button type="text" @click="handleJd(scope.row)">{{
+                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:sj:jd']">{{
                   $t('page.business.resource.sj.jiedang') }}</el-button>
                 <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)">{{
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:sj:jy']">{{
                   $t('page.business.resource.sj.jieyue') }}</el-button>
               </template>
 
@@ -274,13 +274,13 @@ export default {
     },
     //详情
     handleXq(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
-    closeXq(){
-      this.showDetail=false
-      this.$emit('showDetail',this.showDetail)
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
       this.handleQuery()
     },
     //批量解锁

src/views/business/resource/yq/list.vue

@@ -27,7 +27,10 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain @click="handleAdd">{{ $t('form.add') }}</el-button>
+        <el-button type="primary" plain @click="handleAdd" v-hasPermi="['business:resource:yq:gxsjk']">{{
+          $t('page.business.resource.yq.refresh') }}</el-button>
+        <el-button type="primary" plain @click="handleAdd" v-hasPermi="['business:resource:yq:xz']">{{
+          $t('page.business.resource.yq.add') }}</el-button>
       </el-col>
     </el-row>
 
@@ -44,8 +47,10 @@
       <el-table-column :label="$t('page.business.resource.yq.ssbm')" align="center" prop="bmMc" />
       <el-table-column :label="$t('form.operate')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="text" @click="handleDetail(scope.row)">{{ $t('form.detail') }}</el-button>
-          <el-button type="text" @click="handleUpdate(scope.row)">{{ $t('form.edit') }}</el-button>
+          <el-button type="text" @click="handleDetail(scope.row)" v-hasPermi="['business:resource:yq:xq']">{{
+            $t('form.detail') }}</el-button>
+          <el-button type="text" @click="handleUpdate(scope.row)" v-hasPermi="['business:resource:yq:bj']">{{
+            $t('form.edit') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,24 +64,24 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.yqmc')" prop="mc">
-              <el-input v-model="form.mc" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
+              <el-input v-model="form.mc" :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.yqbh')" prop="bh">
-              <el-input v-model="form.bh" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
+              <el-input v-model="form.bh" :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.yqxh')" prop="xh">
-              <el-input v-model="form.xh" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
+              <el-input v-model="form.xh" :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.yqly')" prop="ly">
-              <el-input v-model="form.ly" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
+              <el-input v-model="form.ly" :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,7 +109,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderInput')" maxlength="500" />
+              <el-input v-model="form.remark" type="textarea" :placeholder="$t('form.placeholderInput')"
+                maxlength="500" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,26 +126,27 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm" :placeholder="$t('form.placeholderInput')" type="password" maxlength="20"/>
+              <el-input v-model="form.qmrmm" :placeholder="$t('form.placeholderInput')" type="password"
+                maxlength="20" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{$t('form.saveConfirm')}}</el-button>
-        <el-button @click="cancel">{{$t('form.cancel')}}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('form.saveConfirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
     <!-- 仪器详情 -->
-    <YqDetail ref="YqDetail"  />
+    <YqDetail ref="YqDetail" />
   </div>
 </template>
 
 <script>
-import { yq_list, yq_info, yq_save, yqJcgj_list } from '@/api/business/yq/yq'
+import { yq_list, yq_info, yq_save, yq_update } from '@/api/business/yq/yq'
 import YqDetail from './comps/detail'
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 import SelectDept from '@/views/business/comps/select/SelectDept';
@@ -189,40 +196,40 @@ export default {
       // 表单校验
       rules: {
         mc: [
-          { required: true, message: this.$t('page.business.resource.yq.yqmc')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqmc')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqmc') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqmc') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         bh: [
-          { required: true, message: this.$t('page.business.resource.yq.yqbh')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqbh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqbh') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqbh') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         xh: [
-          { required: true, message: this.$t('page.business.resource.yq.yqxh')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqxh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqxh') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqxh') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         ly: [
-          { required: true, message: this.$t('page.business.resource.yq.yqly')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqly')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqly') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqly') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         jzrq: [
-          { required: true, message: this.$t('page.business.resource.yq.xcjzrq')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.xcjzrq') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         bmMc: [
-          { required: true, message: this.$t('page.business.resource.yq.ssbm')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.ssbm') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         wc: [
-          { required: true, message: this.$t('page.business.resource.yq.wc')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.wc') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         qmrmm: [
-          { required: true, message: this.$t('form.signerPsw')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 20, message: this.$t('form.signerPsw')+ this.$t('form.lengthLimit') + '20', trigger: 'blur' }
+          { required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 20, message: this.$t('form.signerPsw') + this.$t('form.lengthLimit') + '20', trigger: 'blur' }
         ]
       }
     }
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -281,7 +288,7 @@ export default {
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
-      yq_info({id: id}).then((response) => {
+      yq_info({ id: id }).then((response) => {
         this.form = response.data
         this.form.qmyy = '编辑仪器'
         this.open = true
@@ -295,11 +302,19 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          yq_save(this.form).then((response) => {
-            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
-            this.open = false
-            this.getList()
-          })
+          if (this.form.id) {
+            yq_update(this.form).then((response) => {
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
+              this.open = false
+              this.getList()
+            })
+          } else {
+            yq_save(this.form).then((response) => {
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
+              this.open = false
+              this.getList()
+            })
+          }
         }
       })
     },

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

@@ -38,6 +38,8 @@
         </div>
       </div>
        <div class="content-box">
+        <sjList v-if="active === 'sjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
+        <gspList v-if="active === 'gsplb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <mjyList v-if="active === 'mjylb'" :study="studyInfo" @showDetail="showDetailCallback"/>
       </div>
@@ -50,6 +52,8 @@
 import { checkPermi, checkRole } from "@/utils/permission";
 import { study_info } from "@/api/business/study/study"
 import gyzjList from './wzlb/gyzjList.vue'
+import sjList from './wzlb/sjList.vue'
+import gspList from './wzlb/gspList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -69,7 +73,7 @@ export default {
       }
     },
   },
-  components: {gyzjList},
+  components: {gyzjList, sjList, gspList},
   data() {
     return {
       showDetail: false,

src/views/business/study/comp/wzlb/gspList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <div>
+      <div class="mjy" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <!-- 名称 -->
+          <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
+            <el-input v-model="queryParams.mc" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 编号 -->
+          <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
+            <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 有效日期 -->
+          <el-form-item :label="$t('page.business.resource.gsp.yxq') + '：'">
+            <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+              :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
+              @change="handleQuery" style="width: 250px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </el-form>
+
+
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.gg }}{{ scope.row.ggdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.kcl')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.kc }}{{ scope.row.kcdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gsp.sxrq')" align="center" prop="sxr" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.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 == 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>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" fixed="right" align="center"
+            class-name="small-padding fixed-width" width="250px">
+            <template slot-scope="scope">
+              <!-- 详情 -->
+              <el-button type="text" @click="handleXq(scope.row)"
+                v-hasPermi="['business:studyMjy:xq', 'business:nonTrialMjy:xq', 'business:drugMjy:xq']">{{
+                  $t('page.business.resource.gsp.detail') }}</el-button>
+              <template v-if="scope.row.syghzt == 1">
+                <!-- 处置 -->
+                <el-button type="text" @click="handleCz(scope.row)"
+                  v-hasPermi="['business:studyMjy:czyj', 'business:nonTrialMjy:czyj', 'business:drugMjy:czyj']">{{
+                    $t('page.business.resource.gsp.cz') }}</el-button>
+                <!-- 编辑 -->
+                <el-button type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:studyMjy:bj', 'business:nonTrialMjy:bj', 'business:drugMjy:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:studyMjy:xgkc', 'business:nonTrialMjy:xgkc', 'business:drugMjy:xgkc']">{{
+                    $t('page.business.resource.gsp.xgkc') }}</el-button>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 修改库存 -->
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
+      <!-- 处置 -->
+      <Cz key="Cz" ref="Cz" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { studyList } from "@/api/business/gsp/gsp"
+import Xq from "@/views/business/resource/gsp/comps/gsp/Xq";
+import Bj from "@/views/business/resource/gsp/comps/gsp/Bj";
+import Xgkc from "@/views/business/resource/gsp/comps/gsp/Xgkc";
+import Cz from "@/views/business/resource/gsp/comps/gsp/Cz";
+import moment from "moment";
+
+export default {
+  name: "GspList",
+  components: { Xq, Bj, Xgkc, Cz },
+  data() {
+    return {
+      daterange: [],
+      loading: true,
+      single: true,
+      multiple: true,
+      showDetail: false,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        jyzt: null,
+        studyId: null,
+        zjzt: null,
+        bh: null,
+        startDate: null,
+        endDate: null,
+      },
+    }
+  },
+  created() {
+  },
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.queryParams.studyId = newVal.id
+        this.handleQuery()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    //处置
+    handleCzyj(row) {
+      this.$refs.Cz.show(row)
+    },
+    //编辑
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    //修改库存
+    handleXgkc(row) {
+      this.$refs.Xgkc.show(row)
+    },
+    //归还
+    handleGh(row) {
+      this.$refs.Gh.show(row)
+    },
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //获取列表
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.queryParams.startDate = this.daterange[0]
+        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
+      }
+      this.loading = true
+      studyList(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.mjy {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>

src/views/business/study/comp/wzlb/sjList.vue

@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <div>
+      <div class="mjy" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <!-- 名称 -->
+          <el-form-item :label="$t('page.business.resource.sj.mc') + '：'">
+            <el-input v-model="queryParams.mc" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 编号 -->
+          <el-form-item :label="$t('page.business.resource.sj.bh') + '：'">
+            <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.resource.sj.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 失效日期 -->
+          <el-form-item :label="$t('page.business.resource.sj.sxrq') + '：'">
+            <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+              :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
+              @change="handleQuery" style="width: 250px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </el-form>
+
+
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.resource.sj.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.sj.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.sj.nd')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.nd }}{{ scope.row.nddw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.sj.kcl')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.kc }}{{ scope.row.kcdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.sj.sxrq')" align="center" prop="sxr" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.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 == 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>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" fixed="right" align="center"
+            class-name="small-padding fixed-width" width="250px">
+            <template slot-scope="scope">
+                <!-- 详情 -->
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:studyMjy:xq', 'business:nonTrialMjy:xq', 'business:drugMjy:xq']">{{
+                  $t('page.business.resource.mjy.detail') }}</el-button>
+               <template v-if="scope.row.syghzt == 1">
+                <!-- 处置 -->
+                <el-button type="text" @click="handleCz(scope.row)" v-hasPermi="['business:studyMjy:czyj', 'business:nonTrialMjy:czyj', 'business:drugMjy:czyj']">{{
+                  $t('page.business.resource.sj.cz') }}</el-button>
+                <!-- 编辑 -->
+                <el-button  type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:studyMjy:bj', 'business:nonTrialMjy:bj', 'business:drugMjy:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button  type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:studyMjy:xgkc', 'business:nonTrialMjy:xgkc', 'business:drugMjy:xgkc']">{{
+                    $t('page.business.resource.sj.xgkc') }}</el-button>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 修改库存 -->
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
+      <!-- 处置 -->
+      <Cz key="Cz" ref="Cz" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { studyList } from "@/api/business/sj/sj"
+import Xq from "@/views/business/resource/sj/comps/Xq";
+import Bj from "@/views/business/resource/sj/comps/Bj";
+import Xgkc from "@/views/business/resource/sj/comps/Xgkc";
+import Cz from "@/views/business/resource/sj/comps/Cz";
+import moment from "moment";
+
+export default {
+  name: "SjList",
+  components: { Xq, Bj, Xgkc, Cz },
+  data() {
+    return {
+      daterange: [],
+      loading: true,
+      single: true,
+      multiple: true,
+      showDetail: false,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        jyzt: null,
+        studyId: null,
+        zjzt: null,
+        bh: null,
+        startDate: null,
+        endDate: null,
+      },
+    }
+  },
+  created() {
+  },
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.queryParams.studyId = newVal.id
+        this.handleQuery()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    //处置
+    handleCzyj(row) {
+      this.$refs.Cz.show(row)
+    },
+    //编辑
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    //修改库存
+    handleXgkc(row) {
+      this.$refs.Xgkc.show(row)
+    },
+    //归还
+    handleGh(row) {
+      this.$refs.Gh.show(row)
+    },
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //获取列表
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.queryParams.startDate = this.daterange[0]
+        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
+      }
+      this.loading = true
+      studyList(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.mjy {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>

src/views/business/study/comp/ytbd/Bj.vue

@@ -228,7 +228,6 @@ export default {
     },
     edit(row) {
       this.reset()
-      debugger
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()

src/views/business/study/comp/ytbd/Sh.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
       <div class="edit-content ">
-        <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
+        <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="audit" />
       </div>
     </div>
     <!-- 通过 -->

src/views/business/study/comp/ytbd/Xq.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="edit-content ">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form"  fillType="audit" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPre.qmxx') }}</div>

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-         //  target: `http://39.99.251.173:8080`,
+        // target: `http://localhost:8080`,
+          target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''