-
- {{ uploadFileInfo.fileName }}
+
-
+
@@ -64,14 +59,14 @@ export default {
flowId: flow.flowId,
state: 'C'
})
-
+
if (data.length < 1) {
this.$message.error(this.$t('newOaWorkflowManage.flowNotDeployed'))
return
}
-
+
this.$router.push({
- path: '/form.html#/pages/property/newOaWorkflow',
+ path: '/views/oa/newOaWorkflow',
query: { flowId: flow.flowId }
})
} catch (error) {
@@ -85,27 +80,27 @@ export default {
+
-
-
- {{ $t('uploadFile.upload') }}
+
\ No newline at end of file
diff --git a/src/views/fee/owePayFeeOrderLang.js b/src/views/fee/owePayFeeOrderLang.js
new file mode 100644
index 0000000..36b4c36
--- /dev/null
+++ b/src/views/fee/owePayFeeOrderLang.js
@@ -0,0 +1,88 @@
+export const messages = {
+ en: {
+ owePayFeeOrder: {
+ printNotice1: 'Notice 1',
+ printNotice2: 'Notice 2',
+ payerObj: 'Payer',
+ feeType: 'Fee Type',
+ feeItem: 'Fee Item',
+ feeFlag: 'Fee Flag',
+ feeId: 'Fee ID',
+ startTime: 'Start Time',
+ endTime: 'End Time',
+ oweAmount: 'Owe Amount',
+ paymentAmount: 'Payment Amount',
+ yuan: 'Yuan',
+ scanPay: 'Scan Payment',
+ pay: 'Pay',
+ paymentConfirm: 'Payment Confirmation',
+ room: 'Room:',
+ amount: 'Amount:',
+ paymentMethod: 'Payment Method:',
+ selectPaymentMethod: 'Required, please select payment method',
+ remark: 'Remark:',
+ inputRemark: 'Optional, please enter remark',
+ authCode: 'Auth Code:',
+ scanCodeTip: 'Please scan with scanner',
+ confirmPayment: 'Confirm Payment',
+ paymentTip: 'Payment Notice',
+ paymentSuccess: 'Payment successful',
+ mergePrint: 'Merge Print',
+ printReceipt: 'Print Receipt',
+ illegalOperation: 'Illegal operation',
+ noOweData: 'No owe data currently',
+ noSelectedFee: 'No fee selected',
+ noSelectedFeeItem: 'No fee item selected',
+ selectPaymentMethodTip: 'Please select payment method'
+ },
+ printOwnFee: {
+ printTitle: 'Print Notice',
+ validityDate: 'Validity Date:',
+ selectEndTime: 'Required, please select end time',
+ selectEndTimeTip: 'Please select end time'
+ }
+ },
+ zh: {
+ owePayFeeOrder: {
+ printNotice1: '催缴单1',
+ printNotice2: '催缴单2',
+ payerObj: '收费对象',
+ feeType: '费用类型',
+ feeItem: '费用项目',
+ feeFlag: '费用标识',
+ feeId: '费用ID',
+ startTime: '计费起始时间',
+ endTime: '计费结束时间',
+ oweAmount: '欠费金额',
+ paymentAmount: '缴费金额',
+ yuan: '元',
+ scanPay: '扫码收费',
+ pay: '缴费',
+ paymentConfirm: '收费确认',
+ room: '房屋：',
+ amount: '金额：',
+ paymentMethod: '支付方式：',
+ selectPaymentMethod: '必填，请选择支付方式',
+ remark: '备注：',
+ inputRemark: '可填，请填写备注',
+ authCode: '授权码：',
+ scanCodeTip: '请用扫码枪扫码',
+ confirmPayment: '确定收费',
+ paymentTip: '缴费提示',
+ paymentSuccess: '缴费成功',
+ mergePrint: '合并打印',
+ printReceipt: '打印收据',
+ illegalOperation: '非法操作',
+ noOweData: '当前没有欠费数据',
+ noSelectedFee: '未选择费用',
+ noSelectedFeeItem: '未选中要缴费的项目',
+ selectPaymentMethodTip: '请选择支付方式'
+ },
+ printOwnFee: {
+ printTitle: '打印催缴单',
+ validityDate: '有效期至：',
+ selectEndTime: '必填，请填写截止时间',
+ selectEndTimeTip: '请选择截止时间'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/fee/owePayFeeOrderList.vue b/src/views/fee/owePayFeeOrderList.vue
new file mode 100644
index 0000000..e2e8bf1
--- /dev/null
+++ b/src/views/fee/owePayFeeOrderList.vue
@@ -0,0 +1,573 @@
+
+
+ {{ uploadFileInfo.fileName }}
+
+
+
+ {{ $t('uploadFile.uploadBtn') }}
-
+
+
+
+
+
+ {{ _getEndTime(scope.row) }}
+
+
+
+
+ {{ _getDeadlineTime(scope.row) }}
+
+
+
+
+
+
+ {{ $t('owePayFeeOrder.paymentAmount') }}：
+ {{ owePayFeeOrderInfo.feePrices }}
+ {{ $t('owePayFeeOrder.yuan') }}
+
+
+
+ {{ $t('owePayFeeOrder.scanPay') }}
+
+
+
+
+ {{ $t('owePayFeeOrder.pay') }}
+
+
+
+
+
+
+
+
+
+ {{ owePayFeeOrderInfo.roomName }}
+
+
+ {{ owePayFeeOrderInfo.feePrices }}
+ {{ $t('owePayFeeOrder.yuan') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/fee/refundDepositFeeLang.js b/src/views/fee/refundDepositFeeLang.js
new file mode 100644
index 0000000..25fb8f7
--- /dev/null
+++ b/src/views/fee/refundDepositFeeLang.js
@@ -0,0 +1,70 @@
+export const messages = {
+ en: {
+ refundDepositFee: {
+ title: 'Refund Deposit',
+ unrefunded: 'Unrefunded',
+ refunded: 'Refunded',
+ pendingReview: 'Pending Review',
+ printReceipt: 'Reprint Receipt'
+ },
+ payFeeDeposit: {
+ payerObject: 'Payer',
+ feeItem: 'Fee Item',
+ timePeriod: 'Time Period',
+ amount: 'Amount',
+ paymentTime: 'Payment Time',
+ status: 'Status',
+ operation: 'Operation',
+ refundDeposit: 'Refund Deposit',
+ detail: 'Detail'
+ },
+ returnPayFee: {
+ fillRefundReason: 'Fill Refund Reason',
+ payment: 'Payment',
+ monthUnit: '(Months)',
+ cycle: 'Cycle',
+ receivableAmount: 'Receivable Amount',
+ receivedAmount: 'Received Amount',
+ paymentTime: 'Payment Time',
+ refundReason: 'Refund Reason',
+ reasonRequired: 'Refund reason is required',
+ reasonMaxLength: 'Refund reason cannot exceed 200 characters',
+ reasonPlaceholder: 'Please enter refund reason',
+ submitRefund: 'Submit Refund Application'
+ }
+ },
+ zh: {
+ refundDepositFee: {
+ title: '退押金',
+ unrefunded: '未退押金',
+ refunded: '已退押金',
+ pendingReview: '待审核',
+ printReceipt: '补打退款单'
+ },
+ payFeeDeposit: {
+ payerObject: '收费对象',
+ feeItem: '费用项',
+ timePeriod: '时间段',
+ amount: '金额',
+ paymentTime: '缴费时间',
+ status: '状态',
+ operation: '操作',
+ refundDeposit: '退押金',
+ detail: '详情'
+ },
+ returnPayFee: {
+ fillRefundReason: '填写退费原因',
+ payment: '缴费',
+ monthUnit: '(单位月)',
+ cycle: '周期',
+ receivableAmount: '应收金额',
+ receivedAmount: '实收金额',
+ paymentTime: '缴费时间',
+ refundReason: '退费原因',
+ reasonRequired: '退费原因不能为空',
+ reasonMaxLength: '退费原因不能超过200个字符',
+ reasonPlaceholder: '请输入退费原因',
+ submitRefund: '提交退费申请'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/fee/refundDepositFeeList.vue b/src/views/fee/refundDepositFeeList.vue
new file mode 100644
index 0000000..987b6e4
--- /dev/null
+++ b/src/views/fee/refundDepositFeeList.vue
@@ -0,0 +1,198 @@
+
+
+ {{ owePayFeeOrderInfo.roomName }}
+
+
+
+
+ {{ $t('owePayFeeOrder.printNotice1') }}
+
+
+ {{ $t('owePayFeeOrder.printNotice2') }}
+
+
+
+ {{ $t('common.back') }}
+
+
+ {{ $t('owePayFeeOrder.paymentSuccess') }}
+ +
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.startTime }}~{{ scope.row.endTime }}
+
+
+
+
+
+ {{ $t('payFeeDeposit.refundDeposit') }}
+
+
+ {{ $t('payFeeDeposit.detail') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowDetailLang.js b/src/views/oa/newOaWorkflowDetailLang.js
new file mode 100644
index 0000000..6687cd6
--- /dev/null
+++ b/src/views/oa/newOaWorkflowDetailLang.js
@@ -0,0 +1,102 @@
+export const messages = {
+ en: {
+ newOaWorkflowDetail: {
+ title: 'Work Order Details',
+ back: 'Back',
+ applicant: 'Applicant',
+ applyTime: 'Application Time',
+ status: 'Status',
+ workflowProcess: 'Work Order Process',
+ serialNumber: 'No.',
+ department: 'Department',
+ handler: 'Handler',
+ timeConsuming: 'Time Consuming',
+ comment: 'Comment',
+ processed: 'Processed',
+ processing: 'Processing',
+ admin: 'Administrator',
+ workflowHandle: 'Work Order Handling',
+ action: 'Action',
+ selectAction: 'Please select',
+ handle: 'Handle',
+ return: 'Return',
+ returnToSubmitter: 'Return to Submitter',
+ end: 'End',
+ transfer: 'Transfer',
+ workflowDescription: 'Work Order Description',
+ descriptionRequired: 'Required, please fill in the work order description',
+ nextHandler: 'Next Handler',
+ selectNextHandler: 'Required, please select the next handler',
+ select: 'Select',
+ submit: 'Submit',
+ flowChart: 'Flow Chart',
+ illegalOperation: 'Illegal operation',
+ selectStatus: 'Please select status',
+ fillDescription: 'Please fill in the description',
+ submitSuccess: 'Submitted successfully',
+ unknown: 'Unknown',
+ apply: 'Apply',
+ pendingReview: 'Pending Review',
+ returned: 'Returned',
+ transferred: 'Transferred',
+ completed: 'Completed'
+ },
+ selectStaff: {
+ title: 'Select Staff',
+ orgInfo: 'Organization Information',
+ staffInfo: 'Staff Information',
+ submitter: 'Submitter',
+ customAssign: 'Dynamic Assignment'
+ }
+ },
+ zh: {
+ newOaWorkflowDetail: {
+ title: '工单详情',
+ back: '返回',
+ applicant: '申请人',
+ applyTime: '申请时间',
+ status: '状态',
+ workflowProcess: '工单流转',
+ serialNumber: '序号',
+ department: '部门',
+ handler: '处理人',
+ timeConsuming: '耗时',
+ comment: '意见',
+ processed: '处理完成',
+ processing: '正在处理',
+ admin: '管理员',
+ workflowHandle: '工单办理',
+ action: '动作',
+ selectAction: '请选择',
+ handle: '办理',
+ return: '退回',
+ returnToSubmitter: '退回至提交者',
+ end: '结束',
+ transfer: '转单',
+ workflowDescription: '工单说明',
+ descriptionRequired: '必填，请填写工单说明',
+ nextHandler: '下一处理人',
+ selectNextHandler: '必填，请选择下一处理人',
+ select: '选择',
+ submit: '提交',
+ flowChart: '流程图',
+ illegalOperation: '非法操作',
+ selectStatus: '请选择状态',
+ fillDescription: '请填写说明',
+ submitSuccess: '提交成功',
+ unknown: '未知',
+ apply: '申请',
+ pendingReview: '待审核',
+ returned: '退回',
+ transferred: '转单',
+ completed: '办结'
+ },
+ selectStaff: {
+ title: '选择员工',
+ orgInfo: '组织信息',
+ staffInfo: '员工信息',
+ submitter: '提交者',
+ customAssign: '动态指定'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowDetailList.vue b/src/views/oa/newOaWorkflowDetailList.vue
new file mode 100644
index 0000000..b3d249e
--- /dev/null
+++ b/src/views/oa/newOaWorkflowDetailList.vue
@@ -0,0 +1,369 @@
+
+ -
+
- + {{ item.name }} + +
+ {{ $t('refundDepositFee.title') }}
+
+
+
+
+ {{ $t('refundDepositFee.printReceipt') }}
+
+
+ {{ $t('common.back') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+ {{ scope.row.orgName || $t('newOaWorkflowDetail.admin') }}
+
+
+
+
+ {{ scope.row.endTime ? $t('newOaWorkflowDetail.processed') : $t('newOaWorkflowDetail.processing') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('newOaWorkflowDetail.select') }}
+
+
+
+
+
+
+ {{ $t('newOaWorkflowDetail.select') }}
+
+
+
+
+
+ {{ $t('newOaWorkflowDetail.submit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowFormEditLang.js b/src/views/oa/newOaWorkflowFormEditLang.js
new file mode 100644
index 0000000..bfd11d9
--- /dev/null
+++ b/src/views/oa/newOaWorkflowFormEditLang.js
@@ -0,0 +1,34 @@
+export const messages = {
+ en: {
+ newOaWorkflowFormEdit: {
+ title: 'Edit',
+ submit: 'Submit',
+ cancel: 'Cancel',
+ requiredMessage: ' is required',
+ submitSuccess: 'Submit successfully',
+ submitError: 'Submit failed'
+ },
+ uploadFile: {
+ uploadBtn: 'Upload Attachment',
+ sizeLimit: 'File size cannot exceed 20MB',
+ uploadSuccess: 'File uploaded successfully',
+ uploadError: 'File upload failed'
+ }
+ },
+ zh: {
+ newOaWorkflowFormEdit: {
+ title: '编辑',
+ submit: '提交',
+ cancel: '取消',
+ requiredMessage: '不能为空',
+ submitSuccess: '提交成功',
+ submitError: '提交失败'
+ },
+ uploadFile: {
+ uploadBtn: '上传附件',
+ sizeLimit: '文件大小不能超过20MB',
+ uploadSuccess: '文件上传成功',
+ uploadError: '文件上传失败'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowFormEditList.vue b/src/views/oa/newOaWorkflowFormEditList.vue
new file mode 100644
index 0000000..d936472
--- /dev/null
+++ b/src/views/oa/newOaWorkflowFormEditList.vue
@@ -0,0 +1,195 @@
+
+
+ {{ $t('newOaWorkflowDetail.title') }}
+
+
+
+
+ {{ $t('newOaWorkflowDetail.back') }}
+
+
+
+
+
+
+
+ {{ newOaWorkflowDetailInfo.pools.create_user_name }}
+
+
+
+
+ {{ newOaWorkflowDetailInfo.pools.create_time }}
+
+
+
+
+ {{ _getNewOaWorkflowDetailState(newOaWorkflowDetailInfo.pools) }}
+
+
+
+
+
+
+
+
+ {{ newOaWorkflowDetailInfo.pools[item.key] }}
+
+
+
+
+
+
+
+
+ {{ item.fileName }}
+
+
+
+
+
+
+ {{ $t('newOaWorkflowDetail.workflowProcess') }}
+
+
+
+ {{ $t('newOaWorkflowDetail.workflowHandle') }}
+
+
+
+ {{ $t('newOaWorkflowDetail.flowChart') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowLang.js b/src/views/oa/newOaWorkflowLang.js
new file mode 100644
index 0000000..961a657
--- /dev/null
+++ b/src/views/oa/newOaWorkflowLang.js
@@ -0,0 +1,138 @@
+export const messages = {
+ en: {
+ newOaWorkflow: {
+ processWorkOrder: 'Process Work Order',
+ draftProcess: 'Draft Process',
+ processTodo: 'Process Todo',
+ processDone: 'Process Done'
+ },
+ newOaWorkflowPool: {
+ searchTitle: 'Search Conditions',
+ enterApplicant: 'Please enter applicant',
+ enterStartTime: 'Please enter start time',
+ enterEndTime: 'Please enter end time',
+ processWorkOrder: 'Process Work Order',
+ applicant: 'Applicant',
+ status: 'Status',
+ createTime: 'Create Time',
+ operation: 'Operation',
+ detail: 'Detail',
+ flowChart: 'Flow Chart',
+ stateApply: 'Apply',
+ statePending: 'Pending',
+ stateReturned: 'Returned',
+ stateDelegate: 'Delegate',
+ stateCompleted: 'Completed'
+ },
+ newOaWorkflowUndo: {
+ searchTitle: 'Search Conditions',
+ enterApplicant: 'Please enter applicant',
+ enterStartTime: 'Please enter start time',
+ enterEndTime: 'Please enter end time',
+ todoProcess: 'Todo Process',
+ applicant: 'Applicant',
+ status: 'Status',
+ createTime: 'Create Time',
+ operation: 'Operation',
+ process: 'Process',
+ detail: 'Detail',
+ edit: 'Edit',
+ stateApply: 'Apply',
+ statePending: 'Pending',
+ stateReturned: 'Returned',
+ stateDelegate: 'Delegate',
+ stateCompleted: 'Completed'
+ },
+ newOaWorkflowFinish: {
+ searchTitle: 'Search Conditions',
+ enterApplicant: 'Please enter applicant',
+ enterStartTime: 'Please enter start time',
+ enterEndTime: 'Please enter end time',
+ doneProcess: 'Done Process',
+ applicant: 'Applicant',
+ status: 'Status',
+ createTime: 'Create Time',
+ operation: 'Operation',
+ detail: 'Detail',
+ stateApply: 'Apply',
+ statePending: 'Pending',
+ stateReturned: 'Returned',
+ stateDelegate: 'Delegate',
+ stateCompleted: 'Completed'
+ },
+ uploadFile: {
+ uploadAttachment: 'Upload Attachment',
+ fileSizeLimit: 'File size cannot exceed 20MB',
+ uploadSuccess: 'File uploaded successfully',
+ uploadFailed: 'File upload failed'
+ }
+ },
+ zh: {
+ newOaWorkflow: {
+ processWorkOrder: '流程工单',
+ draftProcess: '起草流程',
+ processTodo: '流程待办',
+ processDone: '流程已办'
+ },
+ newOaWorkflowPool: {
+ searchTitle: '查询条件',
+ enterApplicant: '请输入申请人',
+ enterStartTime: '请输入开始时间',
+ enterEndTime: '请输入结束时间',
+ processWorkOrder: '流程工单',
+ applicant: '申请人',
+ status: '状态',
+ createTime: '创建时间',
+ operation: '操作',
+ detail: '详情',
+ flowChart: '流程图',
+ stateApply: '申请',
+ statePending: '待审核',
+ stateReturned: '退回',
+ stateDelegate: '委托',
+ stateCompleted: '办结'
+ },
+ newOaWorkflowUndo: {
+ searchTitle: '查询条件',
+ enterApplicant: '请输入申请人',
+ enterStartTime: '请输入开始时间',
+ enterEndTime: '请输入结束时间',
+ todoProcess: '待办流程',
+ applicant: '申请人',
+ status: '状态',
+ createTime: '创建时间',
+ operation: '操作',
+ process: '办理',
+ detail: '详情',
+ edit: '编辑',
+ stateApply: '申请',
+ statePending: '待审核',
+ stateReturned: '退回',
+ stateDelegate: '委托',
+ stateCompleted: '办结'
+ },
+ newOaWorkflowFinish: {
+ searchTitle: '查询条件',
+ enterApplicant: '请输入申请人',
+ enterStartTime: '请输入开始时间',
+ enterEndTime: '请输入结束时间',
+ doneProcess: '已办流程',
+ applicant: '申请人',
+ status: '状态',
+ createTime: '创建时间',
+ operation: '操作',
+ detail: '详情',
+ stateApply: '申请',
+ statePending: '待审核',
+ stateReturned: '退回',
+ stateDelegate: '委托',
+ stateCompleted: '办结'
+ },
+ uploadFile: {
+ uploadAttachment: '上传附件',
+ fileSizeLimit: '文件大小不能超过20MB',
+ uploadSuccess: '文件上传成功',
+ uploadFailed: '文件上传失败'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowList.vue b/src/views/oa/newOaWorkflowList.vue
new file mode 100644
index 0000000..7e42cab
--- /dev/null
+++ b/src/views/oa/newOaWorkflowList.vue
@@ -0,0 +1,121 @@
+
+
+ {{ $t('newOaWorkflowFormEdit.title') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/oa/newOaWorkflowManageList.vue b/src/views/oa/newOaWorkflowManageList.vue
index 85371be..864ea1c 100644
--- a/src/views/oa/newOaWorkflowManageList.vue
+++ b/src/views/oa/newOaWorkflowManageList.vue
@@ -3,13 +3,8 @@
+
+