Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5f8c1bc9 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 6d92b7a2 6ea2c27b
Inline Side-by-side
Showing 8 changed files with 65 additions and 19 deletions
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-04 11:13:36
*/
const state = {
yjsqOptions: "",
yjsqOptions: {},
}
const mutations = {
......
......@@ -64,7 +64,7 @@ export default {
watch: {
yjsqOptions: {
handler(val) {
this.add(val);
this.add(val.opinion);
},
deep: true,
immediate: true,
......
......@@ -102,7 +102,7 @@ export default {
this.add("");
this.monitor=false
}else{
this.add(val);
this.add(val.opinion);
}
},
deep: true,
......
......@@ -142,7 +142,7 @@
this.defaultNode = getNode(
this.formData.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
this.formData.bdcdylx || ""
res.result.bdcdylx|| ""
);
this.sfqdata[0].children.forEach((item, index) => {
if (item.id == this.defaultNode.id) {
......@@ -229,7 +229,6 @@
* @author: renchao
*/
loadComponent (form) {
console.log(form, 'form');
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
......
......@@ -40,6 +40,7 @@
.xxTable {
//border-spacing: 1px;
width: 100%;
border-collapse: collapse;
// table-layout: fixed;
tr {
......@@ -59,12 +60,34 @@
top: 0px;
z-index: 3;
margin-top: -2px;
&:after{
content: "";
display: inline-block;
width: 100%;
height: 2px;
background-color: rgb(227, 226, 226);
position: absolute;
bottom: -1px;
left: 0;
z-index: 3;
}
}
tr:nth-child(2) {
position: sticky;
top: 40px;
z-index: 3;
&:after{
content: "";
display: inline-block;
width: 100%;
height: 2px;
background-color: rgb(227, 226, 226);
position: absolute;
bottom: -1px;
left: 0;
z-index: 3;
}
}
tr:nth-child(3) {
......@@ -79,6 +102,28 @@
left: 0;
z-index: 2;
margin-left: -2px;
&:before{
content: "";
display: inline-block;
width: 2px;
height: 43px;
background-color: #e3e2e2;
position: absolute;
top: 0;
left: -2px;
z-index: 3;
}
&:after{
content: "";
display: inline-block;
width: 2px;
height: 43px;
background-color: #e3e2e2;
position: absolute;
top: 0;
right: -2px;
z-index: 3;
}
}
th.linshi,
......@@ -166,27 +211,27 @@
tr {
display: flex;
// display: flex;
}
tr td {
border: 1px solid rgb(227, 226, 226);
border: 2px solid rgb(227, 226, 226);
text-align: center;
height: 40px;
font-size: 13px;
width: 140px;
flex: 1;
// flex: 1;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
min-width: 360px;
// display: flex;
// align-items: center;
// justify-content: center;
min-width: 340px;
z-index: 1;
}
td:first-child{
flex: inherit !important;
width: 200px !important;
min-width: auto !important;
// width: 200px !important;
min-width: 180px !important;
}
>tr:nth-child(odd) td {
background: #f2f2f2;
......
......@@ -144,7 +144,7 @@
* @author: renchao
*/
useCommonOpinion (item) {
store.dispatch('workflow/setOptions', item.opinion);
store.dispatch('workflow/setOptions', item);
this.$popupCacel()
},
//删除常用意见
......
......@@ -93,7 +93,7 @@ export default {
watch: {
yjsqOptions: {
handler(val) {
this.add(val);
this.add(val.opinion);
},
deep: true,
immediate: true,
......
......@@ -107,12 +107,12 @@
<el-row :gutter="10" v-if="ruleForm.fdcq1">
<el-col :span="8">
<el-form-item label="独用土地面积：">
<el-input v-model="ruleForm.fdcq1.dytdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.dytdmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊土地面积：">
<el-input v-model="ruleForm.fdcq1.fttdmj"></el-input>
<el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.fttdmj"></el-input>
</el-form-item>
</el-col>
......@@ -120,11 +120,12 @@
<el-form-item label="房地产交易价格：">
<div class="flex">
<el-input
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.fdcjyjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select v-model="ruleForm.fdcq1.jedw">
<el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......@@ -140,6 +141,7 @@
<el-col :span="24">
<el-form-item label="附记：">
<el-input
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.fj"
type="textarea"
maxlength="500"
......