Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
611d76a2 by renchao@pashanhoo.com
Options

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

2 parents 4839a900 42ebafed
Inline Side-by-side
Showing 4 changed files with 113 additions and 71 deletions
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
31 </div> 31 </div>
32 </template> 32 </template>
33 <script> 33 <script>
34 import { getLpb } from "@/api/lpcx.js";
34 import chCpn from "./ch.vue"; 35 import chCpn from "./ch.vue";
35 import zdyCpn from "./zdys.vue"; 36 import zdyCpn from "./zdys.vue";
36 import ljzsCpn from "./ljzs.vue"; 37 import ljzsCpn from "./ljzs.vue";
37 import { getLpb } from "@/api/lpcx.js";
38 import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js"; 38 import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
39 import jump from "../../ywbl/ywsq/components/mixin/jump"; 39 import jump from "../../ywbl/ywsq/components/mixin/jump";
40 import store from "@/store/index.js"; 40 import store from '@/store/index.js'
41 import { ywPopupCacel } from "@/utils/popup.js"; 41 import { ywPopupCacel } from "@/utils/popup.js";
42 export default { 42 export default {
43 mixins: [jump], 43 mixins: [jump],
...@@ -81,50 +81,68 @@ ...@@ -81,50 +81,68 @@
81 type: Object, 81 type: Object,
82 default: () => { } 82 default: () => { }
83 }, 83 },
84 isJump: { type: Boolean, default: false }, 84 name: "",
85 }, 85 components: { chCpn, zdyCpn, ljzsCpn },
86 data () { 86 props: {
87 return { 87 zrzbsm: {
88 lpbData: { 88 type: String,
89 ljzs: [], 89 default: "",
90 cs: [],
91 zdys: [],
92 }, 90 },
93 //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应 91 lpbParent: {
94 selectAllObj: { 92 type: String,
95 selectAll: false, 93 default: "isLpb",
96 }, 94 },
97 //层户右键菜单显隐 95 isHb: {
98 lpbChVisible: false, 96 type: Boolean,
99 //右键菜单定位位置 97 default: true,
100 lpbChLeft: 100,
101 lpbChTop: 100,
102 // 改变户选中状态
103 changeChoosedObj: {
104 bsms: [],
105 color: ''
106 }, 98 },
107 // 选中户bsm合集 99 onlyShow: {
108 bsmList: [], 100 type: Boolean,
109 loading: false, 101 default: true,
110 }; 102 },
111 }, 103 showSave: {
112 mounted () { 104 type: Boolean,
113 this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm); 105 default: false,
114 window.lpbContent = this; 106 },
115 }, 107 scyclx: {
116 methods: { 108 type: Number,
117 /** 109 default: 0,
118 * @description: 获取当前楼盘表选中户信息 110 },
119 * @param {Array} bsmList 111 sqywInfo: {
120 * @author: renchao 112 type: Object,
121 */ 113 default: () => { }
122 getBsmList (bsmList, compFlag) { 114 },
123 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据 115 isJump: { type: Boolean, default: false },
124 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag) 116 },
125 // 合并本次数据 117 data () {
126 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]); 118 return {
127 // }) 119 lpbData: {
120 ljzs: [],
121 cs: [],
122 zdys: [],
123 },
124 //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应
125 selectAllObj: {
126 selectAll: false,
127 },
128 //层户右键菜单显隐
129 lpbChVisible: false,
130 //右键菜单定位位置
131 lpbChLeft: 100,
132 lpbChTop: 100,
133 // 改变户选中状态
134 changeChoosedObj: {
135 bsms: [],
136 color: ''
137 },
138 // 选中户bsm合集
139 bsmList: [],
140 loading: false,
141 };
142 },
143 mounted () {
144 this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
145 window.lpbContent = this;
128 }, 146 },
129 /** 147 /**
130 * @description: 保存当前楼盘表 148 * @description: 保存当前楼盘表
...@@ -136,7 +154,6 @@ ...@@ -136,7 +154,6 @@
136 return; 154 return;
137 } 155 }
138 this.loading = true; 156 this.loading = true;
139 store.dispatch('user/reMenuRefresh', false)
140 againAddSldy({ 157 againAddSldy({
141 bsmSqyw: this.sqywInfo.bsmSqyw, 158 bsmSqyw: this.sqywInfo.bsmSqyw,
142 bsmSlsq: this.sqywInfo.bsmSlsq, 159 bsmSlsq: this.sqywInfo.bsmSlsq,
...@@ -150,16 +167,22 @@ ...@@ -150,16 +167,22 @@
150 message: '添加成功', 167 message: '添加成功',
151 type: 'success' 168 type: 'success'
152 }) 169 })
153 store.dispatch('user/reMenuRefresh', true)
154 if (!this.isJump) { 170 if (!this.isJump) {
155 this.jump(res.result, this.sqywInfo.djywbm) 171 this.jump(res.result, this.sqywInfo.djywbm)
172 } else {
173 store.dispatch('user/refreshPage', true);
156 } 174 }
175 //this.close();
157 this.$popupCacel(); 176 this.$popupCacel();
158 } else { 177 } else {
159 if (res.result && res.result.length > 0) { 178 if (res.result && res.result.length > 0) {
160 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } }) 179 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
161 } else { 180 } else {
162 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } }) 181 if (res.result && res.result.length > 0) {
182 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
183 } else {
184 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
185 }
163 } 186 }
164 } 187 }
165 }).catch(() => { 188 }).catch(() => {
...@@ -206,24 +229,34 @@ ...@@ -206,24 +229,34 @@
206 * @author: renchao 229 * @author: renchao
207 */ 230 */
208 getLpb (zrzbsm, scyclx, actual) { 231 getLpb (zrzbsm, scyclx, actual) {
209 getLpb(zrzbsm, scyclx).then((res) => { 232 if (!zrzbsm) {
210 if (res.code == 200) { 233 this.$message({
211 if (scyclx) { 234 message: "暂无楼盘表",
212 if (res.result.syclx == "1") { 235 type: "warning",
213 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); 236 });
214 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; 237 } else {
238 getLpb(zrzbsm, scyclx).then((res) => {
239 if (res.code == 200) {
240 if (scyclx) {
241 if (res.result.syclx == "1") {
242 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
243 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
244 }
245 } else {
246 this.$message({
247 message: res.message,
248 type: "warning",
249 });
215 } 250 }
216 } else { 251 } else {
217 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); 252 this.$message({
218 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; 253 message: res.message,
254 type: "warning",
255 });
219 } 256 }
220 } else { 257 });
221 this.$message({ 258 }
222 message: res.message, 259
223 type: "warning",
224 });
225 }
226 });
227 }, 260 },
228 //户右键点击事件 261 //户右键点击事件
229 /** 262 /**
......
...@@ -30,30 +30,30 @@ ...@@ -30,30 +30,30 @@
30 <el-row> 30 <el-row>
31 <el-col :span="3"> 31 <el-col :span="3">
32 <el-form-item label="身份证读卡器"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button> 33 <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="5"> 36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px"> 37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
38 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="5"> 41 <el-col :span="5">
42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="5"> 49 <el-col :span="5">
50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
51 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="5"> 54 <el-col :span="5">
55 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
56 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
133 total: 0, 133 total: 0,
134 columns: datas.columns().lzgrid, 134 columns: datas.columns().lzgrid,
135 data: [] 135 data: []
136 } 136 },
137 show:true
137 } 138 }
138 }, 139 },
139 mounted () { 140 mounted () {
...@@ -202,6 +203,7 @@ ...@@ -202,6 +203,7 @@
202 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { 203 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
203 if (res.code === 200) { 204 if (res.code === 200) {
204 this.tableData.data = res.result.list; 205 this.tableData.data = res.result.list;
206 this.show=!res.result.list.length>0;
205 this.$nextTick(() => { 207 this.$nextTick(() => {
206 this.tableData.data.forEach(item => { 208 this.tableData.data.forEach(item => {
207 that.$refs.table.toggleRowSelection(item) 209 that.$refs.table.toggleRowSelection(item)
......
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
380 </el-col> 380 </el-col>
381 </el-row> 381 </el-row>
382 <qlrCommonTable 382 <qlrCommonTable
383 :tableData="ruleForm.qlrList"
383 @upDateQlrxxList="upDateQlrxxList" 384 @upDateQlrxxList="upDateQlrxxList"
384 :disabled="!viewEdit" 385 :disabled="viewEdit"
385 :tableData="ruleForm.qlrList"
386 :gyfs="ruleForm.sldy.gyfs" /> 386 :gyfs="ruleForm.sldy.gyfs" />
387 <div class="slxx_title title-block"> 387 <div class="slxx_title title-block">
388 登记原因 388 登记原因
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 import table from "@/utils/mixin/table"; 98 import table from "@/utils/mixin/table";
99 import { datas, sendThis } from "./djbcxdata"; 99 import { datas, sendThis } from "./djbcxdata";
100 import { getDjbBysearch } from "@/api/search.js"; 100 import { getDjbBysearch } from "@/api/search.js";
101 import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
101 102
102 export default { 103 export default {
103 name: "djbcx", 104 name: "djbcx",
...@@ -137,7 +138,8 @@ ...@@ -137,7 +138,8 @@
137 }, 138 },
138 qllxs: [], 139 qllxs: [],
139 isDialog: false, 140 isDialog: false,
140 djbxxData: {} 141 djbxxData: {},
142 zrzbsm:""
141 } 143 }
142 }, 144 },
143 computed: { 145 computed: {
...@@ -188,6 +190,11 @@ ...@@ -188,6 +190,11 @@
188 * @author: renchao 190 * @author: renchao
189 */ 191 */
190 handleLpbClick (item) { 192 handleLpbClick (item) {
193 let params = {zdbsm:item.bsmZd};
194 getZrzListByBsmSlsq(params).then((res) => {
195 if (res.code === 200) {
196 }
197 });
191 console.log("zrzbsm",item,item.zrzbsm); 198 console.log("zrzbsm",item,item.zrzbsm);
192 this.$popupDialog('楼盘表', 'lpb/index', { 199 this.$popupDialog('楼盘表', 'lpb/index', {
193 bsm: item.zrzbsm, 200 bsm: item.zrzbsm,
......