项目清单字段调整

This commit is contained in:
shenyanpei
2022-01-25 14:57:52 +08:00
parent 82c9a6ac19
commit 38b22f2142
2 changed files with 235 additions and 229 deletions
@@ -21,7 +21,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="项目分类" class="search-item">
<!-- <el-form-item label="项目分类" class="search-item">
<el-select
v-model="projectLibrarySearch.projectClassification"
placeholder="请选择项目类别"
@@ -34,7 +34,7 @@
>{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectLibrarySearch.projectStatus" placeholder="请选择项目状态" clearable>
<el-option
@@ -85,130 +85,132 @@
</div>
<div class="table_info">
<el-table
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectClassification"
label="项目分类"
align="center"
min-width="120"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectStatus"
label="项目状态"
align="center"
min-width="120"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectGroup"
label="项目群"
min-width="120"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="160"
align="center"
>
</el-table-column>
<el-table-column
prop="projectStartDate"
label="项目计划开始日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="currentNode"
align="center"
label="当前节点">
</el-table-column>
<el-table-column
prop="projectLevel"
align="center"
label="项目级别">
<!-- <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="uname"
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
查看
</el-dropdown-item>
<!-- // 权限id -->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
发起确认流程
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
@selection-change="handleSelectionChange">
<!-- <el-table-column
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="projectGroup"
label="项目群"
fixed="left"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
</template>
</el-table-column>
<!-- <el-table-column
show-overflow-tooltip
prop="projectClassification"
label="项目分类"
align="center"
min-width="120"
>
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="projectStatus"
label="项目状态"
align="center"
min-width="120"
>
</el-table-column>
<!--<el-table-column
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="160"
align="center"
>
</el-table-column>-->
<el-table-column
prop="projectStartDate"
label="项目计划开始日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
>
<!-- <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="currentNode"
align="center"
label="当前节点">
</el-table-column>
<!--<el-table-column
prop="projectLevel"
align="center"
label="项目级别">
&lt;!&ndash; <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>&ndash;&gt;
</el-table-column>-->
<el-table-column
show-overflow-tooltip
prop="uname"
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
查看
</el-dropdown-item>
<!-- // 权限id -->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
发起确认流程
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</div>
<pagination
:page="page"
@@ -303,9 +305,9 @@ import DatePickerGroup from "./components/DatePickerGroup";
import OrgTree from "@/components/CustomFormComponents/OrgTree";
import eventHub from "@/common/eventHub";
import ProjectRelatedPersonnel from "@/components/CustomFormComponents/ProjectRelatedPersonnel";
import { dateFormat } from "@/common/date/index";
import {dateFormat} from "@/common/date/index";
import moment from "moment";
import { solostarData } from "@/api/unqualProcess";
import {solostarData} from "@/api/unqualProcess";
function checkFD(rules, value, callback) {
this.value = value;
@@ -406,69 +408,69 @@ export default {
// 相关人员姓名
},
// 新增编辑弹窗里的数据
/* localProEODefault: {
// 项目相关人员
userEOList: [],
// 产品代码
produceCode: "",
// 项目阶段
productStage: "",
// 整车项目编号
zhengcarNo: "",
// 整车SOP时间
zhengcarSopTime: "",
// 项目编号
productNo: "",
// 项目类型
productTypeCode: "",
// 生产基地
producePlace: "",
// 基础车型
baseCartype: "",
// 左驾右驾
leftRight: "",
// 项目经理
productManager: "",
productManagerShow: "",
// 是否纳入开发
isDevelop: "",
energyKind: "",
// 平台
flatform: "",
// 项目名称
productName: "",
// 车型系列
productSet: "",
// 项目类别
productType: "",
// 项目状态
productBrand: "",
// SOP时间
sopTime: "",
// 阀点
pointTime: [],
// 计划通过时间
planPassTime: "",
// 实际通过时间
actualPassTime: "",
// 目标市场
targetMarket: "",
// 公告车型号
carModel: "",
// 项目相关人员id
relatePerson: "",
// eop信息
eopTime: "",
// 项目相关信息
saleMarket: "",
// 判断是国内还是海外
prodectCode: "",
// carModeFile: ''
// carModeFileList: ''
// 相关人员信息
relatePersonShow: ""
// 相关人员姓名
},*/
/* localProEODefault: {
// 项目相关人员
userEOList: [],
// 产品代码
produceCode: "",
// 项目阶段
productStage: "",
// 整车项目编号
zhengcarNo: "",
// 整车SOP时间
zhengcarSopTime: "",
// 项目编号
productNo: "",
// 项目类型
productTypeCode: "",
// 生产基地
producePlace: "",
// 基础车型
baseCartype: "",
// 左驾右驾
leftRight: "",
// 项目经理
productManager: "",
productManagerShow: "",
// 是否纳入开发
isDevelop: "",
energyKind: "",
// 平台
flatform: "",
// 项目名称
productName: "",
// 车型系列
productSet: "",
// 项目类别
productType: "",
// 项目状态
productBrand: "",
// SOP时间
sopTime: "",
// 阀点
pointTime: [],
// 计划通过时间
planPassTime: "",
// 实际通过时间
actualPassTime: "",
// 目标市场
targetMarket: "",
// 公告车型号
carModel: "",
// 项目相关人员id
relatePerson: "",
// eop信息
eopTime: "",
// 项目相关信息
saleMarket: "",
// 判断是国内还是海外
prodectCode: "",
// carModeFile: ''
// carModeFileList: ''
// 相关人员信息
relatePersonShow: ""
// 相关人员姓名
},*/
//查询3类
projectLibrarySearch: {
// 项目名称
@@ -679,9 +681,9 @@ export default {
// { type: 'string', max: 100, message: '产品系列长度不能超过100个字符', trigger: 'blur' }
// ],
productName: [
{ required: true, message: "项目名称不能为空", trigger: "blur" },
{ type: "string", max: 100, message: "项目名称长度不能超过100个字符", trigger: "blur" },
{ type: "string", validator: this.verify.checkSpecialCharacterProduct, trigger: "blur" }
{required: true, message: "项目名称不能为空", trigger: "blur"},
{type: "string", max: 100, message: "项目名称长度不能超过100个字符", trigger: "blur"},
{type: "string", validator: this.verify.checkSpecialCharacterProduct, trigger: "blur"}
],
// carModel: [
// { type: 'string', max: 100, message: '公告车型号不能为空', trigger: 'blur' }
@@ -699,31 +701,31 @@ export default {
// {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
// ],
flatform: [
{ required: true, message: "平台不能为空", trigger: "change" }
{required: true, message: "平台不能为空", trigger: "change"}
],
// productType: [
// { required: false, message: '项目类别不能为空', trigger: 'change' }
// ],
productBrand: [
{ required: true, message: "项目状态不能为空", trigger: "change" }
{required: true, message: "项目状态不能为空", trigger: "change"}
],
sopTime: [
{ required: true, message: "sop时间不能为空", trigger: "change" }
{required: true, message: "sop时间不能为空", trigger: "change"}
],
// productNo: [
// { required: false, validator:this.checkNum, trigger: 'change' }
// ],
productTypeCode: [
{ required: true, message: "项目类型不能为空", trigger: "change" }
{required: true, message: "项目类型不能为空", trigger: "change"}
],
productManager: [
{ required: true, message: "项目经理不能为空", trigger: "change" }
{required: true, message: "项目经理不能为空", trigger: "change"}
],
// produceCode: [
// { required: true, message: '产品代码不能为空', trigger: 'change' }
// ],
relatePerson: [
{ required: true, message: "项目相关成员不能为空", trigger: "change" }
{required: true, message: "项目相关成员不能为空", trigger: "change"}
],
// carModeFileList: []
pointTime: [
@@ -884,7 +886,7 @@ export default {
},
// 获取标准类别List数据
getAllInforList() {
this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
this.$http.get("sys/dictype/getDicTypeListCode", {}, {_this: this}, res => {
// this.xmztOptions = res.data.XMZT;
this.scxxOptions = res.data.SCXX;
this.countryList = res.data.COUNTRY;
@@ -955,7 +957,7 @@ export default {
} else {
this.title = "编辑车型/项目库";
row.targetMarket = row.targetMarket.split(",");
this.localProEO = { ...row };
this.localProEO = {...row};
// this.localProEO.id = row.id
if (this.localProEO.energyKind != null && !(this.localProEO.energyKind instanceof Array)) {
if (this.localProEO.energyKind === "") {
@@ -1095,8 +1097,8 @@ export default {
},
// 清空条件查询
clearAllSearch() {
this.localProTableSearch = { ...this.localProTableSearchDefault };
this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
this.localProTableSearch = {...this.localProTableSearchDefault};
this.projectLibrarySearch = {...this.projectLibrarySearchDefault};
this.localProTableSearch.page = 1;
this.getLocalProductTable();
},
@@ -1337,7 +1339,7 @@ export default {
handleProcess(row) {
// 项目清单确认流程
this.$router.push({
name:'xmqdqrStep1-4',
name: 'xmqdqrStep1-4',
query: {
row
}
@@ -1402,7 +1404,7 @@ export default {
},
// 取消或者关闭弹窗
resetReletionForm() {
this.relationTableSearch = { ...this.relationTableSearchDefault };
this.relationTableSearch = {...this.relationTableSearchDefault};
// this.$refs['processForm'].clearValidate()
this.$refs.RelectionMultipleTable.clearSelection();
this.reletionSelectNum = [];
@@ -1432,7 +1434,7 @@ export default {
this.$http.get("lawss/sarProductInfo/isOver", {
productNo: this.localProEO.productNo,
id: this.localProEO.id
}, { _this: this }, res => {
}, {_this: this}, res => {
if (res.data) {
callback(new Error("项目编号不能重复"));
} else {
@@ -1564,26 +1566,26 @@ export default {
this.localProEO.productManagerShow = userNameList.join(",");
},
selectSort() {
solostarData().then(res=>{
res.data.MaintenanceProjectClassification.forEach((item, index)=>{
solostarData().then(res => {
res.data.MaintenanceProjectClassification.forEach((item, index) => {
this.projectData.push({
label: item,
value: index
})
})
res.data.MaintenanceProjectStatus.forEach((item, index)=>{
res.data.MaintenanceProjectStatus.forEach((item, index) => {
this.projectStatus.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectClassification.forEach((item, index)=>{
res.data.notMaintenanceProjectClassification.forEach((item, index) => {
this.notProjectData.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
res.data.notMaintenanceProjectStatus.forEach((item, index) => {
this.notProjectStatus.push({
label: item,
value: index
@@ -1614,7 +1616,7 @@ export default {
this.ifMaintaince = "Maintenance";
} else {
this.ifMaintaince = this.$route.query.tabName;
if(this.ifMaintaince === "notMaintenance"){
if (this.ifMaintaince === "notMaintenance") {
this.localProTableSearch.prodectCode = this.ifMaintaince;
}
}
@@ -1644,6 +1646,7 @@ export default {
width: 100%;
//height: calc(100% - 110px);
height: calc(~'100% - 30px');
.table_info {
height: calc(70vh - 90px);
}
@@ -1654,7 +1657,7 @@ export default {
}
/deep/ .pagination {
position:inherit;
position: inherit;
//position: unset;
}
@@ -1668,15 +1671,17 @@ export default {
}
}
}
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
// overflow-x: scroll;
//}
///deep/.el-table__fixed {
// height: 48px !important;
//}
/deep/.el-table .el-table__body-wrapper {
/deep/ .el-table .el-table__body-wrapper {
height: 84%;
}
::v-deep .el-drawer__header {
& > span:first-child {
outline: none !important;
@@ -10,9 +10,15 @@
<el-card class="contaiinerCard" style="margin: 5px">
<div style="padding: 20px">
<el-row style="margin-top: 10px">
<el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2">
<!-- <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>-->
<el-col :span="6">管理主体: <span class="valueColor">{{ localProEO.managementHostName || '-' }}</span></el-col>
<el-col :span="6">开发主体: <span class="valueColor">{{ localProEO.developmentHostName || '-' }}</span></el-col>
<el-col :span="6">项目细分类:<span class="valueColor">{{ localProEO.categoryName || '-' }}</span></el-col>
<el-col :span="6">项目群: <span class="valueColor">{{ localProEO.projectGroup }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="6">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="6">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
{{ localProEO.projectName }}
@@ -26,21 +32,16 @@
</div>
</el-tooltip>
</el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
</el-col>
<el-col :span="6">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
<!--<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>-->
<el-col :span="6">当前节点: <span class="valueColor">{{ localProEO.currentNode }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">项目状态: <span class="valueColor">{{ localProEO.projectStatus }} </span></el-col>
<el-col :span="5" :push="1">项目: <span class="valueColor">{{ localProEO.projectGroup }} </span></el-col>
<el-col :span="5" :push="2">当前节点: <span class="valueColor">{{ localProEO.currentNode }} </span></el-col>
<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
<el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="2"> 项目计划开始时间: <span
<!--<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>-->
<el-col :span="6">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="6"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="4" :push="3">项目计划完成时间: <span
<el-col :span="6">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>