fix：[资源库管理][给药制剂，麻精药]签名意义中英文

src/lang/en.js

@@ -75,6 +75,7 @@ export default {
     saveConfirm: 'Confirm',
     confirm: 'Confirm',
     reject: 'Reject',
+    approve: 'Approve',
     cancel: 'Cancel',
     close: 'Close',
     operate: 'Action',

src/lang/zh.js

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

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

@@ -32,59 +32,23 @@
           </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-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="rkzytj">
+              <BusinessSelect v-model="form.rkzytj" 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.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 :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
+              <BusinessSelect v-model="form.rkwz" dictType="business_rkwz"></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-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.rktj')" prop="rktj">
-              <BusinessSelect v-model="form.rktj" dictType="business_cctj"></BusinessSelect>
+              <BusinessSelect v-model="form.rktj" dictType="business_rktj"></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')">
@@ -92,13 +56,6 @@
               </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">
@@ -157,9 +114,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
-        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -192,12 +149,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        ghzytj: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        rkmz: [{
+        rkzytj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -244,6 +196,7 @@ export default {
     reset() {
       this.form = {
         qmyy: null,
+        rkl:null,
         qmyyMc: this.$t('page.business.resource.gyzj.tyjjrk'),
       }
       this.resetForm("form")
@@ -253,6 +206,7 @@ export default {
       let that = this
       info({ id: row.id }).then(response => {
         that.form = _.merge({},this.form,response.data)
+        this.form.rkl=this.form.kc
         that.open = true
       })
     },

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

@@ -91,9 +91,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
-        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -72,9 +72,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
-        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -33,8 +33,8 @@
         </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 :label="$t('page.business.resource.gyzj.zytj')" prop="rkzytj">
+              <BusinessSelect v-model="form.rkzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
 
@@ -129,7 +129,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        ghzytj: [{
+        rkzytj: [{
           required: true,
           message: ' ',
           trigger: 'blur'

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

@@ -91,9 +91,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
-        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -72,9 +72,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
-        <el-button type="primary" @click="save(10)">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -71,7 +71,7 @@
               <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.syghzt == 1">
+              <template v-if="scope.row.syghzt == 1&&scope.row.zjzt==3">
                 <template v-if="scope.row.ghzt == 1">
                   <!-- 归还 -->
                   <el-button type="text" @click="handleGh(scope.row)"
@@ -94,7 +94,7 @@
                 </template>
               </template>
               <!-- 入库 -->
-              <el-button type="text" v-if="scope.row.zjzt==2" @click="handleRk(scope.row)"
+              <el-button type="text" v-if="scope.row.zjzt==2&&scope.row.rksqzt==1" @click="handleRk(scope.row)"
                 v-hasPermi="['business:studyGyzj:rk', 'business:nonTrialGyzj:rk', 'business:drugGyzj:rk']">{{
                   $t('page.business.resource.gyzj.ruku') }}</el-button>
             </template>