Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
+26
-1
@@ -1223,6 +1223,31 @@ export default {
|
||||
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
|
||||
}
|
||||
},
|
||||
// 上移 事件
|
||||
moveUp(index, row) {
|
||||
if (index === 0) {
|
||||
this.$message({
|
||||
message: '已经是列表中第一个素材!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else {
|
||||
let temp = this.sarAccessInfoList[index - 1]
|
||||
this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
|
||||
this.$set(this.sarAccessInfoList, index, temp)
|
||||
}
|
||||
},
|
||||
moveDown(index) {
|
||||
if (index === (this.sarAccessInfoList.length - 1)) {
|
||||
this.$message({
|
||||
message: '已经是列表中最后一个素材!',
|
||||
type: 'warning'
|
||||
})
|
||||
} else {
|
||||
let i = this.sarAccessInfoList[index + 1]
|
||||
this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
|
||||
this.$set(this.sarAccessInfoList, index, i)
|
||||
}
|
||||
},
|
||||
// 点击清单条目导入按钮事件
|
||||
importmodalFlags() {
|
||||
this.importmodalFlag = true
|
||||
@@ -2075,7 +2100,7 @@ export default {
|
||||
// 责任部门数据字典
|
||||
this.zrbmOptions = res.data.ZRBMCLASS
|
||||
// 能源类型数据字典
|
||||
this.CycxOptions = res.data.CLLX
|
||||
this.CycxOptions = res.data.ENERGYTYPES
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
// 适用车型数据字典
|
||||
this.applyArcticOptions = res.data.PRODUCTTYPE
|
||||
|
||||
@@ -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"></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="项目级别">
|
||||
<!– <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"></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>
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
<template>
|
||||
<div class="AddFileDetails">
|
||||
<div class="left">
|
||||
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
|
||||
width="100%" height="100%"
|
||||
frameborder="0" scrolling="no" ref="iframeDom"
|
||||
></iframe>
|
||||
</div>
|
||||
<div class="rightDiv">
|
||||
<div class="height">
|
||||
新增意见
|
||||
</div>
|
||||
<div class="search-area">
|
||||
<el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
|
||||
<el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
|
||||
<el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
|
||||
<el-option
|
||||
v-for="(item,index) in options"
|
||||
:key="index"
|
||||
:label="item.itemsNum"
|
||||
:value="item.itemsNum"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
|
||||
<el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="修改前" label-width="" class="add-form-item">
|
||||
<div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
|
||||
</el-form-item>
|
||||
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
|
||||
<el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
|
||||
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
|
||||
<el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
|
||||
提交
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "AddFileDetails",
|
||||
data () {
|
||||
return {
|
||||
options: [],
|
||||
opinionContent: { // 抽屉数据
|
||||
partCode: '',
|
||||
oldText: '',
|
||||
newText: '',
|
||||
reason: '',
|
||||
chapterName: '',
|
||||
cause: '',
|
||||
},
|
||||
opinionContentRules: {
|
||||
partCode: [
|
||||
{required: true, message: '请输入章节编号', trigger: 'blur'},
|
||||
],
|
||||
oldText: [
|
||||
{required: true, message: '请输入修改前内容', trigger: 'blur'}
|
||||
],
|
||||
newText: [
|
||||
{required: true, message: '请输入修改后内容', trigger: 'blur'}
|
||||
],
|
||||
reason: [
|
||||
{required: true, message: '请输入修改理由', trigger: 'blur'}
|
||||
],
|
||||
},
|
||||
isSubmit: false,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
saveUserInfo () {
|
||||
this.$refs['formAdd'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
var form = {
|
||||
ideaId: this.$route.query.ideaId,
|
||||
cid: this.$route.query.cid,
|
||||
oldText: this.opinionContent.oldText,
|
||||
newText: this.opinionContent.newText,
|
||||
reason: this.opinionContent.reason,
|
||||
partCode: this.opinionContent.partCode,
|
||||
chapterName: this.opinionContent.chapterName,
|
||||
cause: this.opinionContent.cause,
|
||||
userId: this.$route.query.userId || '',
|
||||
userName: this.$route.query.userName || '',
|
||||
deptName: this.$route.query.institutionName || '',
|
||||
deptId: this.$route.query.institutionId || '',
|
||||
}
|
||||
this.$http.post('slrs/sar-public-idea-all/insetStand', form, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.respCode === '200') {
|
||||
localStorage.setItem('freshClueNum', new Date().getTime())
|
||||
this.isSubmit = false
|
||||
this.opinionContent.partCode = ''
|
||||
this.opinionContent.reason = ''
|
||||
this.opinionContent.oldText = ''
|
||||
this.opinionContent.newText = ''
|
||||
this.opinionContent.cause = ''
|
||||
this.opinionContent.chapterName = ''
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
optionsChange (data) {
|
||||
for (let a = 0; a < this.options.length; a++) {
|
||||
if (data === this.options[a].itemsNum) {
|
||||
this.opinionContent.oldText = this.options[a].termsConditions
|
||||
this.opinionContent.chapterName = this.options[a].itemsName
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
console.log(this.$route.query);
|
||||
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
|
||||
standId: this.$route.query.standId,
|
||||
fileType: this.$route.query.fileType,
|
||||
pageSize: 9999,
|
||||
page: 1
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
this.options = res.data.list
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/mixins';
|
||||
@import '~@/assets/styles/style';
|
||||
.AddFileDetails {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
.left {
|
||||
width: 60%;
|
||||
height: 100%;
|
||||
}
|
||||
.rightDiv {
|
||||
background: #fff;
|
||||
width: 40%;
|
||||
height: 100%;
|
||||
.height {
|
||||
margin-bottom: 0;
|
||||
padding: 10px 20px;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
}
|
||||
.search-area {
|
||||
height: calc(~'100% - 90px');
|
||||
overflow: auto;
|
||||
}
|
||||
.demo-drawer-footer {
|
||||
width: 100%;
|
||||
padding: 0 20px;
|
||||
height: 50px;
|
||||
line-height: 50px;
|
||||
border-top: 1px solid #e8e8e8;
|
||||
text-align: right;
|
||||
background: #fff;
|
||||
z-index: 999;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -250,6 +250,7 @@ export default {
|
||||
name: 'consultationDetails',
|
||||
data() {
|
||||
return {
|
||||
freshClueNum: '',
|
||||
itermsConditionsFlag: false,
|
||||
itermsConditionsTitle: '',
|
||||
options: [],
|
||||
@@ -385,7 +386,7 @@ export default {
|
||||
},
|
||||
//编辑
|
||||
selectStandardPro(type, row) {
|
||||
this.type = type
|
||||
this.type = type
|
||||
if (type === 'edit') {
|
||||
this.id = row.id
|
||||
this.opiniontitle = '编辑意见内容'
|
||||
@@ -394,16 +395,34 @@ export default {
|
||||
this.opinionContent.oldText = row.oldText
|
||||
this.opinionContent.newText = row.newText
|
||||
this.opinionContent.cause = row.cause
|
||||
this.isDialog = true
|
||||
} else {
|
||||
this.id = ''
|
||||
this.opiniontitle = '新增意见'
|
||||
this.opinionContent.partCode = ''
|
||||
this.opinionContent.reason = ''
|
||||
this.opinionContent.oldText = ''
|
||||
this.opinionContent.newText = ''
|
||||
this.opinionContent.cause = ''
|
||||
localStorage.setItem('freshClueNum', new Date().getTime())
|
||||
this.freshClueNum = localStorage.getItem('freshClueNum') || '';
|
||||
let routeData = this.$router.resolve({
|
||||
name: "AddFileDetails",
|
||||
query: {
|
||||
attId: this.fileInfoList[0].attId,
|
||||
userId: this.$store.getters.userInfo.userId || '',
|
||||
userName: this.$store.getters.userInfo.userName || '',
|
||||
deptName: this.$store.getters.userInfo.institutionName || '',
|
||||
deptId: this.$store.getters.userInfo.institutionId || '',
|
||||
standId: JSON.parse(this.$route.query.item.files)[0].standId,
|
||||
fileType: JSON.parse(this.$route.query.item.files)[0].standFileClassify,
|
||||
ideaId: this.$route.query.item.id,
|
||||
cid: this.$route.query.item.cid,
|
||||
}
|
||||
});
|
||||
window.open(routeData.href, '_blank')
|
||||
// return
|
||||
// this.id = ''
|
||||
// this.opiniontitle = '新增意见'
|
||||
// this.opinionContent.partCode = ''
|
||||
// this.opinionContent.reason = ''
|
||||
// this.opinionContent.oldText = ''
|
||||
// this.opinionContent.newText = ''
|
||||
// this.opinionContent.cause = ''
|
||||
}
|
||||
this.isDialog = true
|
||||
},
|
||||
//删除
|
||||
deleteStand(id) {
|
||||
@@ -449,8 +468,8 @@ export default {
|
||||
cause: this.opinionContent.cause,
|
||||
userId: this.$store.getters.userInfo.userId || '',
|
||||
userName: this.$store.getters.userInfo.userName || '',
|
||||
deptName: this.$store.getters.userInfo.orgName || '',
|
||||
deptId: this.$store.getters.userInfo.orgId || ''
|
||||
deptName: this.$store.getters.userInfo.institutionName || '',
|
||||
deptId: this.$store.getters.userInfo.institutionId || '',
|
||||
}
|
||||
if (this.type === 'edit') {
|
||||
form.id = this.id
|
||||
@@ -498,6 +517,11 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
window.addEventListener("storage", ev => {
|
||||
if(ev.key === 'freshClueNum'){
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
if (JSON.parse(this.$route.query.item.wkfiles).length) {
|
||||
this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles)
|
||||
} else {
|
||||
@@ -522,7 +546,7 @@ export default {
|
||||
this.getList()
|
||||
this.getIdeaKey()
|
||||
this.getFileInfo()
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user