@@ -250,6 +250,9 @@
import {
cereContractInformation
} from '@/api/commodityLease.js'
+ import {
+ cerePlatformMerchant
+ } from '@/api/newly.js'
export default {
components: {
upimg
@@ -390,12 +393,9 @@
}],
},
shopfrom: {
- shopName: '', // 店铺名称
- shopCode: '', // 店铺编码
- chargePersonName: '', // 店铺负责人
- contractState: '1', // 合同状态 1-有效 0-无效
- page: '1', // 当前页
- pageSize: '1000' // 每页记录数
+ checkState:'2',
+ pageNumber: 0,
+ pageSize: 1000,
},
pageindex: {
pageNumber: 1,
@@ -414,8 +414,8 @@
},
},
created() {
- businessListGetAll(this.shopfrom).then(res => {
- this.shopList = res.data.list
+ cerePlatformMerchant(this.shopfrom).then(res => {
+ this.shopList = res.data.content
console.error(this.shopList)
})
},
@@ -480,7 +480,13 @@
relatedMerchants: this.shopId,
contractChangeReason: this.contractChangeReason,
dataStatus: dataStatus,
- originalContractCode: this.info.contractNumber
+ originalContractCode: this.info.contractNumber,
+
+ relatedMerchants: this.info.relatedMerchants,
+ tenantName: this.info.tenantName,
+ tenantTelephone: this.info.tenantTelephone,
+ shopNumber: this.info.shopNumber,
+
})
// return
if (valid) {
@@ -495,7 +501,11 @@
updateDate: this.gettime(),
createDate: this.gettime(),
contractChangeTime: this.gettime(),
- updateUser:localStorage.getItem('roleName')
+ updateUser:localStorage.getItem('roleName'),
+ relatedMerchants: this.info.relatedMerchants,
+ tenantName: this.info.tenantName,
+ tenantTelephone: this.info.tenantTelephone,
+ shopNumber: this.info.shopNumber,
}).then(res => {
console.error(res)
if (res.code == 200) {
@@ -598,9 +608,9 @@
},
changeRelatedMerchants(e) {
console.error(e)
- this.shopId = this.shopList[e].shopId
- this.formInline.tenantName = this.shopList[e].chargePersonName
- this.formInline.tenantTelephone = this.shopList[e].shopPhone
+ this.shopId = this.shopList[e].id
+ this.formInline.tenantName = this.shopList[e].name
+ this.formInline.tenantTelephone = this.shopList[e].phone
},
hefuRemove() {
this.hefuData = []
diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue
index cee3c12..94c31ca 100644
--- a/admin-web-master/src/components/add/addss.vue
+++ b/admin-web-master/src/components/add/addss.vue
@@ -19,7 +19,7 @@
-
+
@@ -192,27 +192,43 @@
})
},
methods: {
+ //获取当前时间
+ updateCurrentTime() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = (now.getMonth() + 1).toString().padStart(2, '0');
+ const day = now.getDate().toString().padStart(2, '0');
+ const hours = now.getHours().toString().padStart(2, '0');
+ const minutes = now.getMinutes().toString().padStart(2, '0');
+ const seconds = now.getSeconds().toString().padStart(2, '0');
+
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
add() {
- console.log({...this.formInline})
+ console.log({
+ ...this.formInline
+ })
this.$refs.heForm.validate((valid) => {
if (valid) {
-
- // cerePlatformMerchantadd({
- // ...this.formInline,
- // }).then(res => {
- // if (res.code == 200) {
- // this.$message({
- // message: '添加成功',
- // type: 'success'
- // })
- // this.$emit('removeonaction', '1')
- // } else {
- // this.$message({
- // message: res.msg,
- // type: 'error'
- // })
- // }
- // })
+
+ cerePlatformMerchantadd({
+ ...this.formInline,
+ checkState: '2',
+ applyTime: this.updateCurrentTime()
+ }).then(res => {
+ if (res.code == 200) {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.$emit('removeonaction', '1')
+ } else {
+ this.$message({
+ message: res.msg,
+ type: 'error'
+ })
+ }
+ })
} else {
this.$message({
message: '请填写完整信息',
@@ -257,7 +273,7 @@
this.formInline.tenantTelephone = this.shopList[e].shopPhone
},
hefuRemove(e) {
- this.formInline[e] = ''
+ // this.formInline[e] = ''
},
hefuSuccess(response, e) {
console.error(response)
@@ -267,6 +283,7 @@
fd.append('file', response.raw)
fd.append('filePath', 'yh')
miniioupload(fd).then(res => {
+ console.error(res)
this.formInline[e] = res.data
})
}
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index b5c2751..2371d1e 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -135,22 +135,39 @@
-
-
- {{shop.shopName}}
+
+
+ {{shop.name}}
+
+
+
+
+ {{shop.phone}}
-
-
- {{shop.shopPhone}}
+
+
+
+
+ {{shop.idCardType}}
-
-
- {{shop.shopAdress}}
+
+
+ {{shop.idCardNumber}}
+
+
+
+
+
+
+
+
+
+
+
确定
返回
@@ -486,6 +499,10 @@
} from '../../api/business.js'
import TitleWithCircle from '@/components/top/index';
import MapXian from "@/components/MapContainer/MapXian";
+ import {
+ msgedit,
+
+ } from '@/api/cereBusinessInfo'
export default {
components: {
TitleWithCircle,
@@ -501,6 +518,7 @@
},
data() {
return {
+ radio:'2',
ontype:'线上广告位',
url:'',
type:'1',
@@ -526,6 +544,26 @@
},
methods: {
+ minSev(){
+ console.error(this.info)
+ console.error(this.radio)
+
+ msgedit({id:this.info.id,'auditStatus':this.radio,reviewComments:this.info.reviewComments}).then(res => {
+ console.error(res)
+ if (res.code == 200) {
+ this.$message({
+ message: '处理成功',
+ type: 'success'
+ })
+ this.info.auditStatus= this.radio
+ } else {
+ this.$message({
+ message: '处理失败',
+ type: 'error'
+ })
+ }
+ })
+ },
openfile(e) {
if (e) {
const fullUrl = this.url + e;
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
new file mode 100644
index 0000000..cbca4c9
--- /dev/null
+++ b/admin-web-master/src/components/change/cl.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.isrental == '0' ? '否' : '是' }}
+
+
+
+
+ {{ scope.row.isSelfOperated == '0' ? '否' : '是' }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index 6a22b51..7f28536 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -33,12 +33,12 @@
-
+
-
+
@@ -56,7 +56,7 @@