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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-29 16:19:52 +08:00
parent a1fff94099 41bcf30fed
commit 332ad90625
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+2 -2
View File
@@ -261,8 +261,8 @@
:pageSize="pageConfig.newStandPageSize"
:total="pageConfig.count3"
autoSize
@pageChange="page => handlePageChange('newItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
@pageChange="page => handlePageChange('newStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
<el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
<el-table
:data="oldStand"
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+16
View File
@@ -29,21 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+22
View File
@@ -29,21 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
@@ -87,6 +103,12 @@
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input