diff --git a/src/views/classMessage/cardOverdueList/components/corpUserList.vue b/src/views/classMessage/cardOverdueList/components/corpUserList.vue index 73057ea..f4492f5 100644 --- a/src/views/classMessage/cardOverdueList/components/corpUserList.vue +++ b/src/views/classMessage/cardOverdueList/components/corpUserList.vue @@ -183,20 +183,23 @@ export default { this.getTreeList() }, methods: { - getCardStatus(VALIDITY_PERIOD_END){ - const nowDate = new Date() - const nextDate = new Date((new Date).getFullYear() + '-' + ((new Date).getMonth() + 3) + '-' + (new Date).getDate()) - console.log('当前时间 ==>'+nowDate) - console.log('两个月后的时间 ==>'+nextDate) - console.log('证件到期日 ==>'+new Date(VALIDITY_PERIOD_END)) - if (nowDate > new Date(VALIDITY_PERIOD_END)){ - return 1 - }else if (new Date(VALIDITY_PERIOD_END) > nowDate && new Date(VALIDITY_PERIOD_END) < nextDate){ - return 2 - }else { - return 0 - } + getCardStatus(VALIDITY_PERIOD_END) { + const now = new Date(); // 当前时间 + const threeMonthsLater = new Date(now); // 三个月后的时间 + threeMonthsLater.setMonth(threeMonthsLater.getMonth() + 3); // 设置为未来三个月后的时间 + // 将VALIDITY_PERIOD_END转换为Date对象(假设它是一个有效的日期字符串) + const validityPeriodEnd = new Date(VALIDITY_PERIOD_END); + // 比较日期并返回状态 + if (now > validityPeriodEnd) { + // 证件已过期 + return 1; + } else if (validityPeriodEnd > now && validityPeriodEnd <= threeMonthsLater) { + // 证件即将到期 + return 2; + } else { + return 0; + } }, filterNode(value, data) { if (!value) return true diff --git a/src/views/gatemachine/second/dockdevice/components/detail.vue b/src/views/gatemachine/second/dockdevice/components/detail.vue new file mode 100644 index 0000000..49efb9b --- /dev/null +++ b/src/views/gatemachine/second/dockdevice/components/detail.vue @@ -0,0 +1,112 @@ + + + + diff --git a/src/views/gatemachine/second/dockdevice/components/edit.vue b/src/views/gatemachine/second/dockdevice/components/edit.vue new file mode 100644 index 0000000..e80993e --- /dev/null +++ b/src/views/gatemachine/second/dockdevice/components/edit.vue @@ -0,0 +1,278 @@ + + + + diff --git a/src/views/gatemachine/second/dockdevice/components/list.vue b/src/views/gatemachine/second/dockdevice/components/list.vue new file mode 100644 index 0000000..6bae822 --- /dev/null +++ b/src/views/gatemachine/second/dockdevice/components/list.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/src/views/gatemachine/second/dockdevice/index.vue b/src/views/gatemachine/second/dockdevice/index.vue new file mode 100644 index 0000000..5ff66c3 --- /dev/null +++ b/src/views/gatemachine/second/dockdevice/index.vue @@ -0,0 +1,32 @@ + + + + + + diff --git a/src/views/xgf/allXgfUserList/components/QRCode.vue b/src/views/xgf/allXgfUserList/components/QRCode.vue new file mode 100644 index 0000000..297e138 --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/QRCode.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/xgf/allXgfUserList/components/apply.vue b/src/views/xgf/allXgfUserList/components/apply.vue new file mode 100644 index 0000000..199811d --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/apply.vue @@ -0,0 +1,320 @@ + + + diff --git a/src/views/xgf/allXgfUserList/components/entrust.vue b/src/views/xgf/allXgfUserList/components/entrust.vue new file mode 100644 index 0000000..799927c --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/entrust.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/views/xgf/allXgfUserList/components/list.vue b/src/views/xgf/allXgfUserList/components/list.vue new file mode 100644 index 0000000..9c6af5e --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/list.vue @@ -0,0 +1,385 @@ + + + + diff --git a/src/views/xgf/allXgfUserList/components/picture.vue b/src/views/xgf/allXgfUserList/components/picture.vue new file mode 100644 index 0000000..57e7255 --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/picture.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/views/xgf/allXgfUserList/components/record.vue b/src/views/xgf/allXgfUserList/components/record.vue new file mode 100644 index 0000000..e82258d --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/record.vue @@ -0,0 +1,198 @@ + + + + diff --git a/src/views/xgf/allXgfUserList/components/sendUtil.vue b/src/views/xgf/allXgfUserList/components/sendUtil.vue new file mode 100644 index 0000000..77364e7 --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/sendUtil.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/xgf/allXgfUserList/components/user.vue b/src/views/xgf/allXgfUserList/components/user.vue new file mode 100644 index 0000000..889dc08 --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/user.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/xgf/allXgfUserList/components/users.vue b/src/views/xgf/allXgfUserList/components/users.vue new file mode 100644 index 0000000..22ec0be --- /dev/null +++ b/src/views/xgf/allXgfUserList/components/users.vue @@ -0,0 +1,513 @@ + + + diff --git a/src/views/xgf/allXgfUserList/index.vue b/src/views/xgf/allXgfUserList/index.vue new file mode 100644 index 0000000..005a3c2 --- /dev/null +++ b/src/views/xgf/allXgfUserList/index.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index a9d8bc3..f937dc5 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -52,13 +52,13 @@ + @click.native="backPoint('-1',BELONG_TO_CORP_NAME)">
相关方端
- 企业名称:{{ info.BELONG_TO_CORP_NAME }} + 企业名称:{{ BELONG_TO_CORP_NAME }}
@@ -223,7 +223,8 @@ export default { } ], step: 0, - showStepFlag: false + showStepFlag: false, + BELONG_TO_CORP_NAME: '' } }, methods: { @@ -348,6 +349,8 @@ export default { APPOINT_USER_ID: '', APPOINT_USER_NAME: '', OPINION: '', + BACK_NAME:'', + BACK_STEP: '', user: '', list: [], tm: new Date().getTime() @@ -364,6 +367,8 @@ export default { APPOINT_USER_ID: '', APPOINT_USER_NAME: '', OPINION: '', + BACK_NAME:'', + BACK_STEP: '', user: '', list: [], tm: new Date().getTime() @@ -387,6 +392,8 @@ export default { ).then((data) => { this.list = data.flow.info this.step = data.flow.STEP + this.form.BACK_NAME = data.flow.BELONG_TO_CORP_NAME + this.BELONG_TO_CORP_NAME = data.flow.BELONG_TO_CORP_NAME if (data.flow.endFlag === '1') { this.title = '审批中' } @@ -403,6 +410,7 @@ export default { }) }, backPoint(num, name) { + console.log(this.form) this.form.BACK_STEP = num this.form.BACK_NAME = name this.$forceUpdate()