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

feat: There is no way the, bug #51988 #51984 #51982

Browse Source
This commit is contained in:
super_liu
2022-03-24 14:23:49 +08:00
parent 8cca416f22
commit ddcb5bab64
1 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+65 -69
View File
@@ -1225,8 +1225,26 @@
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="sarBussionessSearch.CYCVPPSBMBUSS" v-model="sarBussionessSearch.CYCVPPSBMBUSS"
placeholder="选择关联模块--乘用车VPPS编码" placeholder="请输入关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input> ></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSBMBUSS"
placeholder="请输入关联模块--卡车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYBXHBUSS"
placeholder="请输入模块结构单元变型号(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYBXHBUSS"
placeholder="请输入模块结构单元变型号(乘用车)"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -1240,18 +1258,6 @@
@click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])"> @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
<!--&lt;!&ndash; <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
<!--&lt;!&ndash; <el-option&ndash;&gt;-->
<!--&lt;!&ndash; v-for="item in qcrOptions"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择"&ndash;&gt;-->
<!--&lt;!&ndash; :key="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :value="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :label="item.label"&ndash;&gt;-->
<!--&lt;!&ndash; ></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- 能源类型--> <!-- 能源类型-->
<template> <template>
<custom-select-array <custom-select-array
@@ -1260,18 +1266,6 @@
v-model="sarBussionessSearch['NYLXCLASS']" v-model="sarBussionessSearch['NYLXCLASS']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in categoryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 适用产品线（新增字段）-->
<template> <template>
<custom-select-array <custom-select-array
:config="sycpxOptions" :config="sycpxOptions"
@@ -1279,20 +1273,30 @@
v-model="sarBussionessSearch['SYCPXCLASS']" v-model="sarBussionessSearch['SYCPXCLASS']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">--> <el-form-item label="关联模块--乘用车vpps中文名称" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<!-- <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>--> <el-input
<!-- <el-option--> v-model="sarBussionessSearch.CYCVPPSCNBUSS"
<!-- v-for="item in sycpxOptions"--> placeholder="请输入关联模块--乘用车vpps中文名称"
<!-- placeholder="请选择"--> ></el-input>
<!-- :key="item.value"--> </el-form-item>
<!-- :value="item.value"--> <el-form-item label="关联模块--卡车vpps中文名称" title="关联模块--卡车vpps中文名称" class="add-form-item form-item-disabled">
<!-- :label="item.label"--> <el-input
<!-- ></el-option>--> v-model="sarBussionessSearch.KCVPPSCNBUSS"
<!-- </el-select>--> placeholder="请输入关联模块--卡车vpps中文名称"
<!-- </el-form-item>--> ></el-input>
<!-- <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled"> </el-form-item>
<el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input> <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
</el-form-item>--> <el-input
v-model="sarBussionessSearch.DYMCBUSS"
placeholder="请输入模块结构单元名称(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYMCBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -2581,17 +2585,17 @@ export default {
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) { if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) { if (checkedData.length > 0) {
if (this.drawerTitle2 === 'VPPS编码') { if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else { } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} }
} else { } else {
if (this.drawerTitle2 === 'VPPS编码') { if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
} else { } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -4336,37 +4340,29 @@ export default {
formFieldList.forEach((item) => { formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField] const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理 // 时间格式处理
if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') { if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: "and", connect: "and",
field: 'CYCVPPSBM', field: item.attrField || "",
type: 'like', type: 'EQUALS',
value: value value: value
}); });
}else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') { }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSCN',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "", connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "", field: item.attrField || "",
type: "between", type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "") {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'like',
value: value value: value
}); });
} }
}) })
if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'EQUALS',
value: formData.BARQ
});
}
} }
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData; this.SarExportSearchEo = formData;