Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1c9b8815 by 任超
Options

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

2 parents 31fd03fa 62e5b429
Inline Side-by-side
Showing 10 changed files with 51 additions and 44 deletions
...@@ -57,6 +57,7 @@ export default { ...@@ -57,6 +57,7 @@ export default {
57 if (res.code == 200) { 57 if (res.code == 200) {
58 this.$message.success('保存成功') 58 this.$message.success('保存成功')
59 this.$emit("input", false); 59 this.$emit("input", false);
60 this.resetRuleForm();
60 this.$parent.queryClick(); 61 this.$parent.queryClick();
61 } else { 62 } else {
62 this.$message.error(res.message) 63 this.$message.error(res.message)
......
...@@ -66,6 +66,7 @@ export default { ...@@ -66,6 +66,7 @@ export default {
66 if (res.code == 200) { 66 if (res.code == 200) {
67 this.$message.success('保存成功') 67 this.$message.success('保存成功')
68 this.$emit("input", false); 68 this.$emit("input", false);
69 this.resetRuleForm();
69 this.$parent.queryClick(); 70 this.$parent.queryClick();
70 } else { 71 } else {
71 this.$message.error(res.message) 72 this.$message.error(res.message)
......
...@@ -74,7 +74,7 @@ class data extends filter { ...@@ -74,7 +74,7 @@ class data extends filter {
74 case '2': 74 case '2':
75 return <div> 75 return <div>
76 <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button> 76 <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
77 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>取消发布</el-button> 77 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.toUnPublish(scope.row) }}>撤销通知</el-button>
78 </div> 78 </div>
79 } 79 }
80 } 80 }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="家庭关系" prop="jtgxdm"> 12 <el-form-item label="家庭关系" prop="jtgxdm">
13 <el-select clearable v-model="ruleForm.jtgxdm" class="width100" placeholder="请选择"> 13 <el-select clearable v-model="ruleForm.jtgxdm" class="width100" placeholder="请选择">
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 14 <el-option v-for="item in jtgx" :key="item.value" :label="item.label" :value="item.value">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
...@@ -113,6 +113,17 @@ export default { ...@@ -113,6 +113,17 @@ export default {
113 data () { 113 data () {
114 return { 114 return {
115 myValue: this.value, 115 myValue: this.value,
116 jtgx: [
117 {value:'0',label:'本人或户主'},
118 {value:'1',label:'配偶'},
119 {value:'2',label:'子'},
120 {value:'3',label:'女'},
121 {value:'4',label:'子孙、孙女、外孙子、外孙女'},
122 {value:'5',label:'父母'},
123 {value:'6',label:'祖父母、外祖父母'},
124 {value:'7',label:'兄、弟、姐、妹'},
125 {value:'8',label:'其他'},
126 ],
116 ruleForm: { 127 ruleForm: {
117 qlrlx: '', 128 qlrlx: '',
118 sqrmc: '', 129 sqrmc: '',
......
...@@ -87,14 +87,16 @@ ...@@ -87,14 +87,16 @@
87 <el-button @click="closeInvalidDiglog()">取 消</el-button> 87 <el-button @click="closeInvalidDiglog()">取 消</el-button>
88 <el-button type="primary" @click="confirmInvalid()">确 定</el-button> 88 <el-button type="primary" @click="confirmInvalid()">确 定</el-button>
89 </div> 89 </div>
90
91 <bdcqzPrint v-model="bdcqz" />
90 </div> 92 </div>
91 </el-dialog> 93 </el-dialog>
92 <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty> 94 <el-empty description="暂无数据" v-if="tableData.length == 0"></el-empty>
93 </div> 95 </div>
94 </template> 96 </template>
95 <script> 97 <script>
96 import { getSlsqBdcqzList, invalidCertificate } from "@/api/fqsq.js"; 98 import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
97 99 import bdcqzPrint from "./zsdy.vue";
98 export default { 100 export default {
99 components: {}, 101 components: {},
100 props: {}, 102 props: {},
...@@ -114,7 +116,6 @@ export default { ...@@ -114,7 +116,6 @@ export default {
114 methods: { 116 methods: {
115 //初始化列表 117 //初始化列表
116 list() { 118 list() {
117 // var bsmSldy = this.$parent.unitData[0].bsmSldy;
118 var bsmSlsq = this.$route.query.bsmSlsq; 119 var bsmSlsq = this.$route.query.bsmSlsq;
119 getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => { 120 getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => {
120 if (res.code === 200) { 121 if (res.code === 200) {
...@@ -146,22 +147,22 @@ export default { ...@@ -146,22 +147,22 @@ export default {
146 }); 147 });
147 } else { 148 } else {
148 //证书打印 149 //证书打印
149 this.$popup("证书打印", "workflow/components/zsdy", { 150 // this.$popup("证书打印", "workflow/components/zsdy", {
150 height: "700px", 151 // height: "700px",
151 width: "800px", 152 // width: "800px",
152 formData: { 153 // formData: {
153 bsmSlsq: this.bsmSlsq, 154 // bsmSlsq: this.bsmSlsq,
154 bdcqz: item, 155 // bdcqz: item,
155 }, 156 // },
156 btnShow: true, 157 // btnShow: true,
157 confirmText: "打印证书", 158 // confirmText: "打印证书",
158 cancel: () => { 159 // cancel: () => {
159 console.log("取消回调"); 160 // console.log("取消回调");
160 }, 161 // },
161 confirm: () => { 162 // confirm: () => {
162 that.list(); 163 // that.list();
163 }, 164 // },
164 }); 165 // });
165 } 166 }
166 }, 167 },
167 //再次打印 168 //再次打印
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 44
45 <script> 45 <script>
46 import { datas } from "../javascript/zsyl.js"; 46 import { datas } from "../javascript/zsyl.js";
47 import { readYsxlh,certificate,getSlsqBdcqzList} from "@/api/fqsq.js" 47 import { readYsxlh,certificate,getSlsqBdcqzList} from "@/api/bdcqz.js"
48 export default { 48 export default {
49 components: { 49 components: {
50 }, 50 },
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </div> 26 </div>
27 <div class="zsyl-right"> 27 <div class="zsyl-right">
28 <div class="zsyl-title">附记</div> 28 <div class="zsyl-title">附记</div>
29 <div class="zsyl-text"></div> 29 <div class="zsyl-text">{{bdcqz.fj}}</div>
30 </div> 30 </div>
31 </div> 31 </div>
32 </div> 32 </div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 34
35 <script> 35 <script>
36 import { datas } from "../javascript/zsyl.js"; 36 import { datas } from "../javascript/zsyl.js";
37 import { readYsxlh,certificate,getSlsqBdcqzList} from "@/api/fqsq.js" 37 import { getSlsqBdcqzList} from "@/api/bdcqz.js"
38 export default { 38 export default {
39 components: { 39 components: {
40 }, 40 },
...@@ -82,17 +82,7 @@ export default { ...@@ -82,17 +82,7 @@ export default {
82 methods: { 82 methods: {
83 //获取证书内容 83 //获取证书内容
84 getRowValue(code){ 84 getRowValue(code){
85 var value = this.bdcqz[code] 85 var value = this.bdcqz[code];
86 if(code == 'gyqk'){
87 switch(value){
88 case '1':
89 return '单独所有';
90 case '2':
91 return '共同共有';
92 case '3':
93 return '按份所有';
94 }
95 }
96 return value; 86 return value;
97 }, 87 },
98 //获取受理申请下全部不动产权证 88 //获取受理申请下全部不动产权证
......
...@@ -220,9 +220,10 @@ ...@@ -220,9 +220,10 @@
220 :disabled="$route.query.viewtype == 1" 220 :disabled="$route.query.viewtype == 1"
221 v-model="ruleForm.slywxx.gyfs" 221 v-model="ruleForm.slywxx.gyfs"
222 > 222 >
223 <el-radio label="1">单独所有</el-radio> 223 <el-radio label="0">单独所有</el-radio>
224 <el-radio label="2">共同共有</el-radio> 224 <el-radio label="1">共同共有</el-radio>
225 <el-radio label="3">按份所有</el-radio> 225 <el-radio label="2">按份所有</el-radio>
226 <el-radio label="3">其它共有</el-radio>
226 </el-radio-group> 227 </el-radio-group>
227 </el-form-item> 228 </el-form-item>
228 </el-col> 229 </el-col>
......
...@@ -177,9 +177,10 @@ ...@@ -177,9 +177,10 @@
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="1">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="2">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="3">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
183 <el-radio label="3">其它共有</el-radio>
183 </el-radio-group> 184 </el-radio-group>
184 </el-form-item> 185 </el-form-item>
185 </el-col> 186 </el-col>
......
...@@ -177,9 +177,10 @@ ...@@ -177,9 +177,10 @@
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="1">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="2">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="3">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
183 <el-radio label="3">其它共有</el-radio>
183 </el-radio-group> 184 </el-radio-group>
184 </el-form-item> 185 </el-form-item>
185 </el-col> 186 </el-col>
......