diff --git a/admin-web-master/src/views/customer/rsaManagement/genjin.vue b/admin-web-master/src/views/customer/rsaManagement/genjin.vue index d30b962..1a876d3 100644 --- a/admin-web-master/src/views/customer/rsaManagement/genjin.vue +++ b/admin-web-master/src/views/customer/rsaManagement/genjin.vue @@ -1,270 +1,248 @@ @@ -498,10 +497,12 @@ ::v-deep .el-calendar button-group { display: none; } + .zhuti { padding: 0 20px 20px 20px; - min-height: calc(100vh - 50px - 20px); + min-height: calc(100vh - 50px - 20px); background-color: #fff; + box-sizing: border-box; } .formSearch { @@ -512,7 +513,16 @@ justify-content: space-between; } -::v-deep .el-calendar-table:not(.is-range)td.next{display: none;} -::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;} -::v-deep .el-calendar__button-group {display: none;} + + ::v-deep .el-calendar-table:not(.is-range)td.next { + display: none; + } + + ::v-deep .el-calendar-table:not(.is-range)td.prev { + visibility: hidden; + } + + ::v-deep .el-calendar__button-group { + display: none; + } diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue index 8165f68..ab8f47b 100644 --- a/admin-web-master/src/views/customer/rsaManagement/index.vue +++ b/admin-web-master/src/views/customer/rsaManagement/index.vue @@ -46,7 +46,7 @@ {{scope.$index+1}} - + @@ -58,23 +58,23 @@
查看
-
+
编辑
删除
- -
+
跟进日志
-
+
谈判日志
+
+
共 {{total}} 项数据
+ +
@@ -179,225 +186,228 @@
-
-
商户寻租管理 > 查看
-
- -
- -
- - - - - - - -
{{secondData.leaseType}}
- - - - - -
{{secondData.leaseCycle}}
- - - - - - - -
{{secondData.rentalRent}}
- - - - - -
{{secondData.operationType}}
- - - - - - - -
{{secondData.intentionRegion}}
- - - - - - - - -
{{secondData.intentCustomerName}}
- - - - -
{{secondData.phone}}
- - - - - - -
{{secondData.idCardNumber}}
- - - - -
{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}
- - - - - - -
- -
- - - - - - - - -
- -
- - - - - - -
-
- - -
- 取消 -
+
+
商户寻租管理 > 查看
+
- - +
+ +
+ + + + + + + +
{{secondData.leaseType}}
+ + + + + +
{{secondData.leaseCycle}}
+ + + + + + + +
{{secondData.rentalRent}}
+ + + + + +
{{secondData.operationType}}
+ + + + + + + +
{{secondData.intentionRegion}}
+ + + + + + + + +
{{secondData.intentCustomerName}}
+ + + + +
{{secondData.phone}}
+ + + + + + +
{{secondData.idCardNumber}}
+ + + + +
{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}
+ + + + + + +
+ +
+ + + + + + + + +
+ +
+ + + + + +
- -
-
-
商户寻租管理 > {{edit?'新增':'编辑'}}
+
+ + +
+ 取消
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 确 定 - 取 消 -
- - - - + + +
+ +
+
+
商户寻租管理 > {{edit?'新增':'编辑'}}
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 + 消 + +
+ + + + - -
-
+
- - +
+
+ +
@@ -454,26 +464,26 @@ stepNum: 0, // 切换 formSel: { intentCustomerName: '', - leaseType:'', + leaseType: '', pageNumber: 0, pageSize: 10, }, ruleForm: { - intentCustomerName:'', //意向客户名称 - leaseType:'',//租赁类型 - leaseCycle:'',//租赁周期 - rentalRent:null,//意向租金 - operationType:'',//经营类型 - intentionRegion:'',//意向区域 - idCardNumber:'',//身份证号 - idCardType:'',//证件类型 - phone:null,//手机号 - idTime:[], - idCardValidStart:'',//身份证有效开始时间 - idCardValidEnd:'',//身份证有效结束时间 - idCardPhotoFront:'',//身份证照片(正面) - idCardPhotoBack:'',//身份证照片(反面) - source:0 + intentCustomerName: '', //意向客户名称 + leaseType: '', //租赁类型 + leaseCycle: '', //租赁周期 + rentalRent: null, //意向租金 + operationType: '', //经营类型 + intentionRegion: '', //意向区域 + idCardNumber: '', //身份证号 + idCardType: '', //证件类型 + phone: null, //手机号 + idTime: [], + idCardValidStart: '', //身份证有效开始时间 + idCardValidEnd: '', //身份证有效结束时间 + idCardPhotoFront: '', //身份证照片(正面) + idCardPhotoBack: '', //身份证照片(反面) + source: 0 }, secondData: {}, @@ -544,11 +554,11 @@ required: true, message: '请输入手机号', trigger: 'blur' - },{ + }, { pattern: /^[0-9]+$/, message: '手机号只能包含数字', - trigger: 'blur' , - }], + trigger: 'blur', + }], idCardValidStart: [{ required: true, message: '请选择身份证有效时间', @@ -565,9 +575,9 @@ trigger: 'change' }, ], }, - genjinId:'', - genjinShow:false, - tanpanShow:false, + genjinId: '', + genjinShow: false, + tanpanShow: false, } }, @@ -582,13 +592,20 @@ // }, methods: { getCoordinateRules(coord) { - return [ - { required: true, message: `意向租金不能为空且必须是数字`, trigger: 'blur'}, - { pattern: /^(\d+|\d*\.\d{1,10})$/, message: `意向租金为整数或最多三位小数,`, trigger: 'blur' }, + return [{ + required: true, + message: `意向租金不能为空且必须是数字`, + trigger: 'blur' + }, + { + pattern: /^(\d+|\d*\.\d{1,10})$/, + message: `意向租金为整数或最多三位小数,`, + trigger: 'blur' + }, ] }, - changimg(e,type) { + changimg(e, type) { this.ruleForm[type] = e }, // 获取当前时间 @@ -634,10 +651,10 @@ this.ruleForm.idTime = [] this.ruleForm.idTime[0] = item.idCardValidStart this.ruleForm.idTime[1] = item.idCardValidEnd - if(this.edit){ - this.edit =false - } - this.ggXin = true + if (this.edit) { + this.edit = false + } + this.ggXin = true }, async chehui(item) { await rsaManEdit({ @@ -663,70 +680,70 @@ // 新增 addbuss() { this.ruleForm = { - intentCustomerName:'', //意向客户名称 - leaseType:'',//租赁类型 - leaseCycle:'',//租赁周期 - rentalRent:null,//意向租金 - operationType:'',//经营类型 - intentionRegion:'',//意向区域 - idCardNumber:'',//身份证号 - idCardType:'',//证件类型 - phone:null,//手机号 - idTime:[], - idCardValidStart:'',//身份证有效开始时间 - idCardValidEnd:'',//身份证有效结束时间 - idCardPhotoFront:'',//身份证照片(正面) - idCardPhotoBack:'',//身份证照片(反面) - source:0 + intentCustomerName: '', //意向客户名称 + leaseType: '', //租赁类型 + leaseCycle: '', //租赁周期 + rentalRent: null, //意向租金 + operationType: '', //经营类型 + intentionRegion: '', //意向区域 + idCardNumber: '', //身份证号 + idCardType: '', //证件类型 + phone: null, //手机号 + idTime: [], + idCardValidStart: '', //身份证有效开始时间 + idCardValidEnd: '', //身份证有效结束时间 + idCardPhotoFront: '', //身份证照片(正面) + idCardPhotoBack: '', //身份证照片(反面) + source: 0 } -this.edit = true + this.edit = true this.ggXin = true this.getAll(); }, - idCardchange(e){ + idCardchange(e) { - this.ruleForm.idCardValidStart = e[0] - this.ruleForm.idCardValidEnd = e[1] + this.ruleForm.idCardValidStart = e[0] + this.ruleForm.idCardValidEnd = e[1] }, // 新增确定 - addCheck() { - - this.$refs.AddFromOne.validate((valid) => { - if (valid) { - if(this.edit){ - rsaManAdd(this.ruleForm).then(res => { - icManAdd(this.ruleForm).then(res=>{ - this.$message({ - message: '保存成功', - type: 'success' - }) - this.getAll(); - this.ggXin = false - this.$refs.AddFrom.resetFields() - }) - - }) - }else{ - rsaManEdit(this.ruleForm).then(res => { - this.$message({ - message: '修改成功', - type: 'success' - }) - this.getAll(); - this.ggXin = false - this.$refs.AddFrom.resetFields() - }) - } + addCheck() { + + this.$refs.AddFromOne.validate((valid) => { + if (valid) { + if (this.edit) { + rsaManAdd(this.ruleForm).then(res => { + icManAdd(this.ruleForm).then(res => { + this.$message({ + message: '保存成功', + type: 'success' + }) + this.getAll(); + this.ggXin = false + this.$refs.AddFrom.resetFields() + }) + }) } else { - this.$message({ - message: '请填写完整信息', - type: 'error' + rsaManEdit(this.ruleForm).then(res => { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.getAll(); + this.ggXin = false + this.$refs.AddFrom.resetFields() }) - } - }) + + } else { + this.$message({ + message: '请填写完整信息', + type: 'error' + }) + + } + }) }, handleCurrentChange(val) { this.currentPage = val; @@ -737,7 +754,7 @@ this.edit = true // 取消 closeFn(val) { this.getAll() - this.ggXin = false; + this.ggXin = false; }, //删除管理列表 @@ -784,17 +801,17 @@ this.edit = true resetting() { this.formSel = { intentCustomerName: '', - leaseType:'', + leaseType: '', pageNumber: 0, pageSize: 10, } - this.currentPage =1 + this.currentPage = 1 this.getAll() }, // 查询 async onSubmit() { const res = await rsaManAll(this.formSel) - this.currentPage =1 + this.currentPage = 1 this.tableData = res.data.content this.total = res.data.content.length }, @@ -813,8 +830,8 @@ this.edit = true this.pipData = [] }, shengRenwu(item) { - this.genjinId = item.id - this.genjinShow = true + this.genjinId = item.id + this.genjinShow = true // genAdd({ // potentialCustomer: item.id, // status: '1' @@ -826,7 +843,7 @@ this.edit = true // }) }, - tanRenwu(item){ + tanRenwu(item) { this.genjinId = item.id this.tanpanShow = true }, @@ -857,384 +874,63 @@ this.edit = true }, this.pipData = [] }, - cancel(e){ + cancel(e) { this.genjinShow = e this.getAll() }, - tancel(e){ + tancel(e) { this.tanpanShow = e this.getAll() }, } } - diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue index 4c29439..94f5bb6 100644 --- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue +++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue @@ -1,153 +1,179 @@ @@ -364,6 +396,7 @@ ::v-deep .el-calendar button-group { display: none; } + .zhuti { padding: 0 20px 20px 20px; min-height: calc(100vh - 50px - 20px); @@ -378,12 +411,29 @@ justify-content: space-between; } + .greens { color: #3F9B6A; } -::v-deep .el-calendar-table:not(.is-range)td.next{display: none;} -::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;} -::v-deep .el-calendar__button-group {display: none;} -::v-deep .el-backtop, .el-calendar-table td.is-today{color: #3F9B6A;} -::v-deep .el-calendar-table .el-calendar-day {min-height:85px;} + + ::v-deep .el-calendar-table:not(.is-range)td.next { + display: none; + } + + ::v-deep .el-calendar-table:not(.is-range)td.prev { + visibility: hidden; + } + + ::v-deep .el-calendar__button-group { + display: none; + } + + ::v-deep .el-backtop, + .el-calendar-table td.is-today { + color: #3F9B6A; + } + + ::v-deep .el-calendar-table .el-calendar-day { + min-height: 85px; + } diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue index 57163e3..84199a7 100644 --- a/admin-web-master/src/views/detect/examine/index.vue +++ b/admin-web-master/src/views/detect/examine/index.vue @@ -71,11 +71,11 @@ {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }} - + - + - +