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 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-04 11:13:36 4 * @LastEditTime: 2023-05-04 11:13:36
5 */ 5 */
6 const state = { 6 const state = {
7 yjsqOptions: "", 7 yjsqOptions: {},
8 } 8 }
9 9
10 const mutations = { 10 const mutations = {
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 watch: { 64 watch: {
65 yjsqOptions: { 65 yjsqOptions: {
66 handler(val) { 66 handler(val) {
67 this.add(val); 67 this.add(val.opinion);
68 }, 68 },
69 deep: true, 69 deep: true,
70 immediate: true, 70 immediate: true,
......
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
102 this.add(""); 102 this.add("");
103 this.monitor=false 103 this.monitor=false
104 }else{ 104 }else{
105 this.add(val); 105 this.add(val.opinion);
106 } 106 }
107 }, 107 },
108 deep: true, 108 deep: true,
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 this.defaultNode = getNode( 142 this.defaultNode = getNode(
143 this.formData.qllx, 143 this.formData.qllx,
144 { linShi: 0, xianShi: 0, liShi: 0 }, 144 { linShi: 0, xianShi: 0, liShi: 0 },
145 this.formData.bdcdylx || "" 145 res.result.bdcdylx|| ""
146 ); 146 );
147 this.sfqdata[0].children.forEach((item, index) => { 147 this.sfqdata[0].children.forEach((item, index) => {
148 if (item.id == this.defaultNode.id) { 148 if (item.id == this.defaultNode.id) {
...@@ -229,7 +229,6 @@ ...@@ -229,7 +229,6 @@
229 * @author: renchao 229 * @author: renchao
230 */ 230 */
231 loadComponent (form) { 231 loadComponent (form) {
232 console.log(form, 'form');
233 this.componentTag = (r) => 232 this.componentTag = (r) =>
234 require.ensure([], () => r(require("@/views/registerBook/" + form))); 233 require.ensure([], () => r(require("@/views/registerBook/" + form)));
235 }, 234 },
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
40 .xxTable { 40 .xxTable {
41 //border-spacing: 1px; 41 //border-spacing: 1px;
42 width: 100%; 42 width: 100%;
43 border-collapse: collapse;
43 // table-layout: fixed; 44 // table-layout: fixed;
44 45
45 tr { 46 tr {
...@@ -59,12 +60,34 @@ ...@@ -59,12 +60,34 @@
59 top: 0px; 60 top: 0px;
60 z-index: 3; 61 z-index: 3;
61 margin-top: -2px; 62 margin-top: -2px;
63 &:after{
64 content: "";
65 display: inline-block;
66 width: 100%;
67 height: 2px;
68 background-color: rgb(227, 226, 226);
69 position: absolute;
70 bottom: -1px;
71 left: 0;
72 z-index: 3;
73 }
62 } 74 }
63 75
64 tr:nth-child(2) { 76 tr:nth-child(2) {
65 position: sticky; 77 position: sticky;
66 top: 40px; 78 top: 40px;
67 z-index: 3; 79 z-index: 3;
80 &:after{
81 content: "";
82 display: inline-block;
83 width: 100%;
84 height: 2px;
85 background-color: rgb(227, 226, 226);
86 position: absolute;
87 bottom: -1px;
88 left: 0;
89 z-index: 3;
90 }
68 } 91 }
69 92
70 tr:nth-child(3) { 93 tr:nth-child(3) {
...@@ -79,6 +102,28 @@ ...@@ -79,6 +102,28 @@
79 left: 0; 102 left: 0;
80 z-index: 2; 103 z-index: 2;
81 margin-left: -2px; 104 margin-left: -2px;
105 &:before{
106 content: "";
107 display: inline-block;
108 width: 2px;
109 height: 43px;
110 background-color: #e3e2e2;
111 position: absolute;
112 top: 0;
113 left: -2px;
114 z-index: 3;
115 }
116 &:after{
117 content: "";
118 display: inline-block;
119 width: 2px;
120 height: 43px;
121 background-color: #e3e2e2;
122 position: absolute;
123 top: 0;
124 right: -2px;
125 z-index: 3;
126 }
82 } 127 }
83 128
84 th.linshi, 129 th.linshi,
...@@ -166,27 +211,27 @@ ...@@ -166,27 +211,27 @@
166 211
167 212
168 tr { 213 tr {
169 display: flex; 214 // display: flex;
170 } 215 }
171 216
172 tr td { 217 tr td {
173 border: 1px solid rgb(227, 226, 226); 218 border: 2px solid rgb(227, 226, 226);
174 text-align: center; 219 text-align: center;
175 height: 40px; 220 height: 40px;
176 font-size: 13px; 221 font-size: 13px;
177 width: 140px; 222 width: 140px;
178 flex: 1; 223 // flex: 1;
179 width: 100%; 224 width: 100%;
180 display: flex; 225 // display: flex;
181 align-items: center; 226 // align-items: center;
182 justify-content: center; 227 // justify-content: center;
183 min-width: 360px; 228 min-width: 340px;
184 z-index: 1; 229 z-index: 1;
185 } 230 }
186 td:first-child{ 231 td:first-child{
187 flex: inherit !important; 232 flex: inherit !important;
188 width: 200px !important; 233 // width: 200px !important;
189 min-width: auto !important; 234 min-width: 180px !important;
190 } 235 }
191 >tr:nth-child(odd) td { 236 >tr:nth-child(odd) td {
192 background: #f2f2f2; 237 background: #f2f2f2;
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 * @author: renchao 144 * @author: renchao
145 */ 145 */
146 useCommonOpinion (item) { 146 useCommonOpinion (item) {
147 store.dispatch('workflow/setOptions', item.opinion); 147 store.dispatch('workflow/setOptions', item);
148 this.$popupCacel() 148 this.$popupCacel()
149 }, 149 },
150 //删除常用意见 150 //删除常用意见
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
93 watch: { 93 watch: {
94 yjsqOptions: { 94 yjsqOptions: {
95 handler(val) { 95 handler(val) {
96 this.add(val); 96 this.add(val.opinion);
97 }, 97 },
98 deep: true, 98 deep: true,
99 immediate: true, 99 immediate: true,
......
...@@ -107,12 +107,12 @@ ...@@ -107,12 +107,12 @@
107 <el-row :gutter="10" v-if="ruleForm.fdcq1"> 107 <el-row :gutter="10" v-if="ruleForm.fdcq1">
108 <el-col :span="8"> 108 <el-col :span="8">
109 <el-form-item label="独用土地面积："> 109 <el-form-item label="独用土地面积：">
110 <el-input v-model="ruleForm.fdcq1.dytdmj"></el-input> 110 <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.dytdmj"></el-input>
111 </el-form-item> 111 </el-form-item>
112 </el-col> 112 </el-col>
113 <el-col :span="8"> 113 <el-col :span="8">
114 <el-form-item label="分摊土地面积："> 114 <el-form-item label="分摊土地面积：">
115 <el-input v-model="ruleForm.fdcq1.fttdmj"></el-input> 115 <el-input :disabled="!viewEdit" v-model="ruleForm.fdcq1.fttdmj"></el-input>
116 </el-form-item> 116 </el-form-item>
117 </el-col> 117 </el-col>
118 118
...@@ -120,11 +120,12 @@ ...@@ -120,11 +120,12 @@
120 <el-form-item label="房地产交易价格："> 120 <el-form-item label="房地产交易价格：">
121 <div class="flex"> 121 <div class="flex">
122 <el-input 122 <el-input
123 :disabled="!viewEdit"
123 v-model="ruleForm.fdcq1.fdcjyjg" 124 v-model="ruleForm.fdcq1.fdcjyjg"
124 style="width: 500%" 125 style="width: 500%"
125 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" 126 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
126 ></el-input> 127 ></el-input>
127 <el-select v-model="ruleForm.fdcq1.jedw"> 128 <el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
128 <el-option 129 <el-option
129 v-for="item in dictData['A57']" 130 v-for="item in dictData['A57']"
130 :key="item.dcode" 131 :key="item.dcode"
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
140 <el-col :span="24"> 141 <el-col :span="24">
141 <el-form-item label="附记："> 142 <el-form-item label="附记：">
142 <el-input 143 <el-input
144 :disabled="!viewEdit"
143 v-model="ruleForm.fdcq1.fj" 145 v-model="ruleForm.fdcq1.fj"
144 type="textarea" 146 type="textarea"
145 maxlength="500" 147 maxlength="500"
......