fix：[非实验管理][麻精药]发放

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

@@ -244,13 +244,9 @@ export default {
     },
     reset() {
       this.form = {
-        id: null,
         rkwz: null,
         rktj: null,
         ghzytj: null,
-        rkmz: null,
-        jsl: null,
-        syl: null,
         ghr1Id: null,
         ghr1mm: null,
         ghr2Id: null,
@@ -267,7 +263,7 @@ export default {
       this.reset()
       let that = this
       info({ id: row.id }).then(response => {
-        that.form = _.merge({}, this.form, response.data)
+        that.form = _.merge({}, response.data, this.form)
         that.open = true
       })
     },

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

@@ -44,7 +44,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.xmId" maxlength="50"
+                    <el-input type="text" v-model="scope.row.mdIds" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
@@ -120,8 +120,8 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.md')" prop="xmId">
-                <el-input type="text" v-model="form.xmId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.resource.mjy.md')" prop="mdIds">
+               <SelectStudy v-model="form.mdIds"  @change="selectStudyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -217,10 +217,11 @@ import { ff, plff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectStudy from '@/views/business/comps/select/SelectStudy';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser },
+  components: { SelectList, SelectDeptUser,SelectStudy },
   data() {
     return {
       isBatch: false,
@@ -269,11 +270,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        xmId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
+       
         ckmzdw: [{
           required: true,
           message: ' ',
@@ -289,7 +286,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        xmId: [{
+        mdIds: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -312,6 +309,10 @@ export default {
   created() {
   },
   methods: {
+    selectStudyChange(val){
+       this.form.mdMcs=val.name
+       this.form.mdOther=val.other
+    },
     handleSc(row) {
       const that = this
       this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
@@ -334,7 +335,9 @@ export default {
         a.ckmzdw = a.kcdw
         a.zytj = null
         a.ckmz = null
-        a.xmIds = null
+        a.mdIds = null
+        a.mdMcs = null
+        a.mdOther = null
         a.remark = null
         tmp.push(a)
       })
@@ -352,7 +355,6 @@ export default {
         bh: null,
         ckmzdw: null,
         zytj: null,
-        xmId: null,
         ckmz: null,
         lqr1Id: null,
         lqr2Id: null,
@@ -362,7 +364,9 @@ export default {
         ffr1mm: null,
         ffr2Id: null,
         ffr2mm: null,
-        xmId: null,
+        mdIds: null,
+        mdMcs: null,
+        mdOther: null,
         qmyy: '领取发放',
         qmrmm: null,
         remark: null

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

@@ -76,8 +76,8 @@
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.md') }}</div>
-              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+              <div class="left-title">{{ $t('page.business.resource.mjy.sssy') }}</div>
+              <el-input type="text" :value="form.studyMc" maxlength="50" disabled />
             </div>
             <div class="right">
               <div class="right-title">{{ $t('page.business.resource.mjy.ssbd') }}</div>
@@ -87,7 +87,7 @@
           <div class="pal">
             <div class="left">
               <div class="left-title">{{ $t('page.business.resource.mjy.bdssr') }}</div>
-              <el-input type="text" :value="form.bdssrMc" maxlength="50" disabled />
+              <el-input type="text" :value="form.bdgsrMc" maxlength="50" disabled />
             </div>
           </div>
           <div class="content-title">

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

@@ -37,8 +37,6 @@
             <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.gyzj.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
@@ -72,23 +70,27 @@
               <el-button type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:studyGyzj:xq', 'business:nonTrialGyzj:xq', 'business:drugGyzj:xq']">{{
                   $t('page.business.resource.gyzj.detail') }}</el-button>
-              <template v-if="scope.row.zjzt == 3">
-                <!-- 处置药剂 -->
-                <el-button type="text" @click="handleCzyj(scope.row)"
-                  v-hasPermi="['business:studyGyzj:czyj', 'business:nonTrialGyzj:czyj', 'business:drugGyzj:czyj']">{{
-                    $t('page.business.resource.gyzj.czyj') }}</el-button>
-                <!-- 编辑 -->
-                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
-                  v-hasPermi="['business:studyGyzj:bj', 'business:nonTrialGyzj:bj', 'business:drugGyzj:bj']">{{
-                    $t('form.edit') }}</el-button>
-                <!-- 修改库存 -->
-                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
-                  v-hasPermi="['business:studyGyzj:xgkc', 'business:nonTrialGyzj:xgkc', 'business:drugGyzj:xgkc']">{{
-                    $t('page.business.resource.gyzj.xgkc') }}</el-button>
-                <!-- 归还 -->
-                <el-button type="text" v-if="scope.row.ghzt == 1" @click="handleGh(scope.row)"
-                  v-hasPermi="['business:studyGyzj:gh', 'business:nonTrialGyzj:gh', 'business:drugGyzj:gh']">{{
-                    $t('page.business.resource.gyzj.guihuan') }}</el-button>
+              <template v-if="scope.row.syghzt == 1">
+                <template v-if="scope.row.ghzt == 1">
+                  <!-- 归还 -->
+                  <el-button type="text" @click="handleGh(scope.row)"
+                    v-hasPermi="['business:studyGyzj:gh', 'business:nonTrialGyzj:gh', 'business:drugGyzj:gh']">{{
+                      $t('page.business.resource.gyzj.guihuan') }}</el-button>
+                </template>
+                <template>
+                  <!-- 处置药剂 -->
+                  <el-button type="text" @click="handleCzyj(scope.row)"
+                    v-hasPermi="['business:studyGyzj:czyj', 'business:nonTrialGyzj:czyj', 'business:drugGyzj:czyj']">{{
+                      $t('page.business.resource.gyzj.czyj') }}</el-button>
+                  <!-- 编辑 -->
+                  <el-button type="text" @click="handleBj(scope.row)"
+                    v-hasPermi="['business:studyGyzj:bj', 'business:nonTrialGyzj:bj', 'business:drugGyzj:bj']">{{
+                      $t('form.edit') }}</el-button>
+                  <!-- 修改库存 -->
+                  <el-button type="text" @click="handleXgkc(scope.row)"
+                    v-hasPermi="['business:studyGyzj:xgkc', 'business:nonTrialGyzj:xgkc', 'business:drugGyzj:xgkc']">{{
+                      $t('page.business.resource.gyzj.xgkc') }}</el-button>
+                </template>
               </template>
             </template>
           </el-table-column>

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

@@ -68,22 +68,20 @@
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
                 <!-- 详情 -->
-                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
+                <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>
-              <template v-if="scope.row.zjzt == 1">
+               <template v-if="scope.row.syghzt == 1">
                 <!-- 处置药剂 -->
-                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:mjy:czyj']">{{
+                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:studyMjy:czyj', 'business:nonTrialMjy:czyj', 'business:drugMjy:czyj']">{{
                   $t('page.business.resource.mjy.czyj') }}</el-button>
                 <!-- 编辑 -->
-                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
-                  v-hasPermi="['business:resource:mjy:bj']">{{
+                <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 v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
-                  v-hasPermi="['business:resource:mjy:xgkc']">{{
+                <el-button  type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:studyMjy:xgkc', 'business:nonTrialMjy:xgkc', 'business:drugMjy:xgkc']">{{
                     $t('page.business.resource.mjy.xgkc') }}</el-button>
               </template>
             </template>