Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
2 changed files
with
55 additions
and
38 deletions
... | @@ -53,7 +53,7 @@ | ... | @@ -53,7 +53,7 @@ |
53 | </el-col> | 53 | </el-col> |
54 | </el-row> | 54 | </el-row> |
55 | <div class="slxx_title title-block"> | 55 | <div class="slxx_title title-block"> |
56 | 查封不动产列表 | 56 | 查封不动产列表({{ ruleForm.ztQlxxList.length }} 个) |
57 | <div class="triangle"></div> | 57 | <div class="triangle"></div> |
58 | </div> | 58 | </div> |
59 | <cfBdcdyTable :tableData="ruleForm.ztQlxxList" /> | 59 | <cfBdcdyTable :tableData="ruleForm.ztQlxxList" /> |
... | @@ -63,58 +63,65 @@ | ... | @@ -63,58 +63,65 @@ |
63 | </div> | 63 | </div> |
64 | <el-row :gutter="10"> | 64 | <el-row :gutter="10"> |
65 | <el-col :span="8"> | 65 | <el-col :span="8"> |
66 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:"> | 66 | <el-form-item :class="flag ? 'marginBot0' : ''" label="原告:"> |
67 | <el-input v-model="ruleForm.cfdjList[0].cfjg" :disabled="!ableOperation|| isJfOperation"></el-input> | 67 | <el-input v-model="ruleForm.cfdj.yg" :disabled="!ableOperation|| isJfOperation"></el-input> |
68 | </el-form-item> | 68 | </el-form-item> |
69 | </el-col> | 69 | </el-col> |
70 | <el-col :span="8"> | 70 | <el-col :span="8"> |
71 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:"> | 71 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:" > |
72 | <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input> | 72 | <el-input v-model="ruleForm.cfdj.cfwh" :disabled="!ableOperation|| isJfOperation"></el-input> |
73 | </el-form-item> | 73 | </el-form-item> |
74 | </el-col> | 74 | </el-col> |
75 | <el-col :span="8"> | 75 | <el-col :span="8"> |
76 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限:"> | 76 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:"> |
77 | <el-input v-model="ruleForm.cfdjList[0].cfqx" :disabled="!ableOperation|| isJfOperation"></el-input> | 77 | <el-input v-model="ruleForm.cfdj.cfjg" :disabled="!ableOperation|| isJfOperation"></el-input> |
78 | </el-form-item> | 78 | </el-form-item> |
79 | </el-col> | 79 | </el-col> |
80 | </el-row> | 80 | </el-row> |
81 | <el-row :gutter="10"> | 81 | <el-row :gutter="10"> |
82 | <el-col :span="8"> | ||
83 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限:"> | ||
84 | <el-input v-model="ruleForm.cfdj.cfqx" :disabled="!ableOperation|| isJfOperation"></el-input> | ||
85 | </el-form-item> | ||
86 | </el-col> | ||
82 | <el-col :span="8"> | 87 | <el-col :span="8"> |
83 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:"> | 88 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:"> |
84 | <el-date-picker v-model="ruleForm.cfdjList[0].cfqssj" class="width100" type="date" placeholder="选择日期" | 89 | <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期" |
85 | value-format="yyyy-MM-dd" :disabled="!ableOperation|| isJfOperation"></el-date-picker> | 90 | value-format="yyyy-MM-dd" :disabled="!ableOperation|| isJfOperation"></el-date-picker> |
86 | </el-form-item> | 91 | </el-form-item> |
87 | </el-col> | 92 | </el-col> |
88 | <el-col :span="8"> | 93 | <el-col :span="8"> |
89 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:"> | 94 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:"> |
90 | <el-date-picker v-model="ruleForm.cfdjList[0].cfjssj" class="width100" | 95 | <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" |
91 | :disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期" | 96 | :disabled="!ableOperation|| isJfOperation" type="date" placeholder="选择日期" |
92 | value-format="yyyy-MM-dd"></el-date-picker> | 97 | value-format="yyyy-MM-dd"></el-date-picker> |
93 | </el-form-item> | 98 | </el-form-item> |
94 | </el-col> | 99 | </el-col> |
95 | <el-col :span="8"> | 100 | </el-row> |
101 | <el-row :gutter="10"> | ||
102 | <el-col :span="8"> | ||
96 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:"> | 103 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:"> |
97 | <el-input v-model="ruleForm.cfdjList[0].cfwj" :disabled="!ableOperation|| isJfOperation"></el-input> | 104 | <el-input v-model="ruleForm.cfdj.cfwj" :disabled="!ableOperation|| isJfOperation"></el-input> |
98 | </el-form-item> | 105 | </el-form-item> |
99 | </el-col> | 106 | </el-col> |
100 | </el-row> | 107 | <el-col :span="16"> |
101 | <el-row :gutter="10"> | ||
102 | <el-col :span="8"> | ||
103 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:"> | 108 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:"> |
104 | <el-input v-model="ruleForm.cfdjList[0].cffw" :disabled="!ableOperation|| isJfOperation"></el-input> | 109 | <el-input v-model="ruleForm.cfdj.cffw" :disabled="!ableOperation|| isJfOperation"></el-input> |
105 | </el-form-item> | 110 | </el-form-item> |
106 | </el-col> | 111 | </el-col> |
107 | <el-col :span="16"> | 112 | </el-row> |
108 | <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:"> | 113 | <el-row :gutter="10"> |
109 | <el-input v-model="ruleForm.cfdjList[0].fj" :disabled="!ableOperation|| isJfOperation"> | 114 | <el-col> |
110 | </el-input> | 115 | <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:"> |
116 | <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.fj" | ||
117 | :disabled="!ableOperation|| isJfOperation"></el-input> | ||
111 | </el-form-item> | 118 | </el-form-item> |
112 | </el-col> | 119 | </el-col> |
113 | </el-row> | 120 | </el-row> |
114 | <el-row :gutter="10"> | 121 | <el-row :gutter="10"> |
115 | <el-col> | 122 | <el-col> |
116 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdjList[0].djyy"> | 123 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy"> |
117 | <el-input class="textArea" type="textarea" v-model="ruleForm.cfdjList[0].djyy" | 124 | <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" |
118 | :disabled="!ableOperation|| isJfOperation"></el-input> | 125 | :disabled="!ableOperation|| isJfOperation"></el-input> |
119 | </el-form-item> | 126 | </el-form-item> |
120 | </el-col> | 127 | </el-col> |
... | @@ -127,17 +134,17 @@ | ... | @@ -127,17 +134,17 @@ |
127 | <el-row :gutter="10"> | 134 | <el-row :gutter="10"> |
128 | <el-col :span="8"> | 135 | <el-col :span="8"> |
129 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关:"> | 136 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封机关:"> |
130 | <el-input v-model="ruleForm.cfdjList[0].jfjg" :disabled="!ableOperation"></el-input> | 137 | <el-input v-model="ruleForm.cfdj.jfjg" :disabled="!ableOperation"></el-input> |
131 | </el-form-item> | 138 | </el-form-item> |
132 | </el-col> | 139 | </el-col> |
133 | <el-col :span="8"> | 140 | <el-col :span="8"> |
134 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件:"> | 141 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文件:"> |
135 | <el-input v-model="ruleForm.cfdjList[0].jfwj" :disabled="!ableOperation"></el-input> | 142 | <el-input v-model="ruleForm.cfdj.jfwj" :disabled="!ableOperation"></el-input> |
136 | </el-form-item> | 143 | </el-form-item> |
137 | </el-col> | 144 | </el-col> |
138 | <el-col :span="8"> | 145 | <el-col :span="8"> |
139 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号:"> | 146 | <el-form-item :class="flag ? 'marginBot0' : ''" label="解封文号:"> |
140 | <el-input v-model="ruleForm.cfdjList[0].jfwh" :disabled="!ableOperation"></el-input> | 147 | <el-input v-model="ruleForm.cfdj.jfwh" :disabled="!ableOperation"></el-input> |
141 | </el-form-item> | 148 | </el-form-item> |
142 | </el-col> | 149 | </el-col> |
143 | </el-row> | 150 | </el-row> |
... | @@ -161,7 +168,7 @@ | ... | @@ -161,7 +168,7 @@ |
161 | disabled: true, | 168 | disabled: true, |
162 | flagTop: this.flag ? "top" : "", | 169 | flagTop: this.flag ? "top" : "", |
163 | rules: { | 170 | rules: { |
164 | 'cfdjList[0].djyy': [ | 171 | 'cfdj.djyy': [ |
165 | { required: true, message: '请输入登记原因', trigger: 'blur' } | 172 | { required: true, message: '请输入登记原因', trigger: 'blur' } |
166 | ] | 173 | ] |
167 | }, | 174 | }, | ... | ... |
... | @@ -149,9 +149,9 @@ | ... | @@ -149,9 +149,9 @@ |
149 | </div> | 149 | </div> |
150 | <el-row :gutter="10"> | 150 | <el-row :gutter="10"> |
151 | <el-col :span="8"> | 151 | <el-col :span="8"> |
152 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg"> | 152 | <el-form-item :class="flag ? 'marginBot0' : ''" label="原告:" prop="cfdj.cfwh"> |
153 | <el-input | 153 | <el-input |
154 | v-model="ruleForm.cfdj.cfjg" | 154 | v-model="ruleForm.cfdj.yg" |
155 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> | 155 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> |
156 | </el-form-item> | 156 | </el-form-item> |
157 | </el-col> | 157 | </el-col> |
... | @@ -162,11 +162,27 @@ | ... | @@ -162,11 +162,27 @@ |
162 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> | 162 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> |
163 | </el-form-item> | 163 | </el-form-item> |
164 | </el-col> | 164 | </el-col> |
165 | <el-col :span="8"> | ||
166 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg"> | ||
167 | <el-input | ||
168 | v-model="ruleForm.cfdj.cfjg" | ||
169 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> | ||
170 | </el-form-item> | ||
171 | </el-col> | ||
172 | </el-row> | ||
173 | <el-row :gutter="10"> | ||
165 | <el-col :span="8"> | 174 | <el-col :span="8"> |
166 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc"> | 175 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc"> |
167 | <el-input v-model="ruleForm.cfdj.cflxmc" disabled></el-input> | 176 | <el-input v-model="ruleForm.cfdj.cflxmc" disabled></el-input> |
168 | </el-form-item> | 177 | </el-form-item> |
169 | </el-col> | 178 | </el-col> |
179 | <el-col :span="16"> | ||
180 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj"> | ||
181 | <el-input | ||
182 | v-model="ruleForm.cfdj.cfwj" | ||
183 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> | ||
184 | </el-form-item> | ||
185 | </el-col> | ||
170 | </el-row> | 186 | </el-row> |
171 | <el-row :gutter="10"> | 187 | <el-row :gutter="10"> |
172 | <el-col :span="8"> | 188 | <el-col :span="8"> |
... | @@ -199,15 +215,9 @@ | ... | @@ -199,15 +215,9 @@ |
199 | </el-form-item> | 215 | </el-form-item> |
200 | </el-col> | 216 | </el-col> |
201 | </el-row> | 217 | </el-row> |
218 | |||
202 | <el-row :gutter="10"> | 219 | <el-row :gutter="10"> |
203 | <el-col :span="8"> | 220 | <el-col :span="24"> |
204 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj"> | ||
205 | <el-input | ||
206 | v-model="ruleForm.cfdj.cfwj" | ||
207 | :disabled="!viewEdit || ableEdit || isJfOperation"></el-input> | ||
208 | </el-form-item> | ||
209 | </el-col> | ||
210 | <el-col :span="16"> | ||
211 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw"> | 221 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw"> |
212 | <el-input | 222 | <el-input |
213 | v-model="ruleForm.cfdj.cffw" | 223 | v-model="ruleForm.cfdj.cffw" | ... | ... |
-
Please register or sign in to post a comment