FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-19 08:46:07 +08:00
parent 745bc9a6e7 8581ce4106
commit 6da636cb6e
14 changed files with 339 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standContrast/pages/comparisonClauses.vue
+4 -4
View File
@@ -56,8 +56,8 @@
</el-col>
</el-row>
</div>
<div v-html="leftString" v-if="comparisonFlag === '2'"></div>
<!-- <div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>-->
<!-- <div v-html="leftString" v-if="comparisonFlag === '2'"></div>-->
<div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
</div>
</div>
</div>
@@ -110,8 +110,8 @@
</el-col>
</el-row>
</div>
<!-- <div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>-->
<div v-html="rightString" v-if="comparisonFlag === '2'"></div>
<div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
<!-- <div v-html="rightString" v-if="comparisonFlag === '2'"></div>-->
</div>
</div>
</div>
src/pages/personal/pages/my-questions/index.vue
+5 -2
View File
@@ -846,7 +846,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
<el-button class="common-button-primary" size="mini" type="primary":loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
</span>
</el-dialog>
<!-- 选择标准抽屉-->
@@ -1253,6 +1253,7 @@ export default {
},
data(){
return{
submitBtnLoading: false,
aiKey:1,
qiiKey:1,
institutionId: this.$store.getters.userInfo.institutionId,
@@ -1881,10 +1882,12 @@ export default {
this.questionForm.fileList = this.fileList
this.$refs['queForm'].validate((valid) => {
if(valid){
this.submitBtnLoading = true
this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm },
{
_this: this
}, res => {
this.submitBtnLoading = false
this.dialogVisible = false
this.activeName = "myQue"
this.activeType = this.standType
@@ -1901,7 +1904,7 @@ export default {
this.handleSelectForm.standName = ''
this.handleSelectForm.numberName = ''
}, e => {
this.submitBtnLoading = false
})
}else{
return this.$message.warning('请输入问题')
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+24 -10
View File
@@ -181,13 +181,24 @@
<el-col :span="12">
<el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
<template v-if="form.standInData === '0'">
<el-option
v-for="item in standStateOptions0"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</template>
<template v-else>
<el-option
v-for="item in standStateOptions1"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</template>
</el-select>
</el-form-item>
<el-form-item v-if="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
@@ -1731,7 +1742,8 @@ export default {
countryOptions: [],//国家地区
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standStateOptions0: [], // 文本状态 - 国内
standStateOptions1: [], // 文本状态 - 海外
standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构
busVppsChildOptions: [], // 车系体系架构子集合
@@ -3482,7 +3494,8 @@ export default {
standOptions.push(item)
}
})
this.standStateOptions = standOptions // 文本状态
this.standStateOptions0 = standOptions // 文本状态
this.standStateOptions1 = res.data.WBZTCLASS
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
@@ -3497,7 +3510,8 @@ export default {
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.setMap(this.standStateOptions)
this.setMap(this.standStateOptions0)
this.setMap(this.standStateOptions1)
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getTaskId()
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+1
View File
@@ -427,6 +427,7 @@ export default {
this.active = name;
},
toggleComName(name) {
this.qbfsForm = {}
this.comName = name;
if(this.comName === 'merge'){
this.toggleType = '1'
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
-6
View File
@@ -35,12 +35,6 @@
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id,item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<span class="transition-box-span" v-else>-</span>
src/pages/regulatoryRepository/dataCenter/index.vue
+1 -1
View File
@@ -511,7 +511,7 @@ export default {
update(data) {
this.modalType = 2
this.productModal = true
this.productModelAdd = data
this.productModelAdd = JSON.parse(JSON.stringify(data));
// 取消所有的选中效果
this.productTitle = '编辑目录'
// const newChild = { id: this.id++, label: 'testtest', children: [] };
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+7 -3
View File
@@ -1743,8 +1743,8 @@
<!-- </el-select>-->
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-form-item label="是否纳入认证清单" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入认证清单查找">
<el-option value="1" label="是"></el-option>
<el-option value="2" label="否"></el-option>
</el-select>
@@ -2477,7 +2477,6 @@ export default {
GKDW: '', //归口管理部门
SSRQ: '',//实施日期
XCXSSRQ: ''//新车型实施日期
, ZCCSSRQ: ''//在产车实施日期
, QCDW: ''//起草单位
, NYLX: ''//能源类型
@@ -3845,12 +3844,17 @@ export default {
this.sarStandardsSearch.replacedPartStandNum = ''
this.sarStandardsSearch.synopsis = ''
this.sarStandardsSearch.category = ''
this.sarStandardsSearch.standYear = ''
this.sarStandardsSearch.standEnName = ''
this.isAdvancedSearch = false
// } else if (flag === 'standCommonlySearch') {
this.sarStandardsSearch.standName = ''
this.sarStandardsSearch.standNumber = ''
this.pageChange(1)
this.getDomesticStandardTable(this.sarStandardsSearch)
for (let key in this.advanceSearchMapping) {
this.advanceSearchMapping[key] = ''
}
} else if (flag === 2) {
// 标准条目搜索
this.standItemSearch.responsibleUnit = ''
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+11 -6
View File
@@ -25,7 +25,7 @@
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span>
<span>
<span v-if="data.id !== 'gnwdsc'" >
<el-button
type="text"
size="mini"
@@ -1402,12 +1402,12 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="代替企标编号" title="代替企标编号" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.DTQBBHBUSS" placeholder="请输入模块中文名称" clearable></el-input>
<el-input v-model="sarBussionessSearch.DTQBBHBUSS" placeholder="请输入代替企标编号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被代替企标编号" title="被代替企标编号" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.BDTQBBHBUSS" placeholder="请输入模块中文名称" clearable></el-input>
<el-input v-model="sarBussionessSearch.BDTQBBHBUSS" placeholder="请输入被代替企标编号" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -3095,9 +3095,14 @@ export default {
this.$set(data, 'show', false)
this.$set(data, 'showDel', false)
}else {
this.$set(data, 'show', true)
if (data.parentId !== null) {
this.$set(data, 'showDel', true)
if(data.id !== 'qbwdsc'){
this.$set(data, 'show', true)
if (data.parentId !== null) {
this.$set(data, 'showDel', true)
}
}else{
this.$set(data, 'show', false)
this.$set(data, 'showDel', false)
}
}
},
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+3 -1
View File
@@ -841,8 +841,10 @@
const filterList = list.filter(s => s !== 'null');
this.addForm.esMatingRelations = filterList.join(",");
}else if(val === 'null'){
this.addForm.esMatingRelations = "";
this.addForm.esMatingRelations = null;
}
}else {
this.addForm.esMatingRelations = null
}
}
},
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -577,8 +577,8 @@
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" title="是否纳入标准清单" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-form-item label="是否纳入认证清单" title="是否纳入认证清单" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入认证清单查找">
<el-option value="1" label="是"></el-option>
<el-option value="2" label="否"></el-option>
</el-select>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+268 -47
View File
@@ -178,58 +178,113 @@
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' && !itemType"
prop="lastVersionNumber"
label="上一版本标准编号">
</el-table-column>
<el-table-column
v-if="sarProject.position === '2'"
prop="correspondDomesticStandard"
label="对应国行标">
fixed="left"
width="60"
>
</el-table-column>
<el-table-column
sortable="custom"
show-overflow-tooltip
prop="specificItem"
label="具体章条">
width="90"
label="条款号"
>
</el-table-column>
<el-table-column
prop="carModel"
align="center"
label="解读内容">
<el-table-column
show-overflow-tooltip
v-if="itemType"
prop="coreTechnicalRequirement"
label="核心技术要求(简述、请勿抄写标准)">
</el-table-column>
<el-table-column
show-overflow-tooltip
v-if="sarProject.position === '1' && !itemType"
prop="comparedWithPrevious"
label="相对于上一版本变化点">
</el-table-column>
<el-table-column
show-overflow-tooltip
v-if="sarProject.position === '2'"
prop="comparedDomesticStandard"
label="相对于国行标差异点">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
label="合规性分析">
</el-table-column>
show-overflow-tooltip
prop="itemName"
min-width="300"
label="条款名称"
>
</el-table-column>
<el-table-column
prop="termsConditions"
min-width="200"
label="条款内容"
:resizable="false"
>
<template slot-scope="scope">
<!-- <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
<!-- {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
<!-- </div>-->
<el-tooltip placement="top">
<div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
<div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
prop="readContent"
width="170"
label="核心技术要求/变化点"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="comparedWithPrevious"
label="基于上一版本差异"
width="170">
</el-table-column>
<el-table-column
prop="xccssrq"
label="新车型实施日期(文本)"
width="180">
</el-table-column>
<el-table-column
prop="zccssrq"
label="在产车实施日期(文本)"
width="170">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="applyArctic"
label="适用车型"
width="90"
>
<template slot-scope="scope">
{{JSON.parse(scope.row.applyArctic).join(',')}}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="responsibleUnit"-->
<!-- label="责任部门">-->
<!-- </el-table-column>-->
<el-table-column
prop="dutyEngineer"
label="责任工程师"
width="100">
</el-table-column>
<el-table-column
show-overflow-tooltip
label="符合性状态"
width="100">
<template slot-scope="scope">
{{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="complianceState"
label="合规性分析"
width="100">
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope">
<div @click.stop>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看
</el-dropdown-item>
<!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
<!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
<pagination
@@ -253,6 +308,120 @@
<el-button type="primary" size="mini" @click="riskDegreeModal = false">关闭</el-button>
</span>
</el-dialog>
<!--分解单-查看 （标准拆分-属性）-->
<el-drawer
:wrapperClosable="false"
size="800px"
title="查看属性信息"
:visible.sync="showItemInfoModal"
>
<div class="see-drawer-content">
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{
standShowItemEO.itemsNum
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{
standShowItemEO.itemsName
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
<span class="see-drawer-val" style="font-size: 12px"
:title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
<span class="see-drawer-val" style="font-size: 12px"
:title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
{{
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
<span class="see-drawer-val" style="font-size: 12px"
:title="standShowItemEO.xcxssrq">{{
standShowItemEO.xccssrq
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
<span class="see-drawer-val" style="font-size: 12px"
:title="standShowItemEO.zccssrq">{{
standShowItemEO.zccssrq
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
standShowItemEO.applyArctic
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
standShowItemEO.responsibleUnit
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
{{ standShowItemEO.dutyEngineer }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
{{ standShowItemEO.comparedWithPrevious }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
{{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
{{ standShowItemEO.complianceState }}</span>
</div>
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="FO">FO</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
<!-- standShowItemEO.dutyEngineerShow-->
<!-- }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
<!-- <span class="see-drawer-val"-->
<!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
<!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
<!-- }}</span>-->
<!-- </div>-->
</div>
</el-drawer>
</div>
</template>
@@ -296,9 +465,61 @@
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null,
standId: '', // 符合性项目id
showItemInfoModal: false,
standShowItemEO: {},
}
},
methods: {
// ...
handleCommand(command) {
switch (command[1]) {
case '查看':
this.handlePreview(command[0])
break
}
},
// 分解单-查看
handlePreview(item) {
this.standShowItemEO = item
this.showItemInfoModal = true
let fileList = []
item.defaultFileList = []
if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
}
this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
// 请求文件信息
if (item.relevanceFile != null && item.relevanceFile !== '') {
let paramefile = item.relevanceFile
if (paramefile.charAt(paramefile.length - 1) === ',') {
paramefile = paramefile.substring(0, paramefile.length - 1)
}
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: paramefile
}, {
_this: this
}, res => {
fileList = res.data
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
let obj = {name: '', response: {}}
obj.name = fileList[i].oldFileName
obj.response.data = fileList[i]
item.defaultFileList.push(obj)
}
}
this.standShowItemEO = JSON.parse(JSON.stringify(item))
if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
}
// let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit)
this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow
}, e => {
})
}
},
risSubmit () {
this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', {
standNumber: this.editData.standNumber,
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -2
View File
@@ -883,7 +883,8 @@ export default {
}else{
this.addForm.standId = this.standList[0].id
this.addForm.standName = this.standList[0].standName
this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber
this.addForm.standSerialNumber += this.standList[0].standYear ? '-' + this.standList[0].standYear : ''
this.dialogTableVisible = false
if(this.addForm.standName){
this.$refs.addForm.validateField('standName');
@@ -1387,7 +1388,7 @@ export default {
},
//获取产品线数据
getProductData() {
this.$http.get("sarStandProjectLibrary/queryProjectManager", {
this.$http.get("sarStandProjectLibrary/queryProjectManagerXL", {
current: 1,
PageSize:100,
}, {
src/pages/regulatoryRepository/standQA/index.vue
+4 -1
View File
@@ -132,7 +132,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
<el-button class="common-button-primary" size="mini" :loading="isSubmit" type="primary" @click="queSubmit">提 交</el-button>
</span>
</el-dialog>
<!-- 选择标准抽屉-->
@@ -586,6 +586,7 @@ export default {
activeName: 'INLAND',
activeType: 'INLAND',
activestand: '',
isSubmit: false,
activeQue: '',
standType: 'INLAND',
dialogVisible: false,
@@ -1035,6 +1036,7 @@ export default {
},
//提交问题
queSubmit(){
this.isSubmit = true
if(this.standType === 'OTHER'){
this.questionForm.standardId = this.questionForm.pubQue
this.questionForm.standardName = this.questionForm.pubQue
@@ -1049,6 +1051,7 @@ export default {
_this: this
}, res => {
this.dialogVisible = false
this.isSubmit = false
this.searchBtn()
}, e => {
src/pages/regulatoryRepository/standQA/index2.vue
+6 -1
View File
@@ -320,7 +320,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
<el-button class="common-button-primary" :loading="queSubmitLading" size="mini" type="primary" @click="queSubmit">提 交</el-button>
</span>
</el-dialog>
<!-- 选择标准抽屉-->
@@ -766,6 +766,7 @@ export default {
{required: true, message: '请输入问题', trigger: 'blur'},
],
},
queSubmitLading: false,
questionSerach:{
classification: 'INLAND',
standardName: '', //标准名称
@@ -1226,6 +1227,7 @@ export default {
},
//提交问题
queSubmit(){
this.queSubmitLading = true
if(this.standType === 'OTHER'){
this.questionForm.standardId = this.questionForm.pubQue
this.questionForm.standardName = this.questionForm.pubQue
@@ -1260,15 +1262,18 @@ export default {
this.standSearch2()
break
}
this.queSubmitLading = false
this.queSearch()
}, e => {
})
}else{
this.queSubmitLading = false
return this.$message.warning('请输入问题')
}
})
}else{
this.queSubmitLading = false
this.$message.warning('请选择至少一条标准')
}
},