增加项目成本产值管理
parent
d7bdc1849f
commit
72fe8bdc16
|
|
@ -99,10 +99,89 @@ const milestoneList = (data) => {
|
|||
});
|
||||
});
|
||||
};
|
||||
|
||||
const costOutputSelectYearAndMonth=(data)=> {
|
||||
return new Promise(reslove=>{
|
||||
let data2={...data};
|
||||
let y=data2.year;
|
||||
let m=data2.month-1;
|
||||
if(m==0){
|
||||
m=12;
|
||||
y--;
|
||||
}
|
||||
data2.year=y;
|
||||
data2.month=m;
|
||||
var ajaxs=[request({
|
||||
url: `/manage/costOutput/selectYearAndMonth`,
|
||||
method: 'post',
|
||||
data:data
|
||||
}),
|
||||
request({
|
||||
url: `/manage/costOutput/selectYearAndMonth`,
|
||||
method: 'post',
|
||||
data:data2
|
||||
})];
|
||||
|
||||
axios.all(ajaxs).then(res=>{
|
||||
let d=res[0]
|
||||
const getValue=(tmps,type)=>{
|
||||
let objs=tmps.filter(d=>d.costType==type);
|
||||
return objs.length>0?objs[0]:{};
|
||||
}
|
||||
let tmps=(d.data||[]).map(it=>{
|
||||
it.money=it.money?it.money/10000.0:0;
|
||||
return it;
|
||||
});
|
||||
let y=data.year;
|
||||
let m=data.month-1;
|
||||
if(m==0){
|
||||
m=12;
|
||||
y--;
|
||||
}
|
||||
let tmps2=(res[1].data||[]).map(it=>{
|
||||
it.money=it.money?it.money/10000.0:0;
|
||||
return it;
|
||||
});
|
||||
let curM=tmps2.filter(it=>it.costType==9 && it.year==y && it.month==m);
|
||||
curM=curM.length>0?curM[0]:{};
|
||||
|
||||
let totalObjs=tmps.filter(it=>it.costType==9);
|
||||
let total=0;
|
||||
totalObjs.forEach(it=>{
|
||||
if(it.money){
|
||||
total+=it.money;
|
||||
}
|
||||
});
|
||||
let yearObjs=tmps.filter(it=>it.costType==9 && it.year==y);
|
||||
let totalY=0;
|
||||
yearObjs.forEach(it=>{
|
||||
if(it.money){
|
||||
totalY+=it.money;
|
||||
}
|
||||
});
|
||||
let obj={
|
||||
totalInv:getValue(tmps,1).money||0,//总投资
|
||||
curYear:getValue(tmps,2).money||0,//年总投资
|
||||
contract1:getValue(tmps,3).money||0,//合同金额
|
||||
contract2:getValue(tmps,4).money||0,//合同支付金额
|
||||
contract3:getValue(tmps,5).money||0,//合同挂账金额
|
||||
safety1:getValue(tmps,6).money||0,//安措金额
|
||||
safety2:getValue(tmps,7).money||0,//安措支付金额
|
||||
safety3:getValue(tmps,8).money||0,//安措挂账金额
|
||||
curMonth:curM.money||0,//当月投资
|
||||
totalMonth:total,//开累投资
|
||||
totalYear:totalY,//本年完成
|
||||
}
|
||||
reslove(obj);
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
export default {
|
||||
groupByCraftType,
|
||||
groupByCraftTypeByAttendance,
|
||||
subdeptsUsersList,
|
||||
attendanceUbiDataList,
|
||||
milestoneList,
|
||||
costOutputSelectYearAndMonth
|
||||
};
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ service.interceptors.response.use(res => {
|
|||
return res.data
|
||||
}
|
||||
if (code === 401) {
|
||||
debugger
|
||||
if (!isRelogin.show) {
|
||||
isRelogin.show = true;
|
||||
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@
|
|||
总投资
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 1000 }}</span> 万元
|
||||
<span class="led-number">{{ costOutData.totalInv||0 }}</span> 万元
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
本月完成
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 1000 }}</span> 万元
|
||||
<span class="led-number">{{ costOutData.curMonth||0 }}</span> 万元
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -251,7 +251,7 @@
|
|||
本年完成
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 1000 }}</span> 万元
|
||||
<span class="led-number">{{ costOutData.totalYear||0 }}</span> 万元
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -265,7 +265,7 @@
|
|||
开累完成
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 1000 }}</span> 万元
|
||||
<span class="led-number">{{ costOutData.totalMonth||0 }}</span> 万元
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
计划开工日期
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ new Date() | toDate }}</span>
|
||||
<span class="led-number">{{ selProject.scheduledStartTime | toDate }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -295,7 +295,7 @@
|
|||
计划竣工日期
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ new Date() | toDate }}</span>
|
||||
<span class="led-number">{{ selProject.plannedCompletionTime | toDate }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -309,7 +309,7 @@
|
|||
实际开工日期
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ new Date() | toDate }}</span>
|
||||
<span class="led-number">{{ selProject.actualOperatingTime | toDate }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -323,7 +323,7 @@
|
|||
合同工期
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 2100 }}</span> 天
|
||||
<span class="led-number">{{ selProject.projectTimeLimit||'' }}</span> 天
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -338,7 +338,7 @@
|
|||
建筑面积
|
||||
</p>
|
||||
<div>
|
||||
<span class="led-number">{{ 10000 }}</span> 平方米
|
||||
<span class="led-number">{{ selProject.floorArea||'' }}</span> 平方米
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -503,7 +503,6 @@ import projectInfoDialog from './detail/projectInfoDialog.vue';
|
|||
import staffSurveyChart from '@/components/staffSurveyChart.vue';
|
||||
import MonitAndWarning from './components/MonitAndWarning.vue';
|
||||
import attendanceInfoDlg from './detail/attendanceInfoDlg.vue';
|
||||
import testData from './test/detail'
|
||||
import debounce from 'lodash.debounce'
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -549,6 +548,7 @@ export default {
|
|||
projectBuildNode: [],
|
||||
maxWidth: 0,
|
||||
minWidth: 100,
|
||||
costOutData:{},
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -615,13 +615,25 @@ export default {
|
|||
});
|
||||
this.loadAttendanceData();
|
||||
this.loadMilestoneData();
|
||||
this.loadCostOutput();
|
||||
},
|
||||
loadCostOutput(){
|
||||
let dt = this.$dt(new Date());
|
||||
this.$api.detail.costOutputSelectYearAndMonth({
|
||||
comId: this.selProject.comId,
|
||||
projectId: this.selProject.id,
|
||||
year: dt.$y,
|
||||
month: dt.$M + 1,
|
||||
}).then(d=>{
|
||||
this.costOutData=d;
|
||||
});
|
||||
},
|
||||
loadMilestoneData() {
|
||||
this.$api.detail.milestoneList({
|
||||
pageNum: 1,
|
||||
pageSize: 100,
|
||||
comId: this.prjInfo.comId,
|
||||
projectId: this.prjInfo.id
|
||||
comId: this.selProject.comId,
|
||||
projectId: this.selProject.id
|
||||
}).then(d => {
|
||||
this.projectBuildNode = d;
|
||||
let itemWidth = this.$dpi() == "1K" ? 200 : this.$dpi() == "2K" ? 300 : 500;
|
||||
|
|
@ -638,8 +650,8 @@ export default {
|
|||
loadAttendanceData() {
|
||||
let ajax = this.$api.detail.groupByCraftType;
|
||||
let posData = {
|
||||
comId: this.prjInfo.comId,
|
||||
projectId: this.prjInfo.id
|
||||
comId: this.selProject.comId,
|
||||
projectId: this.selProject.id
|
||||
}
|
||||
if (this.attendanceNav == 1) {
|
||||
ajax = this.$api.detail.groupByCraftTypeByAttendance;
|
||||
|
|
|
|||
|
|
@ -142,4 +142,59 @@ public class ProCostOutputController extends BaseController
|
|||
Map<String,List<List<ProCostOutput>>> list=proCostOutputService.selectForBigEnginList(where);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按项目ID查询，如果没有数据进行初始化
|
||||
* @param projectId
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/listByProjectId")
|
||||
public AjaxResult listByProjectId(long projectId,long comId){
|
||||
ProCostOutput where =new ProCostOutput();
|
||||
where.setProjectId(projectId);
|
||||
where.setComId(comId);
|
||||
List<ProCostOutput> list=proCostOutputService.selectProCostOutputList(where);
|
||||
if(list.size()==0){
|
||||
proCostOutputService.initProject(projectId,comId);
|
||||
}
|
||||
list=proCostOutputService.selectProCostOutputList(where);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
* 增加年度投资
|
||||
* @param projectId
|
||||
* @param year
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/addYearInvestment")
|
||||
public AjaxResult addYearInvestment(@RequestBody ProCostOutput where){
|
||||
List<ProCostOutput> list=proCostOutputService.selectProCostOutputList(where);
|
||||
if(list.size()==0){
|
||||
proCostOutputService.addYearInvestment(where);
|
||||
return AjaxResult.success("增加年度投资成功!");
|
||||
}else{
|
||||
return AjaxResult.error("此年度投资已存在!");
|
||||
}
|
||||
}
|
||||
@PostMapping("/addMonthInvestment")
|
||||
public AjaxResult addMonthInvestment(@RequestBody ProCostOutput where) {
|
||||
List<ProCostOutput> list=proCostOutputService.selectProCostOutputList(where);
|
||||
if(list.size()==0){
|
||||
proCostOutputService.addMonthInvestment(where);
|
||||
return AjaxResult.success("增加月度投资成功!");
|
||||
}else{
|
||||
return AjaxResult.error("此月度投资已存在!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/batchUpdate")
|
||||
public AjaxResult batchUpdate(@RequestBody List<ProCostOutput> list){
|
||||
try {
|
||||
proCostOutputService.batchUpdate(list);
|
||||
return AjaxResult.success("保存成功!");
|
||||
}catch (Exception ex){
|
||||
return AjaxResult.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,19 +118,19 @@ public class ProCostOutputServiceImpl implements IProCostOutputService
|
|||
insertProCostOutput(it);
|
||||
it.setYear(null);
|
||||
it.setCostType(3l);//合同金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(4l);//合同支付金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(5l);//合同挂账金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(6l);//安措金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(7l);//安措支付金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(8l);//安措挂账金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(10l);//建安费金额
|
||||
insertProCostOutput(it);
|
||||
//insertProCostOutput(it);
|
||||
it.setCostType(9l);//月度投资
|
||||
it.setYear(year*1l);
|
||||
for(int i=1;i<=12;i++){
|
||||
|
|
|
|||
|
|
@ -66,4 +66,7 @@ onMounted(() => {
|
|||
display: none;
|
||||
}
|
||||
}
|
||||
:focus-visible {
|
||||
outline: none !important;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -42,3 +42,36 @@ export function delCostOutput(id) {
|
|||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
export function listByProjectId(query){
|
||||
return request({
|
||||
url: '/manage/costOutput/listByProjectId',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export function addYearInvestment(data){
|
||||
return request({
|
||||
url: '/manage/costOutput/addYearInvestment',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
export function addMonthInvestment(data){
|
||||
return request({
|
||||
url: '/manage/costOutput/addMonthInvestment',
|
||||
method: 'post',
|
||||
data:data
|
||||
})
|
||||
}
|
||||
|
||||
export function batchUpdate(datas){
|
||||
return request({
|
||||
url: '/manage/costOutput/batchUpdate',
|
||||
method: 'post',
|
||||
data:datas
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
<template>
|
||||
<div class="cost-month" style="border:solid 1px #409eff;margin: 12px 0px;padding: 6px 12px 0px;position: relative;">
|
||||
<el-popover placement="top" :visible="data.showPop2" ref="pop" width="300px">
|
||||
<p>选择年份</p>
|
||||
<div style="margin-bottom: 12px;">
|
||||
<el-date-picker v-model="data.selYear" type="year" placeholder="选择年份" style="width:100%"
|
||||
:picker-options="{ disabledDate: doPick }">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="text-align: right; margin: 0">
|
||||
<el-button size="mini" type="text" @click="data.showPop2 = false">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="doAddYear">确定</el-button>
|
||||
</div>
|
||||
<template #reference>
|
||||
<el-button size="mini" type="success" @click="data.showPop2=true" style="margin-right: 12px;" class="btn-add-year" round>增加年份</el-button>
|
||||
</template>
|
||||
</el-popover>
|
||||
<el-tabs type="card" v-model="data.activeName">
|
||||
<el-tab-pane v-for="(it, idx) in data.monthInv" :label="'' + it.year" :name="'' + it.year" :key="idx">
|
||||
<el-row>
|
||||
<el-col v-for="(item, idxx) in it.value" :key="idxx" :span="12">
|
||||
<el-form-item :label="data.names[item.month]" class="w200" :class="item.money * 1 < 0 ? 'txt-error' : ''">
|
||||
<el-input-number :precision="2" v-model="item.money" placeholder="年度投资">
|
||||
</el-input-number>
|
||||
<span class="sp-unit">万元</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {addMonthInvestment} from '@/api/manage/costOutput.js'
|
||||
const { proxy } = getCurrentInstance();
|
||||
const $emit=defineEmits(["success"])
|
||||
const data = reactive({
|
||||
prj: null,
|
||||
selYear: '',
|
||||
names: ['', '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
|
||||
activeName: '',
|
||||
monthInv: [],
|
||||
showPop2: false,
|
||||
})
|
||||
function doPick(a, b) {
|
||||
return data.monthInv.filter(d => d.year == a.getFullYear()).length > 0;
|
||||
}
|
||||
function doAddYear() {
|
||||
addMonthInvestment({comId:data.prj.comId,
|
||||
year:proxy.$dt(data.selYear).$y,
|
||||
projectId:data.prj.id,
|
||||
costType:9
|
||||
}).then(d=>{
|
||||
$emit("success");
|
||||
data.showPop2=false;
|
||||
});
|
||||
}
|
||||
function init(d, prj) {
|
||||
data.monthInv = d;
|
||||
data.prj = prj;
|
||||
if (d.filter(it => it.year == new Date().getFullYear()).length > 0) {
|
||||
data.activeName = "" + new Date().getFullYear()
|
||||
} else {
|
||||
if (d.length > 0) {
|
||||
data.activeName = "" + d[0].year;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
init
|
||||
})
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.cost-month{
|
||||
.btn-add-year{
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
z-index: 9;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
<template>
|
||||
<el-drawer class="cost-output-drawer" v-if="data.isOpen" v-model="data.isOpen" direction="rtl" size="50%" style="padding-left: 20px">
|
||||
<template #header>
|
||||
<div>{{ (data.title) + " 【项目成本产值管理】" }}</div>
|
||||
<right-toolbar @queryTable="doQuery" :search="false">
|
||||
</right-toolbar>
|
||||
</template>
|
||||
<div style="margin-top:12px;" v-if="data.form.totalInv">
|
||||
<el-form ref="form" label-width="100px">
|
||||
<el-tabs type="card" v-model="data.activeName" @tab-click="handleClick">
|
||||
<el-tab-pane label="总投资" name="first">
|
||||
<el-form-item label="总投资" class="w400"
|
||||
:class="data.form.totalInv.money * 1 < 0 ? 'txt-error' : ''">
|
||||
<el-input-number :precision="2" v-model="data.form.totalInv.money" placeholder="请输入总投资">
|
||||
</el-input-number>
|
||||
<span class="sp-unit">万元</span>
|
||||
</el-form-item>
|
||||
<div class="div-title fblue" style="color: #409eff;">年度投资</div>
|
||||
<costYear ref="costYearCom" @success="doAddYearSuccess">
|
||||
|
||||
</costYear>
|
||||
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="月度产值" name="fourth">
|
||||
<div class="div-title fblue" style="color: #409eff;">月度产值</div>
|
||||
<costMonth ref="costMonthCom" @success="doAddYearSuccess"></costMonth>
|
||||
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-form>
|
||||
|
||||
<div style="text-align: center;margin-top: 24px;">
|
||||
<el-button type="success" :loading="data.loading" @click="doSave">保存</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { listByProjectId,batchUpdate } from '@/api/manage/costOutput.js'
|
||||
import costYear from './costYear.vue';
|
||||
import costMonth from './costMonth.vue';
|
||||
const { proxy } = getCurrentInstance();
|
||||
const userStore = useUserStore()
|
||||
const costYearCom = ref()
|
||||
const costMonthCom = ref()
|
||||
const data = reactive({
|
||||
isOpen: false,
|
||||
prjInfo: null,
|
||||
title: '',
|
||||
loading: false,
|
||||
activeName: 'first',
|
||||
form: {
|
||||
totalInv: null,//总投资
|
||||
contract1: null,//合同金额
|
||||
contract2: null,//合同支付金额
|
||||
contract3: null,//农民工支付金额
|
||||
safety1: null,//安措金额
|
||||
safety2: null,//安措支付金额
|
||||
safety3: null,//安措挂账金额
|
||||
|
||||
},
|
||||
oldData: [],
|
||||
yearInv: [],//年度投资
|
||||
monthInv: [],//月度产值
|
||||
contract: [],//合同金额明细
|
||||
safety: [],//安措支付明细
|
||||
})
|
||||
|
||||
const doQuery = () => {
|
||||
proxy.$confirm('确定刷新数据?', '提示', { type: 'warning' }).then(() => {
|
||||
loadData();
|
||||
});
|
||||
}
|
||||
const showDrawer = (row) => {
|
||||
data.prjInfo = row;
|
||||
data.title = row.projectName;
|
||||
data.isOpen = true;
|
||||
data.activeName="first";
|
||||
loadData();
|
||||
}
|
||||
function handleClick() {
|
||||
|
||||
}
|
||||
function doAddYearSuccess() {
|
||||
loadData();
|
||||
}
|
||||
function doSave() {
|
||||
|
||||
let objs = data.oldData.filter(d => d.costType != 11 && d.costType != 12).map(it => {
|
||||
let obj = { ...it };
|
||||
obj.money = obj.money ? obj.money * 10000 : 0;
|
||||
return obj;
|
||||
});
|
||||
if (objs.filter(d => d.money * 1 < 0).length > 0) {
|
||||
proxy.$message.error("请检查，金额不能为负数!");
|
||||
return;
|
||||
}
|
||||
|
||||
data.loading = true;
|
||||
batchUpdate([...objs]).then(d => {
|
||||
data.loading = false;
|
||||
if (d.code != 200) {
|
||||
loadData();
|
||||
} else {
|
||||
proxy.$modal.msgSuccess("保存成功");
|
||||
loadData();
|
||||
}
|
||||
});
|
||||
}
|
||||
function getValue(tmps, type) {
|
||||
let objs = tmps.filter(d => d.costType == type);
|
||||
if (objs.length > 0) {
|
||||
return objs[0];
|
||||
}
|
||||
let obj = {
|
||||
money: 0,
|
||||
costType: type,
|
||||
projectId: data.prjInfo.id
|
||||
};
|
||||
tmps.push(obj);
|
||||
return obj;
|
||||
}
|
||||
function loadData() {
|
||||
listByProjectId({
|
||||
projectId: data.prjInfo.id,
|
||||
comId: data.prjInfo.comId
|
||||
}).then(d => {
|
||||
let tmps = (d.data || []).map(it => {
|
||||
it.money = it.money ? it.money / 10000.0 : 0;
|
||||
it.money2 = it.money2 ? it.money2 / 10000.0 : 0;
|
||||
it.moneyTotal = it.money - it.money2;
|
||||
it.money3 = it.money3 ? it.money3 / 10000.0 : 0;
|
||||
it.isErr = false;
|
||||
it.date1 = proxy.$dt(it.date1)
|
||||
return it;
|
||||
});
|
||||
data.oldData = tmps;
|
||||
data.form.totalInv = getValue(tmps, 1);
|
||||
data.yearInv = tmps.filter(it => it.costType == 2);
|
||||
data.contract = tmps.filter(it => it.costType == 11);
|
||||
data.safety = tmps.filter(it => it.costType == 12);
|
||||
|
||||
data.form.contract1 = getValue(tmps, 3);
|
||||
data.form.contract2 = getValue(tmps, 10);
|
||||
|
||||
data.form.safety1 = getValue(tmps, 6);
|
||||
data.form.safety2 = getValue(tmps, 7);
|
||||
data.form.safety3 = getValue(tmps, 8);
|
||||
let objs = tmps.filter(it => it.costType == 9);
|
||||
let obj = {};
|
||||
data.monthInv = [];
|
||||
objs.forEach(it => {
|
||||
if (!obj[it.year]) {
|
||||
obj[it.year] = [];
|
||||
}
|
||||
obj[it.year].push(it);
|
||||
});
|
||||
for (let k in obj) {
|
||||
data.monthInv.push({
|
||||
year: k,
|
||||
value: obj[k]
|
||||
})
|
||||
}
|
||||
setTimeout(() => {
|
||||
costYearCom.value.init(data.yearInv, data.prjInfo);
|
||||
costMonthCom.value.init(data.monthInv, data.prjInfo);
|
||||
}, 400)
|
||||
});
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
showDrawer
|
||||
})
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.cost-output-drawer{
|
||||
.el-drawer__header{
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<template>
|
||||
<div class="cost-year" style="border:solid 1px #409eff;margin: 12px 0px;padding: 12px 12px 0px;position: relative;">
|
||||
|
||||
<el-popover placement="top" :visible="data.showPop2" width="300px">
|
||||
<p>选择年份</p>
|
||||
<div style="margin-bottom: 12px;">
|
||||
<el-date-picker v-model="data.selYear" type="year" placeholder="选择年份" style="width:100%"
|
||||
:picker-options="{ disabledDate: doPick }">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="text-align: right; margin: 0">
|
||||
<el-button size="mini" type="text" @click="doCancel">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="doAddYear">确定</el-button>
|
||||
</div>
|
||||
<template #reference>
|
||||
<el-button class="btn-add-year" size="mini" @click="data.showPop2=true" type="success" style="margin-right: 12px;" round>增加年份</el-button>
|
||||
</template>
|
||||
|
||||
</el-popover>
|
||||
|
||||
|
||||
<el-tabs type="card" v-model="data.activeName">
|
||||
<el-tab-pane v-for="(it, idx) in data.yearInv" :label="'' + it.year" :name="'' + it.year" :key="idx">
|
||||
<el-form-item label="年度投资" class="w400" :class="it.money * 1 < 0 ? 'txt-error' : ''">
|
||||
<el-input-number :precision="2" v-model="it.money" placeholder="年度投资">
|
||||
</el-input-number>
|
||||
<span class="sp-unit">万元</span>
|
||||
</el-form-item>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {addYearInvestment} from '@/api/manage/costOutput.js'
|
||||
const { proxy } = getCurrentInstance();
|
||||
const $emit=defineEmits(["success"])
|
||||
const data = reactive({
|
||||
selYear: '',
|
||||
activeName: '',
|
||||
yearInv: [],
|
||||
showPop2: false,
|
||||
prj: null
|
||||
})
|
||||
|
||||
function doCancel(){
|
||||
data.showPop2=false;
|
||||
}
|
||||
function doPick(a, b) {
|
||||
return data.yearInv.filter(d => d.year == a.getFullYear()).length > 0;
|
||||
}
|
||||
function doAddYear() {
|
||||
addYearInvestment({
|
||||
comId:data.prj.comId,
|
||||
year:proxy.$dt(data.selYear).$y,
|
||||
projectId:data.prj.id,
|
||||
costType:2
|
||||
}).then(d=>{
|
||||
$emit("success");
|
||||
data.showPop2=false;
|
||||
})
|
||||
}
|
||||
function init(d, prj) {
|
||||
data.prj = prj;
|
||||
data.yearInv = d;
|
||||
if (d.filter(it => it.year == new Date().getFullYear()).length > 0) {
|
||||
data.activeName = "" + new Date().getFullYear()
|
||||
} else {
|
||||
if (d.length > 0) {
|
||||
data.activeName = "" + d[0].year;
|
||||
}
|
||||
}
|
||||
}
|
||||
defineExpose({
|
||||
init
|
||||
})
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.cost-year{
|
||||
.btn-add-year{
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
z-index: 9;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -2,76 +2,35 @@
|
|||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="部门ID" prop="comId">
|
||||
<el-input
|
||||
v-model="queryParams.comId"
|
||||
placeholder="请输入部门ID"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.comId" placeholder="请输入部门ID" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="项目编号" prop="projectId">
|
||||
<el-input
|
||||
v-model="queryParams.projectId"
|
||||
placeholder="请输入项目编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.projectId" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="金额" prop="money">
|
||||
<el-input
|
||||
v-model="queryParams.money"
|
||||
placeholder="请输入金额"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.money" placeholder="请输入金额" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="金额2" prop="money2">
|
||||
<el-input
|
||||
v-model="queryParams.money2"
|
||||
placeholder="请输入金额2"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.money2" placeholder="请输入金额2" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="月份" prop="month">
|
||||
<el-input
|
||||
v-model="queryParams.month"
|
||||
placeholder="请输入月份"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.month" placeholder="请输入月份" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="年份" prop="year">
|
||||
<el-input
|
||||
v-model="queryParams.year"
|
||||
placeholder="请输入年份"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.year" placeholder="请输入年份" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="date1">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.date1"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
<el-date-picker clearable v-model="queryParams.date1" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择${comment}">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="date2">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.date2"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
<el-date-picker clearable v-model="queryParams.date2" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择${comment}">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="isDel">
|
||||
<el-input
|
||||
v-model="queryParams.isDel"
|
||||
placeholder="请输入${comment}"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.isDel" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
|
|
@ -81,42 +40,20 @@
|
|||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['manage:costOutput:add']"
|
||||
>新增</el-button>
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['manage:costOutput:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['manage:costOutput:edit']"
|
||||
>修改</el-button>
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['manage:costOutput:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['manage:costOutput:remove']"
|
||||
>删除</el-button>
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['manage:costOutput:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['manage:costOutput:export']"
|
||||
>导出</el-button>
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['manage:costOutput:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
|
@ -145,19 +82,16 @@
|
|||
<el-table-column label="${comment}" align="center" prop="isDel" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:costOutput:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:costOutput:remove']">删除</el-button>
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['manage:costOutput:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['manage:costOutput:remove']">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- 添加或修改项目成本产值对话框 -->
|
||||
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
||||
|
|
@ -181,18 +115,12 @@
|
|||
<el-input v-model="form.year" placeholder="请输入年份" />
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="date1">
|
||||
<el-date-picker clearable
|
||||
v-model="form.date1"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
<el-date-picker clearable v-model="form.date1" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择${comment}">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="date2">
|
||||
<el-date-picker clearable
|
||||
v-model="form.date2"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
<el-date-picker clearable v-model="form.date2" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择${comment}">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
@ -350,12 +278,12 @@ function submitForm() {
|
|||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
const _ids = row.id || ids.value;
|
||||
proxy.$modal.confirm('是否确认删除项目成本产值编号为"' + _ids + '"的数据项？').then(function() {
|
||||
proxy.$modal.confirm('是否确认删除项目成本产值编号为"' + _ids + '"的数据项？').then(function () {
|
||||
return delCostOutput(_ids);
|
||||
}).then(() => {
|
||||
getList();
|
||||
proxy.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
}).catch(() => { });
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ function handleAdd() {
|
|||
pageNum: 1,
|
||||
pageSize: 100,
|
||||
projectId: userStore.currentProId,
|
||||
comIdL: userStore.currentComId,
|
||||
comId: userStore.currentComId,
|
||||
carbonFactorType: data.selTab
|
||||
}).then(d => {
|
||||
data.itemList = d.rows || [];
|
||||
|
|
@ -306,7 +306,7 @@ function handleUpdate(row) {
|
|||
pageNum: 1,
|
||||
pageSize: 100,
|
||||
projectId: userStore.currentProId,
|
||||
comIdL: userStore.currentComId,
|
||||
comId: userStore.currentComId,
|
||||
carbonFactorType: data.selTab
|
||||
}).then(d => {
|
||||
data.itemList = d.rows || [];
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="项目排序" align="center" prop="projectSort" width="180" v-if="isAdmin">
|
||||
<template #default="scope">
|
||||
<el-input-number v-model="scope.row.projectSort" :min="1" :max="999"
|
||||
<el-input-number v-model="scope.row.projectSort" :min="1" :max="999"
|
||||
@change="setProjectSort(scope.row, $event)"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -101,25 +101,42 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<template #default="scope"><!--
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
|
||||
<el-dropdown>
|
||||
<span class="el-dropdown-link">
|
||||
操作
|
||||
<el-icon class="el-icon--right">
|
||||
<arrow-down />
|
||||
</el-icon>
|
||||
</span>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item v-hasPermi="['manage:proProjectInfo:edit']">修改</el-dropdown-item>
|
||||
<el-dropdown-item divided v-hasPermi="['manage:proProjectInfo:remove']">删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>-->
|
||||
<el-dropdown @command="e=>menuCommand(e,scope.row)">
|
||||
<span class="el-dropdown-link">
|
||||
<el-icon :size="14" color="var(--el-color-primary)">
|
||||
<Setting />
|
||||
</el-icon><span style="margin-left:8px;position: relative;top:-3px;">操作</span>
|
||||
<el-icon class="el-icon--right">
|
||||
<arrow-down />
|
||||
</el-icon>
|
||||
</span>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item v-hasPermi="['manage:proProjectInfo:edit']" command="edit"
|
||||
style="color: var(--el-color-primary);"><el-icon :size="14" color="var(--el-color-primary)">
|
||||
<Edit />
|
||||
</el-icon>修改
|
||||
</el-dropdown-item>
|
||||
|
||||
|
||||
<el-dropdown-item divided v-hasPermi="['manage:costOutput:add']" command="outCost"
|
||||
style="color: var(--el-color-primary);"><el-icon :size="14" color="var(--el-color-primary)">
|
||||
<Money />
|
||||
</el-icon>项目产值管理
|
||||
</el-dropdown-item>
|
||||
|
||||
<el-dropdown-item divided v-hasPermi="['manage:proProjectInfo:remove']" command="delete"
|
||||
style="color: var(--el-color-primary);"><el-icon :size="14" color="var(--el-color-primary)">
|
||||
<Delete />
|
||||
</el-icon>删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -128,13 +145,10 @@
|
|||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
|
||||
<!-- 添加或修改项目信息对话框 -->
|
||||
<el-dialog :title="title" v-model="open" width="1080px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" class="project-info-edit-dlg">
|
||||
<el-dialog :title="title" v-model="open" width="1080px" append-to-body :close-on-click-modal="false"
|
||||
:close-on-press-escape="false" class="project-info-edit-dlg">
|
||||
<el-form ref="proProjectInfoRef" :model="form" :rules="rules" label-width="120px">
|
||||
<el-tabs
|
||||
v-model="activeTags"
|
||||
type="card"
|
||||
class="demo-tabs"
|
||||
>
|
||||
<el-tabs v-model="activeTags" type="card" class="demo-tabs">
|
||||
<el-tab-pane label="项目基本信息" name="base">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
|
|
@ -181,7 +195,7 @@
|
|||
<el-input v-model="form.techLeader" maxlength="10" show-word-limit placeholder="请输入项目技术负责人" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-form-item label="技术负责人电话" prop="techLeaderPhone">
|
||||
<el-input v-model="form.techLeaderPhone" maxlength="10" show-word-limit placeholder="请输入技术负责人电话" />
|
||||
</el-form-item>
|
||||
|
|
@ -232,13 +246,13 @@
|
|||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-form-item label="计划开工时间" prop="scheduledStartTime">
|
||||
<el-date-picker v-model="form.scheduledStartTime" type="date" placeholder="请选择计划开工时间"
|
||||
style="width:100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-form-item label="计划完工时间" prop="plannedCompletionTime">
|
||||
<el-date-picker v-model="form.plannedCompletionTime" type="date" placeholder="请选择计划完工时间"
|
||||
style="width:100%" />
|
||||
|
|
@ -255,13 +269,13 @@
|
|||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-form-item label="实际开工时间" prop="actualOperatingTime">
|
||||
<el-date-picker v-model="form.actualOperatingTime" type="date" placeholder="请选择实际开工时间"
|
||||
style="width:100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-col :span="8" class="fitem-no-width">
|
||||
<el-form-item label="实际完工时间" prop="actualCompletionTime">
|
||||
<el-date-picker v-model="form.actualCompletionTime" type="date" placeholder="请选择实际完工时间"
|
||||
style="width:100%" />
|
||||
|
|
@ -279,44 +293,47 @@
|
|||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注"
|
||||
maxlength="255" />
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" maxlength="255" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="建设单位信息" name="depts" v-if="data.opt=='edit'">
|
||||
<el-tab-pane label="建设单位信息" name="depts" v-if="data.opt == 'edit'">
|
||||
<div class="scroll" style="max-height: 60vh; overflow-y: auto;">
|
||||
<div v-for="(it,idx) in data.projectDeptsList" :key="idx" class="prj-dept-item">
|
||||
<div class="dept-item-header">
|
||||
<el-icon size="14" color="#2196F3"><OfficeBuilding /></el-icon>
|
||||
<span class="sp-header">{{ it.header }}</span>
|
||||
<el-button @click="doAddPrjDept(it)" type="primary" size="small" style="margin-left: 10px;" v-if="it.header!='建设单位'">增加一行</el-button>
|
||||
<div v-for="(it, idx) in data.projectDeptsList" :key="idx" class="prj-dept-item">
|
||||
<div class="dept-item-header">
|
||||
<el-icon size="14" color="#2196F3">
|
||||
<OfficeBuilding />
|
||||
</el-icon>
|
||||
<span class="sp-header">{{ it.header }}</span>
|
||||
<el-button @click="doAddPrjDept(it)" type="primary" size="small" style="margin-left: 10px;"
|
||||
v-if="it.header != '建设单位'">增加一行</el-button>
|
||||
</div>
|
||||
<el-row v-for="(item, index) in it.datas" :key="index">
|
||||
<el-col :span="7">
|
||||
<el-form-item :label="item.deptType + '名称'">
|
||||
<el-input v-model="item.deptName" class="txt-dept-name" placeholder="请输入单位名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="负责人姓名">
|
||||
<el-input v-model="item.leader" class="txt-leader" placeholder="请输入负责人姓名" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="负责人电话">
|
||||
<el-input v-model="item.phone" class="txt-phone" placeholder="请输入负责人电话" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button v-if="index > 0" type="warning" size="small"
|
||||
@click="doDeletPrjDept(it, item, index)">删除</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row v-for="(item,index) in it.datas" :key="index">
|
||||
<el-col :span="7">
|
||||
<el-form-item :label="item.deptType+'名称'">
|
||||
<el-input v-model="item.deptName" class="txt-dept-name" placeholder="请输入单位名称"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="负责人姓名">
|
||||
<el-input v-model="item.leader" class="txt-leader" placeholder="请输入负责人姓名"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="负责人电话">
|
||||
<el-input v-model="item.phone" class="txt-phone" placeholder="请输入负责人电话"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button v-if="index>0" type="warning" size="small" @click="doDeletPrjDept(it,item,index)">删除</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="项目大屏设置" name="setting" v-if="data.opt=='edit'" class="pan-setting">
|
||||
<el-tab-pane label="项目大屏设置" name="setting" v-if="data.opt == 'edit'" class="pan-setting">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="项目显示名" prop="orgName">
|
||||
|
|
@ -325,26 +342,28 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12" :class="form.setting.orgLogo?'no-up':'can-up'" class="up-img">
|
||||
<el-col :span="12" :class="form.setting.orgLogo ? 'no-up' : 'can-up'" class="up-img">
|
||||
<el-form-item label="显示LOGO" prop="orgLogo">
|
||||
<image-upload v-model="form.setting.orgLogo" :limit="1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" :class="form.setting.orgPlane?'no-up':'can-up'" class="up-img">
|
||||
<el-col :span="12" :class="form.setting.orgPlane ? 'no-up' : 'can-up'" class="up-img">
|
||||
<el-form-item label="施工平面图布置图" prop="orgPlane">
|
||||
<image-upload v-model="form.setting.orgPlane" :limit="1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24" :class="form.setting.orgImage && form.setting.orgImage.split(',').length==9?'no-up':'can-up'" class="up-img">
|
||||
<el-col :span="24"
|
||||
:class="form.setting.orgImage && form.setting.orgImage.split(',').length == 9 ? 'no-up' : 'can-up'"
|
||||
class="up-img">
|
||||
<el-form-item label="项目预览图" prop="orgImage">
|
||||
<image-upload v-model="form.setting.orgImage" :limit="9" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24" :class="form.setting.orgVideo?'no-up':'can-up'" class="up-video">
|
||||
<el-col :span="24" :class="form.setting.orgVideo ? 'no-up' : 'can-up'" class="up-video">
|
||||
<el-form-item label="项目视频" prop="orgVideo">
|
||||
<file-upload v-model="form.setting.orgVideo" :limit="1" :fileType="['mp4']" :fileSize="100" />
|
||||
</el-form-item>
|
||||
|
|
@ -361,7 +380,7 @@
|
|||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<costOutputDrawer ref="coDrawer"/>
|
||||
<baidu-map ref="mapRef" @docom="mapDocom"></baidu-map>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -371,6 +390,7 @@ import { deptTreeSelect } from "@/api/system/user";
|
|||
import { listProProjectInfo, getProProjectInfo, delProProjectInfo, addProProjectInfo, updateProProjectInfo } from "@/api/manage/proProjectInfo";
|
||||
import BaiduMap from "@/components/BaiduMap/Map.vue";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import costOutputDrawer from "../costOutput/costOutputDrawer.vue";
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { pro_project_type, pro_project_schedule, pro_dept_type, sys_is_del } = proxy.useDict('pro_project_type', 'pro_project_schedule', 'pro_dept_type', 'sys_is_del');
|
||||
|
||||
|
|
@ -387,10 +407,10 @@ const total = ref(0);
|
|||
const title = ref("");
|
||||
const activeTags = ref('base')
|
||||
const addressInfos = ref("");
|
||||
const fitemPrjAddr=ref()
|
||||
const fitemPrjAddr = ref()
|
||||
const projectDeptsList = ref([]);
|
||||
const checkedProjectDepts = ref([]);
|
||||
|
||||
const coDrawer=ref();
|
||||
const deptOptions = ref([]);
|
||||
const userStore = useUserStore()
|
||||
const data = reactive({
|
||||
|
|
@ -432,18 +452,18 @@ const data = reactive({
|
|||
actualOperatingTime: [{ required: true, message: "实际开工时间不能为空", trigger: "blur" }],
|
||||
projectSummarize: [{ required: true, message: "项目概述不能为空", trigger: "blur" }],
|
||||
},
|
||||
opt:'',
|
||||
projectDeptsList:[]
|
||||
opt: '',
|
||||
projectDeptsList: []
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
/** 地图选择 */
|
||||
function mapDocom(pt, city) {
|
||||
form.value.province=city.province
|
||||
form.value.city=city.city
|
||||
form.value.district=city.district
|
||||
form.value.address=city.address;
|
||||
form.value.province = city.province
|
||||
form.value.city = city.city
|
||||
form.value.district = city.district
|
||||
form.value.address = city.address;
|
||||
form.value.projectAddress = city.address || "";
|
||||
form.value.longitude = pt.lng.toFixed(5);
|
||||
form.value.latitude = pt.lat.toFixed(5);
|
||||
|
|
@ -451,6 +471,20 @@ function mapDocom(pt, city) {
|
|||
fitemPrjAddr.value.clearValidate();
|
||||
}
|
||||
|
||||
function menuCommand(e,row){
|
||||
if(e=="edit"){
|
||||
handleUpdate(row);
|
||||
return;
|
||||
}
|
||||
if(e=="delete"){
|
||||
handleDelete(row);
|
||||
return;
|
||||
}
|
||||
if(e=="outCost"){
|
||||
coDrawer.value.showDrawer(row);
|
||||
return;
|
||||
}
|
||||
}
|
||||
/** 查询项目信息列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
|
|
@ -469,7 +503,7 @@ function cancel() {
|
|||
|
||||
// 表单重置
|
||||
function reset() {
|
||||
addressInfos.value="";
|
||||
addressInfos.value = "";
|
||||
form.value = {
|
||||
id: null,
|
||||
deptId: null,
|
||||
|
|
@ -513,7 +547,7 @@ function reset() {
|
|||
setting: {}
|
||||
};
|
||||
proxy.resetForm("proProjectInfoRef");
|
||||
activeTags.value="base";
|
||||
activeTags.value = "base";
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
|
|
@ -537,61 +571,60 @@ function handleSelectionChange(selection) {
|
|||
|
||||
/** 新增按钮操作 */
|
||||
function handleAdd() {
|
||||
data.opt="add"
|
||||
data.opt = "add"
|
||||
reset();
|
||||
open.value = true;
|
||||
title.value = "添加项目";
|
||||
}
|
||||
function doAddPrjDept(it){
|
||||
function doAddPrjDept(it) {
|
||||
it.datas.push({
|
||||
deptType:it.header,deptName:'',leader:'',phone:''
|
||||
deptType: it.header, deptName: '', leader: '', phone: ''
|
||||
});
|
||||
}
|
||||
|
||||
function doDeletPrjDept(it,item,index){
|
||||
if(item.deptName || item.leader || item.phone){
|
||||
function doDeletPrjDept(it, item, index) {
|
||||
if (item.deptName || item.leader || item.phone) {
|
||||
proxy.$modal.confirm('是否确认删除这个数据？').then(function () {
|
||||
it.datas.splice(index,1)
|
||||
it.datas.splice(index, 1)
|
||||
proxy.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => { });
|
||||
}else{
|
||||
it.datas.splice(index,1)
|
||||
} else {
|
||||
it.datas.splice(index, 1)
|
||||
}
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row) {
|
||||
data.opt="edit"
|
||||
data.opt = "edit"
|
||||
reset();
|
||||
const _id = row.id || ids.value
|
||||
getProProjectInfo(_id).then(response => {
|
||||
debugger
|
||||
form.value = response.data;
|
||||
form.value.setting=response.data.setting||{
|
||||
orgName:'',
|
||||
orgLogo:'',
|
||||
orgPlane:'',
|
||||
orgImage:[],
|
||||
orgVideo:''
|
||||
form.value.setting = response.data.setting || {
|
||||
orgName: '',
|
||||
orgLogo: '',
|
||||
orgPlane: '',
|
||||
orgImage: [],
|
||||
orgVideo: ''
|
||||
};
|
||||
open.value = true;
|
||||
title.value = "修改项目信息";
|
||||
projectDeptsList.value=(response.data.projectDeptsList||[]).filter(d=>d.id);
|
||||
if(projectDeptsList.value.length==0){
|
||||
projectDeptsList.value=[
|
||||
{deptType:'建设单位',deptName:'',leader:'',phone:''},
|
||||
{deptType:'监理单位',deptName:'',leader:'',phone:''},
|
||||
{deptType:'设计单位',deptName:'',leader:'',phone:''},
|
||||
{deptType:'检测单位',deptName:'',leader:'',phone:''},
|
||||
{deptType:'勘察单位',deptName:'',leader:'',phone:''},
|
||||
projectDeptsList.value = (response.data.projectDeptsList || []).filter(d => d.id);
|
||||
if (projectDeptsList.value.length == 0) {
|
||||
projectDeptsList.value = [
|
||||
{ deptType: '建设单位', deptName: '', leader: '', phone: '' },
|
||||
{ deptType: '监理单位', deptName: '', leader: '', phone: '' },
|
||||
{ deptType: '设计单位', deptName: '', leader: '', phone: '' },
|
||||
{ deptType: '检测单位', deptName: '', leader: '', phone: '' },
|
||||
{ deptType: '勘察单位', deptName: '', leader: '', phone: '' },
|
||||
];
|
||||
}
|
||||
let headers="建设单位,监理单位,设计单位,检测单位,勘察单位".split(",");
|
||||
data.projectDeptsList=[];
|
||||
headers.forEach(h=>{
|
||||
let headers = "建设单位,监理单位,设计单位,检测单位,勘察单位".split(",");
|
||||
data.projectDeptsList = [];
|
||||
headers.forEach(h => {
|
||||
data.projectDeptsList.push({
|
||||
header:h,
|
||||
datas:projectDeptsList.value.filter(it=>it.deptType==h)
|
||||
header: h,
|
||||
datas: projectDeptsList.value.filter(it => it.deptType == h)
|
||||
})
|
||||
});
|
||||
addressInfos.value = form.value.projectAddress + "," + form.value.longitude + "," + form.value.latitude;
|
||||
|
|
@ -632,12 +665,12 @@ function handleDeptsSelectionChange(selection) {
|
|||
checkedProjectDepts.value = selection.map(item => item.index)
|
||||
}
|
||||
|
||||
function getProjectDeptsList(){
|
||||
let datas=[];
|
||||
data.projectDeptsList.forEach(d=>{
|
||||
if(d.datas){
|
||||
d.datas.forEach(it=>{
|
||||
if(it.deptName || it.leader || it.phone){
|
||||
function getProjectDeptsList() {
|
||||
let datas = [];
|
||||
data.projectDeptsList.forEach(d => {
|
||||
if (d.datas) {
|
||||
d.datas.forEach(it => {
|
||||
if (it.deptName || it.leader || it.phone) {
|
||||
datas.push(it);
|
||||
}
|
||||
})
|
||||
|
|
@ -651,7 +684,7 @@ function submitForm() {
|
|||
proxy.$refs["proProjectInfoRef"].validate(valid => {
|
||||
if (valid) {
|
||||
form.value.projectDeptsList = getProjectDeptsList();
|
||||
let postData={
|
||||
let postData = {
|
||||
...form.value
|
||||
}
|
||||
if (form.value.id != null) {
|
||||
|
|
@ -716,9 +749,9 @@ function getMapInfo() {
|
|||
/** 初始化页面 */
|
||||
function initPage() {
|
||||
let roles = userStore.roles;
|
||||
if(roles.includes("admin") || roles.includes("gsAdmin")){
|
||||
if (roles.includes("admin") || roles.includes("gsAdmin")) {
|
||||
isAdmin.value = true;
|
||||
}else{
|
||||
} else {
|
||||
isAdmin.value = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -728,52 +761,62 @@ getList();
|
|||
getDeptTree();
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.project-info-edit-dlg{
|
||||
.prj-dept-item{
|
||||
.project-info-edit-dlg {
|
||||
.prj-dept-item {
|
||||
margin-bottom: 10px;
|
||||
.dept-item-header{
|
||||
|
||||
.dept-item-header {
|
||||
display: flex;
|
||||
color: #2196F3;
|
||||
align-items: center;
|
||||
line-height: 30px;
|
||||
.sp-header{
|
||||
|
||||
.sp-header {
|
||||
display: inline-block;
|
||||
margin-left: 4px;
|
||||
}
|
||||
}
|
||||
.el-form-item{
|
||||
|
||||
.el-form-item {
|
||||
margin-bottom: 8px !important;
|
||||
}
|
||||
.el-input{
|
||||
|
||||
.el-input {
|
||||
display: inline-block;
|
||||
width:auto;
|
||||
width: auto;
|
||||
}
|
||||
.sp-label{
|
||||
font-size:12px;
|
||||
color:#888;
|
||||
&::after{
|
||||
|
||||
.sp-label {
|
||||
font-size: 12px;
|
||||
color: #888;
|
||||
|
||||
&::after {
|
||||
content: ":";
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-tab-pane.pan-setting{
|
||||
.el-form-item{
|
||||
|
||||
.el-tab-pane.pan-setting {
|
||||
.el-form-item {
|
||||
flex-flow: column;
|
||||
margin-bottom:0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.up-img{
|
||||
&.no-up{
|
||||
.el-upload__tip{
|
||||
|
||||
.up-img {
|
||||
&.no-up {
|
||||
.el-upload__tip {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
.up-video{
|
||||
&.no-up{
|
||||
.el-upload__tip{
|
||||
|
||||
.up-video {
|
||||
&.no-up {
|
||||
.el-upload__tip {
|
||||
display: none;
|
||||
}
|
||||
.upload-file-uploader{
|
||||
|
||||
.upload-file-uploader {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue