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

Merge branch 'fix_20240123_UAT' into 'master'

Browse Source 
fix: 技术标准-关联模块鼠标悬浮

See merge request laws-foton-slrs/foton-laws-system-front!158
This commit is contained in:
高嵩
2024-02-27 09:50:27 +00:00
parent cd13a1f4bd 7aaf77e544
commit bdadd6c55c
5 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+10 -1
View File
@@ -357,6 +357,7 @@
>
<el-input
v-model="form.CYCVPPSBMBUSS"
:title="form.CYCVPPSBMBUSS"
readonly="readonly"
placeholder="选择关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"
@@ -369,6 +370,7 @@
>
<el-input
v-model="form.KCVPPSBMBUSS"
:title="form.KCVPPSBMBUSS"
readonly="readonly"
placeholder="选择关联模块--卡车VPPS编码"
@click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"
@@ -436,12 +438,19 @@
prop="CYCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="关联模块--乘用车vpps中文名称" clearable disabled />
<el-input
v-model="form.CYCVPPSCNBUSS"
:title="form.CYCVPPSCNBUSS"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
/>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input
v-model="form.KCVPPSCNBUSS"
placeholder="关联模块--卡车VPPS中文名称"
:title="form.KCVPPSCNBUSS"
clearable
disabled
/>
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+28 -4
View File
@@ -348,10 +348,22 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)" />
<el-input
v-model="form.CYCVPPSBMBUSS"
:title="form.CYCVPPSBMBUSS"
readonly="readonly"
placeholder="选择关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"
/>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)" />
<el-input
v-model="form.KCVPPSBMBUSS"
:title="form.KCVPPSBMBUSS"
readonly="readonly"
placeholder="选择关联模块--卡车VPPS编码"
@click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"
/>
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
@@ -401,10 +413,22 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="关联模块--乘用车vpps中文名称" clearable disabled />
<el-input
v-model="form.CYCVPPSCNBUSS"
:title="form.CYCVPPSCNBUSS"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
/>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS中文名称" clearable disabled />
<el-input
v-model="form.KCVPPSCNBUSS"
:title="form.KCVPPSCNBUSS"
placeholder="关联模块--卡车VPPS中文名称"
clearable
disabled
/>
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+12 -4
View File
@@ -268,14 +268,22 @@
title="关联模块--乘用车VPPS编码"
class="add-form-item form-item-disabled"
>
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState" />
<el-input
v-model="form.CYCVPPSBMBUSS"
:title="form.CYCVPPSBMBUSS"
:disabled="disabledState"
/>
</el-form-item>
<el-form-item
label="关联模块--卡车VPPS编码"
title="关联模块--卡车VPPS编码"
class="add-form-item form-item-disabled"
>
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState" />
<el-input
v-model="form.KCVPPSBMBUSS"
:title="form.KCVPPSBMBUSS"
:disabled="disabledState"
/>
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYBXHBUSS" :disabled="disabledState"></el-input>-->
@@ -333,10 +341,10 @@
prop="CYCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
<el-input v-model="form.CYCVPPSCNBUSS" clearable disabled />
<el-input v-model="form.CYCVPPSCNBUSS" :title="form.CYCVPPSCNBUSS" clearable disabled />
</el-form-item>
<el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" clearable disabled />
<el-input v-model="form.KCVPPSCNBUSS" :title="form.KCVPPSCNBUSS" clearable disabled />
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+4
View File
@@ -317,6 +317,7 @@
v-model="form.CYCVPPSBMBUSS"
:disabled="disabledXX"
readonly="readonly"
:title="form.CYCVPPSBMBUSS"
placeholder="关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"
/>
@@ -330,6 +331,7 @@
v-model="form.KCVPPSBMBUSS"
:disabled="disabledXX"
readonly="readonly"
:title="form.KCVPPSBMBUSS"
placeholder="关联模块--卡车VPPS编码"
@click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"
/>
@@ -405,6 +407,7 @@
<el-input
v-model="form.CYCVPPSCNBUSS"
:disabled="disabledXX"
:title="form.CYCVPPSCNBUSS"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
@@ -418,6 +421,7 @@
<el-input
v-model="form.KCVPPSCNBUSS"
:disabled="disabledXX"
:title="form.KCVPPSCNBUSS"
placeholder="关联模块--卡车vpps中文名称"
clearable
disabled
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+4
View File
@@ -401,6 +401,7 @@
v-model="form.CYCVPPSBMBUSS"
:disabled="disabledXX"
readonly="readonly"
:title="form.CYCVPPSBMBUSS"
placeholder="关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"
/>
@@ -414,6 +415,7 @@
v-model="form.KCVPPSBMBUSS"
:disabled="disabledXX"
readonly="readonly"
:title="form.KCVPPSBMBUSS"
placeholder="关联模块--卡车VPPS编码"
@click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"
/>
@@ -488,6 +490,7 @@
<el-input
v-model="form.CYCVPPSCNBUSS"
:disabled="disabledXX"
:title="form.CYCVPPSCNBUSS"
placeholder="关联模块--乘用车vpps中文名称"
clearable
disabled
@@ -501,6 +504,7 @@
<el-input
v-model="form.KCVPPSCNBUSS"
:disabled="disabledXX"
:title="form.KCVPPSCNBUSS"
placeholder="关联模块--卡车VPPS中文名称"
clearable
disabled