From c0c9fa7a7181d7bbd2b69cffa9b399d19fb849cd Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Wed, 19 Mar 2025 19:20:48 +0800 Subject: [PATCH] 1 --- admin-web-master/src/api/manage.js | 9 +++++++++ admin-web-master/src/api/newly.js | 11 +++++++++++ admin-web-master/src/components/add/addht.vue | 6 +++--- admin-web-master/src/components/buscha/busCha.vue | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/utils/request.js | 6 +----- admin-web-master/src/views/shopRental/manage/index.vue | 48 ++++++++++++++++++++++++++++++++++++++++++++---- admin-web-master/src/views/shopRental/rentTermination/index copy 2.vue | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/views/shopRental/rentTermination/index.vue | 25 +++++++++++++++---------- lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------- 9 files changed, 638 insertions(+), 91 deletions(-) create mode 100644 admin-web-master/src/views/shopRental/rentTermination/index copy 2.vue diff --git a/admin-web-master/src/api/manage.js b/admin-web-master/src/api/manage.js index 28a9873..31c1af3 100644 --- a/admin-web-master/src/api/manage.js +++ b/admin-web-master/src/api/manage.js @@ -1,4 +1,13 @@ import request from '@/utils/request' +// 合同修改是否内部 + +export function editById(data) { + return request({ + url: '/cereContractInformation/editById', + method: 'post', + data + }) +} // 合同修改 export function edit(data) { diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 2ad56a4..3b0fd73 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,5 +1,16 @@ import request from '@/utils/request' // import request from '@/utils/request2' + + +// 退租决算管理 +export function changeContractInformationqueryByPage(data) { + return request({ + url: '/changeContractInformation/queryByPage', + method: 'post', + data + }) +} + // oa export function general(data) { return request({ diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 576aa2f..9f46199 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -236,7 +236,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, + documentAddress: this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { @@ -329,7 +329,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, + documentAddress: this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { @@ -483,7 +483,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, + documentAddress: this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue index a7de35e..81620fd 100644 --- a/admin-web-master/src/components/buscha/busCha.vue +++ b/admin-web-master/src/components/buscha/busCha.vue @@ -228,7 +228,37 @@ +
+ +
+ + + 通过 + 不通过 + + + + + +
+
+
+ +
+ + +
{{info.dataStatus=='1'?'使用中':info.dataStatus=='3'?'已拒绝':'无'}}
+ + +
{{info.reviewComments || '无'}}
+ + +
+
+ 确定 返回 @@ -273,6 +303,9 @@ import chakanmap from '@/components/chakan/map' import allimg from '@/components/chakan/allimg.vue'; import chakancd from '@/components/chakan/cd' + import { + editById, + } from '@/api/manage.js' export default { components: { oneht, @@ -289,9 +322,17 @@ return {}; // 返回一个空数组作为默认值 }, }, + issp: { + type: String, + default: function() { + return '1'; + }, + }, }, data() { return { + reviewComments:'', + radio: '1', url:'', type:'1', tableData: [], @@ -333,6 +374,28 @@ }, methods: { + minSev() { + editById({ + contractNumber: this.info.contractNumber, + dataStatus: this.radio, + reviewComments: this.reviewComments?this.reviewComments:null + }).then(res => { + console.error(res) + if (res.code == 200) { + this.$message({ + message: '处理成功', + type: 'success' + }) + this.info.dataStatus = this.radio + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: '处理失败', + type: 'error' + }) + } + }) + }, removeonaction() { this.type = '1' }, diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 429d95f..af6d24e 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,15 +17,11 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; -<<<<<<< HEAD baseURL = 'http://128.10.249.23:9003'; -======= - // baseURL = 'http://128.10.249.13:9003'; ->>>>>>> 89bb9f2b58e667e7b1bc81a97a5c37f15bfe7980 } else { console.error('---------------------') diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue index ab34e4a..afc56db 100644 --- a/admin-web-master/src/views/shopRental/manage/index.vue +++ b/admin-web-master/src/views/shopRental/manage/index.vue @@ -96,8 +96,10 @@ + + + + + diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue index 60d24de..f49abde 100644 --- a/admin-web-master/src/views/shopRental/rentTermination/index.vue +++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue @@ -34,35 +34,40 @@ :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> - + - + + + +