diff --git a/src/api/business/gyzj/gyzj.js b/src/api/business/gyzj/gyzj.js
index b5f38fb..584a714 100644
--- a/src/api/business/gyzj/gyzj.js
+++ b/src/api/business/gyzj/gyzj.js
@@ -48,6 +48,14 @@ export function gh(data) {
data: data
})
}
+//借阅
+export function jy(data) {
+ return request({
+ url: '/system/business/gyzj/jy',
+ method: 'post',
+ data: data
+ })
+}
//申请归还
export function sqgh(data) {
return request({
diff --git a/src/views/business/archive/formulation/comps/gyzjList.vue b/src/views/business/archive/formulation/comps/gyzjList.vue
index f533ec6..f443b99 100644
--- a/src/views/business/archive/formulation/comps/gyzjList.vue
+++ b/src/views/business/archive/formulation/comps/gyzjList.vue
@@ -99,7 +99,7 @@
v-hasPermi="['business:archive:gyzj:tygd']">{{
$t('page.business.resource.gyzj.tygd') }}
- {{
$t('page.business.resource.gyzj.jjgd') }}
@@ -107,7 +107,7 @@
v-hasPermi="['business:archive:gyzj:tyjd']">{{
$t('page.business.resource.gyzj.tyjd') }}
- {{
$t('page.business.resource.gyzj.jjjd') }}
@@ -115,7 +115,7 @@
v-hasPermi="['business:archive:gyzj:tyjy']">{{
$t('page.business.resource.gyzj.tyjy') }}
- {{
$t('page.business.resource.gyzj.jjjy') }}
@@ -170,15 +170,14 @@ export default {
this.getList()
},
methods: {
- handleSign(row, qmyy, showDate, type) {
+ handleSign(row, qmyy, showDate, type,isReson,reasonRequired) {
this.form.id = row.id
let title = this.$t(qmyy)
this.type = type
- this.$refs.refSign.show(title, title, showDate)
+ this.$refs.refSign.show(title, title, showDate,(type=='jjjy'||type=='tyjy')?[row.jyksrq,row.jyjsrq]:[],isReson,reasonRequired)
},
doSign(val) {
let params = _.merge({}, this.form, val)
- debugger
this.$modal.loading()
if (this.type == 'tygd') {
tygd(params).then(response => {
diff --git a/src/views/business/comps/common/sign.vue b/src/views/business/comps/common/sign.vue
index 702f901..dc5f7fb 100644
--- a/src/views/business/comps/common/sign.vue
+++ b/src/views/business/comps/common/sign.vue
@@ -3,7 +3,7 @@
-
+
@@ -13,6 +13,7 @@
value-format="yyyy-MM-dd" style="width: 100%" @change="changeDate" />
+
-
+
@@ -61,9 +62,11 @@ export default {
remark: '',
qmrId: '',
qmrMc: '',
+ qmrMcEn: '',
qmrmm: '',
- jyjsrq: '',
- jyksrq: ''
+
+ startDate: '',
+ endDate: ''
},
dateArr: [],
showDate: false,
@@ -78,7 +81,9 @@ export default {
message: ' ',
trigger: 'change'
}]
- }
+ },
+
+ isReson: false
}
},
computed: {
@@ -86,21 +91,56 @@ export default {
created() {
},
methods: {
- show(title, qmyy, showDate) {
+ show(title, qmyy, showDate, selectedDate, isReson, reasonRequired) {
this.showDate = showDate == undefined ? false : showDate
- this.dateArr = []
+ this.dateArr = selectedDate || []
this.title = title
this.form = {
qmyy: qmyy,
remark: '',
qmrId: this.$store.getters.id,
qmrMc: this.$store.getters.nickName,
+ qmrMcEn: this.$store.getters.name,
qmrmm: '',
- jyjsrq: '',
- jyksrq: ''
+ jyksrq: selectedDate && selectedDate.length > 0 ? selectedDate[0] : '',
+ jyjsrq: selectedDate && selectedDate.length > 0 ? selectedDate[1] : ''
}
this.resetForm("signForm")
this.open = true
+
+ this.isReson = isReson || false
+ if (reasonRequired) {
+ this.rules = {
+ qmrmm: [{
+ required: true,
+ message: ' ',
+ trigger: 'blur'
+ }],
+ jyksrq: [{
+ required: true,
+ message: ' ',
+ trigger: 'change'
+ }],
+ remark: [{
+ required: true,
+ message: ' ',
+ trigger: 'blur'
+ }]
+ }
+ } else {
+ this.rules = {
+ qmrmm: [{
+ required: true,
+ message: ' ',
+ trigger: 'blur'
+ }],
+ startDate: [{
+ required: true,
+ message: ' ',
+ trigger: 'change'
+ }]
+ }
+ }
},
cancel() {
this.open = false
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
index 6a72026..63da006 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -5,15 +5,6 @@
:close-on-click-modal="false">
-
-
-
-
-
-
-
-
-
@@ -66,7 +57,7 @@