From 6abe03169eff82d40ff2a3aef9947b8eb9367481 Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Wed, 5 Feb 2025 15:41:35 +0800 Subject: [PATCH] 1 --- admin-web-master/src/api/newly.js | 35 +++++++++++++++++++++++++++++++++++ admin-web-master/src/components/add/addht copy.vue | 833 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/components/add/addht.vue | 773 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ admin-web-master/src/components/add/addmb copy.vue | 815 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/components/add/addmb.vue | 931 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin-web-master/src/components/buscha/busCha.vue | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- admin-web-master/src/components/chakan/mb.vue | 301 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/components/change/mbachakan.vue | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/components/change/mbadd.vue | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/components/change/zy.vue | 30 ++++++++++++++++++++++-------- admin-web-master/src/main.js | 6 +++--- admin-web-master/src/store/modules/app.js | 41 ++++++++++++++++++++++++++++++++++++++++- admin-web-master/src/views/shopRental/manage/index.vue | 3 ++- admin-web-master/src/views/shopRental/template/index.vue | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------- 14 files changed, 3512 insertions(+), 1228 deletions(-) create mode 100644 admin-web-master/src/components/add/addht copy.vue create mode 100644 admin-web-master/src/components/add/addmb copy.vue create mode 100644 admin-web-master/src/components/chakan/mb.vue create mode 100644 admin-web-master/src/components/change/mbachakan.vue create mode 100644 admin-web-master/src/components/change/mbadd.vue diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index ca1f0c0..419e303 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,5 +1,40 @@ import request from '@/utils/request' import requestnew from '@/utils/request2' +// 生成合同附件 +export function dataInprotDocument(data) { + return request({ + url: '/cereContractTemplate/dataInprotDocument ', + method: 'post', + data + }) +} +// ******模版****** +// 列表 +export function cereContractTemplate(data) { + return request({ + url: '/cereContractTemplate/queryByPage', + method: 'post', + data + }) +} +// 添加 +export function cereContractTemplateadd(data) { + return request({ + url: '/cereContractTemplate/add', + method: 'post', + data + }) +} +// 删除 +export function cereContractTemplatedeleteById(data) { + return request({ + url: '/cereContractTemplate/deleteById', + method: 'post', + data + }) +} + + // 获取方案资源 export function cereBusinessPlanqueryById(data) { return request({ diff --git a/admin-web-master/src/components/add/addht copy.vue b/admin-web-master/src/components/add/addht copy.vue new file mode 100644 index 0000000..e8ece3f --- /dev/null +++ b/admin-web-master/src/components/add/addht copy.vue @@ -0,0 +1,833 @@ + + + + diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 939dcdb..923db0b 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -1,279 +1,58 @@ - diff --git a/admin-web-master/src/components/add/addmb copy.vue b/admin-web-master/src/components/add/addmb copy.vue new file mode 100644 index 0000000..f989cc4 --- /dev/null +++ b/admin-web-master/src/components/add/addmb copy.vue @@ -0,0 +1,815 @@ + + + + diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue index 6605d3f..eea8b5d 100644 --- a/admin-web-master/src/components/add/addmb.vue +++ b/admin-web-master/src/components/add/addmb.vue @@ -1,139 +1,33 @@ @@ -236,10 +258,16 @@ import { cerePlatformMerchantinfo } from '../../api/newly.js' + import resourceCommodity from '@/components/resourceCommodity/index' + import chakanmap from '@/components/chakan/map' + import chakancd from '@/components/chakan/cd' export default { components: { oneht, - TitleWithCircle + TitleWithCircle, + chakancd, + chakanmap, + resourceCommodity, }, props: { info: { @@ -261,11 +289,16 @@ shopIds: [], shop: {}, newshop:{}, - newinfo:{} + newinfo:{}, + detailsinfo:{}, + detailstype:'', + list1:[] } }, created() { console.log(this.info) + this.list1 = JSON.parse(this.info.templateInformation) + console.log(this.list1) this.url = process.env.VUE_APP_DOMAIN_PREFIX_1 queryByContractcontractNumber({ contractNumber: this.info.contractNumber @@ -287,6 +320,14 @@ }, methods: { + removeonaction() { + this.type = '1' + }, + details(row) { + this.detailstype = row.shopName?'商铺':row.advertisingType?'广告位':'场地' + this.detailsinfo = row + this.type = '3' + }, openfile(e) { if (e) { const fullUrl = this.$baseURL + e; diff --git a/admin-web-master/src/components/chakan/mb.vue b/admin-web-master/src/components/chakan/mb.vue new file mode 100644 index 0000000..372ba0f --- /dev/null +++ b/admin-web-master/src/components/chakan/mb.vue @@ -0,0 +1,301 @@ + + + diff --git a/admin-web-master/src/components/change/mbachakan.vue b/admin-web-master/src/components/change/mbachakan.vue new file mode 100644 index 0000000..d400ce5 --- /dev/null +++ b/admin-web-master/src/components/change/mbachakan.vue @@ -0,0 +1,360 @@ + + + diff --git a/admin-web-master/src/components/change/mbadd.vue b/admin-web-master/src/components/change/mbadd.vue new file mode 100644 index 0000000..d400ce5 --- /dev/null +++ b/admin-web-master/src/components/change/mbadd.vue @@ -0,0 +1,360 @@ + + + diff --git a/admin-web-master/src/components/change/zy.vue b/admin-web-master/src/components/change/zy.vue index 31827f2..14b06ab 100644 --- a/admin-web-master/src/components/change/zy.vue +++ b/admin-web-master/src/components/change/zy.vue @@ -87,7 +87,7 @@ pageindex: { pageNumber: 0, pageSize: 5, - publishStatus:'0' + // publishStatus:'0' }, selectedRows: [], listData: [], @@ -98,12 +98,18 @@ await this.getAll() }, props: { - resourcesId: { + publishStatus: { type: String, default: function () { - return '' + return '0' } - } + }, + maxSelection: { + type: Number, + default: function () { + return 20 + } + }, }, methods: { changzytype() { @@ -112,11 +118,11 @@ async getAll() { let list = [] if(this.zytype == '1') { - list = await getAlls({shopName: this.name,...this.pageindex}) + list = await getAlls({shopName: this.name,...this.pageindex,publishStatus:this.publishStatus}) } else if(this.zytype == '2') { - list = await map1({advertisingName: this.name,...this.pageindex}) + list = await map1({advertisingName: this.name,...this.pageindex,publishStatus:this.publishStatus}) } else if(this.zytype == '3') { - list = await changAlls({venueName: this.name,...this.pageindex}) + list = await changAlls({venueName: this.name,...this.pageindex,publishStatus:this.publishStatus}) } this.listData = list.data.content this.total = list.data.totalElements @@ -143,7 +149,15 @@ this.getAll() }, handleSelectionChange(selection) { - this.selectedRows = selection; + if (selection.length > this.maxSelection) { + this.$message.warning(`最多只能选择 ${this.maxSelection} 项`); + this.$refs.multipleTable.clearSelection(); + selection.slice(0, this.maxSelection).forEach(row => { + this.$refs.multipleTable.toggleRowSelection(row, true); + }); + } else { + this.selectedRows = selection; + } }, confirm() { diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js index ca65a83..ea452ea 100644 --- a/admin-web-master/src/main.js +++ b/admin-web-master/src/main.js @@ -39,9 +39,9 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd let host = window.location.host; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) { - Vue.prototype.$baseURL ='http://172.16.61.125/cdwlMall' - Vue.prototype.$fontBold = `http://172.16.61.125/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` - Vue.prototype.$fontRegular = `http://172.16.61.125/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` + Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall' + Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` + Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` } else { Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall` Vue.prototype.$fontBold = `${window.location.protocol}//${window.location.host}/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` diff --git a/admin-web-master/src/store/modules/app.js b/admin-web-master/src/store/modules/app.js index 79dcd69..88b0edd 100644 --- a/admin-web-master/src/store/modules/app.js +++ b/admin-web-master/src/store/modules/app.js @@ -17,7 +17,46 @@ const state = { { label: '郫都区', value: '郫都区' }, { label: '龙泉驿区', value: '龙泉驿区' }, { label: '温江区', value: '温江区' } -] +], +mobantype:[ + + { + label: '单行文本', + value: '单行文本' + }, + { + label: '单行数字文本', + value: '单行数字文本' + }, + { + label: '多行文本', + value: '多行文本' + }, + { + label: '下拉选择', + value: '下拉选择' + }, + { + label: '日期', + value: '日期' + }, + { + label: '付款日', + value: '付款日' + }, + // { + // label: '商家', + // value: '商家' + // }, + { + label: '附件', + value: '附件' + }, + // { + // label: '资源', + // value: '资源' + // } +], } const mutations = { diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue index 3ccc53c..20ad71b 100644 --- a/admin-web-master/src/views/shopRental/manage/index.vue +++ b/admin-web-master/src/views/shopRental/manage/index.vue @@ -280,7 +280,8 @@ message: '终止成功', type: 'success' }) - this.$emit('removeonaction', '1') + // this.$emit('removeonaction', '1') + this.getAll() } else { this.$message({ message: res.msg, diff --git a/admin-web-master/src/views/shopRental/template/index.vue b/admin-web-master/src/views/shopRental/template/index.vue index 378f63a..ef2864a 100644 --- a/admin-web-master/src/views/shopRental/template/index.vue +++ b/admin-web-master/src/views/shopRental/template/index.vue @@ -3,15 +3,15 @@
商铺租赁服务 > 合同管理
+ style="color:#000000e6">合同模版管理
- - + + @@ -32,65 +32,21 @@ - + - - - - - - - - - - - - - - - - - - - - + - + @@ -113,37 +69,20 @@
-
合同管理 > 合同模版管理 > 新增
-
- +
-
合同管理 > 合同模版管理 > 查看
-
- -
- -
-
-
-
合同管理 > {{contractChangeReason}}
-
-
- - +
@@ -153,11 +92,11 @@