From aeaf7f86d89a3b55e13848f3bc531732bf8a20f5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 8 Sep 2023 10:48:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.staging | 10 -- src/views/payAll/payConfirmation.vue | 193 ++++++++++++++++++++++++++ src/views/payAll/payList.vue | 196 +++++++++++++++++++++++++-- 4 files changed, 381 insertions(+), 20 deletions(-) delete mode 100644 .env.staging create mode 100644 src/views/payAll/payConfirmation.vue diff --git a/.env.development b/.env.development index 97b76e7..6b812a6 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 智慧仲裁管理系统 ENV = 'development' # 智慧仲裁管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = '/API' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.staging b/.env.staging deleted file mode 100644 index 5fa21b4..0000000 --- a/.env.staging +++ /dev/null @@ -1,10 +0,0 @@ -# 页面标题 -VUE_APP_TITLE = 智慧仲裁管理系统 - -NODE_ENV = production - -# 测试环境配置 -ENV = 'staging' - -# 智慧仲裁管理系统/测试环境 -VUE_APP_BASE_API = '/stage-api' diff --git a/src/views/payAll/payConfirmation.vue b/src/views/payAll/payConfirmation.vue new file mode 100644 index 0000000..a1ef507 --- /dev/null +++ b/src/views/payAll/payConfirmation.vue @@ -0,0 +1,193 @@ + + + + + \ No newline at end of file diff --git a/src/views/payAll/payList.vue b/src/views/payAll/payList.vue index d327660..c266f70 100644 --- a/src/views/payAll/payList.vue +++ b/src/views/payAll/payList.vue @@ -1,15 +1,193 @@ - + - - \ No newline at end of file + + \ No newline at end of file From a38d7cd3b3621ea665115d1fe9758b20add7ff59 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 8 Sep 2023 18:50:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseAccessAll/batchFiling.vue | 68 ++++-- src/views/caseAccessAll/caseEntry.vue | 279 +++++++++++++++--------- 2 files changed, 214 insertions(+), 133 deletions(-) diff --git a/src/views/caseAccessAll/batchFiling.vue b/src/views/caseAccessAll/batchFiling.vue index 86e6c63..fde4273 100644 --- a/src/views/caseAccessAll/batchFiling.vue +++ b/src/views/caseAccessAll/batchFiling.vue @@ -49,11 +49,7 @@ > - + @@ -127,7 +131,9 @@ - 下载模板 + 下载模板 详情 + 删除 @@ -269,72 +273,96 @@ -

主体信息：

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

代理人信息：

- - - - - - - - - - - - - - - - - - - - - - - 新增主体信息 - -
+
+
+

主体信息：

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

代理人信息：

+ + + + + + + + + + + + + + + + + + + + + + +
+ + 新增主体信息
确 定 取 消 @@ -354,7 +382,7 @@ export default { // 总条数 total: 0, // 表格数据 - list: [], + dataList: [], pageNum: 1, pageSize: 10, // 查询参数 @@ -389,47 +417,60 @@ export default { starttime: "", //开始时间 endtime: "", //结束时间 fileList: [], - paymentArr: [], + paymentArr: [ + { + identityType: "", + applicant: "", + IDnumber: "", + phoneNumber: "", + unitAddress: "", + worktelephone: "", + contactAddress: "", + agentName: "", + agentPhone: "", + agentAddress: "", + }, + ], }; }, created() { this.getList(); }, methods: { + // 新增主体信息 generateForm() { - // var formContainer = document.getElementById("formContainer"); - // var form = document.createElement("form2"); - // form.setAttribute("method", "post"); - // form.setAttribute("action", "#"); - - // var inputField = document.createElement("input"); - // inputField.setAttribute("type", "text"); - // inputField.setAttribute("name", "username"); - // inputField.setAttribute("placeholder", "用户名"); - - // var passwordField = document.createElement("input"); - // passwordField.setAttribute("type", "password"); - // passwordField.setAttribute("name", "password"); - // passwordField.setAttribute("placeholder", "密码"); - - // var submitButton = document.createElement("input"); - // submitButton.setAttribute("type", "submit"); - // submitButton.setAttribute("value", "提交"); - - // form.appendChild(inputField); - // form.appendChild(passwordField); - // form.appendChild(submitButton); - - // formContainer.appendChild(form); + this.paymentArr.push({ + identityType: "", + applicant: "", + IDnumber: "", + phoneNumber: "", + unitAddress: "", + worktelephone: "", + contactAddress: "", + agentName: "", + agentPhone: "", + agentAddress: "", + }); }, /** 查询登录日志列表 */ getList() { - this.loading = true; - list(this.queryParams).then((response) => { - this.list = response.rows; - this.total = response.total; - this.loading = false; - }); + this.dataList = [ + { + id: 1, + caseNumber: "5644456", + applicant: "韩某某", + matterofCase: "5000", + filingDate: "2023-9-3", + // ArbitrateMethod: '线上', + caseStatus: "未开庭", + }, + ]; + // this.loading = true; + // list(this.queryParams).then((response) => { + // this.list = response.rows; + // this.total = response.total; + this.loading = false; + // }); }, /** 搜索按钮操作 */ handleQuery() { @@ -453,9 +494,27 @@ export default { this.openapply = false; }, // 修改 - editRow() {}, + editRow(row) { + this.openapply = true; + this.dialogtitle = "立案修改"; + }, // 详情 - detailRow() {}, + detailRow(row) { + this.openapply = true; + this.dialogtitle = "立案详情"; + }, + // 删除 + deleteRow(row) { + // const id = row.id; + this.$modal + .confirm("是否确认删除？") + .then() + .then(() => { + // this.getList(); + this.$modal.msgSuccess("删除成功"); + }) + .catch(() => {}); + }, handleRemove(file, fileList) { console.log(file, fileList); }, @@ -472,8 +531,10 @@ export default { beforeRemove(file, fileList) { return this.$confirm(`确定移除 ${file.name}？`); }, - - + // 删除主体信息 + deleteData(index) { + this.paymentArr.splice(index,1) + } }, }; @@ -483,7 +544,7 @@ export default { height: 700px !important; overflow: auto !important; } -#formContainer{ - +#formContainer { + } From 217c8edc3143db5f6f7c4d293719a413c0191717 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 Sep 2023 15:49:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/caseAccess/caseEntry.js | 51 +- src/views/caseAccessAll/caseEntry.vue | 521 ++++--------- .../caseAccessAll/components/batchDialog.vue | 75 ++ .../components/caseentryDialog.vue | 721 ++++++++++++++++++ vue.config.js | 4 +- 6 files changed, 990 insertions(+), 383 deletions(-) create mode 100644 src/views/caseAccessAll/components/batchDialog.vue create mode 100644 src/views/caseAccessAll/components/caseentryDialog.vue diff --git a/package.json b/package.json index c29f5ac..164609d 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "moment": "^2.29.4", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", diff --git a/src/api/caseAccess/caseEntry.js b/src/api/caseAccess/caseEntry.js index b77e920..635b67f 100644 --- a/src/api/caseAccess/caseEntry.js +++ b/src/api/caseAccess/caseEntry.js @@ -1,10 +1,51 @@ import request from '@/utils/request' -// 查询在线用户列表 -export function list(query) { +// 查询案件录入列表 +export function caseApply(data) { return request({ - url: '/monitor/online/list', - method: 'get', - params: query + url: '/caseApplication/list', + method: 'post', + data: data + }) +} + +// 立案申请 +export function addCaseApply(data) { + return request({ + url: '/caseApplication/addCaseApplication', + method: 'post', + data: data + }) +} +// 点击修改获取主体信息 +export function selectCaseApply(data) { + return request({ + url: '/caseApplication/selectCaseApplication', + method: 'post', + data: data + }) +} +// 修改案件信息 +export function editCaseApply(data) { + return request({ + url: '/caseApplication/editCaseApplication', + method: 'post', + data: data + }) +} +// 删除案件信息 +export function removeCaseApply(data) { + return request({ + url: '/caseApplication/removeCaseApplication', + method: 'post', + data: data + }) +} +// 提交 +export function submitCaseApply(data) { + return request({ + url: '/caseApplication/submitCaseApplication', + method: 'post', + data: data }) } diff --git a/src/views/caseAccessAll/caseEntry.vue b/src/views/caseAccessAll/caseEntry.vue index 3521a04..818038c 100644 --- a/src/views/caseAccessAll/caseEntry.vue +++ b/src/views/caseAccessAll/caseEntry.vue @@ -7,22 +7,22 @@ :inline="true" label-width="68px" > - + - + 搜索 - 重置 + > --> @@ -47,34 +47,49 @@ v-hasPermi="['monitor:job:add']" >立案申请 + 批量立案 - --> + - - + @@ -545,6 +315,5 @@ export default { overflow: auto !important; } #formContainer { - } diff --git a/src/views/caseAccessAll/components/batchDialog.vue b/src/views/caseAccessAll/components/batchDialog.vue new file mode 100644 index 0000000..1f25129 --- /dev/null +++ b/src/views/caseAccessAll/components/batchDialog.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseAccessAll/components/caseentryDialog.vue b/src/views/caseAccessAll/components/caseentryDialog.vue new file mode 100644 index 0000000..1bc03e7 --- /dev/null +++ b/src/views/caseAccessAll/components/caseentryDialog.vue @@ -0,0 +1,721 @@ + + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index d1d3369..5b35050 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页 const port = process.env.port || process.env.npm_config_port || 80 // 端口 -const API = 'http://121.40.189.20:9001' //测试 -// const API = 'http://192.168.3.77:8080' //Q +// const API = 'http://121.40.189.20:9001' //测试 +const API = 'http://192.168.3.77:8080' //Q // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions From 8b735d148d884a2df20211131e7d14871e0be5ed Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 Sep 2023 21:24:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/caseAccess/caseEntry.js | 13 +- src/views/caseAccessAll/caseEntry.vue | 40 +++++- .../caseAccessAll/components/batchDialog.vue | 132 ++++++++++++++---- .../components/caseentryDialog.vue | 100 +++++-------- 4 files changed, 193 insertions(+), 92 deletions(-) diff --git a/src/api/caseAccess/caseEntry.js b/src/api/caseAccess/caseEntry.js index 635b67f..41e1116 100644 --- a/src/api/caseAccess/caseEntry.js +++ b/src/api/caseAccess/caseEntry.js @@ -4,8 +4,8 @@ import request from '@/utils/request' export function caseApply(data) { return request({ url: '/caseApplication/list', - method: 'post', - data: data + method: 'get', + params: data }) } @@ -49,3 +49,12 @@ export function submitCaseApply(data) { data: data }) } + +// 下载模板 +export function importTemplate(data) { + return request({ + url: '/caseApplication/importTemplate', + method: 'post', + data: data + }) +} diff --git a/src/views/caseAccessAll/caseEntry.vue b/src/views/caseAccessAll/caseEntry.vue index 818038c..cbf8c5a 100644 --- a/src/views/caseAccessAll/caseEntry.vue +++ b/src/views/caseAccessAll/caseEntry.vue @@ -152,9 +152,11 @@ :initpaymentArr1="initpaymentArr1" > - + @cancelBatch="cancelBatch" + :getcaseApply="getcaseApply" + >
@@ -172,7 +174,7 @@ export default { dicts: ["sys_identity_type"], components: { caseentryDialog, - // batchDialog + batchDialog }, data() { return { @@ -211,6 +213,9 @@ export default { cancel() { this.visible = false; }, + cancelBatch() { + this.openbatch = false + }, /** 查询登录日志列表 */ getcaseApply() { this.loading = true; @@ -236,6 +241,35 @@ export default { // 立案申请 filingApplication() { this.form = {}; + this.paymentArr = [ + { + identityType: 1, + name: "", + identityNum: "", + contactTelphone: "", + workAddress: "", + workTelphone: "", + contactAddress: "", + nameAgent: "", + contactTelphoneAgent: "", + contactAddressAgent: "", + }, + ]; + this.paymentArr1 = [ + { + identityType: 2, + name: "", + identityNum: "", + contactTelphone: "", + workAddress: "", + workTelphone: "", + contactAddress: "", + nameAgent: "", + contactTelphoneAgent: "", + contactAddressAgent: "", + }, + ] + this.visible = true; this.dialogtitle = "立案申请"; this.flag = "2" diff --git a/src/views/caseAccessAll/components/batchDialog.vue b/src/views/caseAccessAll/components/batchDialog.vue index 1f25129..4003ce0 100644 --- a/src/views/caseAccessAll/components/batchDialog.vue +++ b/src/views/caseAccessAll/components/batchDialog.vue @@ -2,44 +2,52 @@
- + - 下载模板 - --> +
+ 下载： + + 批量导入模板 + +
+ - + - 点击上传 + +
将文件拖到此处，或点击上传
+
- 只能上传文件，且不超过500kb + 只接收.xlsx, .xls格式文件
@@ -54,22 +62,98 @@ \ No newline at end of file diff --git a/src/views/caseAccessAll/components/caseentryDialog.vue b/src/views/caseAccessAll/components/caseentryDialog.vue index 1bc03e7..ebc5917 100644 --- a/src/views/caseAccessAll/components/caseentryDialog.vue +++ b/src/views/caseAccessAll/components/caseentryDialog.vue @@ -375,12 +375,17 @@ diff --git a/src/views/caseAccessAll/components/caseentryDialog.vue b/src/views/caseAccessAll/components/caseentryDialog.vue index ebc5917..1a90216 100644 --- a/src/views/caseAccessAll/components/caseentryDialog.vue +++ b/src/views/caseAccessAll/components/caseentryDialog.vue @@ -141,101 +141,178 @@ ref="form2" :model="form2" label-width="150px" - v-for="(item, index) in paymentArr" - :key="index" :disabled="flag == '0'" > -
+

申请人主体信息：

- - + + - - + + - - + + - - + + - - + + - - + +

代理人信息：

- + + + + + + - + - + - - - - - @@ -255,100 +332,178 @@ ref="form3" label-width="150px" :disabled="flag == '0'" - v-for="(item, index) in paymentArr1" - :key="index + paymentArr.length" + :model="form3" > -
+

被申请人主体信息：

- - + + - - + + - - + + - - + + - - + + - - + +

代理人信息：

- + + + + + + + + + + + - + - - - - - - - - - - @@ -389,12 +544,47 @@ export default { data() { return { formData: this.form, - form2: {}, //申请人主体信息 - form3: {}, //被申请人主体信息 + form2: { + paymentArr: [ + { + identityType: 1, + name: "", + identityNum: "", + contactTelphone: "", + workAddress: "", + workTelphone: "", + contactAddress: "", + nameAgent: "", + contactTelphoneAgent: "", + contactAddressAgent: "", + }, + ], + }, //申请人主体信息 + form3: { + paymentArr1: [ + { + identityType: 2, + name: "", + identityNum: "", + contactTelphone: "", + workAddress: "", + workTelphone: "", + contactAddress: "", + nameAgent: "", + contactTelphoneAgent: "", + contactAddressAgent: "", + }, + ], + }, //被申请人主体信息 // 表单校验 rules: { caseNum: [ - { required: true, message: "案件编号不能为空", trigger: "blur" }, + { + required: true, + message: "案件编号不能为空", + trigger: ["change", "blur"], + }, + { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }, ], caseSubjectAmount: [ { @@ -465,122 +655,7 @@ export default { // { type: 'number', message: '申请人主张违约金必须为数字值'} ], }, - rulesmain: { - name: [ - { - required: true, - message: "申请人不能为空", - trigger: "blur", - }, - ], - identityNum: [ - { - required: true, - message: "身份证号不能为空", - trigger: "blur", - }, - ], - contactTelphone: [ - { - required: true, - message: "联系电话不能为空", - trigger: "blur", - }, - { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur", - }, - ], - workAddress: [ - { - required: true, - message: "单位地址不能为空", - trigger: "blur", - }, - ], - workTelphone: [ - { - required: true, - message: "单位电话不能为空", - trigger: "blur", - }, - { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur", - }, - ], - contactAddress: [ - { - required: true, - message: "联系地址不能为空", - trigger: "blur", - }, - ], - nameAgent: [ - { - required: true, - message: "姓名不能为空", - trigger: "blur", - }, - ], - identityNumAgent: [ - { - required: true, - message: "身份证号不能为空", - trigger: "blur", - }, - ], - contactTelphoneAgent: [ - { - required: true, - message: "联系电话不能为空", - trigger: "blur", - }, - { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur", - }, - ], - contactAddressAgent: [ - { - required: true, - message: "联系地址不能为空", - trigger: "blur", - }, - ], - }, fileList: [], - paymentArr: [ - { - identityType: 1, - name: "", - identityNum: "", - contactTelphone: "", - workAddress: "", - workTelphone: "", - contactAddress: "", - nameAgent: "", - contactTelphoneAgent: "", - contactAddressAgent: "", - }, - ], - paymentArr1: [ - { - identityType: 2, - name: "", - identityNum: "", - contactTelphone: "", - workAddress: "", - workTelphone: "", - contactAddress: "", - nameAgent: "", - contactTelphoneAgent: "", - contactAddressAgent: "", - }, - ], }; }, watch: { @@ -589,8 +664,10 @@ export default { if (val) { this.formData = this.form; if (this.flag == "1" || this.flag == "0") { - this.paymentArr = this.initpaymentArr; - this.paymentArr1 = this.initpaymentArr1; + setTimeout(() => { + this.form2.paymentArr = this.initpaymentArr; + this.form3.paymentArr1 = this.initpaymentArr1; + }, 1000); } } }, @@ -617,7 +694,7 @@ export default { // 新增申请人主体信息 generateForm() { - this.paymentArr.push({ + this.form2.paymentArr.push({ identityType: 1, name: "", identityNum: "", @@ -632,7 +709,7 @@ export default { }, // 新增被申请人主体信息 generateForm1() { - this.paymentArr1.push({ + this.form3.paymentArr1.push({ identityType: 2, name: "", identityNum: "", @@ -647,11 +724,11 @@ export default { }, // 删除申请人主体信息 deleteData(index) { - this.paymentArr.splice(index, 1); + this.form2.paymentArr.splice(index, 1); }, // 删除被申请人主体信息 deleteData1(index) { - this.paymentArr1.splice(index, 1); + this.form3.paymentArr1.splice(index, 1); }, // 提交立案申请 addCaseApply submitForm() { @@ -662,28 +739,40 @@ export default { this.formData.loanEndDate = moment(this.formData.loanEndDate).format( "YYYY-MM-DD HH:mm:ss" ); - this.formData.caseAffiliates = [ - ...this.paymentArr, - ...this.paymentArr1, - ]; if (valid) { - if (this.formData.id) { - editCaseApply({ - ...this.formData, - caseAffiliates: this.formData.caseAffiliates, - }).then((res) => { - this.$modal.msgSuccess("修改成功"); - }); - } else { - addCaseApply({ - ...this.formData, - caseAffiliates: this.formData.caseAffiliates, - }).then((response) => { - this.$modal.msgSuccess("新增成功"); - }); - } - this.$emit("cancel"); - this.getcaseApply(); + this.$refs["form2"].validate((valid) => { + if (valid) { + this.$refs["form3"].validate((vail) => { + if (vail) { + this.formData.caseAffiliates = [ + ...this.form2.paymentArr, + ...this.form3.paymentArr1, + ]; + if (this.formData.id) { + editCaseApply({ + ...this.formData, + caseAffiliates: this.formData.caseAffiliates, + }).then((res) => { + this.$modal.msgSuccess("修改成功"); + this.$emit("cancel"); + this.getcaseApply(); + }); + } else { + addCaseApply({ + ...this.formData, + caseAffiliates: this.formData.caseAffiliates, + }).then((response) => { + this.$modal.msgSuccess("新增成功"); + this.$emit("cancel"); + this.getcaseApply(); + }); + } + // this.$emit("cancel"); + // this.getcaseApply(); + } + }); + } + }); } }); }, @@ -692,4 +781,8 @@ export default { \ No newline at end of file