fix:[资源库管理][供试品管理]中英

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

@@ -111,4 +111,23 @@ export default {
   ffjlxq: '发放回收记录详情',
   dr: 'Import',
   gd: '归档',
+
+  bjgsp: 'Edit',
+  xzgsp: 'Add',
+  lqff: 'Distribution',
+  sqgd: 'Apply for Archiving',
+  sqjd: 'Apply for De-archiving',
+  gh: 'Return',
+  jsgsp: 'Unlock',
+  sqjy: 'Apply for Check-out',
+  sdgsp: 'Lock',
+  tyjjbj: '同意/拒绝编辑',
+  tyjjxgkc:'同意/拒绝修改库存',
+  bcsm: '补充说明',
+  jsffjl: '解锁发放记录',
+  sdffjl: '锁定发放记录',
+  bjgsprkjl: '编辑供试品入库记录',
+  jsgsprkjl: '解锁供试品入库记录',
+  sdgsprkjl: '锁定供试品入库记录',
+  xzgsprkjl: '新增供试品入库记录',
 }

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

@@ -115,4 +115,24 @@ export default {
   ffjlxq: '发放回收记录详情',
   dr: '导入',
   gd: '归档',
+
+  bjgsp: '编辑供试品',
+  xzgsp: '新增供试品',
+  lqff: '领取发放',
+  sqgd: '申请归档',
+  sqjd: '申请解档案',
+  sqjy: '申请借阅',
+  gh: '归还',
+  jsgsp: '解锁供试品',
+  sdgsp: '锁定供试品',
+  tyjjbj: '同意/拒绝编辑',
+  tyjjxgkc:'同意/拒绝修改库存',
+  bcsm: '补充说明',
+  jsffjl: '解锁发放记录',
+  sdffjl: '锁定发放记录',
+  bjgsprkjl: '编辑供试品入库记录',
+  jsgsprkjl: '解锁供试品入库记录',
+  sdgsprkjl: '锁定供试品入库记录',
+  xzgsprkjl: '新增供试品入库记录',
 }
+

src/views/business/resource/gsp/comps/ffjl/Gd.vue

@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.gsp.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/ffjl/Jd.vue

@@ -106,7 +106,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.gsp.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/ffjl/Jq.vue

@@ -96,7 +96,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '补充说明',
+        qmyy: this.$t('page.business.resource.gsp.bcsm'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/ffjl/Js.vue

@@ -96,7 +96,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁发放记录',
+        qmyy: this.$t('page.business.resource.gsp.jsffjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/ffjl/Jy.vue

@@ -129,7 +129,7 @@ export default {
         startDate: null,
         endDate: null,
         bh: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.gsp.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/ffjl/Sd.vue

@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定发放记录',
+        qmyy: this.$t('page.business.resource.gsp.sdffjl'),
         qmrmm: null
       }
       this.resetForm("form")

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

@@ -190,7 +190,7 @@ export default {
     },
     reset() {
       this.form = {
-        qmyy: '编辑',
+        qmyy: this.$t('page.business.resource.gsp.bjgsp'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gsp/comps/gsp/Cz.vue

@@ -128,7 +128,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '处置',
+        qmyy: this.$t('page.business.resource.gsp.cz'),
         kcdw: '',
         qmrmm: null
       }

src/views/business/resource/gsp/comps/gsp/CzBatch.vue

@@ -136,7 +136,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '处置',
+        qmyy: this.$t('page.business.resource.gsp.cz'),
         kcdw: '',
         qmrmm: null
       }

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

@@ -364,7 +364,7 @@ export default {
         ffr2Id: null,
         ffr2mm: null,
         xmId: null,
-        qmyy: '领取发放',
+        qmyy: this.$t('page.business.resource.gsp.lqff'),
         qmrmm: null,
         remark: null
       }

src/views/business/resource/gsp/comps/gsp/Gd.vue

@@ -94,7 +94,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.gsp.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

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

@@ -262,7 +262,7 @@ export default {
         jsr1mm: null,
         jsr2Id: null,
         jsr2mm: null,
-        qmyy: '归还',
+        qmyy: this.$t('page.business.resource.gsp.gh'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gsp/comps/gsp/Jd.vue

@@ -119,7 +119,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.gsp.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/gsp/Js.vue

@@ -98,7 +98,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁供试品',
+        qmyy: this.$t('page.business.resource.gsp.jsgsp'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/gsp/Jy.vue

@@ -153,7 +153,7 @@ export default {
         bh: null,
         startDate: null,
         endDate: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.gsp.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/gsp/Sd.vue

@@ -93,7 +93,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定供试品',
+        qmyy: this.$t('page.business.resource.gsp.sdgsp'),
         qmrmm: null
       }
       this.resetForm("form")

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

@@ -58,10 +58,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.qmyyMc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -89,8 +86,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.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -144,7 +141,8 @@ export default {
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
-        qmyy: 10,
+        qmyy: null,
+        qmyyMc: this.$t('page.business.resource.gsp.tyjjbj'),
         remark: ''
       }
       this.resetForm("form")
@@ -167,12 +165,17 @@ 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.$modal.closeLoading()
             this.$emit('callback')
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })

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

@@ -48,10 +48,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.qmyyMc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -79,8 +76,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.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -143,7 +140,8 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: 10,
+        qmyy: null,
+        qmyyMc: this.$t('page.business.resource.gsp.tyjjxgkc'),
         remark: ''
       }
       this.resetForm("form")
@@ -165,12 +163,17 @@ 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')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })

src/views/business/resource/gsp/comps/gsp/Xgkc.vue

@@ -108,7 +108,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '修改库存',
+        qmyy: this.$t('page.business.resource.gsp.xgkc'),
         sdrmm: null,
         kc: '',
         kcdw: '',

src/views/business/resource/gsp/comps/gsp/Xz.vue

@@ -209,7 +209,7 @@ export default {
         cctj: null,
         ccwz: null,
         qmrmm: null,
-        qmyy: '新增供试品',
+        qmyy: this.$t('page.business.resource.gsp.xzgsp'),
         bjbz: ''
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/gsp/Ysff.vue

@@ -91,7 +91,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr')">
-              <el-input type="text" v-model="nickName" maxlength="50" 
+              <el-input type="text" v-model="nickName" maxlength="50"
                 :placeholder="$t('form.placeholderInput')" disabled/>
             </el-form-item>
           </el-col>
@@ -186,7 +186,7 @@ export default {
     reset() {
       this.form = {
         ids: null,
-        qmyy: '钥匙发放',
+        qmyy: this.$t('page.business.resource.gsp.ysff'),
         zcgId: null,
         qmrmm: null,
         remark: null,

src/views/business/resource/gsp/comps/rkjl/Bj.vue

@@ -180,7 +180,7 @@ export default {
     },
     reset() {
       this.form = {
-        qmyy: '编辑供试品入库记录',
+        qmyy: this.$t('page.business.resource.gsp.bjgsprkjl'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gsp/comps/rkjl/Gd.vue

@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.gsp.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/rkjl/Jd.vue

@@ -106,7 +106,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.gsp.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/rkjl/Js.vue

@@ -96,7 +96,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁发放记录',
+        qmyy: this.$t('page.business.resource.gsp.jsgsprkjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/rkjl/Jy.vue

@@ -129,7 +129,7 @@ export default {
         startDate: null,
         endDate: null,
         bh: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.gsp.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/rkjl/Sd.vue

@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定发放记录',
+        qmyy: this.$t('page.business.resource.gsp.sdgsprkjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gsp/comps/rkjl/Xz.vue

@@ -194,7 +194,7 @@ export default {
         cctj: null,
         ccwz: null,
         qmrmm: null,
-        qmyy: '新增供试品入库记录',
+        qmyy: this.$t('page.business.resource.gsp.xzgsprkjl'),
         bjbz: ''
       }
       this.resetForm("form")