Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
This commit is contained in:
Superman_Main
2021-11-25 15:19:34 +08:00
40 changed files with 6954 additions and 6228 deletions
+88
View File
@@ -4646,6 +4646,94 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.3.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz",
"integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true,
"optional": true
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"json5": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
+30
View File
@@ -54,3 +54,33 @@ export function meetingByMonth (params) {
params
})
}
export function addUn (closeState, standId,standName,standSerialNumber, itemsNum,itemsName, productType, productLine,
productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, qaEngineerName,
authEngineerName, dutyEngineerName, planCloseTime) {
const data = {
closeState,
standSerialNumber, //标准号
standName, //标准名称
standId,
itemsNum, //条款号
itemsName, //条款名称
productType,
productLine, //产品线
productName, //项目名称
reason, //不合规项目
responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
qaEngineerName,
authEngineerName,
dutyEngineerName,
planCloseTime, //计划关闭时间
}
return axios({
url: 'api/sarStandUnqualified/sar-stand-unqualified/addOne',
method: 'post',
data
})
}
+1 -1
View File
@@ -14,7 +14,7 @@
font-weight: 600;
}
.el-submenu__title, .el-menu-item{
font-size: 15px;
font-size: 14px;
background-color: transparent !important;
&::before{
content: '';
+1 -1
View File
@@ -706,7 +706,7 @@ export default {
}
.el-menu-item {
padding-left: 29px !important;
font-size: 15px;
font-size: 14px;
font-weight: normal;
height: 40px;
line-height: 40px;
@@ -3,7 +3,9 @@
<div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
<!--title 标题-->
<div class="details-header">
<span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} {{sarStandardsInfoEO.standName}} 企标详情</span>
<span>{{sarStandardsInfoEO.standCode}} {{sarStandardsInfoEO.standName}} 企标详情</span>
<!-- 之前的先注掉-->
<!-- <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} {{sarStandardsInfoEO.standName}} 企标详情</span>-->
</div>
<!--主体内容-->
<div class="details-content" style="position: relative">
@@ -57,6 +59,7 @@
/>
<i
title="下载带水印"
v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
+2 -3
View File
@@ -2,7 +2,7 @@
<template>
<div class="nav-menu">
<div class="lattice" style=" box-shadow:1px 1px 10px rgba(0,0,0,0.1);" >
<div class="title"><i class="el-icon-s-promotion"></i> 快捷入口</div>
<div class="title" ><i class="el-icon-s-promotion"></i> 快捷入口</div>
<div class="menu-wrap">
<enter-card v-for="(item, index) in list"
:key="index"
@@ -77,8 +77,7 @@
height: 40px;
line-height: 40px;
background: #fff;
font-size: 16px;
font-weight: bold;
font-size: 14px;
border-radius: 10px;
}
.menu-wrap {
@@ -10,7 +10,7 @@
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 30px">
<span @click="dealWith(item)" style="line-height: 30px">{{ item.prcName }}</span>
<span @click="dealWith(item)" style="line-height: 30px; font-size: 12px;">{{ item.prcName }}</span>
</div>
</li>
</ul>
@@ -1284,8 +1284,7 @@ export default {
display: inline-block;
margin: 15px;
color: #333333;
font-size: 16px;
font-weight: bold;
font-size: 14px;
}
.more {
float: right;
+2 -2
View File
@@ -186,8 +186,8 @@ export default {
padding: 0;
}
.footer {
height: 90px;
line-height: 44px;
height: 70px;
line-height: 33px;
//margin-top: 0.3vh;
//line-height: 5.2vh;
background: #FFFFFF;
@@ -92,6 +92,14 @@
label="比对类型"
align="center">
</el-table-column>
<el-table-column
prop="compareStatus"
label="比对状态"
align="center">
<!-- <template slot-scope="scope">-->
<!-- -->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="createTime"
label="比对时间"
@@ -362,15 +362,29 @@ export default {
type: 'warning'
})
}
this.$router.push({
name: 'TextComparison',
query: {
infoIdLeft: this.selectedSplitStandList[0].id,
infoIdRight: this.selectedSplitStandList2[0].id,
rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
}
})
return new Promise((resolve, reject) => {
this.spinShow = true
this.$http.post('lawss/sarStandCompareHis/fullTextComparison', {
leftStandard:this.selectedSplitStandList[0].id,
rightStandard: this.selectedSplitStandList2[0].id,
}, {
_this: this
}, res => {
this.spinShow = false
this.$message.warning(res.data)
this.$router.push('/standContrast')
}, e => {
})
})
// this.$router.push({
// name: 'TextComparison',
// query: {
// infoIdLeft: this.selectedSplitStandList[0].id,
// infoIdRight: this.selectedSplitStandList2[0].id,
// rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
// rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
// }
// })
},
addFileStandPageChange (page) {
this.addFilePage = page
@@ -182,7 +182,7 @@ export default {
},
page () {
this.spinShow = true
this.$http.get('lawss/sarItemsCompareHis/page', {
this.$http.get('lawss/sarStandItemsCompareHis/page', {
page: this.splitInfoPage,
pageSize: this.splitInfoPageSize,
standHisId: JSON.parse(this.$route.query.row).id
@@ -93,7 +93,6 @@
</div>
</div>
</div>
<el-dialog :visible.sync="resultModal" title="比对结果" width="80%" class="standerModal">
<div class="standerModal-content">
<div class="content-header">
@@ -109,7 +108,6 @@
</div>
</div>
</el-dialog>
<loading :loading="spinShow">数据加载中</loading>
</div>
</template>
@@ -517,7 +515,7 @@ export default {
return el.offsetTop - el.parentNode.offsetTop;
}
const offsetTop = getElementTop(domId)
/*$('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500)*/
$('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500)
},
handleRightTreeClick(treeId, treeNode) {
@@ -530,7 +528,7 @@ export default {
return el.offsetTop - el.parentNode.offsetTop;
}
const offsetTop = getElementTop(domId)
/*$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)*/
$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)
}
},
components: {
@@ -65,22 +65,22 @@
align="center"
>
</el-table-column>
<el-table-column :label="this.$t('m.textState')" width="150" align="center">
<template slot-scope="scope">
{{
scope.row.fileType === "STAND_FILE"
? "标准文本"
: scope.row.fileType === "DRAFT_FILE"
? "草案"
: scope.row.fileType === "OPINION_FILE"
? "征求意见稿"
: scope.row.fileType === "SENT_SCREEN_FILE"
? "送审稿"
: scope.row.fileType === "APPROVAL_FILE"
? "报批稿"
: "关联文件"
}}
</template>
<el-table-column :label="this.$t('m.textState')" width="150" align="center" prop="fileType">
<!-- <template slot-scope="scope">-->
<!-- {{-->
<!-- scope.row.fileType === "STAND_FILE"-->
<!-- ? "标准文本"-->
<!-- : scope.row.fileType === "DRAFT_FILE"-->
<!-- ? "草案"-->
<!-- : scope.row.fileType === "OPINION_FILE"-->
<!-- ? "征求意见稿"-->
<!-- : scope.row.fileType === "SENT_SCREEN_FILE"-->
<!-- ? "送审稿"-->
<!-- : scope.row.fileType === "APPROVAL_FILE"-->
<!-- ? "报批稿"-->
<!-- : "关联文件"-->
<!-- }}-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="resultContent"
@@ -203,9 +203,9 @@
<el-select class="bead-input" v-model="uploadFilesdfEo.fileType">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.attrName"
:value="item.attrName"
>
</el-option>
</el-select>
@@ -713,6 +713,7 @@
</template>
<script>
import axios from 'axios'
export default {
name: "StandardRecognition",
components: {},
@@ -784,30 +785,30 @@ export default {
]
},
options: [
{
value: "STAND_FILE",
label: "标准文本",
},
{
value: "DRAFT_FILE",
label: "草案",
},
{
value: "OPINION_FILE",
label: "征求意见稿",
},
{
value: "SENT_SCREEN_FILE",
label: "送审稿",
},
{
value: "APPROVAL_FILE",
label: "报批稿",
},
{
value: "RELEVANCE_FILE",
label: "关联文件",
},
// {
// value: "STAND_FILE",
// label: "标准文本",
// },
// {
// value: "DRAFT_FILE",
// label: "草案",
// },
// {
// value: "OPINION_FILE",
// label: "征求意见稿",
// },
// {
// value: "SENT_SCREEN_FILE",
// label: "送审稿",
// },
// {
// value: "APPROVAL_FILE",
// label: "报批稿",
// },
// {
// value: "RELEVANCE_FILE",
// label: "关联文件",
// },
],
/* standRecoColumn: [
{
@@ -1340,8 +1341,8 @@ export default {
).standName;
// this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
this.options.map((item) => {
if (item.value === JSON.parse(JSON.stringify(row)).fileType) {
this.uploadFilesdfEo.fileType = item.label;
if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
this.uploadFilesdfEo.fileType = item.attrName;
}
});
this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
@@ -1359,7 +1360,7 @@ export default {
) {
this.isSubmit = true;
this.uploadFilesdfEo.fileType = this.uploadFilesdfEo.fileType.toString();
this.$http.post(
this.$http.post(
"ocr/OCRRestful/addOcrRecord",
this.uploadFilesdfEo,
{
@@ -1413,7 +1414,10 @@ export default {
},
// 获取doc文件
downloadFile(data) {
window.open(data.docRealFile);
let URL = 'https://srms.foton.com.cn/ocrResultFile/' + data.docRealName
window.open(URL)
// console.log(URL);
// window.open(data.docRealFile);
},
// 删除
delSingalData(row) {
@@ -1525,6 +1529,12 @@ export default {
computed: {},
created() {},
mounted() {
this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
_this: this
}, res => {
this.options = res.data
console.log(this.options);
})
this.getTableData();
},
destroyed() {},
+263 -529
View File
@@ -4,17 +4,17 @@
<div class="dynamic-content">
<!-- 实施预警 -->
<div class="dynamic" style="overflow-y: auto;">
<div class="container" :style="containerStyle">
<div class="container" >
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
<div>
<h5>实施预警</h5>
</div>
<!-- <div>-->
<!-- <h5 style="font-size: 20px">实施预警</h5>-->
<!-- </div>-->
<div class="more">
<el-row :gutter="24">
<el-col span="24">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-row :gutter="24">
<el-col>
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="dynamic.standCode"
@@ -27,75 +27,104 @@
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
<el-select v-model="dynamic.applyType" size="mini"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable>
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="适用车型">-->
<!-- <el-input clearable size="mini"-->
<!-- v-model="dynamic.applyType"-->
<!-- placeholder="根据适用车型查找">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
size="mini"
clearable
v-model="dynamic.SSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<!-- <el-datePicker-->
<!-- clearable size="mini"-->
<!-- v-model="dynamic.putTime"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="根据实施日期查找">-->
<!-- </el-datePicker>-->
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
<el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.XCXSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<div style="margin: 8px 0 0 0; float: right">
<el-button
<el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.ZCCSSRQ"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-button
style="margin: 6px 8px 0 0"
type="primary"
size="mini"
@click="searchBtnClick"
class="common-button-primary">
查询
</el-button>
<el-button
查询
</el-button>
<el-button
style="margin: 6px 0 0 0"
size="mini"
@click="clearBtnClick"
class="common-button-primary">
清空
</el-button>
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
<!-- @click="searchBtnClick"-->
<!-- class="common-button-primary">-->
<!-- 查询-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- @click="clearBtnClick"-->
<!-- v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
<!-- class="common-button-primary">-->
<!-- 清空-->
<!-- </el-button>-->
</div>
</el-form>
</el-col>
</el-row>
清空
</el-button>
</el-col>
</el-row>
</el-form>
</div>
<div class="content" style="height: 100%; padding-top: 50px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<div class="content">
<!-- <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
<el-table
:data="newItems"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="loading.newItems"
:data="warningTableDatas"
style="overflow-y: auto;"
height="100%"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="warningTableLoading"
>
<el-table-column prop="standType" label="类型" align="center">
<el-table-column prop="standType" label="类型" width="100" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
@@ -104,7 +133,7 @@
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standCode" label="标准编号" align="center">
<el-table-column prop="standCode" label="标准编号" width="200" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
@@ -114,293 +143,58 @@
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<el-table-column prop="itemsNum" label="条款编号" width="200" align="center">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<a @click="handlePreview(scope.row)">{{ scope.row.itemsNum }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsName" width="320" label="条款名称" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="发布日期" width="120" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? scope.row.putTime.substring(0, 10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
</el-table-column>
<el-table-column label="操作" align="center" v-if="isShowBtn">
<el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
style="position: static;"
:page="pageConfig.newItemsPage"
:pageSize="pageConfig.newItemsPageSize"
:total="pageConfig.count1"
autoSize
@pageChange="page => handlePageChange('newItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
<el-table
:data="oldItems"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="loading.oldItems"
>
<el-table-column prop="sortName" label="类型" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="320" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
</el-table-column>
<el-table-column label="操作" align="center" v-if="isShowBtn">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
style="position: static;"
:page="pageConfig.oldItemsPage"
:pageSize="pageConfig.oldItemsPageSize"
:total="pageConfig.count2"
autoSize
@pageChange="page => handlePageChange('oldItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
<el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>
<el-table
:data="newStand"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="loading.newStand"
>
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="320" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsNum" label="条款号" align="center">
<template slot-scope="scope">
<div>{{ scope.row.itemsNum }}</div>
</template>
</el-table-column>
<el-table-column prop="itemsName" label="条款要求" align="center">
<template slot-scope="scope">
<div>{{ scope.row.itemsName }}</div>
</template>
</el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
</el-table-column>
<el-table-column label="操作" align="center" v-if="isShowBtn">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
style="position: static;"
:page="pageConfig.newStandPage"
:pageSize="pageConfig.newStandPageSize"
:total="pageConfig.count3"
autoSize
@pageChange="page => handlePageChange('newStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
<el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
<el-table
:data="oldStand"
:height="height"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
v-loading="loading.oldStand"
>
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="320" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsNum" label="条款号" align="center">
<template slot-scope="scope">
<div>{{ scope.row.itemsNum }}</div>
</template>
</el-table-column>
<el-table-column prop="itemsName" label="条款要求" align="center">
<template slot-scope="scope">
<div>{{ scope.row.itemsName }}</div>
</template>
</el-table-column>
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
</el-table-column>
<el-table-column label="操作" align="center" v-if="isShowBtn">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
style="position: static;"
:page="pageConfig.oldStandPage"
:pageSize="pageConfig.oldStandPageSize"
:total="pageConfig.count4"
autoSize
@pageChange="page => handlePageChange('oldStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
style="position: static;"
:page="pageConfig.page"
:pageSize="pageConfig.pageSize"
:total="pageConfig.total"
autoSize
@pageChange="page => handlePageChange('page', page)"
@pageSizeChange="pageSize => handlePageSizeChange('pageSize', pageSize)"></pagination>
</div>
</div>
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="政策预警" name="POLICY">-->
<!-- <div class="dynamic-content">-->
<!-- <h5>实施预警</h5>-->
<!-- <div class="content" style="height: 100%; padding-top: 5px; ">-->
<!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>-->
<!-- <div class="table-wrap">-->
<!-- <el-table-->
<!-- :data="newPolicy"-->
<!-- :height="tableHeight"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- v-loading="loading.newPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.newPolicyPage"-->
<!-- :pageSize="pageConfig.newPolicyPageSize"-->
<!-- :total="pageConfig.count5"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('newPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>-->
<!-- </div>-->
<!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
<!-- <div class="table-wrap">-->
<!-- <el-table-->
<!-- :data="oldPolicy"-->
<!-- :height="tableHeight"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- v-loading="loading.oldPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.oldPolicyPage"-->
<!-- :pangSize="pageConfig.oldPolicyPageSize"-->
<!-- :total="pageConfig.count6"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('oldPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div>
</div>
</div>
@@ -415,6 +209,10 @@ export default {
name: "standardWarning",
data() {
return {
//
warningTableDatas:[],
warningTableHeight: '',
applyArcticOptions: [], // 适用车型下拉框
isShowBtn: true,
activeName: "STANDARD", //tab 默认选中值
// 头部搜索框
@@ -423,8 +221,14 @@ export default {
standCode: "",
//标准名称
standName: "",
//发布日期
putTime: [],
//实施日期
putTime: "",
SSRQ: [],
//新车型实施日期
XCXSSRQ: [],
//在产车实施日期
ZCCSSRQ: [],
//适用车型
applyType: "",
},
@@ -445,33 +249,11 @@ export default {
oldPolicy: [],
tableHeight: 0,
pageConfig: {
newItemsPage: 1,
newItemsPageSize: 10,
count1: 0,
newStandPage: 1,
newStandPageSize: 10,
count2: 0,
oldItemsPage: 1,
oldItemsPageSize: 10,
count3: 0,
oldStandPage: 1,
oldStandPageSize: 10,
count4: 0,
newPolicyPage: 1,
newPolicyPageSize: 10,
count5: 0,
oldPolicyPage: 1,
oldPolicyPageSize: 10,
count6: 0,
},
loading: {
newItems: false,
oldItems: false,
newStand: false,
oldStand: false,
newPolicy: false,
oldPolicy: false,
page: 1,
pageSize: 10,
total: 0,
},
warningTableLoading: false,
// 记录当前分页器是哪个预警信息触发
field: ''
};
@@ -479,8 +261,8 @@ export default {
methods: {
// 获取标准预警数据 (type用于区别分页器切换)
getEarlyDate() {
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
applyType: '',
...this.pageConfig
}, {
@@ -515,7 +297,7 @@ export default {
}
}
})
let arr = result.newItems.records
let arr = result.newItems.records
arr.forEach(item => {
// 适用车型转换
if (item.applyType !== null) {
@@ -559,9 +341,7 @@ export default {
break
}
}
for (const loading in this.loading) {
this.loading[loading] = false
}
this.warningTableLoading = false
}, e => {
});
},
@@ -622,30 +402,56 @@ export default {
},
//查找适用车型
searchBtnClick() {
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
...this.pageConfig,
//标准编号
standCode: this.dynamic.standCode,
//标准名称
standName: this.dynamic.standName,
//发布日期
startPutTime: this.dynamic.putTime[0],
endPutTime: this.dynamic.putTime[1],
//实施日期
putTime: this.dynamic.putTime[0],
lastTime: this.dynamic.putTime[1],
startSSRQ: this.dynamic.SSRQ[0],
endSSRQ: this.dynamic.SSRQ[1],
//新车型实施日期
startXCXSSRQ: this.dynamic.XCXSSRQ[0],
endXCXSSRQ: this.dynamic.XCXSSRQ[1],
//在产车实施日期
startZCCSSRQ: this.dynamic.ZCCSSRQ[0],
endZCCSSRQ: this.dynamic.ZCCSSRQ[1],
//适用车型
applyType: this.dynamic.applyType
}, {
_this: this,
}, res => {
const result = res.data[0]
for (const type in result) {
this[type] = result[type].records
console.log('608',res)
// 适用车型转换
for (let a = 0; a < res.data.records.length; a++) {
if (res.data.records[a].applyType !== null) {
let k = (res.data.records[a].applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
res.data.records[a].applyType = k.join(",");
}
}
}
}
this.newItemsPage = 1
this.oldItemsPage = 1
this.newStandPage = 1
this.oldStandPage = 1
this.newPolicyPage = 1
this.oldPolicypage = 1
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
this.warningTableLoading = true
this.handlePageChange('page', 1)
}else {
this.warningTableLoading = false
}
this.pageConfig.pageSize = res.data.size
this.pageConfig.total = res.data.total
// this.warningTableLoading = false
}, e => {
})
},
@@ -655,11 +461,18 @@ export default {
standCode: "",
//标准名称
standName: "",
//发布日期
putTime: [],
//实施日期
putTime: "",
SSRQ: [],
//新车型实施日期
XCXSSRQ: [],
//在产车实施日期
ZCCSSRQ: [],
//适用车型
applyType: "",
}
this.pageConfig.page = 1
this.searchBtnClick()
},
//取消预警
@@ -672,16 +485,14 @@ export default {
roundButton: false
}).then(() => {
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, {}, res => {
this.pageConfig.newItemsPage = 1
this.pageConfig.oldItemsPage = 1
this.pageConfig.newStandPage = 1
this.pageConfig.oldStandPage = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.getEarlyDate()
}
id: row.id,
}, {}, res => {
this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.searchBtnClick()
this.getEarlyDate()
}
)
}).catch(() => {
this.$message.warning('取消事件')
@@ -757,41 +568,21 @@ export default {
return date !== undefined && date != null ? date.split(" ")[0] : "";
},
handlePageChange(field, page) {
switch (field) {
// 新车型实施日期预警
case 'newItems':
this.pageConfig.newItemsPage = page
break
// 新车型条款预警
case 'newStand':
this.pageConfig.newStandPage = page
break
// 在产车实施日期预警
case 'oldItems':
this.pageConfig.oldItemsPage = page
break
// 在产车条款预警
case 'oldStand':
this.pageConfig.oldStandPage = page
break
// 政策新车型实施日期预警
case 'newPolicy':
this.pageConfig.newPolicyPage = page
break
//政策 在产车实施日期预警
case 'oldPolicy':
this.pageConfig.oldPolicyPage = page
break
}
this.pageConfig.page = page
this.searchBtnClick()
console.log('735',this.warningTableDatas)
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
},
//分页每页显示数改变后方法
handlePageSizeChange(field, pageSize) {
const _pageSize = field + 'PageSize'
this.pageConfig[_pageSize] = pageSize
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.field = field
// const _pageSize = field + 'PageSize'
// this.pageConfig[_pageSize] = pageSize
this.pageConfig.pageSize = pageSize
this.searchBtnClick()
console.log('771',this.warningTableDatas)
// this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
// this.field = field
},
...mapMutations(["setDetailMap"])
},
@@ -802,118 +593,53 @@ export default {
},
computed: {
containerStyle() {
return this.activeName === 'POLICY' ? {
height: '100%'
} : {}
this.$nextTick(() => {
return this.activeName === 'POLICY' ? {
height: '100%'
} : {}
})
}
},
watch: {},
mounted() {
this.height = $(".content").height() * 0.4;
window.onresize = () => {
this.height = $(".content").height() * 0.4;
};
this.warningTableLoading = true
// this.$nextTick(() => {
// this.warningTableHeight = $(window).height()*0.54
// window.onresize = () => {
// this.warningTableHeight = $(window).height()*0.54;
// };
// })
// alert(this.warningTableHeight)
// this.height = $(".content").height();
// window.onresize = () => {
// this.height = $(".content").height();
// };
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.zrgcs = res.data.ZRGCSCLASS;
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
this.warningTableLoading = true
this.$http.get('sys/EarlyWarning/getStandWarning', {
applyType: '',
...this.pageConfig
}, {
_this: this
}, res => {
const result = res.data[0]
for (const field in result) {
this[field] = result[field].records
this[field].forEach(item => {
// 适用车型转换
if (item.applyType !== null) {
let k = (item.applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
item.applyType = k.join(",");
}
}
}
// 责任工程师转换
if (item.dutyEngineer !== null) {
let k = (item.dutyEngineer || "").split(",");
for (let i in this.zrgcs) {
for (let m = 0; m < k.length; m++) {
if (this.zrgcs[i].value === k[m]) {
k[m] = this.zrgcs[i].label;
}
item.dutyEngineer = k.join(",");
}
}
}
})
let arr = result.newItems.records
arr.forEach(item => {
console.log(item.applyType)
// 适用车型转换
if (item.applyType !== null) {
let k = (item.applyType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label;
}
item.applyType = k.join(",");
}
}
}
// 责任工程师转换
if (item.dutyEngineer !== null) {
let k = (item.dutyEngineer || "").split(",");
for (let i in this.zrgcs) {
for (let m = 0; m < k.length; m++) {
if (this.zrgcs[i].value === k[m]) {
k[m] = this.zrgcs[i].label;
}
item.dutyEngineer = k.join(",");
}
}
}
})
this.newItems = arr
//可能还需要调整一下条款或标准的顺序(zyh)
switch (field) {
case 'newItems':
this.pageConfig.count1 = result.newItems.total
break
case 'oldItems':
this.pageConfig.count2 = result.oldItems.total
break
case 'newStand':
this.pageConfig.count3 = result.newStand.total
break
case 'oldStand':
this.pageConfig.count4 = result.oldStand.total
break
}
}
for (const loading in this.loading) {
this.loading[loading] = false
}
console.log('805',res)
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
this.pageConfig.pageSize = res.data.size
this.pageConfig.total = res.data.total
this.getEarlyDate();
this.warningTableLoading = false
}, e => {
});
});
// this.queryNewTypeByPage();
// this.queryProductionVehicleByPage();
// 四个预警同时查询,loading全部打开
for (const loading in this.loading) {
this.loading[loading] = true
}
this.getEarlyDate();
}
};
@@ -1036,6 +762,7 @@ export default {
}
.container {
height: calc(100% - 139px);
/deep/ .el-tabs__header {
height: 50px;
}
@@ -1043,7 +770,6 @@ export default {
.dynamic-content {
height: 100%;
overflow-y: hidden;
width: 100%;
position: relative;
@@ -1071,24 +797,28 @@ export default {
}
.more {
margin-top: 30px;
display: flex;
align-items: center;
justify-content: center;
/deep/ .el-input__inner {
width: 155px;
width: 185px;
}
.choose-time-area {
/deep/ .el-input__inner {
width: 220px;
width: 210px;
}
}
cursor: pointer;
//cursor: pointer;
color: #12508e;
position: absolute;
//position: absolute;
top: 0;
right: 0;
z-index: 100;
padding: 5px 10px;
//padding: 5px 10px;
// &:hover {
// color: #fff;
// background: #12508e;
@@ -1096,6 +826,17 @@ export default {
// }
}
.content {
padding-bottom: 10px;
height: calc(~'100% - 40px');
/deep/ .el-button--mini {
padding: 5px 7px;
font-size: 8px;
}
}
.dynamic-loop-container {
position: relative;
min-height: 160px;
@@ -1175,14 +916,7 @@ export default {
}
}
.content {
padding-bottom: 10px;
height: calc(~'100% - 40px');
/deep/.el-button--mini{
padding: 5px 7px;
font-size: 8px;
}
}
}
::v-deep {
@@ -26,7 +26,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -84,7 +84,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -329,7 +329,7 @@
<loading :loading="spinShow">数据加载中</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer"></el-button>
<el-button type="primary" size="mini" @click="enterDrawer"></el-button>
</div>
</div>
</el-drawer>
@@ -649,7 +649,7 @@
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择入数据的方法操作
/** 选择入数据的方法操作
* */
handleSelection(data) {
this.selectedList = [];
@@ -710,9 +710,9 @@
this.loading = false
})
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行入");
this.$message.warning("只能选择一条数据进行入");
} else {
this.$message.warning("请选择一条数据进行入");
this.$message.warning("请选择一条数据进行入");
}
},
closeDrawer2() {
@@ -744,9 +744,9 @@
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行入");
this.$message.warning("只能选择一条数据进行入");
} else {
this.$message.warning("请选择一条数据进行入");
this.$message.warning("请选择一条数据进行入");
}
},
/*** **********************************************/
@@ -27,7 +27,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -94,7 +94,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
<el-button size="small" type="primary" @click="addZqyjList"></el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -345,7 +345,7 @@
<loading :loading="spinShow">数据加载中</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer"></el-button>
<el-button type="primary" size="mini" @click="enterDrawer"></el-button>
</div>
</div>
</el-drawer>
@@ -680,7 +680,7 @@ export default {
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择入数据的方法操作
/** 选择入数据的方法操作
* */
handleSelection(data) {
this.selectedList = [];
@@ -747,9 +747,9 @@ export default {
this.loading = false
})
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行入");
this.$message.warning("只能选择一条数据进行入");
} else {
this.$message.warning("请选择一条数据进行入");
this.$message.warning("请选择一条数据进行入");
}
},
closeDrawer2() {
@@ -781,9 +781,9 @@ export default {
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行入");
this.$message.warning("只能选择一条数据进行入");
} else {
this.$message.warning("请选择一条数据进行入");
this.$message.warning("请选择一条数据进行入");
}
},
/*** **********************************************/
@@ -1478,9 +1478,9 @@
],
},
rules:{
standSort: [
/*standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' }
],
],*/
standNumber: [
{ required: true, message: '请输入标准编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
@@ -1497,9 +1497,9 @@
{ required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
/*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
],*/
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
]
@@ -44,7 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -382,7 +382,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -392,7 +392,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -475,7 +475,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -485,7 +485,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -44,7 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -296,7 +296,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -306,7 +306,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -389,7 +389,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -399,7 +399,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -44,7 +44,7 @@
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
<el-option
v-for="item in standSortOptions"
@@ -91,7 +91,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质">
<el-option
v-for="item in standNatureOptions"
@@ -748,7 +748,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option
v-for="item in zrbmOptions"
@@ -758,7 +758,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option
@@ -874,7 +874,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option
v-for="item in zrgcsOptions"
@@ -884,7 +884,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -1456,9 +1456,9 @@ export default {
replaceLoading: true,
replacePage: 1,
rules:{
standSort: [
/* standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' }
],
],*/
standNumber: [
{ required: true, message: '请输入标准编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
@@ -1475,9 +1475,9 @@ export default {
{ required: true, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
/*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
],*/
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
@@ -1629,19 +1629,6 @@ export default {
}
})
},
getTaskId () {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.taskIds=mes.taskIds
//表单文件处理
this.getFormFieldList(mes.form)
})
},
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
@@ -2215,7 +2202,12 @@ export default {
if (res) {
const processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
this.getFormFieldList(processForm)
if (processForm.form === undefined) {
this.getFormFieldList(processForm)
} else {
//表单文件处理
this.getFormFieldList(processForm.form)
}
}
}).catch(e => {
console.log("错误")
@@ -2238,7 +2230,6 @@ export default {
this.form.prcName = this.prcName
this.form['id'] = item.id
console.log("this.form",this.form);
// 遍历对象
for(const p in this.form) {
@@ -2328,22 +2319,22 @@ export default {
this.form.country=this.countryArr;
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('id', this.bpnId)
// _formData.append('createUser', this.$store.getters.userInfo.userId)
// _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '1')
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
taskInfo: '申请人修订',
taskIds:this.taskIds
// taskInfo: '申请人修订',
// taskIds:this.taskIds
}))
saveTaskFirst(_formData).then(res => {
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
@@ -2442,7 +2433,6 @@ export default {
this.getData()
},
mounted () {
this.getTaskId()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -30,7 +30,7 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -80,7 +80,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -289,7 +289,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -299,7 +299,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -397,7 +397,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -407,7 +407,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<h4>责任领导</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
placeholder="选择责任领导"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -253,7 +253,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
is-title="选择责任领导"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -342,9 +342,9 @@ export default {
cname: [
{required: true, message: '请输入标准名称', trigger: 'change'},
],
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
// fjListId: [
// {required: true, message: '', trigger: 'change'},
// ]
},
//
standCommonlySearch: {
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<h4>责任领导</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
placeholder="选择责任领导"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -254,7 +254,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
is-title="选择责任领导"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -341,9 +341,9 @@ export default {
endTime: [
{required: true, message: '请输入标准结束日期', trigger: 'change'},
],
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
// fjListId: [
// {required: true, message: '', trigger: 'change'},
// ]
},
//
standCommonlySearch: {
@@ -340,6 +340,11 @@ export default {
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.json = data
}).catch(e => {
});
@@ -485,7 +485,8 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
console.log(data);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
@@ -493,12 +494,16 @@ export default {
this.acceptShow = false
this.submitShow = true
}
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.fjList = data.fjList || data.form.fjList || []
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.todoId = res.id
this.json = data
this.json = data
this.data = data.info || data.data || data.form.data || []
}).catch(e => {
})
@@ -373,7 +373,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
@@ -420,7 +420,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -437,7 +437,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -247,7 +247,7 @@ export default {
this.queryProcess()
},
queryProcess () { //
this.$http.postData('lawss/activiti/todoTaskList', {
this.$http.postData('lawss/activiti/todoTaskListNew', {
current: this.pageNo,
size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
@@ -7,10 +7,10 @@
<el-input v-model="formQuery.name" size="small" placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="支出金额">
<el-input v-model="formQuery.money" size="small" placeholder="请输入支出金额"></el-input>
<el-input v-model="formQuery.cost" size="small" placeholder="请输入支出金额"></el-input>
</el-form-item>
<el-form-item label="用途">
<el-input v-model="formQuery.use" size="small" placeholder="请输入用途">
<el-input v-model="formQuery.purposes" size="small" placeholder="请输入用途">
</el-input>
</el-form-item>
<el-form-item>
@@ -61,25 +61,23 @@
</el-table-column>
<el-table-column
align="center"
prop="money"
prop="cost"
label="支出金额">
</el-table-column>
<el-table-column
align="center"
prop="use"
prop="purposes"
label="用途">
</el-table-column>
<el-table-column
align="center"
prop="annex"
show-overflow-tooltip
prop="annexs"
label="详细附件">
<template slot-scope="scope">
<span v-if="scope.row.annex.length === 0">{{ '-' }}</span>
<span v-for="res in scope.row.annex" :key="res.id" style="color: #409EFF;">
<span v-if="scope.row.annexs === null || ''">{{ '-' }}</span>
<span v-for="res in JSON.parse(scope.row.annexs)" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
{{ res.name }} {{ ';'}}
</span>
<!--<el-button size="mini" type="primary" @click="fileDetail(scope.row)"></el-button>-->
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
@@ -119,15 +117,13 @@
</el-input>
</el-form-item>
<el-form-item label="支出金额">
<el-input v-model="formShowData.money" type="text" placeholder="请填写"></el-input>
<el-input v-model="formShowData.cost" type="text" placeholder="请填写"></el-input>
</el-form-item>
<el-form-item label="用途">
<el-input v-model="formShowData.use" type="text" placeholder="请填写">
<el-input v-model="formShowData.purposes" type="text" placeholder="请填写">
</el-input>
</el-form-item>
<el-form-item label="详细附件">
<el-input v-model="formShowData.annex" type="text">
</el-input>
<el-upload
:disabled="acceptShow"
multiple
@@ -139,6 +135,7 @@
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
:on-preview="handleOnPreview"
>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
@@ -153,18 +150,6 @@
</el-drawer>
<el-dialog
:visible.sync="annexDialog"
width="30%"
:before-close="handleClose">
<el-upload
:action="''"
name="file"
:file-list="annexList"
:on-preview="handleOnPreview"
>
</el-upload>
</el-dialog>
<!-- <div>
&lt;!&ndash; 导入弹框 &ndash;&gt;
@@ -192,8 +177,8 @@ export default {
loading: false,
formQuery: {
name: '',
money: '',
use: '',
cost: '',
purposes: '',
current: 1,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
@@ -204,9 +189,9 @@ export default {
formShowData: {
id: '',
name: '',
money: '',
use: '',
annex: ''
cost: '',
purposes: '',
annexs: ''
},
drawerTable: false,
@@ -240,6 +225,7 @@ export default {
//
dataAdd() {
this.drawerTitle = '新增'
this.annexList = []
this.formShowData = {}
this.drawerTable = true
},
@@ -257,6 +243,7 @@ export default {
this.$refs['formShowData'].validate((valid) => {
if (valid) {
this.submitLoading = true
this.formShowData.annexs = JSON.stringify(this.annexList)
if (this.drawerTitle === '新增') {
exportAdd(this.formShowData).then(res=>{
if (res.ok) {
@@ -337,14 +324,16 @@ export default {
}
},
editRowOne(item) {
this.annexList = []
this.drawerTitle = '编辑'
this.formShowData = {
id: item.id,
name: item.name,
money: item.money,
use: item.use,
annex: item.annex
cost: item.cost,
purposes: item.purposes,
annexs: item.annexs
}
this.annexList = JSON.parse(this.formShowData.annexs)
this.drawerTable = true
},
deleteRowOne(val) {
@@ -385,30 +374,32 @@ export default {
this.getTableData()
},
/** 附件详情 */
fileDetail(val) {
/* fileDetail(val) {
this.tableFile = val
this.annexList = this.tableFile.annex
this.annexList = this.tableFile.annexs
this.annexDialog = true
this.acceptShow = true
},
},*/
//
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.annexList !== undefined) {
console.log(this.annexList)
if (this.annexList !== undefined ) {
this.newDataList = this.annexList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.standName,
allName: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.standName,
allName: res.data.name
})
}
this.tableFile.annex = this.newDataList
this.annexList = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -425,7 +416,6 @@ export default {
this.annexList.splice(index,1)
}
})
this.tableFile.annex = this.annexList
},
//
handleBeforeUpload(file) {
@@ -459,6 +449,13 @@ export default {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
}
}
}
</script>
@@ -295,7 +295,6 @@ export default {
}, e => {
})
} else {
console.log(this.formShowData.meetTime)
meetEdit(this.formShowData).then(res => {
if (res.ok) {
this.$message.success('编辑成功')
File diff suppressed because it is too large Load Diff
@@ -228,12 +228,12 @@
</el-form-item>
<!-- 项目名称-->
<el-form-item label="项目名称" class="serch-form-item">
<el-input v-model="projectLibrarySearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
<el-input v-model="localProTableSearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
@keyup.enter.native="getLocalProductTableBtn"></el-input>
</el-form-item>
<!-- 项目分类-->
<el-form-item label="项目分类" class="serch-form-item">
<el-select v-model="projectLibrarySearch.projectClassification" placeholder="根据项目分类" clearable
<el-select v-model="localProTableSearch.projectClassification" placeholder="根据项目分类" clearable
@keyup.enter.native="getLocalProductTableBtn">
<el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label"
:key="opt.label" :label="opt.label">{{ opt.label }}
@@ -242,7 +242,7 @@
</el-form-item>
<!-- 项目状态-->
<el-form-item label="项目状态" class="serch-form-item">
<el-select v-model="projectLibrarySearch.projectStatus" placeholder="根据项目状态" clearable
<el-select v-model="localProTableSearch.projectStatus" placeholder="根据项目状态" clearable
@keyup.enter.native="getLocalProductTableBtn">
<el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label"
:label="opt.label">{{ opt.label }}
@@ -485,6 +485,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
//
localProTableSearch: {
projectClassification: '',
projectStatus: '',
validFlag: 0,
//
projectNumber: "",
@@ -3,12 +3,12 @@
<el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<stand-involve-project-detail ></stand-involve-project-detail>
<stand-involve-project-detail v-if="tabValue === 'standInvolveProjectDetail'"></stand-involve-project-detail>
</div>
</el-tab-pane>
<el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<technology-involve-project ></technology-involve-project>
<technology-involve-project v-if="tabValue === 'technologyInvolveProject'"></technology-involve-project>
</div>
</el-tab-pane>
</el-tabs>
@@ -30,7 +30,7 @@ export default {
return {
skill: false,
project: false,
tabValue: '',
tabValue: 'standInvolveProjectDetail',
menuName: [ "项目评估结果", "技术评估结果"]
}
},
@@ -53,12 +53,12 @@ export default {
}
}
});
if(this.skill === true){
this.tabValue = "technologyInvolveProject"
return;
}else if(this.project === true){
if (this.project === true) {
this.tabValue = "standInvolveProjectDetail"
return;
} else if (this.skill === true) {
this.tabValue = "technologyInvolveProject"
return;
}
}
}
@@ -159,24 +159,24 @@
width="55"
align="center">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productLineId"
label="产品线">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productId"
label="项目编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productName"
label="项目名称">
</el-table-column>
<!-- <el-table-column-->
<!-- width="150px"-->
<!-- align="center"-->
<!-- prop="productLineId"-->
<!-- label="产品线">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- width="150px"-->
<!-- align="center"-->
<!-- prop="productId"-->
<!-- label="项目编号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- width="150px"-->
<!-- align="center"-->
<!-- prop="productName"-->
<!-- label="项目名称">-->
<!-- </el-table-column>-->
<el-table-column
width="150px"
align="center"
@@ -14,12 +14,12 @@
placeholder="标准/政策名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="类型" class="search-item search-item-last">
<el-select v-model="sarProject.position" placeholder="请选择标准性质">
<el-option value="1" label="国内"></el-option>
<el-option value="2" label="海外"></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型" class="search-item search-item-last">
<el-select v-model="sarProject.position" placeholder="请选择标准性质">
<el-option value="1" label="国内"></el-option>
<el-option value="2" label="海外"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
</el-form-item>
@@ -33,24 +33,24 @@
</div>
<div class="content">
<el-table
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standType"
label="标准/政策类型"
width="120"
prop="standType"
label="标准/政策类型"
width="120"
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -61,9 +61,9 @@
</template>
</el-table-column>
<el-table-column
prop="standCode"
label="标准/政策号"
width="180"
prop="standCode"
label="标准/政策号"
width="180"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -71,8 +71,8 @@
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准/政策名称"
prop="standName"
label="标准/政策名称"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -85,10 +85,24 @@
>
</el-table-column>
<el-table-column
fixed="right"
label=""
width="50"
align="center">
prop="status"
label="技术储备情况"
width="150"
>
<template slot-scope="scope">
<div class="status" @click="editRiskDegree(scope.row)">
<div class="color" :style="iconColor(scope.row.riskDegree)"></div>
<div class="text" :style="textColor(scope.row.riskDegree)">
{{ scope.row.riskDegree === '0' ? '初始状态' : (scope.row.riskDegree === '1' ? '低风险' : (scope.row.riskDegree === '2' ? '中风险' : '高风险')) }}
</div>
</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
label=""
width="50"
align="center">
<template slot-scope="scope">
<i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
</template>
@@ -99,53 +113,53 @@
</div>
<!-- 查看符合标准性弹窗-->
<el-drawer
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
>
<div class="demo-drawer-content">
<div class="el-drawer-form">
<div class="search-area-detail">
<div class="left" id="detailSearch">
<el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="标准编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standNumber"
placeholder="根据标准编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="标准名称" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standName"
placeholder="根据标准名称查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<!-- <el-form-item label="标准编号" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarProStateEO.standNumber"-->
<!-- placeholder="根据标准编号查找"-->
<!-- :maxlength="100"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标准名称" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarProStateEO.standName"-->
<!-- placeholder="根据标准名称查找"-->
<!-- :maxlength="100"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="具体章条" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.specificItem"
placeholder="根据具体章条查找"
:maxlength="100"
clearable></el-input>
v-model="sarProStateEO.specificItem"
placeholder="根据具体章条查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'"
@click="querySarProStateZeroBtn">查询</el-button>
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'"
@click="querySarProStateZeroBtn">查询</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'5e5ea3cc23f1b27ba1c6b6bee44214f0'"
@click="clearSearchProState">清空</el-button>
class="common-button-default"
size="mini"
v-btn-permission="'5e5ea3cc23f1b27ba1c6b6bee44214f0'"
@click="clearSearchProState">清空</el-button>
</el-form-item>
</el-form>
</div>
@@ -153,140 +167,209 @@
</div>
</div>
<el-table
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
v-if="sarProject.position === '1'"
prop="lastVersionNumber"
label="上一版本标准编号">
type="selection"
width="55"
align="center">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="standNumber"-->
<!-- label="标准编号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="standName"-->
<!-- label="标准名称">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- v-if="sarProject.position === '1'"-->
<!-- prop="lastVersionNumber"-->
<!-- label="上一版本标准编号">-->
<!-- </el-table-column>-->
<el-table-column
v-if="sarProject.position === '2'"
prop="correspondDomesticStandard"
label="对应国行标">
</el-table-column>
<el-table-column
prop="specificItem"
label="具体章条">
prop="specificItem"
label="具体章条">
</el-table-column>
<el-table-column
prop="carModel"
align="center"
label="解读内容">
prop="carModel"
align="center"
label="解读内容">
<el-table-column
show-overflow-tooltip
prop="coreTechnicalRequirement"
label="核心技术要求(简述、请勿抄写标准)">
</el-table-column>
<el-table-column
show-overflow-tooltip
show-overflow-tooltip
v-if="sarProject.position === '1'"
prop="comparedWithPrevious"
label="相对于上一版本变化点">
</el-table-column>
<el-table-column
show-overflow-tooltip
show-overflow-tooltip
v-if="sarProject.position === '2'"
prop="comparedDomesticStandard"
label="相对于国行标差异点">
</el-table-column>
<el-table-column
show-overflow-tooltip
show-overflow-tooltip
prop="complianceState"
label="合规性分析">
</el-table-column>
</el-table-column>
</el-table>
<pagination
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
</div>
</div>
</el-drawer>
<el-dialog width='400px' :visible.sync="riskDegreeModal" title="修改技术储备情况">
<el-select v-model="riskDegree" placeholder="请选择">
<el-option label="初始状态" value="0"></el-option>
<el-option label="低风险" value="1"></el-option>
<el-option label="中风险" value="2"></el-option>
<el-option label="高风险" value="3"></el-option>
</el-select>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="mini" @click="risSubmit">确定</el-button>
<el-button type="primary" size="mini" @click="riskDegreeModal = false">关闭</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: "technologyInvolveProject",
data () {
return {
SarProStateType: '', //
sarProject: {
standName: '', //
standNumber: '', // /
standApplicationType: 2,
position: '1'
}, //
sarProjectListDatas: [], // table
countryOptions: [], //
tableHeight: null, // table
loading: false,
total: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
showSarProStateModal: false,
sarProStateEO: {
//
standNumber: '',
//
standName: '',
//
specificItem: '',
export default {
name: "technologyInvolveProject",
data () {
return {
riskDegreeModal: false,
editData: {},
riskDegree: '',
SarProStateType: '', //
sarProject: {
standName: '', //
standNumber: '', // /
standApplicationType: 2,
position: '1'
}, //
sarProjectListDatas: [], // table
countryOptions: [], //
tableHeight: null, // table
loading: false,
total: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
showSarProStateModal: false,
sarProStateEO: {
//
standNumber: '',
//
standName: '',
//
specificItem: '',
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], //
sarProStateTableHeight: null,
standId: '', // id
}
},
methods: {
risSubmit () {
this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', {
standNumber: this.editData.standNumber,
standName: this.editData.standName,
interpretationTime: this.editData.interpretationTime,
standId: this.editData.standId,
riskDegree: this.riskDegree
}, {
_this: this
}, res => {
this.riskDegreeModal = false
this.searchStandAndLaws()
})
},
editRiskDegree (row) {
this.riskDegreeModal = true
this.editData = row
this.riskDegree = row.riskDegree
},
iconColor (row) {
if (row === '0') {
return 'background: #409EFF'
} else if (row === '1') {
return 'background: #67c23a'
} else if (row === '2') {
return 'background: #e6a23c'
} else if (row === '3') {
return 'background: #f56c6c'
}
},
textColor (row) {
if (row === '0') {
return 'color: #409EFF'
} else if (row === '1') {
return 'color: #67c23a'
} else if (row === '2') {
return 'color: #e6a23c'
} else if (row === '3') {
return 'color: #f56c6c'
}
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], //
sarProStateTableHeight: null,
standId: '', // id
}
},
methods: {
searchStandAndLaws () {
this.page = 1
this.queryStandAndLaws()
this.page = 1
this.queryStandAndLaws()
}, //
pageChange (page) {
this.page = page
this.queryStandAndLaws()
this.page = page
this.queryStandAndLaws()
},
pageSizeChange (pageSize) {
this.pageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
this.pageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
},
queryStandAndLaws () {
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, {
_this: this,
loading: 'loading',
}, res => {
this.sarProjectListDatas = res.data.records
this.total = res.data.total
}, e=> {})
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, {
_this: this,
loading: 'loading',
}, res => {
this.sarProjectListDatas = res.data.records
this.sarProjectListDatas.forEach((item, index) => {
if (index === 0) {
item.status = '0'
} else if (index === 1) {
item.status = '1'
} else if (index === 2) {
item.status = '2'
} else if (index === 3) {
item.status = '3'
} else {
item.status = '3'
}
})
this.total = res.data.total
}, e=> {})
},
//
handlePreview(item) {
@@ -301,107 +384,124 @@ name: "technologyInvolveProject",
},
//
resetSelect () {
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
this.sarProject.standNumber=''
this.queryStandAndLaws()
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
this.sarProject.standNumber=''
this.queryStandAndLaws()
}, //
handleProjectCompliance (row) {
this.standId = row.standId
this.querySarProStateZero()
},
querySarProStateZeroBtn(){
this.sarProStateTotalPage = 1
this.querySarProStateZero()
},
//
querySarProStateZero () {
var form = this.sarProStateEO
form.position = this.sarProject.position
form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
_this: this,
loading: 'loading'
}, res => {
if (res.ok) {
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
}
})
this.showSarProStateModal = true
}, //
querySarProStateZeroBtn(){
this.sarProStateTotalPage = 1
this.querySarProStateZero()
},
//
querySarProStateZero () {
var form = this.sarProStateEO
form.position = this.sarProject.position
form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
_this: this,
loading: 'loading'
}, res => {
if (res.ok) {
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
}
})
this.showSarProStateModal = true
}, //
clearSearchProState () {
this.sarProStateEO.standNumber = ''
this.sarProStateEO.standName = ''
this.sarProStateEO.specificItem = ''
this.querySarProStateZeroBtn()
this.sarProStateEO.standNumber = ''
this.sarProStateEO.standName = ''
this.sarProStateEO.specificItem = ''
this.querySarProStateZeroBtn()
}, //
clearSearchPro () {
this.sarProStateEO.standNumber = ''
this.sarProStateEO.standName = ''
this.sarProStateEO.specificItem = ''
this.showSarProStateModal = false
this.sarProStateEO.standNumber = ''
this.sarProStateEO.standName = ''
this.sarProStateEO.specificItem = ''
this.showSarProStateModal = false
}, //
pageProStateChange (page) {
this.sarProStateTotalPage = page
this.querySarProStateZero()
this.sarProStateTotalPage = page
this.querySarProStateZero()
},
pageProStateSizeChange (pageSize) {
this.sarProStatePageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.querySarProStateZero()
this.sarProStatePageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.querySarProStateZero()
},
},
mounted () {
},
mounted () {
this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight = $('body').height() - 152
window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight = $('body').height() - 152
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight = $('body').height() - 152
}
}
}
}
</script>
<style lang="less" scoped>
.technology-involve-project{
height: 100%;
.laws-details-header {
background: #fff;
// height: 30px;
line-height: 50px;
padding: 0 10px;
//margin-bottom: 5px;
.back {
display: inline-block;
margin-right: 10px;
.technology-involve-project{
height: 100%;
.status {
border: 1px solid #ccc;
border-radius: 5px;
display: flex;
line-height: 30px;
margin: 5px;
align-items: center;
.text {
font-weight: bold;
}
.color {
margin: 0 10px;
width: 15px;
height: 15px;
border-radius: 50%;
}
}
.title {
display: inline-block;
font-weight: bold;
font-size: 18px;
flex: 1;
padding: 0 15px;
text-align: center;
.laws-details-header {
background: #fff;
// height: 30px;
line-height: 50px;
padding: 0 10px;
//margin-bottom: 5px;
.back {
display: inline-block;
margin-right: 10px;
}
.title {
display: inline-block;
font-weight: bold;
font-size: 18px;
flex: 1;
padding: 0 15px;
text-align: center;
}
}
.contaiiner {
background: #fff;
padding: 5px 10px;
}
}
.contaiiner {
background: #fff;
padding: 5px 10px;
}
}
</style>
<style lang="less">
.technology-involve-project{
.search-area .search-item .el-input--suffix .el-input__inner{
padding-right: 15px;
.technology-involve-project{
.search-area .search-item .el-input--suffix .el-input__inner{
padding-right: 15px;
}
.search-area-detail .el-input__inner{
width: 150px;
}
}
.search-area-detail .el-input__inner{
width: 150px;
}
}
</style>
@@ -22,34 +22,6 @@
{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="nonConformitySearch.responsibleUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -73,6 +45,13 @@
</div>
</div>
<div class="content-center">
<el-button
class="common-button-primary"
size="small"
type="primary"
v-btn-permission="''"
@click="addModel"
><i class="el-icon-plus"></i>新增</el-button>
<el-button
class="common-button-primary"
type="primary"
@@ -209,6 +188,7 @@
<el-dropdown-menu slot="dropdown">
<!--未符合项整改库-查看-->
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">编辑</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -218,7 +198,7 @@
</div>
</div>
<div class="footer">
<pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<pagination :total="totalNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination>
<el-drawer
title='查看'
:visible.sync="historySee"
@@ -408,25 +388,441 @@
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
</span>
</el-dialog>
<!-- 选择项目抽屉-->
<el-drawer
title="选择项目"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="''"
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="''"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="ProjectDatas"
tooltip-effect="dark"
style="width: 100%;"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
type="selection"
width="55"
align="center" />
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
/>
<el-table-column
prop="projectClassification"
align="center"
label="项目分类"
/>
<el-table-column
prop="uname"
align="center"
label="项目经理"
/>
</el-table>
</div>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<!-- 选择项目下标准抽屉-->
<el-drawer
title="选择标准"
:visible.sync="listModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zrbm"
label="责任部门"
align="center"
>
</el-table-column>
</el-table>
</div>
<pagination
:page="standPage"
:pageSize="standPageSize"
:total="standTotal"
@pageChange="standPageChange"
@pageSizeChange="standPageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeStand">取消</el-button>
<el-button type="primary" size="mini" @click="OkStand">带入</el-button>
</div>
</el-drawer>
<!-- 填写未符合项信息表单-->
<el-drawer
size="700px"
:before-close="addDrawerClose"
:title="drawerTitle"
:visible.sync="drawerTable">
<div class="demo-drawer-content" v-if="drawerTable">
<div class="content">
<div class="standard-table-search">
<el-row :gutter="24">
<el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px" ref="addForm">
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px" class="add-form-item">
<el-input
v-model="addForm.standSerialNumber"
placeholder="请输入标准号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.standName"
placeholder="请输入标准名称"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px" class="add-form-item add-input" >
<el-input
v-model="addForm.itemsNum"
placeholder="请输入条款号"
:maxlength="500">
</el-input>
</el-form-item>
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- @click="handSeek"-->
<!-- style="position:absolute;top: 10px; float: right;"-->
<!-- >手动查找</el-button>-->
<el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.itemsName"
placeholder="请输入条款名称"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="projectName" label="项目名称" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.projectName"
placeholder="请输入项目名称"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.reason"
placeholder="请输入不合规项目"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="dutyEngineerName" label="责任工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.dutyEngineerName"
placeholder="请输入责任工程师"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.authEngineer"
placeholder="请输入认证工程师"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="qaEngineerName" label="质量工程师" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-input
v-model="addForm.qaEngineerName"
placeholder="请输入质量工程师"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px" class="add-form-item" >
<el-date-picker
v-model="addForm.planCloseTime"
type="date"
placeholder="请选择计划关闭时间"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-form>
</el-col>
</el-row>
</div>
</div>
</div>
<div class="demo-drawer-footer">
<el-button
size="mini"
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="submit">提交
</el-button>
<el-button
size="mini"
class="common-button-default"
icon="el-icon-close"
@click="addDrawerClose">取消</el-button>
</div>
</el-drawer>
<!-- 条款弹窗-->
<el-dialog title="条款信息" :append-to-body="true" width="875px" :visible.sync="itemModel">
<el-table
ref="selections"
:data="itemsData"
tooltip-effect="dark"
style="width: 100%;overflow-y: auto;overflow-x: hidden;"
border
:height="300"
@selection-change="selectReplaceStandNumRowChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
align="center"
>
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
align="center"
>
</el-table-column>
</el-table>
<loading :loading="replaceLoading">数据获取中</loading>
<!--分页-->
<pagination
style="position: relative;"
:page="replacePage"
:page-size="replacePageSize"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" @click="itemModel = false">取消</el-button>
<el-button type="primary" class="common-button-primary" @click="replaceLawsNumModelBt">带入</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { interfaceUrl } from "@/sysConfig";
import { addUn } from '@/api/unqualProcess'
export default {
name: "rectificationDatabase",
data () {
return {
loading: false,
nonList:[], //
projectModel: false, //
listModel: false, //
itemModel: false, //
replaceLoading: false,
//
projectSearch: {
projectNumber: "",
projectName: ""
},
//
ProjectDatas: [],
itemsData: [],
standList: [],
selectItems: [],
dataList: [],
standPage: 1,
standPageSize: this.$store.getters.userInfo.configContent,
standTotal: 0,
replacePage: 1,
replacePageSize: this.$store.getters.userInfo.configContent,
replaceTotal: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
drawerTitle: '',
breakId: '',
//
selectList: [],
addForm:{
standSerialNumber: '', //
standName: '', //
standId: '',
itemsNum: '', //
itemsName: '', //
productType: '',
productLine: '', //线
projectName: '', //
reason: '', //
responsibleUnit: '', //
dutyEngineerName: '', //
authEngineer: '', //
qaEngineerName: '', //
planCloseTime: '', //
}, //
formRules: {
standSerialNumber: [
{required: true, message: '请输入标准号', trigger: 'blur'},
],
standName: [
{required: true, message: '请输入标准名称', trigger: 'blur'},
],
itemsNum: [
{required: true, message: '请输入条款号', trigger: 'blur'},
],
itemsName: [
{required: true, message: '请输入条款名称', trigger: 'blur'},
],
productType: [
{required: true, message: '请输入产品类型', trigger: 'blur'},
],
productLine: [
{required: true, message: '请输入产品线', trigger: 'blur'},
],
projectName: [
{required: true, message: '请输入项目名称', trigger: 'change'},
],
reason: [
{required: true, message: '请输入不合规项目', trigger: 'blur'},
],
responsibleUnit: [
{required: true, message: '请输入责任部门', trigger: 'blur'},
],
dutyEngineerName: [
{required: true, message: '请输入责任工程师', trigger: 'blur'},
],
planCloseTime: [
{required: true, message: '请选择计划关闭时间', trigger: 'blur'},
],
},
drawerTable: false, //
exportModelFlag: false, //
tableHeight: null, //
exportName: '',
selectedList: [], //
saveExportType: '',//
//
total: 0,
totalNo: 0,
//
pageNo: 1,
nonConformitySearch: {
@@ -458,7 +854,7 @@ export default {
_this: this
}, res => {
this.myLoading.loadData = false
this.total = res.data.total
this.totalNo = res.data.total
this.pageNo = 1
this.nonList = res.data.records
this.nonList.forEach(item => {
@@ -494,7 +890,6 @@ export default {
}
this.exportName = ''
this.exportModelFlag = true
console.log(this.saveExportType);
},
//
cancal () {
@@ -504,14 +899,12 @@ export default {
exportTestItem () {
if(this.saveExportType === 'apart') {
if (this.selectedList != null && this.selectedList != ''){
console.log(this.selectedList);
const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
}
} else if (this.saveExportType === 'all') {
console.log(this.selectedList);
const exportURL = interfaceUrl + 'sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
@@ -599,7 +992,265 @@ export default {
case '查看':
this.showUser(command[0])
break
case '编辑':
this.projectEdit(command[0])
break
}
},
//
getProjectDataBtn(){
this.page = 1;
this.getProjectData();
},
//
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
page: this.page,
pageSize: this.pageSize,
...this.projectSearch
}, {
_this: this
}, res => {
if (res.data === null) {
this.ProjectDatas = "";
this.total = 0;
} else {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
}
});
},
//
clearSearch() {
this.projectSearch = {
projectName: "",
projectNumber: ""
};
this.getProjectData();
},
//
submit(){
// let jsonArr = []
// const json = JSON.stringify(this.addForm);
// const arr = JSON.parse(json)
// jsonArr.push(arr)
// for (const item in arr) {
// jsonArr.push(item +':' + arr[item])
// }
// console.log(jsonArr);
let sarStandUnqualified = {
closeState: 1,
standSerialNumber: '321', //
standName: '321', //
standId: '312',
itemsNum: '312', //
itemsName: '321', //
productType: '312',
productLine: '321', //线
productName: '321', //
reason: '321', //
responsibleUnit: '321', //
dutyEngineer: '312', //
authEngineer: '312', //
qaEngineer: '321', //
qaEngineerName: '2132',
authEngineerName: '3213',
dutyEngineerName: '3123',
planCloseTime: '321', //
}
const closeState = sarStandUnqualified.closeState
const standId = sarStandUnqualified.standId
const standName = sarStandUnqualified.standName
const standSerialNumber = sarStandUnqualified.standSerialNumber
const itemsNum = sarStandUnqualified.itemsNum
const itemsName = sarStandUnqualified.itemsName
const productType = sarStandUnqualified.productType
const productLine = sarStandUnqualified.productLine
const productName = sarStandUnqualified.productName
const reason = sarStandUnqualified.reason
const responsibleUnit = sarStandUnqualified.responsibleUnit
// const dutyEngineer = sarStandUnqualified.dutyEngineer
// const authEngineer = sarStandUnqualified.authEngineer
// const qaEngineer = sarStandUnqualified.qaEngineer
const qaEngineerName = sarStandUnqualified.qaEngineerName
const authEngineerName = sarStandUnqualified.authEngineerName
const dutyEngineerName = sarStandUnqualified.dutyEngineerName
const planCloseTime = sarStandUnqualified.planCloseTime
this.$refs["addForm"].validate((valid) => {
if(valid){
addUn(closeState, standId,standName,standSerialNumber, itemsNum,itemsName, productType, productLine,
productName, reason, responsibleUnit, qaEngineerName,
authEngineerName, dutyEngineerName, planCloseTime).then(res=>{
if(res.ok){
this.$message.success('新增成功')
this.drawerTable = false
this.getTableByPage()
}
})
}else {
this.$message.warning('请完善基础信息')
}
})
},
addDrawerClose () {
this.addForm = {}
this.drawerTable = false
}, // drawer
//
replaceLawsNumModelBt(){
if(this.selectItems.length > 1){
this.$message.warning('您只能选择一条数据进行带入')
}else if(this.selectItems.length <= 0){
this.$message.warning('请至少选择一条数据进行带入')
}else{
this.addForm.itemsName = this.selectItems[0].itemsName
this.addForm.itemsNum = this.selectItems[0].itemsNum
this.itemModel = false
}
},
//
closeStand(){
this.listModel = false;
},
//
OkStand(){
if(this.standList.length > 1){
this.$message.warning('您只能选择一条标准进行带入')
}else if(this.standList.length <= 0){
this.$message.warning('请至少选择一条数据进行带入')
}else{
this.breakId = this.standList[0].standId
this.addForm.standName = this.standList[0].standName
this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear || this.standList[0].standSort + '-' + this.standList[0].standNumber
this.addForm.responsibleUnit = this.standList[0].zrbm || '--'
this.addForm.standId = this.standList[0].standId
this.drawerTitle = '新增';
this.drawerTable = true;
this.listModel = false;
}
},
getItem(){
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.breakId,
type: "FBGBJBD"
}, {
_this: this
}, res => {
this.itemsData = res.data
this.replaceTotal = res.data.length
}, e => {
this.$message.error("添加失败");
});
},
//
handSeek(){
this.itemModel = true
this.getItem()
},
//
closeDrawer() {
this.projectModel = false;
},
//
OkDrawer() {
if (this.selectList.length > 1) {
this.$message.warning("您只能选择一条数据进行带入");
} else if (this.selectList.length === 0) {
this.$message.warning("请选择一条数据进行带入");
} else {
this.projectId = this.selectList[0].id;
this.addForm.productLine = this.selectList[0].productLine
this.addForm.productType = this.selectList[0].projectPlatfor
this.addForm.projectName = this.selectList[0].projectName
this.getStandData();
this.projectModel = false;
this.listModel = true
}
},
//
getStandData() {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this
}, res => {
res.data.records.forEach(item => {
if(item.zrbm === "[]"){
item.zrbm = ''
}
})
this.dataList = res.data.records;
this.dataList.forEach(item => {
//
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(",");
for (let i in this.zrbmOptions) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label;
}
item.zrbm = k.join(",");
}
}
}
});
});
},
//
selectReplaceStandNumRowChange(data){
this.selectItems = data
},
//
selectStandChange(data){
this.standList = data
},
//
selectListChange(data) {
this.selectList = data;
},
//
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
standPageChange(page){
this.standPage = page
this.getStandData()
},
standPageSizeChange(pageSize){
this.standPageSize = pageSize
this.getStandData()
},
//
pageChangeReplace(page){
this.replacePage = page
this.getItem()
},
pageSizeChangeReplace(pageSize){
this.replacePageSize = pageSize
this.getItem()
},
pageChange(page) {
this.page = page;
this.getProjectData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getProjectData();
},
//
addModel(){
this.drawerTable = true
// this.projectModel = true
},
//
projectEdit(row){
},
//
showUser(row) {
@@ -628,7 +1279,6 @@ export default {
},
//
handlePreview (item) {
console.log(item);
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
@@ -641,7 +1291,7 @@ export default {
},
detailsStandard (item) {
this.$http.post('lawss/sarTestItem/validateStandNumber', {
standnumber: item.standNum
standNumber: item.standNum
}, {
_this: this
}, res => {
@@ -670,17 +1320,18 @@ export default {
})
},
//
pageChange (page) {
pageChangeNo (page) {
this.pageNo = page
this.getTableByPage()
},
pageSizeChange (pageSize) {
console.log(pageSize);
pageSizeChangeNo (pageSize) {
this.pageSizeNo = pageSize
this.getTableByPage()
},
},
mounted () {
//
this.getProjectData()
//
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -744,5 +1395,19 @@ export default {
}
}
}
.add-form-item{
/deep/ .el-input__inner {
width: 300px;
}
}
.add-input{
/deep/ .el-input__inner {
width: 370px;
}
}
.tableFooter{
height: 49px;
float: right;
}
}
</style>