dc41809e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 27dd35b0 821394aa
...@@ -286,7 +286,7 @@ export default { ...@@ -286,7 +286,7 @@ export default {
286 * @param {*} obj 286 * @param {*} obj
287 * @author: renchao 287 * @author: renchao
288 */ 288 */
289 sendToNext (obj) { 289 sendToEnd (obj) {
290 this.$popupDialog("转出", "djbworkflow/components/zc", { 290 this.$popupDialog("转出", "djbworkflow/components/zc", {
291 obj:"", 291 obj:"",
292 bsmSlsq: this.bsmSlsq, 292 bsmSlsq: this.bsmSlsq,
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 14:16:07 4 * @LastEditTime: 2023-07-21 14:27:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 </el-radio-group> 161 </el-radio-group>
162 </el-form-item> 162 </el-form-item>
163 </el-col> 163 </el-col>
164 <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'"> 164 <el-col :span="5" v-if="ruleForm.sldy.gyfs && ruleForm.sldy.gyfs == '2'">
165 <el-form-item label="是否分别持证:"> 165 <el-form-item label="是否分别持证:">
166 <el-radio-group v-model="ruleForm.sffbcz" :disabled="!ableOperation"> 166 <el-radio-group v-model="ruleForm.sffbcz" :disabled="!ableOperation">
167 <el-radio label="1"></el-radio> 167 <el-radio label="1"></el-radio>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </el-radio-group> 169 </el-radio-group>
170 </el-form-item> 170 </el-form-item>
171 </el-col> 171 </el-col>
172 <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'"> 172 <el-col :span="5" v-if="ruleForm.sldy.gyfs && ruleForm.sldy.gyfs == '2'">
173 <el-form-item label="持证人:"> 173 <el-form-item label="持证人:">
174 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation"> 174 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation">
175 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 175 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
...@@ -240,12 +240,17 @@ ...@@ -240,12 +240,17 @@
240 tdytOption: [], 240 tdytOption: [],
241 czrOptions: [], 241 czrOptions: [],
242 ruleForm: { 242 ruleForm: {
243 ywh: "", 243 flow: {
244 ywh: ''
245 },
244 slry: "", 246 slry: "",
245 slsj: "", 247 slsj: "",
246 qllx: "", 248 qllx: "",
247 djlx: "", 249 djlx: "",
248 djqx: "", 250 djqx: "",
251 sldy: {
252 gyfs: ''
253 },
249 // 宗地代码 254 // 宗地代码
250 zddm: "", 255 zddm: "",
251 bdcdyh: "", 256 bdcdyh: "",
...@@ -264,7 +269,6 @@ ...@@ -264,7 +269,6 @@
264 fwxz: '', 269 fwxz: '',
265 fwjg: '', 270 fwjg: '',
266 // 权利人信息 271 // 权利人信息
267 gyfs: "1",
268 // 是否分别持证 272 // 是否分别持证
269 sffbcz: "", 273 sffbcz: "",
270 // 持证人 274 // 持证人
...@@ -276,6 +280,9 @@ ...@@ -276,6 +280,9 @@
276 }, 280 },
277 fdcq2: { 281 fdcq2: {
278 fwxzmc: '' 282 fwxzmc: ''
283 },
284 slsq: {
285 gyfs: ''
279 } 286 }
280 }, 287 },
281 //传递参数 288 //传递参数
......