diff --git a/admin-web-master/src/components/add/addyixiang.vue b/admin-web-master/src/components/add/addyixiang.vue
index c378eff..198cc29 100644
--- a/admin-web-master/src/components/add/addyixiang.vue
+++ b/admin-web-master/src/components/add/addyixiang.vue
@@ -390,7 +390,7 @@
无意向
-
@@ -410,8 +410,7 @@
-
确定
+
确定
返回
@@ -438,6 +437,7 @@
import allimg from '@/components/chakan/allimg.vue';
import newmap from "@/components/newmap/index";
import indexall from "@/components/newmap/indexall";
+ import { icManAdd} from '@/api/icManagement';
export default {
components: {
TitleWithCircle,
@@ -499,6 +499,18 @@
},
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}`;
+ },
minSev() {
console.error(this.info)
console.error(this.radio)
@@ -506,7 +518,7 @@
msgedit({
id: this.info.id,
'intentionStatus': this.radio,
- auditSuggestions: this.info.auditSuggestions
+ intentionReason: this.info.intentionReason
}).then(res => {
console.error(res)
if (res.code == 200) {
@@ -514,6 +526,31 @@
message: '处理成功',
type: 'success'
})
+ if(this.radio == '2'){
+ let c1 = {
+ leaseType: this.info.cereBasicInformationShop.id?'商铺':'场地', // 意向租赁类型
+ leaseCycle: this.info.entityName, // 主体名称
+ intentionReason: this.shopMsg.id, // 绑定商家
+ intentCustomerName: this.shopMsg.name, // 商家名
+ phone: this.shopMsg.phone, // 绑定商家电话
+ rentalRent: this.info.unifiedSocialCreditCode, // 统一社会信用代码
+ operationType: this.info.entityType, // 主体类型
+ intentionRegion: this.info.legalRepresentative, // 法定代表人
+ idCardNumber: this.info.businessScope, // 经营范围
+ idCardType: this.info.establishmentDate, // 成立日期
+ idCardValidStart: this.info.residence, // 住所
+ idCardValidEnd: this.info.emailAddress, // 邮箱地址
+ intentionTime: this.info.businessStartDate, // 经营开始时间
+ idCardPhotoBack: this.info.businessEndDate, // 经营结束时间
+ idCardPhotoFront: this.info.businessLicense, // 营业执照
+ createDate:this.updateCurrentTime(),
+ createUser:localStorage.getItem('roleName')
+ }
+ icManAdd(c1).then(res1 => {
+ console.error(res1)
+ })
+ }
+
this.info.intentionStatus = this.radio
} else {
this.$message({
diff --git a/admin-web-master/src/components/add/addyx.vue b/admin-web-master/src/components/add/addyx.vue
new file mode 100644
index 0000000..8a86e9f
--- /dev/null
+++ b/admin-web-master/src/components/add/addyx.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ changimg(e,'idCardPhotoFront')">
+
+
+
+
+
+ 确定
+ 取消
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-web-master/src/components/chakan/yx.vue b/admin-web-master/src/components/chakan/yx.vue
new file mode 100644
index 0000000..025bff0
--- /dev/null
+++ b/admin-web-master/src/components/chakan/yx.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.leaseCycle}}
+
+
+
+
+ {{info.rentalRent}}
+
+
+
+
+ {{info.operationType}}
+
+
+
+
+ {{info.intentionRegion}}
+
+
+
+
+ {{info.idCardNumber}}
+
+
+
+
+ {{info.idCardType}}
+
+
+
+
+ {{info.idCardValidStart}}
+
+
+
+
+ {{info.idCardValidEnd}}
+
+
+
+
+ {{info.intentionTime}} - {{info.idCardPhotoBack}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{shopMsg.name}}
+
+
+
+
+ {{shopMsg.phone}}
+
+
+
+
+
+
+ {{shopMsg.idCardType}}
+
+
+
+
+ {{shopMsg.idCardNumber}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同意
+ 拒绝
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.auditStatus=='2'?'已通过':info.auditStatus=='3'?'不通过':'无'}}
+
+
+ {{info.auditSuggestions || '无'}}
+
+
+
+
+
+ 确定
+ 返回
+
+
+
+
+
+
diff --git a/admin-web-master/src/views/customer/icManagement/index copy.vue b/admin-web-master/src/views/customer/icManagement/index copy.vue
new file mode 100644
index 0000000..a2637c9
--- /dev/null
+++ b/admin-web-master/src/views/customer/icManagement/index copy.vue
@@ -0,0 +1,964 @@
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
商户寻租管理 > {{edit?'新增':'编辑'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ changimg(e,'idCardPhotoFront')" :limit="1" >
+
+
+
+
+
+
+
+ changimg(e,'idCardPhotoBack')" :limit="1" >
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{secondData.leaseType}}
+
+
+
+
+
+ {{secondData.leaseCycle}}
+
+
+
+
+
+
+
+ {{secondData.rentalRent}}
+
+
+
+
+
+ {{secondData.operationType}}
+
+
+
+
+
+
+
+ {{secondData.intentionRegion}}
+
+
+
+
+
+
+
+
+ {{secondData.intentCustomerName}}
+
+
+
+
+ {{secondData.phone}}
+
+
+
+
+
+
+ {{secondData.idCardNumber}}
+
+
+
+
+ {{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index a2637c9..48bb809 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -1,20 +1,23 @@
-
+
+
-
-
新增
+
+ 新增
+
-
-
+
+
+
- {{scope.$index+1}}
+ {{scope.$index +1 }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
- 查看
-
-
- 编辑
-
-
- 删除
-
+ 查看
+ 编辑
+ 删除
-
+
-
-
-
-
商户寻租管理 > {{edit?'新增':'编辑'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- changimg(e,'idCardPhotoFront')" :limit="1" >
-
-
-
-
-
-
- changimg(e,'idCardPhotoBack')" :limit="1" >
-
-
-
-
-
-
-
- 确 定
- 取 消
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{secondData.leaseType}}
-
-
-
-
-
- {{secondData.leaseCycle}}
-
-
-
-
-
-
-
- {{secondData.rentalRent}}
-
-
-
-
-
- {{secondData.operationType}}
-
-
-
-
-
-
-
- {{secondData.intentionRegion}}
-
-
+
+
+
-
-
-
-
-
- {{secondData.intentCustomerName}}
-
-
-
-
- {{secondData.phone}}
-
-
-
-
-
-
- {{secondData.idCardNumber}}
-
-
-
-
- {{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
-
-
-
-
-
-
-
diff --git a/admin-web-master/src/views/customer/icReview/index.vue b/admin-web-master/src/views/customer/icReview/index.vue
index b1164f6..3517330 100644
--- a/admin-web-master/src/views/customer/icReview/index.vue
+++ b/admin-web-master/src/views/customer/icReview/index.vue
@@ -77,14 +77,15 @@
- {{scope.row.intentionStatus ==''?'待审核':scope.row.intentionStatus =='2'?'有意向':scope.row.intentionStatus =='3'?'无意向':''}}
+ {{scope.row.intentionStatus ==''?'待处理':scope.row.intentionStatus =='2'?'有意向':scope.row.intentionStatus =='3'?'无意向':''}}
查看
- 审核
+
+ 审核
@@ -255,8 +256,8 @@
},
async getAll() {
const res = await GetAll(this.pagequery)
- this.tableData = res.data.content
- this.total = res.data.totalElements
+ this.tableData = res.data.records
+ this.total = res.data.total
},
removeonaction(e) {
console.error(e)
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 2d3c373..8602212 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -275,8 +275,8 @@
},
async getAll() {
const res = await GetAll(this.pagequery)
- this.tableData = res.data.content
- this.total = res.data.totalElements
+ this.tableData = res.data.records
+ this.total = res.data.total
},
removeonaction(e) {
console.error(e)