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

src/api/business/gyzj/gyzj.js

@@ -33,7 +33,7 @@ export function info(query) {
     params: query
   })
 }
-//归还
+//确认归还
 export function gh(data) {
   return request({
     url: '/system/business/gyzj/gh',
@@ -41,7 +41,7 @@ export function gh(data) {
     data: data
   })
 }
-//归还
+//申请归还
 export function sqgh(data) {
   return request({
     url: '/system/business/gyzj/sqgh',
@@ -49,6 +49,22 @@ export function sqgh(data) {
     data: data
   })
 }
+//确认入库
+export function rk(data) {
+  return request({
+    url: '/system/business/gyzj/rk',
+    method: 'post',
+    data: data
+  })
+}
+//申请入库
+export function sqrk(data) {
+  return request({
+    url: '/system/business/gyzj/sqrk',
+    method: 'post',
+    data: data
+  })
+}
 // 编辑
 export function bj(data) {
   return request({

src/lang/zh.js

@@ -69,6 +69,7 @@ export default {
     export: '导出',
     saveConfirm: '确定',
     confirm: '确认',
+    reject: '拒绝',
     cancel: '取消',
     close: '关闭',
     operate: '操作',

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

@@ -88,8 +88,8 @@ rkmz:'入库毛重',
   rkl: '入库净重',
   ghr1Id: '归还人',
   ghr2Id: '归还人2',
-  jsr1Id: '库管员',
-  jsr2Id: '库管员2',
+  jsr1Id: '接收人',
+  jsr2Id: '接收人2',
   tz: '给药制剂台账',
   gdsqrId: '归档申请人',
   lqsj: '领取时间',
@@ -100,5 +100,8 @@ rkmz:'入库毛重',
   jysj: '借阅时间',
   ffjlxq: '发放回收记录详情',
   gyzjxq: '给药制剂详情',
-  sqguihuan: '归还'
+  sqguihuan: '归还',
+  qrrk: '确认入库',
+  qmr1Id:'签名人1',
+  qmr2Id:'签名人2',
 }

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

@@ -0,0 +1,276 @@
+<template>
+  <div>
+    <!-- 确认入库弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.qrrk')" :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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.cctj')">
+              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqsj')">
+              <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.md')">
+               <el-input type="text" v-if="form.mdOther != '' && form.mdMcs != ''" :value="form.mdMcs + ',' + form.mdOther"
+                disabled />
+              <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">
+              <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">
+              <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">
+              <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.gyzj.rkl')" prop="rkl">
+              <el-input type="number" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.ckldw }}</template>
+              </el-input>
+            </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">
+            <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.gyzj.qmr1Id')">
+              <el-input type="text" v-model="form.qmr1Mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr2Id')">
+              <el-input type="text" v-model="form.qmr2Mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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.qmyyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { rk, 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,BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghzytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkl: [{
+          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 = {
+        qmyy: null,
+        qmyyMc: '同意/拒绝入库',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      let that = this
+      info({ id: row.id }).then(response => {
+        that.form = _.merge({},this.form,response.data)
+        that.open = true
+      })
+    },
+    save(qmyy) {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          this.form.qmyy=qmyy
+          rk(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -63,10 +63,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
-                <el-option label="同意编辑" :value="10" />
-                <el-option label="拒绝编辑" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -95,8 +92,8 @@
         </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>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -187,7 +184,8 @@ export default {
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
-        qmyy: 10,
+        qmyy: null,
+        qmyyMc: '同意/拒绝编辑',
         remark: ''
       }
       this.resetForm("form")
@@ -210,10 +208,11 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    save() {
+    save(qmyy) {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
+          this.form.qmyy=qmyy
           shbj(this.form).then(response => {
             this.open = false
             this.$emit('callback')

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

@@ -44,10 +44,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
-                <el-option label="同意修改库存" :value="10" />
-                <el-option label="拒绝修改库存" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -76,8 +73,8 @@
         </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>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -140,8 +137,9 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: 10,
-        remark: ''
+        remark: '',
+        qmyy: null,
+        qmyyMc: '同意/拒绝修改库存',
       }
       this.resetForm("form")
     },
@@ -160,10 +158,11 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    save() {
+    save(qmyy) {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
+          this.form.qmyy=qmyy
           shxgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')

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

@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <!-- 申请入库弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.sqrk')" :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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.zytj')" prop="ghzytj">
+              <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
+              <BusinessSelect v-model="form.rkwz" dictType="business_ccwz"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.rktj')" prop="rktj">
+              <BusinessSelect v-model="form.rktj" dictType="business_cctj"></BusinessSelect>
+            </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.gyzj.qmr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
+            </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 { sqrk, 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, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghzytj: [{
+          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'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        qmyy: '给药制剂入库',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      let that = this
+      info({ id: row.id }).then(response => {
+        that.form = _.merge({}, response.data, this.form)
+        that.open = true
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          sqrk(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-  <div >
+  <div>
     <!-- 列表 -->
     <div>
       <div class="gyzj" v-show="!showDetail">
@@ -28,6 +28,7 @@
             <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.wrk')" :value="2" />
               <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" />
@@ -115,6 +116,7 @@
           <el-table-column :label="$t('page.business.resource.gyzj.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>
@@ -167,8 +169,9 @@
               </template>
               <template v-if="scope.row.kcbjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核修改库存 -->
-                <el-button type="text" @click="handleShxgkc(scope.row)" v-hasPermi="['business:resource:gyzj:shxgkc']">{{
-                  $t('page.business.resource.gyzj.shxgkc') }}</el-button>
+                <el-button type="text" @click="handleShxgkc(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:shxgkc']">{{
+                    $t('page.business.resource.gyzj.shxgkc') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 5">
                 <!-- 解锁 -->
@@ -178,11 +181,16 @@
                 <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:gyzj:gd']">{{
                   $t('page.business.resource.gyzj.guidang') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 3&&scope.row.ghzt == 3">
-                <!-- 归还 -->
+              <template v-if="scope.row.zjzt == 3 && scope.row.ghzt == 3">
+                <!-- 确认归还 -->
                 <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gyzj:gh']">{{
                   $t('page.business.resource.gyzj.guihuan') }}</el-button>
               </template>
+              <template v-if="scope.row.zjzt == 2 && scope.row.rksqzt == 3">
+                <!-- 确认入库 -->
+                <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:gyzj:rk']">{{
+                  $t('page.business.resource.gyzj.qrrk') }}</el-button>
+              </template>
               <template v-if="scope.row.zjzt == 9">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:jd']">{{
@@ -216,8 +224,10 @@
       <Shxgkc key="Shxgkc" ref="Shxgkc" @callback="handleQuery" />
       <!-- 借阅 -->
       <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" />
       <!-- 处置药剂 -->
@@ -245,6 +255,7 @@ import Xgkc from "./gyzj/Xgkc";
 import Shxgkc from "./gyzj/Shxgkc";
 import Jy from "./gyzj/Jy";
 import Gh from "./gyzj/Gh";
+import Rk from "./gyzj/Rk";
 import Ff from "./gyzj/Ff";
 import Czrq from "./gyzj/Czrq";
 import Czyj from "./gyzj/Czyj";
@@ -253,14 +264,14 @@ import moment from "moment";
 
 export default {
   name: "GyzjList",
-  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: [],
       loading: true,
       single: true,
       multiple: true,
-      showDetail:false,
+      showDetail: false,
       total: 0,
       list: [],
       //勾选列表
@@ -334,23 +345,27 @@ export default {
     handleJy(row) {
       this.$refs.Jy.show(row)
     },
-    //归还
+    //确认归还
     handleGh(row) {
       this.$refs.Gh.show(row)
     },
+    //确认入库
+    handleRk(row) {
+      this.$refs.Rk.show(row)
+    },
     //是否可勾选
     checkSelectable(row) {
       return true;
     },
-    closeXq(){
-      this.showDetail=false
+    closeXq() {
+      this.showDetail = false
       this.handleQuery()
-      this.$emit('showDetail',this.showDetail)
+      this.$emit('showDetail', this.showDetail)
     },
     //详情
     handleXq(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
     //批量解锁

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

@@ -63,10 +63,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
-                <el-option label="同意编辑" :value="10" />
-                <el-option label="拒绝编辑" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -95,8 +92,8 @@
         </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>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -187,7 +184,8 @@ export default {
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
-        qmyy: 10,
+        qmyy: null,
+        qmyyMc: '同意/拒绝编辑',
         remark: ''
       }
       this.resetForm("form")
@@ -210,10 +208,11 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    save() {
+    save(qmyy) {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
+          this.form.qmyy=qmyy
           shbj(this.form).then(response => {
             this.open = false
             this.$emit('callback')

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

@@ -44,10 +44,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
-                <el-option label="同意修改库存" :value="10" />
-                <el-option label="拒绝修改库存" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -76,8 +73,8 @@
         </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>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -140,7 +137,8 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: 10,
+        qmyy: null,
+        qmyyMc: '同意/拒绝修改库存',
         remark: ''
       }
       this.resetForm("form")
@@ -160,10 +158,11 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    save() {
+    save(qmyy) {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
+          this.form.qmyy=qmyy
           shxgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')

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

@@ -28,6 +28,7 @@
             <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.wrk')" :value="2" />
               <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" />

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

@@ -172,8 +172,20 @@ export default {
         }
       }
       this.infoDialog.saveList = postList
-      this.signType = 'save'
-      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
+
+      this.$modal.loading()
+      studySubject_save({
+        studyId:this.study.id,
+        subjectList:this.infoDialog.saveList,
+        sign:{}
+      }).then(() => {
+        this.signType = 'save'
+        this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
+      }).catch(() => {
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+      
     },
     doSign(val){
       if(this.signType==='save'){