Skip to content

D
dsk-operate-sys-cscec
Commit 7925385e authored by yht15023815643's avatar yht15023815643
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 ebea4efc 547fe1e7
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 11 deletions
dsk-operate-ui/src/views/projectCostLedger/detail/components/CostSummary/index.vue
View file @ 7925385e
...@@ -266,7 +266,14 @@ export default { ...@@ -266,7 +266,14 @@ export default {
}, },
//可访问data属性 //可访问data属性
created() { created() {
this.init(this.comProjectDetailInfo); const { projectId, cbStage } = this.comProjectDetailInfo;
if (!projectId) return;
const params = {
projectId,
cbStage,
cbType: this.currentCategory
};
this.getCostSummaryMenuTree(params);
}, },
//计算集 //计算集
computed: { computed: {
...@@ -328,7 +335,7 @@ export default { ...@@ -328,7 +335,7 @@ export default {
cbStage, cbStage,
cbType: this.currentCategory cbType: this.currentCategory
}; };
await this.getCostSummaryMenuTree(params); // await this.getCostSummaryMenuTree(params);
await this.getCostSummaryMonthList(params, saveReset); await this.getCostSummaryMonthList(params, saveReset);
await this.getLockMonthList(params); await this.getLockMonthList(params);
await this.initDefaultSetting(resetDate, saveReset); await this.initDefaultSetting(resetDate, saveReset);
...@@ -392,28 +399,51 @@ export default { ...@@ -392,28 +399,51 @@ export default {
} }
return params; return params;
}, },
async getMenuTree(params) {
try {
const result = await getCostSummaryMenuTreeApi(params);
if (result.code == 200 && result.data instanceof Array) {
const _tempArray = result.data;
const _tempMenu = {
id: 0,
cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目",
children: _tempArray
};
this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
}
} catch (error) {
}
},
async getCostSummaryMenuTree(params) { async getCostSummaryMenuTree(params) {
try { try {
const result = await getCostSummaryMenuTreeApi(params); const result = await getCostSummaryMenuTreeApi(params);
if (result.code == 200 && result.data instanceof Array) { if (result.code == 200 && result.data instanceof Array) {
if(this.projectDetailInfo.cbStage === 3 && this.currentCategory === 1){
if(result.data.length === 0){ if(result.data.length === 0){
this.show=true;
}
const _tempArray = result.data;
if(this.projectDetailInfo.cbStage === 3){
if(_tempArray.length === 0){
this.currentCategory=2; this.currentCategory=2;
this.categoryList[0].disabled=true; this.categoryList[0].disabled=true;
this.$forceUpdate(); const { projectId, cbStage } = this.comProjectDetailInfo;
const params = {
projectId,
cbStage,
cbType: this.currentCategory
};
this.getMenuTree(params);
return this.init(this.comProjectDetailInfo); return this.init(this.comProjectDetailInfo);
} }
} }
if(result.data.length === 0){
this.show=true;
}
const _tempArray = result.data;
const _tempMenu = { const _tempMenu = {
id: 0, id: 0,
cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目", cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目",
children: _tempArray children: _tempArray
}; };
this.menuTreeList = _tempArray.length ? [_tempMenu] : []; this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
this.init(this.comProjectDetailInfo);
} }
} catch (error) { } catch (error) {
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/EngineeringInformation/index.vue
View file @ 7925385e
...@@ -237,7 +237,6 @@ export default { ...@@ -237,7 +237,6 @@ export default {
try { try {
const result = await getCbProjectInfo(params); const result = await getCbProjectInfo(params);
if (result.code == 200) { if (result.code == 200) {
console.log(result.data)
this.forInfo=result.data; this.forInfo=result.data;
} }
} catch (error) { } catch (error) {
......
dsk-operate-ui/src/views/projectCostLedger/index.vue
View file @ 7925385e
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
</el-table-column> </el-table-column>
<el-table-column label="项目状态" prop="customerCode" width="100" :resizable="false"> <el-table-column label="项目状态" prop="customerCode" width="100" :resizable="false">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="item in ztStagelist"> <span v-if="scope.row.cbStage ===3">--</span>
<template v-else v-for="item in ztStagelist">
<template v-if="item.dictValue == scope.row.projectFileStatus"> <template v-if="item.dictValue == scope.row.projectFileStatus">
<span class="zts" :class="'zt'+scope.row.projectFileStatus">{{item.dictLabel}}</span> <span class="zts" :class="'zt'+scope.row.projectFileStatus">{{item.dictLabel}}</span>
</template> </template>
......
dsk-operate-ui/src/views/supplier/supplierOverview/index.vue
View file @ 7925385e
...@@ -554,6 +554,159 @@ ...@@ -554,6 +554,159 @@
], ],
tableData:[ tableData:[
{
name:'北京宁盛伟业建筑工程机械设备租赁有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京森桦建业防水工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京致用恒力建筑材料检测有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京振兴万源建筑工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京天罡星机械设备租赁有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'河南省天地建筑防水工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'重庆尔安机电设备工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'山东鸿华建筑安装工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'江苏地基工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'信邦建设集团有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'华诚博远钢结构有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'江苏金祥建设工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'浙江精工钢结构集团有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京洪雨建设工程有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'北京中城华远建设集团有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'德州亚太集团有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{
name:'浙江中南绿建科技集团有限公司',
fxsl:'27',
sffx:'85',
jyyj:'77',
xzcf:'77',
blxw:'75',
ss:'43',
},
{ {
name:'中国石油化工股份有限公司', name:'中国石油化工股份有限公司',
fxsl:'27', fxsl:'27',
......
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