b7996116 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents f901e658 9663473f
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:37:21
* @LastEditTime: 2023-08-02 10:59:22
-->
<template>
<!-- 受理信息 -->
......@@ -466,7 +466,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -474,10 +474,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -486,7 +486,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:37:47
* @LastEditTime: 2023-08-02 11:00:09
-->
<template>
<!-- 受理信息 -->
......@@ -366,7 +366,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -374,10 +374,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -386,7 +386,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -402,7 +402,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -410,10 +410,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -422,7 +422,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:38:26
* @LastEditTime: 2023-08-02 11:01:16
-->
<template>
<!-- 受理信息 -->
......@@ -252,7 +252,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -260,10 +260,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -272,7 +272,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:38:41
* @LastEditTime: 2023-08-02 11:01:08
-->
<template>
<!-- 受理信息 -->
......@@ -348,7 +348,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -356,10 +356,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -368,7 +368,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:38:55
* @LastEditTime: 2023-08-02 11:00:54
:show-message="false"
-->
<template>
......@@ -407,7 +407,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -415,10 +415,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -427,7 +427,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:39:13
* @LastEditTime: 2023-08-02 11:00:48
:show-message="false"
-->
<template>
......@@ -328,7 +328,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -336,10 +336,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -348,7 +348,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......@@ -481,14 +481,14 @@
djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
},
ableOperation:false,
ableOperation: false,
};
},
created() {
created () {
this.loadData();
},
mounted() {
this.ableOperation=this.$parent.ableOperation
mounted () {
this.ableOperation = this.$parent.ableOperation
},
methods: {
/**
......@@ -496,7 +496,7 @@
* @param {*} val
* @author: renchao
*/
ssQlxxchange(val) {
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-01 18:12:57
* @LastEditTime: 2023-08-02 11:00:40
-->
<template>
<!-- 受理信息 -->
......@@ -316,10 +316,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证:">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
......@@ -328,7 +328,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -157,12 +157,13 @@ export default {
this.tableData.forEach((item) => {
item.show = true;
if (this.$parent.dqhj == item.jddm) {
item.show = false;
}
item["stepid"] = this.$route.query.bestepid;
item.shjssj = getNewDatesh();
item.shkssj = getNewDatesh();
item["shryxm"] = this.userInfo.name;
item["userid"] = this.userInfo.id;
item.show = false;
}
});
}
});
......@@ -180,7 +181,6 @@ export default {
onSubmit() {
this.tableData.forEach((item, index) => {
item["bsmBusiness"] = this.propsParam.bsmBusiness;
item["stepid"] = this.$route.query.bestepid;
item["czjg"] = "1";
});
saveSpyjBySlsq(this.tableData).then((res) => {
......
......@@ -216,7 +216,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -208,7 +208,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -214,7 +214,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -172,7 +172,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -167,7 +167,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -196,7 +196,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -196,7 +196,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -276,7 +276,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -165,7 +165,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -133,7 +133,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -194,7 +194,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......
......@@ -208,7 +208,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
......