Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
51c4990a by xiaomiao
Options

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

2 parents 3d3595f6 cc7683e0
Inline Side-by-side
Showing 7 changed files with 91 additions and 79 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 15:47:12 3 * @Date: 2023-02-28 15:47:12
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:39:12 5 * @LastEditTime: 2023-09-14 15:04:20
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -108,13 +108,15 @@ export default { ...@@ -108,13 +108,15 @@ export default {
108 // 边框颜色 108 // 边框颜色
109 borderColor:'rgb(230, 230, 230)', 109 borderColor:'rgb(230, 230, 230)',
110 // 申请单元列表数据 110 // 申请单元列表数据
111 unitIdList:[] 111 unitIdList:[],
112 // 组件标识
113 compFlag:Math.random()
112 }; 114 };
113 }, 115 },
114 mounted() { 116 mounted() {
115 // 根据申请单元列表数据处理选中户 117 // 根据申请单元列表数据处理选中户
116 console.log("window.unitData",window.unitData); 118 console.log("window.unitData",window.unitData);
117 if(window.unitData.length){ 119 if(window.unitData && window.unitData.length){
118 window.unitData.forEach(e => { 120 window.unitData.forEach(e => {
119 this.unitIdList.push(e.bdcdyid) 121 this.unitIdList.push(e.bdcdyid)
120 }) 122 })
...@@ -266,14 +268,17 @@ export default { ...@@ -266,14 +268,17 @@ export default {
266 { 268 {
267 bdcdyh:h.bdcdyh, 269 bdcdyh:h.bdcdyh,
268 bsm:h.bsm, 270 bsm:h.bsm,
269 dyhbsm:h.dyhbsm 271 dyhbsm:h.dyhbsm,
272 bdcdyid:h.dyhbsm,
273 bdcdylx:'7',
274 flag:this.compFlag
270 } 275 }
271 ) 276 )
272 } 277 }
273 }); 278 });
274 }); 279 });
275 }) 280 })
276 this.getBsmList(list) 281 this.getBsmList(list,this.compFlag)
277 }, 282 },
278 changeChoosedObj: { 283 changeChoosedObj: {
279 handler(val) { 284 handler(val) {
......
...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue"; ...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
37 import zdyCpn from "./zdys.vue"; 37 import zdyCpn from "./zdys.vue";
38 import ljzsCpn from "./ljzs.vue"; 38 import ljzsCpn from "./ljzs.vue";
39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js"; 39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
40 import jump from "../../ywbl/ywsq/components/mixin/jump";
41 import store from '@/store/index.js'
42 import { ywPopupCacel } from "@/utils/popup.js";
40 export default { 43 export default {
44 mixins: [jump],
41 provide() { 45 provide() {
42 return { 46 return {
43 openMenu: this.openMenu, 47 openMenu: this.openMenu,
...@@ -74,6 +78,7 @@ export default { ...@@ -74,6 +78,7 @@ export default {
74 type: Object, 78 type: Object,
75 default: () => { } 79 default: () => { }
76 }, 80 },
81 isJump: { type: Boolean, default: false },
77 }, 82 },
78 data() { 83 data() {
79 return { 84 return {
...@@ -111,8 +116,12 @@ export default { ...@@ -111,8 +116,12 @@ export default {
111 * @param {Array} bsmList 116 * @param {Array} bsmList
112 * @author: renchao 117 * @author: renchao
113 */ 118 */
114 getBsmList(bsmList){ 119 getBsmList(bsmList,compFlag){
115 this.bsmList = bsmList; 120 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
121 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
122 // 合并本次数据
123 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
124 // })
116 }, 125 },
117 /** 126 /**
118 * @description: 保存当前楼盘表 127 * @description: 保存当前楼盘表
...@@ -229,11 +238,7 @@ export default { ...@@ -229,11 +238,7 @@ export default {
229 this.$message.error("请至少选择一条数据"); 238 this.$message.error("请至少选择一条数据");
230 return; 239 return;
231 } 240 }
232 this.loading = true 241 this.loading = true;
233 this.bsmList.forEach(item=>{
234 item['bdcdyid'] = item.dyhbsm;
235 item['bdcdylx'] = '7';
236 })
237 startBusinessFlow({ 242 startBusinessFlow({
238 bsmSqyw: this.sqywInfo.bsmSqyw, 243 bsmSqyw: this.sqywInfo.bsmSqyw,
239 bdcdysz: this.bsmList, 244 bdcdysz: this.bsmList,
...@@ -250,7 +255,7 @@ export default { ...@@ -250,7 +255,7 @@ export default {
250 } else { 255 } else {
251 store.dispatch('user/refreshPage', true); 256 store.dispatch('user/refreshPage', true);
252 } 257 }
253 this.$popupCacel() 258 this.close()
254 } else { 259 } else {
255 if (res.result && res.result.length > 0) { 260 if (res.result && res.result.length > 0) {
256 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) 261 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
...@@ -262,6 +267,14 @@ export default { ...@@ -262,6 +267,14 @@ export default {
262 this.loading = false 267 this.loading = false
263 }) 268 })
264 }, 269 },
270 /**
271 * @description: close
272 * @param {*} val
273 * @author: renchao
274 */
275 close(){
276 ywPopupCacel()
277 },
265 }, 278 },
266 computed:{ 279 computed:{
267 lpbContentHeight(){ 280 lpbContentHeight(){
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 17:25:45 3 * @Date: 2023-02-28 17:25:45
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:59:46 5 * @LastEditTime: 2023-09-14 14:35:19
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
21 > 21 >
22 <!-- 逻辑幢名称 --> 22 <!-- 逻辑幢名称 -->
23 <p class="lpb-xmmc ljz-xmmc"> 23 <p class="lpb-xmmc ljz-xmmc">
24 <span>{{ljz.ljzmc}}</span> 24 <el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
25 ljz.ljzmc
26 }}</el-checkbox>
25 </p> 27 </p>
26 <!-- 独立层户 --> 28 <!-- 独立层户 -->
27 <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> 29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
28 <!-- 幢单元 --> 30 <!-- 幢单元 -->
29 <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/> 31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
30 </div> 32 </div>
31 </div> 33 </div>
32 </div> 34 </div>
...@@ -38,11 +40,15 @@ ...@@ -38,11 +40,15 @@
38 v-else 40 v-else
39 > 41 >
40 <!-- 逻辑幢名称 --> 42 <!-- 逻辑幢名称 -->
41 <p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p> 43 <p class="lpb-xmmc ljz-xmmc">
44 <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
45 ljzarr[0].ljzmc
46 }}</el-checkbox>
47 </p>
42 <!-- 独立层户 --> 48 <!-- 独立层户 -->
43 <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> 49 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
44 <!-- 幢单元 --> 50 <!-- 幢单元 -->
45 <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> 51 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
46 </div> 52 </div>
47 </div> 53 </div>
48 </div> 54 </div>
...@@ -90,7 +96,20 @@ export default { ...@@ -90,7 +96,20 @@ export default {
90 return tempArr.filter(Boolean) 96 return tempArr.filter(Boolean)
91 }, 97 },
92 }, 98 },
93 methods: {}, 99 methods: {
100 /**
101 * @description: 逻辑幢全选
102 * @param {*} val
103 * @param {*} r
104 * @return {*}
105 */
106 zdySelectAll(val,r) {
107 // 逻辑幢下的独立层户全选
108 this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
109 // 逻辑幢下的幢单元全选
110 this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
111 }
112 },
94 }; 113 };
95 </script> 114 </script>
96 115
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 16:29:04 3 * @Date: 2023-02-28 16:29:04
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:55:30 5 * @LastEditTime: 2023-09-14 14:36:51
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
13 <div v-for="zdy in realZdys" :key="zdy.bsm"> 13 <div v-for="zdy in realZdys" :key="zdy.bsm">
14 <!-- 幢单元名称 --> 14 <!-- 幢单元名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{ 16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
17 zdy.zdymc 17 zdy.zdymc
18 }}</el-checkbox> 18 }}</el-checkbox>
19 <span v-else>aaa{{zdy.zdymc}}</span>
20 </p> 19 </p>
21 <!-- 每个幢单元下的层户 --> 20 <!-- 每个幢单元下的层户 -->
22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 21 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
...@@ -58,6 +57,16 @@ export default { ...@@ -58,6 +57,16 @@ export default {
58 zdySelectAll(val,r) { 57 zdySelectAll(val,r) {
59 this.$refs[r][0].zdySelectAll(val) 58 this.$refs[r][0].zdySelectAll(val)
60 }, 59 },
60 /**
61 * @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
62 * @param {*} val
63 * @return {*}
64 */
65 selectAll(val){
66 this.realZdys.forEach(i=>{
67 this.zdySelectAll(val,i.bsm)
68 })
69 }
61 }, 70 },
62 computed: { 71 computed: {
63 realZdys() { 72 realZdys() {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-14 10:12:23 4 * @LastEditTime: 2023-09-14 11:14:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -34,27 +34,6 @@ ...@@ -34,27 +34,6 @@
34 sortable: null, 34 sortable: null,
35 column: [ 35 column: [
36 { 36 {
37 prop: "isrequired",
38 label: "是否必选",
39 width: "80",
40 render: (h, scope) => {
41 if (scope.row.isrequired === "1") {
42 return (
43 <div>
44 <span>必选</span>
45 </div>
46 );
47 }
48 else {
49 return (
50 <div>
51 <span>可选</span>
52 </div>
53 )
54 }
55 }
56 },
57 {
58 label: "材料名称", 37 label: "材料名称",
59 render: (h, scope) => { 38 render: (h, scope) => {
60 return ( 39 return (
...@@ -101,21 +80,6 @@ ...@@ -101,21 +80,6 @@
101 }, 80 },
102 }, 81 },
103 { 82 {
104 label: "是否新建材料",
105 width: "80",
106 render: (h, scope) => {
107 if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
108 return (
109 <span>是</span>
110 );
111 } else {
112 return (
113 <span>否</span>
114 );
115 }
116 },
117 },
118 {
119 label: "操作", 83 label: "操作",
120 width: "100", 84 width: "100",
121 render: (h, scope) => { 85 render: (h, scope) => {
...@@ -123,7 +87,7 @@ ...@@ -123,7 +87,7 @@
123 <el-button 87 <el-button
124 type="text" 88 type="text"
125 icon="el-icon-delete" 89 icon="el-icon-delete"
126 disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} 90 disabled={scope.row.count != 0}
127 onClick={() => { 91 onClick={() => {
128 this.handleDelete(scope.$index, scope.row); 92 this.handleDelete(scope.$index, scope.row);
129 }} 93 }}
...@@ -170,8 +134,8 @@ ...@@ -170,8 +134,8 @@
170 message: '保存成功', 134 message: '保存成功',
171 type: 'success' 135 type: 'success'
172 }) 136 })
173 ywPopupCacel()
174 store.dispatch('user/reWorkFresh', true) 137 store.dispatch('user/reWorkFresh', true)
138 ywPopupCacel()
175 } 139 }
176 }).catch(() => { 140 }).catch(() => {
177 this.loading = false 141 this.loading = false
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 17:05:49 4 * @LastEditTime: 2023-09-14 14:23:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
58 </template> 58 </template>
59 <script> 59 <script>
60 import store from '@/store/index.js' 60 import store from '@/store/index.js'
61 import { ywPopupDialog, ywPopupCacel } from "@/utils/popup.js"; 61 import { ywPopupDialog } from "@/utils/popup.js";
62 import imagePreview from "./dialog/imagePreview.vue";
62 import clxxAddDialog from "./dialog/clxxAddDialog.vue"; 63 import clxxAddDialog from "./dialog/clxxAddDialog.vue";
63 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue"; 64 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
64 import imagePreview from "./dialog/imagePreview.vue";
65 import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js"; 65 import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js";
66 export default { 66 export default {
67 components: { clxxAddDialog, imagePreview, clxxDetailDialog }, 67 components: { clxxAddDialog, imagePreview, clxxDetailDialog },
...@@ -90,6 +90,20 @@ ...@@ -90,6 +90,20 @@
90 } 90 }
91 } 91 }
92 }, 92 },
93 computed: {
94 workFresh () {
95 return store.state.user.workFresh
96 }
97 },
98 watch: {
99 workFresh: {
100 handler (newValue, oldValue) {
101 this.clmlInitList()
102 },
103 deep: true,
104 immediate: true
105 }
106 },
93 created () { 107 created () {
94 this.clmlInitList() 108 this.clmlInitList()
95 }, 109 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 11:23:49 4 * @LastEditTime: 2023-09-14 11:11:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
39 </div> 39 </div>
40 </template> 40 </template>
41 <script> 41 <script>
42 import { mapGetters } from 'vuex'
43 import table from "@/utils/mixin/table" 42 import table from "@/utils/mixin/table"
44 import { datas, sendThis } from "./data" 43 import { datas, sendThis } from "./data"
45 import { queryQyByPage, addQy, remove } from "@/api/xxba.js"; 44 import { queryQyByPage, addQy, remove } from "@/api/xxba.js";
...@@ -53,17 +52,6 @@ ...@@ -53,17 +52,6 @@
53 activated () { 52 activated () {
54 this.queryClick() 53 this.queryClick()
55 }, 54 },
56 computed: {
57 ...mapGetters(['workFresh'])
58 },
59 watch: {
60 workFresh: {
61 handler (newVal, oldVal) {
62 console.log(newVal, 'newVal');
63 if (newVal) this.queryClick()
64 }
65 }
66 },
67 data () { 55 data () {
68 return { 56 return {
69 queryForm: { 57 queryForm: {
......