This commit is contained in:
zhutianqi
2021-11-23 14:45:24 +08:00
parent a017489a21
commit 1ad7fa21ca
4 changed files with 5599 additions and 5499 deletions
@@ -74,16 +74,16 @@
<div class="left"> <div class="left">
<el-form :modal="standCommonlySearch" :inline="true" class="label-input-form" <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"
@keyup.enter.native="searchBtnClick(standCommonlySearch)"> @keyup.enter.native="searchBtnClick(standCommonlySearch)">
<!-- <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">--> <!-- <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">-->
<!-- <el-select v-model="standCommonlySearch.standSort" filterable>--> <!-- <el-select v-model="standCommonlySearch.standSort" filterable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in standSortOptions"--> <!-- v-for="item in standSortOptions"-->
<!-- :key="item.value"--> <!-- :key="item.value"-->
<!-- :value="item.value"--> <!-- :value="item.value"-->
<!-- :label="item.label"--> <!-- :label="item.label"-->
<!-- ></el-option>--> <!-- ></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准号" class="search-item search-item-last"> <el-form-item label="标准号" class="search-item search-item-last">
<el-input v-model="standCommonlySearch.standNumber" <el-input v-model="standCommonlySearch.standNumber"
placeholder="请输入标准号" placeholder="请输入标准号"
@@ -667,7 +667,7 @@
:disabled="formdisableflag" :disabled="formdisableflag"
></custom-textarea> ></custom-textarea>
</template> </template>
<!-- 起草单位--> <!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' "> <template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' ">
<template> <template>
<custom-select <custom-select
@@ -1715,11 +1715,11 @@
</div> </div>
<!-- 标记--> <!-- 标记-->
<!-- 标签--> <!-- 标签-->
<!-- <el-form-item label="标签">--> <!-- <el-form-item label="标签">-->
<!-- <el-input v-model="advanceSearchMapping.GXHBQ" clearable--> <!-- <el-input v-model="advanceSearchMapping.GXHBQ" clearable-->
<!-- placeholder="根据被标签查找"--> <!-- placeholder="根据被标签查找"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>--> <!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
@@ -1805,31 +1805,31 @@
</template> </template>
<script> <script>
import store from '@/store' import store from '@/store'
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandards' import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandards'
import CustomInput from '@/components/CustomFormComponents/Input' import CustomInput from '@/components/CustomFormComponents/Input'
import CustomTextarea from '@/components/CustomFormComponents/Textarea' import CustomTextarea from '@/components/CustomFormComponents/Textarea'
import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect' import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect'
import CustomSelect from '@/components/CustomFormComponents/Select' import CustomSelect from '@/components/CustomFormComponents/Select'
import CustomDatePick from '@/components/CustomFormComponents/DatePicker' import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
import CustomFile from '@/components/CustomFormComponents/File' import CustomFile from '@/components/CustomFormComponents/File'
import CustomInputNum from '@/components/CustomFormComponents/InputNum' import CustomInputNum from '@/components/CustomFormComponents/InputNum'
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray' import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree' import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText' import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText'
import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText' import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import MechanismTree from '@/components/mechanismTree' import MechanismTree from '@/components/mechanismTree'
import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2' import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
import {interfaceUrl} from '@/sysConfig' import {interfaceUrl} from '@/sysConfig'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
export default { export default {
name: 'domesticStandardsAndRegulations', name: 'domesticStandardsAndRegulations',
components: { components: {
CustomFile, CustomFile,
@@ -2566,13 +2566,13 @@ export default {
console.log(this.OCRDatas); console.log(this.OCRDatas);
console.log(this.ocrList); console.log(this.ocrList);
let json = { let json = {
standNumber: this.ocrList[0].standName, standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
standName: this.ocrList[0].standName, standName: this.ocrList[0].standName,
attId: this.OCRDatas[0].attId, attId: this.OCRDatas[0].attId,
fileName: this.OCRDatas[0].name, fileName: this.OCRDatas[0].name,
fileType: this.ocrList[0].name, fileType: this.ocrList[0].name,
} }
console.log('这儿') console.log(json);
} }
}, },
OCRAdd (type) { OCRAdd (type) {
@@ -5320,15 +5320,15 @@ export default {
this.searchInlandNodes = [] this.searchInlandNodes = []
this.orgData = [] this.orgData = []
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/ .el-table--scrollable-x .el-table__body-wrapper { /deep/ .el-table--scrollable-x .el-table__body-wrapper {
overflow-x: scroll; overflow-x: scroll;
} }
.OCRstandardForComments { .OCRstandardForComments {
height: 100%; height: 100%;
} }
#left{ #left{
width:calc(30% - 5px); width:calc(30% - 5px);
height:100%; height:100%;
@@ -5357,46 +5357,46 @@ export default {
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
background: url('~@/assets/images/shangqi/img/tree-add.png'); background: url('~@/assets/images/shangqi/img/tree-add.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .expanded { /deep/ .expanded {
background: url('~@/assets/images/shangqi/img/tree-sub.png'); background: url('~@/assets/images/shangqi/img/tree-sub.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-leaf { /deep/ .is-leaf {
background-image: none; background-image: none;
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-leaf-none { /deep/ .is-leaf-none {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 15px; width: 15px;
height: 15px; height: 15px;
background: url('~@/assets/images/shangqi/img/none-file.png'); background: url('~@/assets/images/shangqi/img/none-file.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-show { /deep/ .is-show {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 15px; width: 15px;
height: 15px; height: 15px;
background: url('~@/assets/images/shangqi/img/tree.png'); background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
#domesticStandardDatabase{ #domesticStandardDatabase{
height: 100%; height: 100%;
.content { .content {
height: calc(~'100% - 105px - 56px') height: calc(~'100% - 105px - 56px')
} }
} }
/deep/ .tree-line { /deep/ .tree-line {
.el-tree-node { .el-tree-node {
position: relative; position: relative;
padding-left: 0px; // 缩进量 padding-left: 0px; // 缩进量
@@ -5454,14 +5454,14 @@ export default {
// display: none; // 也可以去掉 // display: none; // 也可以去掉
} }
} }
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
#domesticStandardDatabase { #domesticStandardDatabase {
//background: #fff; //background: #fff;
display: flex; display: flex;
height: 100%; height: 100%;
@@ -5571,31 +5571,31 @@ export default {
} }
} }
} }
} }
.el-textarea__inner { .el-textarea__inner {
line-height: 28px !important; line-height: 28px !important;
} }
.btn-col { .btn-col {
padding-top: 11px; padding-top: 11px;
} }
::v-deep .el-drawer__header { ::v-deep .el-drawer__header {
& > span:first-child { & > span:first-child {
outline: none !important; outline: none !important;
} }
} }
::v-deep .el-drawer { ::v-deep .el-drawer {
outline: none !important; outline: none !important;
} }
.el-date-editor.el-input, .el-date-editor.el-input__inner { .el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 190px width: 190px
} }
.classDisplay { .classDisplay {
display: none; display: none;
} }
</style> </style>
@@ -3,12 +3,12 @@
<el-tabs v-model="tabValue" style="height: 100%;"> <el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project"> <el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <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> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill"> <el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <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> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -30,7 +30,7 @@ export default {
return { return {
skill: false, skill: false,
project: false, project: false,
tabValue: '', tabValue: 'standInvolveProjectDetail',
menuName: [ "项目评估结果", "技术评估结果"] menuName: [ "项目评估结果", "技术评估结果"]
} }
}, },
@@ -53,12 +53,12 @@ export default {
} }
} }
}); });
if(this.skill === true){ if (this.project === true) {
this.tabValue = "technologyInvolveProject"
return;
}else if(this.project === true){
this.tabValue = "standInvolveProjectDetail" this.tabValue = "standInvolveProjectDetail"
return; return;
} else if (this.skill === true) {
this.tabValue = "technologyInvolveProject"
return;
} }
} }
} }
@@ -159,24 +159,24 @@
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
width="150px" <!-- width="150px"-->
align="center" <!-- align="center"-->
prop="productLineId" <!-- prop="productLineId"-->
label="产品线"> <!-- label="产品线">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
width="150px" <!-- width="150px"-->
align="center" <!-- align="center"-->
prop="productId" <!-- prop="productId"-->
label="项目编号"> <!-- label="项目编号">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
width="150px" <!-- width="150px"-->
align="center" <!-- align="center"-->
prop="productName" <!-- prop="productName"-->
label="项目名称"> <!-- label="项目名称">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
@@ -84,6 +84,20 @@
label="评估时间" label="评估时间"
> >
</el-table-column> </el-table-column>
<el-table-column
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 <el-table-column
fixed="right" fixed="right"
label="" label=""
@@ -111,20 +125,20 @@
<div class="search-area-detail"> <div class="search-area-detail">
<div class="left" id="detailSearch"> <div class="left" id="detailSearch">
<el-form :inline="true" :model="sarProStateEO" class="label-input-form"> <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="标准编号" class="search-item search-item-last"> <!-- <el-form-item label="标准编号" class="search-item search-item-last">-->
<el-input <!-- <el-input-->
v-model="sarProStateEO.standNumber" <!-- v-model="sarProStateEO.standNumber"-->
placeholder="根据标准编号查找" <!-- placeholder="根据标准编号查找"-->
:maxlength="100" <!-- :maxlength="100"-->
clearable></el-input> <!-- clearable></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="标准名称" class="search-item search-item-last"> <!-- <el-form-item label="标准名称" class="search-item search-item-last">-->
<el-input <!-- <el-input-->
v-model="sarProStateEO.standName" <!-- v-model="sarProStateEO.standName"-->
placeholder="根据标准名称查找" <!-- placeholder="根据标准名称查找"-->
:maxlength="100" <!-- :maxlength="100"-->
clearable></el-input> <!-- clearable></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="具体章条" class="search-item search-item-last"> <el-form-item label="具体章条" class="search-item search-item-last">
<el-input <el-input
v-model="sarProStateEO.specificItem" v-model="sarProStateEO.specificItem"
@@ -166,19 +180,19 @@
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="standNumber" <!-- prop="standNumber"-->
label="标准编号"> <!-- label="标准编号">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
prop="standName" <!-- prop="standName"-->
label="标准名称"> <!-- label="标准名称">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
v-if="sarProject.position === '1'" <!-- v-if="sarProject.position === '1'"-->
prop="lastVersionNumber" <!-- prop="lastVersionNumber"-->
label="上一版本标准编号"> <!-- label="上一版本标准编号">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <el-table-column
v-if="sarProject.position === '2'" v-if="sarProject.position === '2'"
prop="correspondDomesticStandard" prop="correspondDomesticStandard"
@@ -224,14 +238,29 @@
</div> </div>
</div> </div>
</el-drawer> </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> </div>
</template> </template>
<script> <script>
export default { export default {
name: "technologyInvolveProject", name: "technologyInvolveProject",
data () { data () {
return { return {
riskDegreeModal: false,
editData: {},
riskDegree: '',
SarProStateType: '', // 国内外 SarProStateType: '', // 国内外
sarProject: { sarProject: {
standName: '', // 标准政策名称 standName: '', // 标准政策名称
@@ -264,6 +293,47 @@ name: "technologyInvolveProject",
} }
}, },
methods: { 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'
}
},
searchStandAndLaws () { searchStandAndLaws () {
this.page = 1 this.page = 1
this.queryStandAndLaws() this.queryStandAndLaws()
@@ -285,6 +355,19 @@ name: "technologyInvolveProject",
loading: 'loading', loading: 'loading',
}, res => { }, res => {
this.sarProjectListDatas = res.data.records 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 this.total = res.data.total
}, e=> {}) }, e=> {})
}, },
@@ -364,12 +447,29 @@ name: "technologyInvolveProject",
this.sarProStateTableHeight = $('body').height() - 152 this.sarProStateTableHeight = $('body').height() - 152
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.technology-involve-project{ .technology-involve-project{
height: 100%; 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%;
}
}
.laws-details-header { .laws-details-header {
background: #fff; background: #fff;
// height: 30px; // height: 30px;
@@ -393,15 +493,15 @@ name: "technologyInvolveProject",
background: #fff; background: #fff;
padding: 5px 10px; padding: 5px 10px;
} }
} }
</style> </style>
<style lang="less"> <style lang="less">
.technology-involve-project{ .technology-involve-project{
.search-area .search-item .el-input--suffix .el-input__inner{ .search-area .search-item .el-input--suffix .el-input__inner{
padding-right: 15px; padding-right: 15px;
} }
.search-area-detail .el-input__inner{ .search-area-detail .el-input__inner{
width: 150px; width: 150px;
} }
} }
</style> </style>