-
{{ item.text }}
-
- {{ total(item.tag) }}
- {{ item.unit }}
-
+
+
+
+
{{ item.text }}
+
+ 土地
+ {{ total(item.tag)[0] }}
+ {{ item.unit }}
+ ，房产
+ {{ total(item.tag)[1] }}
+ {{ item.unit }}
+
+
+
-
+
+
+
+
+
{{ item.text }}
+
+ {{ total(item.tag) }}
+ {{ item.unit }}
+
+
+
-
@@ -44,7 +70,7 @@ export default {
text: "资产总量",
num: 36650,
tag: "total",
- unit: "平方",
+ unit: "处",
icon: "zichan"
},
{
@@ -55,10 +81,10 @@ export default {
icon: "tudi"
},
{
- text: "汇总数据",
+ text: "房产资产",
num: 8888,
- unit: "",
- tag: "static",
+ unit: "平方米",
+ tag: "house",
icon: "fangwu"
}
]
@@ -72,14 +98,13 @@ export default {
const [houses,lands] = this.$store.state.bigdata.assets
switch (tag) {
case "total":
- total += houses.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0)
- total += lands.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0)
- return total.toFixed(2);
+ return [lands.length,houses.length];
case "land":
- total += lands.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0)
+ total += lands.reduce((a,b) => a + parseFloat(b.shijimianji ?? 0),0)
+ return total.toFixed(2);
+ case "house":
+ total += houses.reduce((a,b) => a + parseFloat(b.shijimianji ?? 0),0)
return total.toFixed(2);
- case "static":
- return `土地 ${lands.length}处，房产 ${houses.length}处`;
default:
return total.toFixed(2);
}
diff --git a/src/views/lease/component/addLease.vue b/src/views/lease/component/addLease.vue
index 5e8bc5e..fc502f2 100644
--- a/src/views/lease/component/addLease.vue
+++ b/src/views/lease/component/addLease.vue
@@ -602,13 +602,13 @@ export default {
diff --git a/src/views/lease/leaseLogDetail.vue b/src/views/lease/leaseLogDetail.vue
index 13ea9e8..c6f6c0b 100644
--- a/src/views/lease/leaseLogDetail.vue
+++ b/src/views/lease/leaseLogDetail.vue
@@ -609,13 +609,13 @@ export default {
height: 49px;
}
.uploaded-a {
- color: red;
+ color: $primaryColor;
text-decoration: none;
transition: all 0.2s;
}
.uploaded-a:hover {
- color: red;
+ color: $primaryColor;
text-decoration: underline;
}
diff --git a/src/views/lease/let.vue b/src/views/lease/let.vue
index 04d8ca8..405a24a 100644
--- a/src/views/lease/let.vue
+++ b/src/views/lease/let.vue
@@ -671,13 +671,13 @@ export default {
}
a {
- color: red;
+ color: $primaryColor;
text-decoration: none;
transition: all 0.2s;
}
a:hover {
- color: red;
+ color: $primaryColor;
text-decoration: underline;
}
diff --git a/src/views/lease/sign.vue b/src/views/lease/sign.vue
index 993b0dd..7609a43 100644
--- a/src/views/lease/sign.vue
+++ b/src/views/lease/sign.vue
@@ -37,6 +37,10 @@ export default {
{
show: this.type !== 'change',
key: "file"
+ },
+ {
+ show: this.type === 'change',
+ key: "buchongwenjian"
}
],
{
@@ -60,7 +64,7 @@ export default {
valueFormat: "yyyy-MM",
}
}),
- },
+ }
],
{
disabled: true,
@@ -71,6 +75,16 @@ export default {
return (
+
+ {
+ let title = new Map([
+ ["add", "签订合同"],
+ ["editor", "修改合同"],
+ ["change", "合同变更"],
+ ]);
+ return title.get(this.type);
+ })()} on={{['back']: _ => {this.$router.go(-1)}}}>
+
-
{
- this.$router.go(-1);
- },
- }}
- >
合同变更-原数据
))}
-
-
- );
- },
- },
- ]}
- > */}
{oldDialog.render()}
@@ -361,15 +239,6 @@ export default {
>
-
{
- this.$router.go(-1);
- },
- }}
- >
{(() => {
let title = new Map([
@@ -616,133 +485,6 @@ export default {
))}
-
-
- );
- },
- },
- ]}
- > */}
{dialog.render()}
@@ -750,6 +492,147 @@ export default {
+ {
+ /*
+ 历史变更
+ */
+ }
+
+ {
+ this.logLeases?.map(item => (
+
+
+
+ { item.biangengshijian } 变更
+
+
+
+
+
+ {item.id_hislease_plans_hislease_id_relation?.map((leasePlan, index) => (
+
+
+
+ 租金收取计划{index + 1}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+ {
+ new CreateDialog(this,
+ [
+ {
+ show: true,
+ key: "qiandingnianyue",
+ label: "签订年月",
+ render: h("el-date-picker", {
+ style: { width: "100%" },
+ props: {
+ disable: true,
+ type: "month",
+ placeholder: "请选择签订年月",
+ value: _this.form.qiandingnianyue,
+ format: "yyyy-MM",
+ valueFormat: "yyyy-MM",
+ }
+ }),
+ }
+ ],
+ {
+ fromFile: item._file,
+ fromData: item,
+ disabled: true
+ },
+ false).render()
+ }
+
+
+ ))
+ }
+
+
{
+ item._file = {};
+ this.formInfo.forEach((i) => {
+ if (i.edit_input === "file") {
+ }
+ if (i.edit_input === "files") {
+ item._file[i.field] = res[`${i.field}_upload_details`];
+ }
+ });
+ })
+ this.logLeases = hisLease.data;
}
this.originalForm = deepCopy(res);
this.originalFile = deepCopy(this.file);
@@ -1569,13 +1478,13 @@ export default {
height: 49px;
}
.uploaded-a {
- color: red;
+ color: $primaryColor;
text-decoration: none;
transition: all 0.2s;
}
.uploaded-a:hover {
- color: red;
+ color: $primaryColor;
text-decoration: underline;
}
diff --git a/src/views/operate/component/addFile.vue b/src/views/operate/component/addFile.vue
index e6ff64c..ecbeba7 100644
--- a/src/views/operate/component/addFile.vue
+++ b/src/views/operate/component/addFile.vue
@@ -260,13 +260,13 @@ export default {
diff --git a/src/views/operate/menu.vue b/src/views/operate/menu.vue
index cfed0e5..2416ae1 100644
--- a/src/views/operate/menu.vue
+++ b/src/views/operate/menu.vue
@@ -579,13 +579,13 @@ export default {
}
a {
- color: red;
+ color: $primaryColor;
text-decoration: none;
transition: all 0.2s;
}
a:hover {
- color: red;
+ color: $primaryColor;
text-decoration: underline;
}
diff --git a/src/views/safety/component/addSafetyPlan.vue b/src/views/safety/component/addSafetyPlan.vue
index 10913a2..e4d4cc7 100644
--- a/src/views/safety/component/addSafetyPlan.vue
+++ b/src/views/safety/component/addSafetyPlan.vue
@@ -238,13 +238,13 @@ export default {
diff --git a/src/views/system/components/formEditor.vue b/src/views/system/components/formEditor.vue
index 50e3610..d358340 100644
--- a/src/views/system/components/formEditor.vue
+++ b/src/views/system/components/formEditor.vue
@@ -138,7 +138,7 @@ export default {
dialogVisible: false,
types: [], //输入类型
- rules: [],
+ rules: {},
};
},
methods: {
diff --git a/src/views/system/components/formSlotRender.vue b/src/views/system/components/formSlotRender.vue
index b55e97f..cc45e6e 100644
--- a/src/views/system/components/formSlotRender.vue
+++ b/src/views/system/components/formSlotRender.vue
@@ -24,15 +24,15 @@ export default {
type: 'primary'
}
}, '选取文件'),
- h('el-button',{
- style: {
- 'margin-left': '10px'
- },
- props: {
- size: 'small',
- type: 'success'
- }
- }, '上传到服务器'),
+ // h('el-button',{
+ // style: {
+ // 'margin-left': '10px'
+ // },
+ // props: {
+ // size: 'small',
+ // type: 'success'
+ // }
+ // }, '上传到服务器'),
h('div',{
class: 'el-upload__tip',
slot: 'tip'