Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b4f32752 by yangwei
Options

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

2 parents 8a2c9efa 611d76a2
Inline Side-by-side
Showing 2 changed files with 107 additions and 83 deletions
......@@ -4,12 +4,12 @@
<!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
<div class="ch-zdy-wrap">
<!-- 幢单元 -->
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow" />
<!-- 独立层户 -->
<ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow"/>
<ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow" />
</div>
<!-- 逻辑幢 -->
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow" />
</div>
<!-- 自然幢名称 -->
<p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
......@@ -24,31 +24,30 @@
<ul
v-show="lpbChVisible"
:style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
class="contextmenu"
>
class="contextmenu">
<li @click="menuClick">菜单一</li>
<li @click="menuClick">菜单二</li>
</ul>
</div>
</template>
<script>
import { getLpb } from "@/api/lpcx.js";
import chCpn from "./ch.vue";
import zdyCpn from "./zdys.vue";
import ljzsCpn from "./ljzs.vue";
import { startBusinessFlow, choiceBdcdy,againAddSldy } from "@/api/workFlow.js";
import jump from "../../ywbl/ywsq/components/mixin/jump";
import store from '@/store/index.js'
import { ywPopupCacel } from "@/utils/popup.js";
export default {
import { getLpb } from "@/api/lpcx.js";
import chCpn from "./ch.vue";
import zdyCpn from "./zdys.vue";
import ljzsCpn from "./ljzs.vue";
import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
import jump from "../../ywbl/ywsq/components/mixin/jump";
import store from '@/store/index.js'
import { ywPopupCacel } from "@/utils/popup.js";
export default {
mixins: [jump],
provide() {
provide () {
return {
openMenu: this.openMenu,
selectAll: this.selectAllObj,
changeChoosedObj:this.changeChoosedObj,
clearChangeChoosedObj:this.clearChangeChoosedObj,
getBsmList:this.getBsmList
changeChoosedObj: this.changeChoosedObj,
clearChangeChoosedObj: this.clearChangeChoosedObj,
getBsmList: this.getBsmList
};
},
name: "",
......@@ -66,11 +65,42 @@ export default {
type: Boolean,
default: true,
},
onlyShow:{
onlyShow: {
type: Boolean,
default: true,
},
showSave:{
showSave: {
type: Boolean,
default: false,
},
scyclx: {
type: Number,
default: 0,
},
sqywInfo: {
type: Object,
default: () => { }
},
name: "",
components: { chCpn, zdyCpn, ljzsCpn },
props: {
zrzbsm: {
type: String,
default: "",
},
lpbParent: {
type: String,
default: "isLpb",
},
isHb: {
type: Boolean,
default: true,
},
onlyShow: {
type: Boolean,
default: true,
},
showSave: {
type: Boolean,
default: false,
},
......@@ -84,7 +114,7 @@ export default {
},
isJump: { type: Boolean, default: false },
},
data() {
data () {
return {
lpbData: {
ljzs: [],
......@@ -101,37 +131,24 @@ export default {
lpbChLeft: 100,
lpbChTop: 100,
// 改变户选中状态
changeChoosedObj:{
bsms:[],
color:''
changeChoosedObj: {
bsms: [],
color: ''
},
// 选中户bsm合集
bsmList:[],
bsmList: [],
loading: false,
};
},
mounted() {
this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm);
mounted () {
this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
window.lpbContent = this;
},
methods: {
/**
* @description: 获取当前楼盘表选中户信息
* @param {Array} bsmList
* @author: renchao
*/
getBsmList(bsmList,compFlag){
// 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
// 合并本次数据
this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
// })
},
/**
* @description: 保存当前楼盘表
* @author: renchao
*/
saveLpb(){
saveLpb () {
if (this.bsmList.length == 0) {
this.$message.error("请至少选择一条数据");
return;
......@@ -159,9 +176,13 @@ export default {
this.$popupCacel();
} else {
if (res.result && res.result.length > 0) {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
} else {
if (res.result && res.result.length > 0) {
this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
} else {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
}
}
}
}).catch(() => {
......@@ -179,7 +200,7 @@ export default {
* @param {*} color
* @author: renchao
*/
changeChoosed(bsms, color){
changeChoosed (bsms, color) {
this.changeChoosedObj.bsms = bsms;
this.changeChoosedObj.color = color;
},
......@@ -187,7 +208,7 @@ export default {
* @description: clearChangeChoosedObj
* @author: renchao
*/
clearChangeChoosedObj(){
clearChangeChoosedObj () {
this.changeChoosedObj.bsms = [];
},
//全选户
......@@ -196,7 +217,7 @@ export default {
* @param {*} val
* @author: renchao
*/
zdySelectAll(val) {
zdySelectAll (val) {
this.selectAllObj.selectAll = val;
},
//获取楼盘表数据
......@@ -207,23 +228,25 @@ export default {
* @param {*} actual
* @author: renchao
*/
getLpb(zrzbsm, scyclx, actual) {
if(!zrzbsm){
getLpb (zrzbsm, scyclx, actual) {
if (!zrzbsm) {
this.$message({
message: "暂无楼盘表",
type: "warning",
});
}else{
} else {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
if(scyclx){
if(res.result.syclx == "1") {
if (scyclx) {
if (res.result.syclx == "1") {
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
}
}else{
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
} else {
this.$message({
message: res.message,
type: "warning",
});
}
} else {
this.$message({
......@@ -243,7 +266,7 @@ export default {
* @param {*} type
* @author: renchao
*/
openMenu(e, item, type) {
openMenu (e, item, type) {
this.lpbChLeft = e.pageX - 96;
this.lpbChTop = e.pageY - 23;
// this.lpbChVisible = true;
......@@ -253,7 +276,7 @@ export default {
* @description: 关闭户右键菜单
* @author: renchao
*/
closeMenu() {
closeMenu () {
this.lpbChVisible = false;
},
//右键菜单点击
......@@ -261,7 +284,7 @@ export default {
* @description: 右键菜单点击
* @author: renchao
*/
menuClick() {
menuClick () {
this.closeMenu();
},
/**
......@@ -269,7 +292,7 @@ export default {
* @param {*} property
* @author: renchao
*/
compare(property) {
compare (property) {
return function (a, b) {
var value1 = a[property];
var value2 = b[property];
......@@ -305,9 +328,9 @@ export default {
this.close()
} else {
if (res.result && res.result.length > 0) {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
} else {
this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
}
}
}).catch(() => {
......@@ -319,19 +342,19 @@ export default {
* @param {*} val
* @author: renchao
*/
close(){
close () {
ywPopupCacel()
},
},
computed:{
lpbContentHeight(){
computed: {
lpbContentHeight () {
return this.onlyShow ? 32 : 76
// return 76
}
},
watch: {
//户右键菜单显示时，监听到鼠标点击时关闭户右键菜单
lpbChVisible(value) {
lpbChVisible (value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
......@@ -339,10 +362,10 @@ export default {
}
}
},
};
};
</script>
<style scoped lang="scss">
.lpbContent-wrap {
.lpbContent-wrap {
width: 100%;
height: 100%;
overflow: hidden;
......@@ -367,7 +390,7 @@ export default {
border: 0;
border-top: 1px solid #e6e6e6;
}
.save-btn{
.save-btn {
display: block;
margin: 5px auto;
}
......@@ -414,5 +437,5 @@ export default {
background: #ffffff;
}
}
}
}
</style>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-02-23 16:27:17
* @LastEditTime: 2024-03-07 09:13:26
*/
import Vue from 'vue'
import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print";
import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
import { getLodop } from "@/utils/LodopFuncs";
import { getNewDate } from '@/utils/util'
......@@ -151,7 +151,8 @@ export default {
unitData: window.unitData,
bsmSlsq: this.bsmSlsq,
showSave: true,
djlx: window.djlx
djlx: window.djlx,
isworkFrame: true
}, '85%', true, false)
} else {
this.$message.error(res.message)
......@@ -259,8 +260,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -288,7 +289,7 @@ export default {
// 补充材料通知书
case "bccltzs":
this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" },
{ bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
'70%', true)
break;
// 补充材料接收凭证
......@@ -302,12 +303,12 @@ export default {
let key = index + 1
this.$set(infoRes.result, "file" + key, it.sjmc)
this.$set(infoRes.result, "file" + key + 'ys', it.ys)
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -347,8 +348,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -387,8 +388,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......@@ -428,8 +429,8 @@ export default {
})
}
infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
infoRes.result.nowyue = this.newDate.slice(5,7)
infoRes.result.nowri = this.newDate.slice(8,10)
infoRes.result.nowyue = this.newDate.slice(5, 7)
infoRes.result.nowri = this.newDate.slice(8, 10)
let date = infoRes.result.sqrq
infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......