diff --git a/src/lang/en/business/resource/gsp.js b/src/lang/en/business/resource/gsp.js index 8f42739..34cb0a2 100644 --- a/src/lang/en/business/resource/gsp.js +++ b/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: '新增供试品入库记录', } diff --git a/src/lang/zh/business/resource/gsp.js b/src/lang/zh/business/resource/gsp.js index d0216ef..1c01798 100644 --- a/src/lang/zh/business/resource/gsp.js +++ b/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: '新增供试品入库记录', } + diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue index fedab20..72856f5 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue index 2011690..83df232 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue index 0b5e790..a3f1bff 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue index 7d970cd..0c793ea 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Js.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue index d9cd7fe..e18d1a2 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue index 37749b9..2e82d3d 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue index ce41131..f719514 100644 --- a/src/views/business/resource/gsp/comps/gsp/Bj.vue +++ b/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") }, diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue index 6a792ad..eeba9d4 100644 --- a/src/views/business/resource/gsp/comps/gsp/Cz.vue +++ b/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 } diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue index bdea640..b5f27bb 100644 --- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue +++ b/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 } diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue index b57568e..728290f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ff.vue +++ b/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 } diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue index 53c26d0..0d9b264 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue index e8d744a..4b0e482 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gh.vue +++ b/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") }, diff --git a/src/views/business/resource/gsp/comps/gsp/Jd.vue b/src/views/business/resource/gsp/comps/gsp/Jd.vue index 772919f..2315622 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue index 7dd24d5..28bb847 100644 --- a/src/views/business/resource/gsp/comps/gsp/Js.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue index 32e6f1f..9cac9ff 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jy.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue index 9f0adca..c822ad8 100644 --- a/src/views/business/resource/gsp/comps/gsp/Sd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Shbj.vue b/src/views/business/resource/gsp/comps/gsp/Shbj.vue index eb12c0f..d148517 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shbj.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shbj.vue @@ -58,10 +58,7 @@ - - - - + @@ -89,8 +86,8 @@
- {{ $t('form.confirm') }} - {{ $t('form.cancel') }} + {{ $t('form.reject') }} + {{ $t('form.approve') }}
@@ -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() }) } }) diff --git a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue index 25d10a4..a718f4e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue @@ -48,10 +48,7 @@ - - - - + @@ -79,8 +76,8 @@
- {{ $t('form.confirm') }} - {{ $t('form.cancel') }} + {{ $t('form.reject') }} + {{ $t('form.approve') }}
@@ -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() }) } }) diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue index aff07e1..a82aa8f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue +++ b/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: '', diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue index 06abd7a..f127f51 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xz.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue index 6be1e72..29e3139 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue @@ -91,7 +91,7 @@ - @@ -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, diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue index 85d7cb7..7542f49 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue +++ b/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") }, diff --git a/src/views/business/resource/gsp/comps/rkjl/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue index 31f4eeb..7f54d34 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Gd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue index e393456..5437608 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/rkjl/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue index 8a5577f..46a8ca3 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Js.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/rkjl/Jy.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue index 63893f6..40171b3 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jy.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/rkjl/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue index 4f15b9a..b95d0f1 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Sd.vue +++ b/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") diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue index ebe6c27..09c6829 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue +++ b/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")