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

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

Browse Source
This commit is contained in:
zhutianqi
2022-01-07 10:34:36 +08:00
parent d688b4b213 27677c2402
commit a33521d380
2 changed files with 34 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+1 -1
View File
@@ -263,7 +263,7 @@
></el-option>
</el-select>
</el-form-item>
<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 v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
src/pages/searchCenter/pages/advancedSearch.vue
+33 -65
View File
@@ -343,20 +343,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', standForm.dybxh)"></el-input>
<tree-select-new
width = "800"
:key="key3"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
<el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -789,28 +776,12 @@
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW">
<el-select v-model="standForm.QCDW" filterable clearable>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-input v-model="standForm.QCDW" clearable placeholder="请输入起草部门"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="standNumber">
<el-select v-model="standForm.QCRBUSS" filterable clearable>
<el-option
v-for="item in qcrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-input v-model="standForm.QCRBUSS" clearable placeholder="请输入起草人"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -822,7 +793,7 @@
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="适用车型" prop="standNumber">
<el-select v-model="standForm.SYCXCLASS" filterable clearable>
<el-select v-model="standForm.SYCXCLASS" filterable clearable multiple>
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
@@ -851,7 +822,7 @@
<el-col :span="12">
<el-form-item label="适用产品线" prop="SYCPXCLASS">
<el-select v-model="standForm.SYCPXCLASS" filterable clearable>
<el-select v-model="standForm.SYCPXCLASS" filterable clearable multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -865,45 +836,42 @@
<el-col :span="12">
<el-form-item label="体系类别" prop="TXLBBUSS">
<el-input v-model="standForm.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRRTxlbBuss('TXLBBUSS', '体系类别', standForm.TXLBBUSS)"></el-input>
<tree-select-new
width = "800"
:key="keyBuss"
:multiple=false
:lazy=false
:check-strictly= true
:modalShowFlag="modalShowFlagBuss"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:data="standSystemBussOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverBuss"></tree-select-new>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
<el-input v-model="standForm.VPPSBMBUSS" placeholder="请输入关联模块-VPPS编码查找" clearable @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', standForm.VPPSBMBUSS,false)"></el-input>
<tree-select-new
width = "800"
:key="key1"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="standForm.CYCVPPSBMBUSS" placeholder="选择VPPS编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块-中文名称" prop="VPPSCNBUSS">
<el-input v-model="standForm.VPPSCNBUSS" clearable
placeholder="请输入关联模块-中文名称查找"></el-input>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model.trim="standForm.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model.trim="standForm.KCVPPSBMBUSS" placeholder="选择VPPS编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model.trim="standForm.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
<el-input v-model.trim="standForm.DYBXHBUSS" placeholder="选择模块结构单元变型号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
<el-input v-model.trim="standForm.DYMCBUSS" placeholder="模块结构单元名称" clearable></el-input>
</el-form-item>
</el-col>
</el-row>