Skip to content

D
dsk-operate-sys-cscec
Commit d44e632a authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 36c69558 5d833de3
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 29 deletions
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ d44e632a
<template>
<div class="app-container part-container details-of-party">
<div style="height: 100%;" v-if="!isCompany">
<div style="height: 100%;" v-if="!isCompany">
<skeleton style="padding-top: 16px"></skeleton>
</div>
<Header :company-id="companyId" :companyInfo="companyInfo" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
<div class="part-main">
<div class="part-left">
<side-bar :statisticObj="statisticObj" ref="sidebar" @currentPath="showPartPage" :pathName="currentPath.pathName"
:partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
:partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
</div>
<div class="part-right">
<div id="partBox" v-if="companyId" class="part-common-container-style">
......@@ -40,7 +40,7 @@
<cooperative-owner-units v-if="currentPath.pathName=='cooperativeOwnerUnits'" :company-id="companyId"></cooperative-owner-units>
<!-- 2、常合作施工单位 -->
<cooperative-construction-unit v-if="currentPath.pathName=='cooperativeConstructionUnit'"
:company-id="companyId"></cooperative-construction-unit>
:company-id="companyId"></cooperative-construction-unit>
<!-- 3、常合作集团 -->
<cooperative-group v-if="currentPath.pathName=='cooperativeGroup'" :company-id="companyId"></cooperative-group>
<!-- 投诚分析 -->
......@@ -63,12 +63,12 @@
<!-- 内部合作 -->
<!-- 1、咨询机构合作 -->
<consulting-agency-cooperation v-if="currentPath.pathName=='consultingAgencyCooperation'"
:company-id="companyId"></consulting-agency-cooperation>
:company-id="companyId"></consulting-agency-cooperation>
<!-- 2、准入情况 -->
<access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition>
<!-- 3、供应商合作记录 -->
<cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId"
:company-name="companyName"></cooperation-record>
:company-name="companyName"></cooperation-record>
<!-- 4、施工业绩 -->
<construction-performance v-if="currentPath.pathName=='constructionPerformance'" :company-id="companyId"></construction-performance>
<!-- 5、在施工程情况 -->
......@@ -81,10 +81,10 @@
<Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" :customerInfo="customerInfo" />
<!-- 合作情况 -->
<Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail"
:customerInfo="customerInfo" @detail="cooperateDetail" />
:customerInfo="customerInfo" @detail="cooperateDetail" />
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo"
:customerInfo="customerInfo" />
:customerInfo="customerInfo" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
</template>
......@@ -151,7 +151,7 @@ import ConstructionSituation from "@/views/detail/party-a/internalCooperation/co
import {
urbanInvestmentPage,
} from '@/api/detail/party-a/urbanLnvestment';
import skeleton from './component/skeleton'
import skeleton from './component/skeleton';
export default {
name: 'PartyA',
components: {
......@@ -282,12 +282,6 @@ export default {
}
},
created() {
let companyName = this.$route.query.companyName ? this.$route.query.companyName : "";
document.getElementById('tagTitle').innerText = companyName;
let titlename = document.getElementById('tagTitles');
if (titlename) {
titlename.innerText = companyName;
}
this.init();
},
mounted() {
......@@ -353,12 +347,13 @@ export default {
this.$refs.sidebar.sideRoute = arr;
}
}
if (this.companyInfo && this.companyInfo.companyName) {
if ((this.companyInfo && this.companyInfo.companyName) || this.companyName) {
await this.$nextTick();
document.getElementById('tagTitle').innerText = this.companyInfo.companyName;
const _cname = this.companyInfo.companyName ? this.companyInfo.companyName : this.companyName;
document.getElementById('tagTitle').innerText = _cname;
let titlename = document.getElementById('tagTitles');
if (titlename) {
titlename.innerText = this.companyInfo.companyName;
titlename.innerText = _cname;
}
}
}
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/PushProjectUseDialog.vue 0 → 100644
View file @ d44e632a
<template>
<el-dialog :title="comIsEntityMaterials ? '推送到物资用量' : '推送工程量'" :visible.sync="pushProjectUseDialog" width="480px" class="push-project-use-dialog"
@close="dialogClose">
<div class="dialog-body-content">
<el-form :model="pushForm" ref="pushForm" :rules="rules">
<el-form-item label="分包项目名称">
<el-input v-model="form.projectName"></el-input>
</el-form-item>
</el-form>
</div>
</el-dialog>
</template>
<script>
export default {
name: "pushProjectUseDialog",
model: {
prop: "pushProjectUseDialog",
event: "close"
},
props: {
pushProjectUseDialog: {
type: Boolean,
default: false
},
isEntityMaterials: {
type: Boolean,
default: false
},
rowData: {
type: Object,
default: () => ({})
}
},
watch: {
pushProjectUseDialog: {
handler(newValue, oldValue) {
this.comPushProjectUseDialog = newValue;
}
},
comIsEntityMaterials: {
handler(newValue, oldValue) {
this.comIsEntityMaterials = newValue;
}
},
rowData: {
handler(newValue, oldValue) {
const _temp = newValue ? newValue : {};
this.pushForm = { ...this.pushForm, ..._temp };
}
}
},
data() {
return {
comIsEntityMaterials: this.isEntityMaterials,
comPushProjectUseDialog: this.pushProjectUseDialog,
pushForm: {
id: "",
pushQuantities: "",
ipmProjectCode: "",
ipmContractCode: "",
ipmBizCode: ""
},
rules: {
}
};
},
//可访问data属性
created() {
},
//计算集
computed: {
},
//方法集
methods: {
dialogClose() {
this.$emit("close", false);
}
},
}
</script>
<style lang="scss" scoped>
.push-project-use-dialog {
::v-deep .el-dialog {
margin-top: 0px !important;
margin: 0px;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
.el-dialog__header {
height: 56px;
padding: 0px 20px;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #eeeeee;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
.el-dialog__title {
color: #232323;
font-size: 16px;
font-weight: bold;
}
.el-dialog__headerbtn {
position: static;
width: 16px;
height: 16px;
}
}
.el-dialog__body {
padding: 0px;
.dialog-body-content {
padding: 24px 20px;
box-sizing: border-box;
}
}
}
}
</style>
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ d44e632a
......@@ -41,7 +41,8 @@
:cell-class-name="cellClassName">
<template slot="action-field-bar" slot-scope="scope">
<div class="project-action-field-bar" v-if="scope.row.id != '0'">
<span class="push-project">推送工程量</span>
<span class="push-project-use" :class="{'is-emty-quantities' : !parseFloat(scope.row.quantities)}"
@click="parseFloat(scope.row.quantities) ? pushProjectUse(scope.row) : ''">推送工程量</span>
</div>
<span v-else>-</span>
</template>
......@@ -70,7 +71,8 @@
:max-height="true" :tableDataTotal="total" :paging="false" @selectionChange="selectionChange">
<template slot="action-field-bar" slot-scope="scope">
<div class="project-action-field-bar">
<span class="push-project">推送工程量</span>
<span class="push-project-use" :class="{'is-emty-quantities' : !parseFloat(scope.row.quantities)}"
@click="parseFloat(scope.row.quantities) ? pushProjectUse(scope.row) : ''">推送物资用量</span>
</div>
</template>
</entity-materials-table>
......@@ -82,8 +84,13 @@
<!-- 填写实际成本触发 -->
<add-actual-cost v-model="showAddActualCost" :project-create-time="projectDetailInfo.createTime" @timeSelect="timeSelect"></add-actual-cost>
<!-- 推送工程量 ， 推送物资 -->
<push-project-use-dialog v-model="pushProjectUseDialog" :is-entity-materials="isEntityMaterials"
:row-data="pushProjectUseTemp"></push-project-use-dialog>
<!-- 单位换算弹窗 -->
<unit-conversion v-if="showUnitConversion" :isVisible="showUnitConversion" :dataList="unitConversionList" @refresh="handleDialogVisible()"></unit-conversion>
<unit-conversion v-if="showUnitConversion" :isVisible="showUnitConversion" :dataList="unitConversionList"
@refresh="handleDialogVisible()"></unit-conversion>
</div>
</template>
......@@ -96,6 +103,7 @@ import CustomTable from "@/components/CustomTable";
import EntityMaterialsTable from "@/components/CustomTable";
import AddActualCost from "./components/AddActualCost";
import unitConversion from "./components/unitConversion";
import PushProjectUseDialog from "./components/PushProjectUseDialog";
import { v4 } from 'uuid';
import dayjs from "dayjs";
import { cloneDeep } from "lodash-es";
......@@ -161,7 +169,8 @@ export default {
EntityMaterialsTable,
DskSkeleton,
AddActualCost,
unitConversion
unitConversion,
PushProjectUseDialog
},
data() {
const amountCheckValidator = (rule, value, callback) => {
......@@ -248,6 +257,10 @@ export default {
addActualCostEditStatus: false,
// 当前选择的成本年份
selectActualCostTime: "",
// 推送工程量弹窗
pushProjectUseDialog: false,
// 推送工程量数据缓存
pushProjectUseTemp: {},
checkRules: {
amountCheck: [
{ trigger: ["change"], validator: amountCheckValidator }
......@@ -255,9 +268,9 @@ export default {
},
statisticsTimer: null,
// 单位换算弹窗
showUnitConversion:false,
showUnitConversion: false,
//单位换算数据
unitConversionList:[]
unitConversionList: []
};
},
//可访问data属性
......@@ -529,8 +542,8 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.unitConversionList=data.data;
this.showUnitConversion=true;
this.unitConversionList = data.data;
this.showUnitConversion = true;
}).catch(() => {
this.$message({
type: 'info',
......@@ -624,6 +637,15 @@ export default {
}
});
},
// 推送工程用量
pushProjectUse(row) {
if (!row.id) return;
// 打开推送推送弹窗
const _temp = { ...this.pushProjectUseTemp, ...cloneDeep(row) };
_temp.projectName = this.projectDetailInfo.projectName;
this.pushProjectUseTemp = _temp;
this.pushProjectUseDialog = true;
},
differentCompare() {
const originData = this.originTableDataList;
/**
......@@ -715,8 +737,8 @@ export default {
return "";
},
//关闭单位换算弹窗
handleDialogVisible () {
this.showUnitConversion = false
handleDialogVisible() {
this.showUnitConversion = false;
},
},
}
......@@ -862,11 +884,16 @@ export default {
display: flex;
align-items: center;
.push-project {
.push-project-use {
color: #0081ff;
font-size: 14px;
font-weight: 350;
cursor: pointer;
&.is-emty-quantities {
cursor: not-allowed;
color: rgba(35, 35, 35, 0.4);
}
}
}
}
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FieldExpenses/index.vue
View file @ d44e632a
......@@ -3,7 +3,7 @@
<div class="field-expenses-inner">
<div class="left-side-menu">
<project-side-menu ref="projectSideMenu" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false"
:default-active="currentNodeValue" @select="menuSelect">
v-model="currentNodeValue" @select="menuSelect">
<template slot="现场经费-1">
<img src="@/assets/images/projectCostLedger/icon_cost_detail_6.svg" alt="">
<div class="project-sub-menu-title-text">现场经费</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment