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

This commit is contained in:
zyx.net
2022-10-09 18:17:59 +08:00
90 changed files with 1721 additions and 1148 deletions
@@ -742,48 +742,48 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXHBUSS'">
<el-form-item
prop="DYBXHBUSS"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(卡车)</template>
<el-input
v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"
@click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">
</el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMCBUSS'">
<el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">
<el-input
v-model="sarBussionessStandEO.DYMCBUSS" disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCDYBXHBUSS'">
<el-form-item
prop="CYCDYBXHBUSS"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(乘用车)</template>
<el-input
v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"
@click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">
</el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCDYMCBUSS'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">
<el-input
v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled
clearable
></el-input>
</el-form-item>
</template>
<!-- <template v-else-if="field.attrField === 'DYBXHBUSS'">-->
<!-- <el-form-item-->
<!-- prop="DYBXHBUSS"-->
<!-- label-width="150px"-->
<!-- class="add-form-item"-->
<!-- >-->
<!-- <template slot="label">模块结构单元变型号(卡车)</template>-->
<!-- <el-input-->
<!-- v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"-->
<!-- @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- <template v-else-if="field.attrField === 'DYMCBUSS'">-->
<!-- <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="sarBussionessStandEO.DYMCBUSS" disabled-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- <template v-else-if="field.attrField === 'CYCDYBXHBUSS'">-->
<!-- <el-form-item-->
<!-- prop="CYCDYBXHBUSS"-->
<!-- label-width="150px"-->
<!-- class="add-form-item"-->
<!-- >-->
<!-- <template slot="label">模块结构单元变型号(乘用车)</template>-->
<!-- <el-input-->
<!-- v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"-->
<!-- @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- <template v-else-if="field.attrField === 'CYCDYMCBUSS'">-->
<!-- <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<template v-else-if="field.attrField === 'VPPSCNBUSS'">
<el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
<el-input
@@ -1357,18 +1357,18 @@
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 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-col>
<el-col :span="12">
<el-form-item
@@ -1410,18 +1410,18 @@
placeholder="请输入关联模块--卡车vpps中文名称"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYMCBUSS"
placeholder="请输入模块结构单元名称(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYMCBUSS"
placeholder="请输入模块结构单元名称(乘用车)"
></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="sarBussionessSearch.DYMCBUSS"-->
<!-- placeholder="请输入模块结构单元名称(卡车)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="sarBussionessSearch.CYCDYMCBUSS"-->
<!-- placeholder="请输入模块结构单元名称(乘用车)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>