Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -977,7 +977,7 @@
|
||||
width = "500"
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
|
||||
<tree-select-new
|
||||
width = "500"
|
||||
:lazy=true
|
||||
@@ -988,7 +988,7 @@
|
||||
:url="url"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
|
||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -162,10 +162,10 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSyqy" class="add-form-item form-item-disabled">
|
||||
<el-select :popper-append-to-body="false" v-model="form.lawsSyqy" multiple placeholder="请选择适用车型">
|
||||
<el-form-item v-show="verifySarStandard" label="适用车型" prop="lawsSycx" class="add-form-item form-item-disabled">
|
||||
<el-select :popper-append-to-body="false" v-model="form.lawsSycx" multiple placeholder="请选择适用车型">
|
||||
<el-option
|
||||
v-for="item in lawsSyqyOptions"
|
||||
v-for="item in lawsSycxOptions"
|
||||
placeholder="请选择适用车型"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
@@ -467,36 +467,6 @@
|
||||
<!-- style="position:absolute;top: 10px;right: 0;"-->
|
||||
<!-- @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"-->
|
||||
<!-- >{{'手动查找'}}</el-button>-->
|
||||
</el-form-item>
|
||||
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.YYBZZCLAWS"
|
||||
placeholder="请输入引用标准&政策"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="form.xglc"-->
|
||||
<!-- placeholder="请输入相关流程"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.BDTWJHLAWS"
|
||||
placeholder="请输入被代替文件号"
|
||||
clearable
|
||||
></el-input>
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- class="common-button-primary"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- style="position:absolute;top: 10px;right: 0;"-->
|
||||
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"-->
|
||||
<!-- >{{'手动查找'}}</el-button>-->
|
||||
</el-form-item>
|
||||
<el-form-item label="关联文件" prop="GLWJLAWSName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
@@ -528,6 +498,43 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="form.xglc"-->
|
||||
<!-- placeholder="请输入相关流程"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="引用标准&政策" prop="YYBZZCLAWS" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="form.YYBZZCLAWS"
|
||||
placeholder="请输入引用标准&政策"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
style="position:absolute;top: 10px;right: 0;"
|
||||
@click="selectLaws('YYBZZCLAWS'),config.attrName = '引用标准&政策'"
|
||||
>{{'手动查找'}}</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="被代替文件号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="form.BDTWJHLAWS"-->
|
||||
<!-- placeholder="请输入被代替文件号"-->
|
||||
<!-- clearable-->
|
||||
<!-- ></el-input>-->
|
||||
<!--<!– <el-button–>-->
|
||||
<!--<!– type="primary"–>-->
|
||||
<!--<!– class="common-button-primary"–>-->
|
||||
<!--<!– size="mini"–>-->
|
||||
<!--<!– style="position:absolute;top: 10px;right: 0;"–>-->
|
||||
<!--<!– @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"–>-->
|
||||
<!--<!– >{{'手动查找'}}</el-button>–>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -651,7 +658,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="编号/名称" class="search-item">
|
||||
<el-input
|
||||
v-model="replaceLawsNumForm.standNumber"
|
||||
v-model.trim="replaceLawsNumForm.numberName"
|
||||
placeholder="根据编号/名称查找"
|
||||
clearable
|
||||
:maxlength="100"></el-input>
|
||||
@@ -694,12 +701,11 @@
|
||||
<el-table-column
|
||||
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 class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
|
||||
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
prop="lawsName"
|
||||
label="标准名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -1808,7 +1814,7 @@
|
||||
}
|
||||
this.replaceLawsNumForm.page = 1
|
||||
this.replacePage = 1
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
|
||||
this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
|
||||
_this: this,
|
||||
loading: 'replaceLoading'
|
||||
}, res => {
|
||||
@@ -1881,20 +1887,15 @@
|
||||
})
|
||||
}
|
||||
this.selectedListRep.map((item) => {
|
||||
let texts = ''
|
||||
if (item.standYear != null && item.standYear !== '') {
|
||||
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
|
||||
} else {
|
||||
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
|
||||
}
|
||||
let texts = item.lawsNumber
|
||||
textArr.push(texts)
|
||||
textArr = [...new Set(textArr)]
|
||||
this.replaceLawsNumModel = false
|
||||
})
|
||||
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
|
||||
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
|
||||
if(this.replaceLawType === 'dtbjh'){
|
||||
this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
|
||||
if(this.replaceLawType === 'YYBZZCLAWS'){
|
||||
this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',')
|
||||
}else if(this.replaceLawType === 'yybj'){
|
||||
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
|
||||
}else if(this.replaceLawType === 'cbbh'){
|
||||
@@ -1949,7 +1950,7 @@
|
||||
this.replaceLawsNumForm.quoteIdList = ''
|
||||
}
|
||||
this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
|
||||
this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
|
||||
_this: this,
|
||||
loading: 'replaceLoading'
|
||||
}, res => {
|
||||
|
||||
@@ -1545,8 +1545,8 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 体系类别-->
|
||||
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
|
||||
<el-form-item label="标准体系" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
|
||||
:key="opt.value"
|
||||
@@ -1841,17 +1841,17 @@
|
||||
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 引用标准-->
|
||||
<el-form-item label="引用标准" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<!-- 被代替标准号-->
|
||||
<el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
|
||||
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
|
||||
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- 引用标准-->
|
||||
<el-form-item label="引用标准" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 被引用标准-->
|
||||
|
||||
Reference in New Issue
Block a user