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

This commit is contained in:
super_liu
2021-12-29 15:04:34 +08:00
6 changed files with 273 additions and 6 deletions
@@ -83,6 +83,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -235,12 +295,19 @@ export default {
nodeList:[],
drawerTitle: '',
detailData: [],
BZList: [],
}
},
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -83,6 +83,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -228,12 +288,18 @@ export default {
nodeList:[],
drawerTitle: '',
detailData: [],
BZList: [],
}
},
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -83,6 +83,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -228,12 +288,18 @@ export default {
nodeList:[],
drawerTitle: '',
detailData: [],
BZList: [],
}
},
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -83,6 +83,66 @@
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入企业标准"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.isRelate"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px" prop="technologic" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.technologic"
placeholder="请输入是否引用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px" prop="esStandRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esStandRelations"
placeholder="请输入采用标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" prop="useLevel" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.useLevel"
placeholder="请输入采标程度"
:maxlength="500"/>
</el-form-item>
<el-form-item label="配套标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入配套标准"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -228,12 +288,18 @@ export default {
nodeList:[],
drawerTitle: '',
detailData: [],
BZList: [],
}
},
mounted() {
this.processTable()
this.getData()
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
this.BZList = res.data.ENERGYTYPES //标准范围
})
},
methods:{
processTable() {
@@ -1672,7 +1672,7 @@
<custom-select-array
style="margin-left: -14px"
:config="applyArcticOptions"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
@@ -2305,6 +2305,7 @@ export default {
standNature: '',//标准性质
textStatus: '',//文本状态
synopsis: '', // 内容摘要
CLLX: '' // 适用车型
}, // 分页查询过程中用到的对象
@@ -619,7 +619,7 @@
<custom-select-array
:config="applyArcticOptions"
style="margin-left: -14px"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@@ -1850,7 +1850,8 @@ export default {
standState: '',
standNature: '',//标准性质
synopsis: '', // 内容摘要
textStatus: ''//文本状态
textStatus: '',//文本状态
CLLX: ''
},
//高级搜索映射
advanceSearchMapping: {